openutils-svn

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

[<me...@us...>]

Revision: 1681
          http://openutils.svn.sourceforge.net/openutils/?rev=1681&view=rev
Author:   memila
Date:     2010-01-19 10:04:11 +0000 (Tue, 19 Jan 2010)

Log Message:
-----------
added examples

Modified Paths:
--------------
    trunk/magnolia-test-webapp/src/main/webapp/template_magnoliautils/magnoliaUtils.jsp
    trunk/openutils-mgnlutils/src/main/resources/META-INF/tld/mgnlutils.tld

Modified: trunk/magnolia-test-webapp/src/main/webapp/template_magnoliautils/magnoliaUtils.jsp
===================================================================
--- trunk/magnolia-test-webapp/src/main/webapp/template_magnoliautils/magnoliaUtils.jsp	2010-01-19 10:03:18 UTC (rev 1680)
+++ trunk/magnolia-test-webapp/src/main/webapp/template_magnoliautils/magnoliaUtils.jsp	2010-01-19 10:04:11 UTC (rev 1681)
@@ -58,6 +58,12 @@
         <div class="sampletext">isPage(actpage)</div>
         <div class="sampleresult">${mu:isPage(actpage)}</div>
       </div>
+       <div class="function">
+        <h2>getPage</h2>
+        <p>Return the object passed or the first parent page that has content type = mgnl:content</p>
+        <div class="sampletext">getPage(actpage))</div>
+        <div class="sampleresult">${mu:getPage(actpage)}</div>
+      </div>
       <div class="function">
         <h2>requestAttributeMap</h2>
         <p>Return a map key=value of all magnolia request attributes</p>

Modified: trunk/openutils-mgnlutils/src/main/resources/META-INF/tld/mgnlutils.tld
===================================================================
--- trunk/openutils-mgnlutils/src/main/resources/META-INF/tld/mgnlutils.tld	2010-01-19 10:03:18 UTC (rev 1680)
+++ trunk/openutils-mgnlutils/src/main/resources/META-INF/tld/mgnlutils.tld	2010-01-19 10:04:11 UTC (rev 1681)
@@ -11,36 +11,68 @@
     <description>Test if exists a parent page with content in the collectionName given as parameter, if exist set the parent page a sactpage</description>
     <function-class>it.openutils.mgnlutils.el.MgnlUtilsElFunctions</function-class>
     <function-signature>java.lang.Boolean firstPageWithCollection(java.lang.String)</function-signature>
+     <example>
+      <![CDATA[
+        <cms:newBar contentNodeCollectionName="newcontent" paragraph="xyz" />
+        ${mu:firstPageWithCollection("newcontent")}}
+      ]]>
+    </example>
   </function>
   <function>
     <name>isPage</name>
     <description>Evaluete if primary node type of the associated Node of an object is a mgnl:contentNode</description>
     <function-class>it.openutils.mgnlutils.el.MgnlUtilsElFunctions</function-class>
     <function-signature>java.lang.Boolean isPage(info.magnolia.cms.core.Content)</function-signature>
+    <example>
+      <![CDATA[
+        ${mu:isPage(actpage)}
+      ]]>
+    </example>
   </function>
   <function>
     <name>getPage</name>
     <description>Return the object passed or the first parent page that has content type = mgnl:content</description> 
     <function-class>it.openutils.mgnlutils.el.MgnlUtilsElFunctions</function-class>
     <function-signature>info.magnolia.cms.core.Content getPage(info.magnolia.cms.core.Content)</function-signature>
+     <example>
+      <![CDATA[
+        ${mu:getPage(actpage)}
+      ]]>
+    </example>
   </function>
   <function>
     <name>requestAttributeMap</name>
     <description>Return a map key=value of all magnolia request attributes</description> 
     <function-class>it.openutils.mgnlutils.el.MgnlUtilsElFunctions</function-class>
     <function-signature>java.util.Map getRequestAttributeMap()</function-signature>
+    <example>
+      <![CDATA[
+        ${mu:requestAttributeMap()["javax.servlet.forward.request_uri"]}
+      ]]>
+    </example>
   </function>
   <function>
     <name>countNodesInCollection</name>
     <description>Count the nodes in a collection with a given content and the name of the collection</description> 
     <function-class>it.openutils.mgnlutils.el.MgnlUtilsElFunctions</function-class>
     <function-signature>java.lang.Integer countNodesInCollection(info.magnolia.cms.core.Content, java.lang.String)</function-signature>
+     <example>
+      <![CDATA[
+       <cms:newBar contentNodeCollectionName="newcontent" paragraph="xyz" />
+       ${mu:countNodesInCollection(actpage,"newcontent")}
+      ]]>
+    </example>
   </function>
   <function>
     <name>countSubpages</name>
     <description>Count subpages with a given content</description> 
     <function-class>it.openutils.mgnlutils.el.MgnlUtilsElFunctions</function-class>
     <function-signature>java.lang.Integer countSubpages(info.magnolia.cms.core.Content)</function-signature>
+    <example>
+      <![CDATA[
+       ${mu:countSubpages(actpage)}
+      ]]>
+    </example>
   </function>
   <function>
     <name>subpages</name>
@@ -53,6 +85,11 @@
     <description>Return the current user logged</description>
     <function-class>info.magnolia.context.MgnlContext</function-class>
     <function-signature>info.magnolia.cms.security.User getUser()</function-signature>
+    <example>
+      <![CDATA[
+       ${mu:user()}
+      ]]>
+    </example>
   </function>
   <function>
     <name>ctx</name>
@@ -65,6 +102,11 @@
     <description>Return the content of a given path and repository</description>
     <function-class>it.openutils.mgnlutils.el.MgnlUtilsElFunctions</function-class>
     <function-signature>info.magnolia.cms.core.Content contentByPath(java.lang.String, java.lang.String)</function-signature>
+     <example>
+      <![CDATA[
+       ${mu:contentByPath('Magnolia-Utils','website')}
+      ]]>
+    </example>
   </function>
   <function>
     <name>message</name>


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

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

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

Revision: 1689
          http://openutils.svn.sourceforge.net/openutils/?rev=1689&view=rev
Author:   fgiust
Date:     2010-01-20 14:39:29 +0000 (Wed, 20 Jan 2010)

Log Message:
-----------
cleaned up dateutils

Modified Paths:
--------------
    trunk/magnolia-test-webapp/src/main/webapp/docroot/dateutils-test.jsp
    trunk/openutils-elfunctions/src/main/java/net/sourceforge/openutils/elfunctions/DateElUtils.java
    trunk/openutils-elfunctions/src/main/resources/META-INF/dateutils.tld
    trunk/openutils-elfunctions/src/test/resources/jsps/formatInterval.jsp

Modified: trunk/magnolia-test-webapp/src/main/webapp/docroot/dateutils-test.jsp
===================================================================
--- trunk/magnolia-test-webapp/src/main/webapp/docroot/dateutils-test.jsp	2010-01-20 14:11:07 UTC (rev 1688)
+++ trunk/magnolia-test-webapp/src/main/webapp/docroot/dateutils-test.jsp	2010-01-20 14:39:29 UTC (rev 1689)
@@ -12,7 +12,7 @@
       .function {
       border: 1px solid #ccc;
       padding: 20px;
-      }      
+      }
       .sampleresult {
         color: red;
       }
@@ -61,9 +61,9 @@
       <div class="function">
         <h2>formatInterval</h2>
         <p>format a milliseconds interval as a string like 523h 22m 18s</p>
-        <div class="sampletext">java.lang.String formatInterval(java.lang.Long, java.lang.Boolean)
+        <div class="sampletext">java.lang.String formatInterval(java.lang.Long)
         </div>
-        <div class="sampleresult">formatInterval(63076234017000,true): ${du:formatInterval(63076234017000,true)}</div>
+        <div class="sampleresult">formatInterval(63076234017000,true): ${du:formatInterval(63076234017000)}</div>
       </div>
        <div class="function">
         <h2>getMillisFromNow</h2>

Modified: trunk/openutils-elfunctions/src/main/java/net/sourceforge/openutils/elfunctions/DateElUtils.java
===================================================================
--- trunk/openutils-elfunctions/src/main/java/net/sourceforge/openutils/elfunctions/DateElUtils.java	2010-01-20 14:11:07 UTC (rev 1688)
+++ trunk/openutils-elfunctions/src/main/java/net/sourceforge/openutils/elfunctions/DateElUtils.java	2010-01-20 14:39:29 UTC (rev 1689)
@@ -30,6 +30,7 @@
 
 
 /**
+ * Utility methods for date/time handling mapped to EL functions to allow usage in jsp pages.
  * @author fgiust
  * @version $Id$
  */
@@ -42,12 +43,12 @@
     private static Logger log = LoggerFactory.getLogger(DateElUtils.class);
 
     /**
-     * internal constant value to indicate no builtin format was found for the input pattern
+     * internal constant value to indicate no built-in format was found for the input pattern
      * @see {@link FastDateFormat}
      */
     private static final int NO_FORMAT = -1337;
 
-    // constants to support builtin date and time formatting
+    // constants to support built-in date and time formatting
     private static final String FORMAT_SHORT = "short";
 
     private static final String FORMAT_MEDIUM = "medium";
@@ -88,12 +89,12 @@
     }
 
     /**
-     * internal utility method to format dates attempting builtin styles first, and then resorting to
+     * internal utility method to format dates attempting built-in styles first, and then resorting to
      * {@link FastDateFormat#getInstance(String)}
      * @param dateTime the date and time to format
-     * @param pattern the format pattern, or one (or two) of the builtin styles
-     * @param date true to format the date part with the builtin style
-     * @param time false to format the time part with the builtin style
+     * @param pattern the format pattern, or one (or two) of the built-in styles
+     * @param date true to format the date part with the built-in style
+     * @param time false to format the time part with the built-in style
      * @param locale formatter locale, default locale if null
      * @return the formatted date, or the empty string if dateTime was null or pattern was blank
      */
@@ -142,7 +143,7 @@
     }
 
     /**
-     * formats a date using the given pattern or builtin style
+     * formats a date using the given pattern or built-in style
      * @param date the date to format
      * @param pattern a valid pattern, or one of "short", "medium", "long", "full" (case insensitive)
      * @return the formatted date
@@ -153,7 +154,7 @@
     }
 
     /**
-     * formats a time using the given pattern or builtin style
+     * formats a time using the given pattern or built-in style
      * @param time the time to format
      * @param pattern a valid pattern, or one of "short", "medium", "long", "full" (case insensitive)
      * @return the formatted time
@@ -164,7 +165,7 @@
     }
 
     /**
-     * Formats a date and/or time using the given pattern or builtin style - supports composite formats for date and
+     * Formats a date and/or time using the given pattern or built-in style - supports composite formats for date and
      * time with the syntax "date_format;time_format" (ex: "long;short")
      * @param dateTime the date and time
      * @param pattern date pattern
@@ -176,7 +177,7 @@
     }
 
     /**
-     * Formats a date and/or time using the given pattern or builtin style - supports composite formats for date and
+     * Formats a date and/or time using the given pattern or built-in style - supports composite formats for date and
      * time with the syntax "date_format;time_format" (ex: "long;short") with locale
      * @param dateTime the date and time
      * @param languageId lowercase two-letter ISO-639 code.
@@ -191,11 +192,11 @@
     /**
      * format a milliseconds interval as a string like 1y 2d 23h 22m 18s (year estimation approximates to 365 days)
      * @param millisInterval the interval in milliseconds
-     * @param isDuration isduration
      * @return the formatted string
      */
-    public static String formatInterval(Long millisInterval, Boolean isDuration)
+    public static String formatInterval(Long millisInterval)
     {
+
         if (millisInterval == null)
         {
             return StringUtils.EMPTY;
@@ -207,79 +208,30 @@
         long minutes = (secondsInterval % (60 * 60)) / 60;
         long seconds = secondsInterval % 60;
         StringBuilder out = new StringBuilder();
-        if (isDuration)
+
+        if (years > 0)
         {
-            if (years > 0)
-            {
-                out.append(years).append("y ");
-            }
-            if (days > 0)
-            {
-                out.append(days).append("d ");
-            }
-            if (hours > 0)
-            {
-                out.append(hours).append("h ");
-            }
-            if (minutes > 0)
-            {
-                out.append(minutes).append("m ");
-            }
-            out.append(seconds).append('s');
+            out.append(years).append("y ");
         }
-        else
+        if (days > 0)
         {
-            if (years > 0)
-            {
-                if (years == 1)
-                {
-                    out.append(years).append(" anno fa");
-                }
-                else
-                {
-                    out.append(years).append(" anni fa");
-                }
-            }
-            else if (days > 0)
-            {
-                if (days == 1)
-                {
-                    out.append(days).append(" giorno fa");
-                }
-                else
-                {
-                    out.append(days).append(" giorni fa");
-                }
-            }
-            else if (hours > 0)
-            {
-                if (hours == 1)
-                {
-                    out.append(hours).append(" ora fa");
-                }
-                else
-                {
-                    out.append(hours).append(" ore fa");
-                }
-            }
-            else if (minutes > 0)
-            {
-                if (minutes == 1)
-                {
-                    out.append(minutes).append(" minuto fa");
-                }
-                else
-                {
-                    out.append(minutes).append(" minuti fa");
-                }
-            }
-
+            out.append(days).append("d ");
         }
+        if (hours > 0)
+        {
+            out.append(hours).append("h ");
+        }
+        if (minutes > 0)
+        {
+            out.append(minutes).append("m ");
+        }
+        out.append(seconds).append('s');
+
         return out.toString();
     }
 
     /**
-     * retrieve the milliseconds in difference between now and the input date
+     * Retrieve the milliseconds in difference between now and the input date
      * @param date the date
      * @return positive value for dates older than now
      */
@@ -318,7 +270,7 @@
 
     /**
      * parse a date with a XSD pattern (YYYY-MM-DDThh:mm:ss) and return the parsed date as as a calendar object
-     * @param date the date string
+     * @param xsdDate the date string in the format "YYYY-MM-DDThh:mm:ss"
      * @return the parsed date as a Calendar
      */
     public static Calendar parseXsdDate(String xsdDate)
@@ -340,7 +292,6 @@
         return cal;
     }
 
-
     /**
      * Given a Calendar, returns a new calendar with same day and hh:mm:ss:mm set to 00:00:00:00
      * @param calendar the calendar

Modified: trunk/openutils-elfunctions/src/main/resources/META-INF/dateutils.tld
===================================================================
--- trunk/openutils-elfunctions/src/main/resources/META-INF/dateutils.tld	2010-01-20 14:11:07 UTC (rev 1688)
+++ trunk/openutils-elfunctions/src/main/resources/META-INF/dateutils.tld	2010-01-20 14:39:29 UTC (rev 1689)
@@ -41,7 +41,7 @@
     <name>formatInterval</name>
     <description>format a milliseconds interval as a string like 523h 22m 18s</description>
     <function-class>net.sourceforge.openutils.elfunctions.DateElUtils</function-class>
-    <function-signature>java.lang.String formatInterval(java.lang.Long, java.lang.Boolean)</function-signature>
+    <function-signature>java.lang.String formatInterval(java.lang.Long)</function-signature>
   </function>
   <function>
     <name>getMillisFromNow</name>

Modified: trunk/openutils-elfunctions/src/test/resources/jsps/formatInterval.jsp
===================================================================
--- trunk/openutils-elfunctions/src/test/resources/jsps/formatInterval.jsp	2010-01-20 14:11:07 UTC (rev 1688)
+++ trunk/openutils-elfunctions/src/test/resources/jsps/formatInterval.jsp	2010-01-20 14:39:29 UTC (rev 1689)
@@ -1,5 +1,5 @@
 <jsp:root version="2.0" 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,true)}</jsp:text>
+  <jsp:text>${du:formatInterval(63076234017000)}</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:[1713] trunk

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

Revision: 1713
          http://openutils.svn.sourceforge.net/openutils/?rev=1713&view=rev
Author:   fgiust
Date:     2010-01-21 10:49:43 +0000 (Thu, 21 Jan 2010)

Log Message:
-----------
site configuration

Modified Paths:
--------------
    trunk/openutils-elfunctions/src/site/site.xml

Added Paths:
-----------
    trunk/openutils-mgnlutils/src/site/
    trunk/openutils-mgnlutils/src/site/site.xml

Modified: trunk/openutils-elfunctions/src/site/site.xml
===================================================================
--- trunk/openutils-elfunctions/src/site/site.xml	2010-01-21 10:47:53 UTC (rev 1712)
+++ trunk/openutils-elfunctions/src/site/site.xml	2010-01-21 10:49:43 UTC (rev 1713)
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project name="Openutils mgnlmedia">
+<project name="Openutils elfunctions">
   <publishDate position="navigation-bottom" format="yyyy-MM-dd" />
   <version position="navigation-bottom" />
   <bannerRight>
@@ -17,7 +17,7 @@
     <head>
       <link rel="icon" href="images/favicon.ico" />
     </head>
-    <menu name="openutils mgnlmedia">
+    <menu name="openutils elfunctions">
       <item name="About" href="index.html"></item>
     </menu>
     <menu ref="modules" inherit="bottom" />

Added: trunk/openutils-mgnlutils/src/site/site.xml
===================================================================
--- trunk/openutils-mgnlutils/src/site/site.xml	                        (rev 0)
+++ trunk/openutils-mgnlutils/src/site/site.xml	2010-01-21 10:49:43 UTC (rev 1713)
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project name="Openutils mgnlutils">
+  <publishDate position="navigation-bottom" format="yyyy-MM-dd" />
+  <version position="navigation-bottom" />
+  <bannerRight>
+    <name>Openutils</name>
+    <src>http://openutils.sourceforge.net/images/openutils-logo.png
+    </src>
+    <href>http://openutils.sourceforge.net</href>
+  </bannerRight>
+  <bannerLeft>
+    <name>Sourceforge</name>
+    <src>http://sourceforge.net/sflogo.php?group_id=150467&amp;amp;type=2</src>
+    <href>http://www.sourceforge.net/projects/openutils</href>
+  </bannerLeft>
+  <body>
+    <head>
+      <link rel="icon" href="images/favicon.ico" />
+    </head>
+    <menu name="openutils mgnlutils">
+      <item name="About" href="index.html"></item>
+    </menu>
+    <menu ref="modules" inherit="bottom" />
+    <menu ref="reports" inherit="bottom" />
+  </body>
+  <skin>
+    <groupId>net.sourceforge.openutils</groupId>
+    <artifactId>openutils-maven-skin</artifactId>
+    <version>1.1</version>
+  </skin>
+</project>


Property changes on: trunk/openutils-mgnlutils/src/site/site.xml
___________________________________________________________________
Added: svn:mime-type
   + text/plain
Added: svn:keywords
   + Author Date Id Revision
Added: svn:eol-style
   + native


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

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

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

Revision: 1726
          http://openutils.svn.sourceforge.net/openutils/?rev=1726&view=rev
Author:   fgiust
Date:     2010-01-31 16:26:25 +0000 (Sun, 31 Jan 2010)

Log Message:
-----------
update parent to version 1.2

Modified Paths:
--------------
    trunk/magnolia-test-webapp/pom.xml
    trunk/openutils-bshd5/pom.xml
    trunk/openutils-dbmigration/pom.xml
    trunk/openutils-deployment/pom.xml
    trunk/openutils-elfunctions/pom.xml
    trunk/openutils-log4j/pom.xml
    trunk/openutils-mgnlbootstrapsync/pom.xml
    trunk/openutils-mgnlcas/pom.xml
    trunk/openutils-mgnlcontrols/pom.xml
    trunk/openutils-mgnlcriteria/pom.xml
    trunk/openutils-mgnlext/pom.xml
    trunk/openutils-mgnlgroovy/pom.xml
    trunk/openutils-mgnlmedia/pom.xml
    trunk/openutils-mgnlmessages/pom.xml
    trunk/openutils-mgnlrepoutils/pom.xml
    trunk/openutils-mgnlspring/pom.xml
    trunk/openutils-mgnlstripes/pom.xml
    trunk/openutils-mgnlstruts11/pom.xml
    trunk/openutils-mgnltasks/pom.xml
    trunk/openutils-mgnlutils/pom.xml
    trunk/openutils-spring/pom.xml
    trunk/openutils-testing/pom.xml
    trunk/openutils-testing-junit/pom.xml
    trunk/openutils-testing-testng/pom.xml
    trunk/openutils-testing4dwr/pom.xml
    trunk/openutils-testing4dwr-junit/pom.xml
    trunk/openutils-testing4dwr-testng/pom.xml
    trunk/openutils-testing4web/pom.xml
    trunk/openutils-testing4web/src/main/java/net/sourceforge/openutils/testing4web/BaseJspEmbeddedTest.java

Added Paths:
-----------
    trunk/openutils-testing4web/src/main/java/net/sourceforge/openutils/testing4web/TestServletOptions.java
    trunk/openutils-testing4web/src/main/java/net/sourceforge/openutils/testing4web/TestTldLocationsCache.java

Modified: trunk/magnolia-test-webapp/pom.xml
===================================================================
--- trunk/magnolia-test-webapp/pom.xml	2010-01-31 16:13:49 UTC (rev 1725)
+++ trunk/magnolia-test-webapp/pom.xml	2010-01-31 16:26:25 UTC (rev 1726)
@@ -4,7 +4,7 @@
   <parent>
     <groupId>net.sourceforge.openutils</groupId>
     <artifactId>openutils-parent</artifactId>
-    <version>1.1</version>
+    <version>1.2</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <packaging>war</packaging>

Modified: trunk/openutils-bshd5/pom.xml
===================================================================
--- trunk/openutils-bshd5/pom.xml	2010-01-31 16:13:49 UTC (rev 1725)
+++ trunk/openutils-bshd5/pom.xml	2010-01-31 16:26:25 UTC (rev 1726)
@@ -4,7 +4,7 @@
   <parent>
     <groupId>net.sourceforge.openutils</groupId>
     <artifactId>openutils-parent</artifactId>
-    <version>1.1</version>
+    <version>1.2</version>
   </parent>
   <artifactId>openutils-bshd5</artifactId>
   <name>openutils base Spring-Hibernate DAO for java 5.0</name>

Modified: trunk/openutils-dbmigration/pom.xml
===================================================================
--- trunk/openutils-dbmigration/pom.xml	2010-01-31 16:13:49 UTC (rev 1725)
+++ trunk/openutils-dbmigration/pom.xml	2010-01-31 16:26:25 UTC (rev 1726)
@@ -3,7 +3,7 @@
   <parent>
     <groupId>net.sourceforge.openutils</groupId>
     <artifactId>openutils-parent</artifactId>
-    <version>1.1</version>
+    <version>1.2</version>
   </parent>
   <artifactId>openutils-dbmigration</artifactId>
   <name>openutils db migration</name>

Modified: trunk/openutils-deployment/pom.xml
===================================================================
--- trunk/openutils-deployment/pom.xml	2010-01-31 16:13:49 UTC (rev 1725)
+++ trunk/openutils-deployment/pom.xml	2010-01-31 16:26:25 UTC (rev 1726)
@@ -3,7 +3,7 @@
   <parent>
     <groupId>net.sourceforge.openutils</groupId>
     <artifactId>openutils-parent</artifactId>
-    <version>1.1</version>
+    <version>1.2</version>
   </parent>
   <artifactId>openutils-deployment</artifactId>
   <name>openutils deployment tools</name>

Modified: trunk/openutils-elfunctions/pom.xml
===================================================================
--- trunk/openutils-elfunctions/pom.xml	2010-01-31 16:13:49 UTC (rev 1725)
+++ trunk/openutils-elfunctions/pom.xml	2010-01-31 16:26:25 UTC (rev 1726)
@@ -2,7 +2,7 @@
   <parent>
     <groupId>net.sourceforge.openutils</groupId>
     <artifactId>openutils-parent</artifactId>
-    <version>1.1</version>
+    <version>1.2</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <packaging>jar</packaging>

Modified: trunk/openutils-log4j/pom.xml
===================================================================
--- trunk/openutils-log4j/pom.xml	2010-01-31 16:13:49 UTC (rev 1725)
+++ trunk/openutils-log4j/pom.xml	2010-01-31 16:26:25 UTC (rev 1726)
@@ -4,7 +4,7 @@
   <parent>
     <groupId>net.sourceforge.openutils</groupId>
     <artifactId>openutils-parent</artifactId>
-    <version>1.1</version>
+    <version>1.2</version>
   </parent>
   <artifactId>openutils-log4j</artifactId>
   <packaging>jar</packaging>

Modified: trunk/openutils-mgnlbootstrapsync/pom.xml
===================================================================
--- trunk/openutils-mgnlbootstrapsync/pom.xml	2010-01-31 16:13:49 UTC (rev 1725)
+++ trunk/openutils-mgnlbootstrapsync/pom.xml	2010-01-31 16:26:25 UTC (rev 1726)
@@ -4,7 +4,7 @@
   <parent>
     <groupId>net.sourceforge.openutils</groupId>
     <artifactId>openutils-parent</artifactId>
-    <version>1.1</version>
+    <version>1.2</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <packaging>jar</packaging>

Modified: trunk/openutils-mgnlcas/pom.xml
===================================================================
--- trunk/openutils-mgnlcas/pom.xml	2010-01-31 16:13:49 UTC (rev 1725)
+++ trunk/openutils-mgnlcas/pom.xml	2010-01-31 16:26:25 UTC (rev 1726)
@@ -3,7 +3,7 @@
   <parent>
     <groupId>net.sourceforge.openutils</groupId>
     <artifactId>openutils-parent</artifactId>
-    <version>1.0</version>
+    <version>1.2</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <packaging>jar</packaging>

Modified: trunk/openutils-mgnlcontrols/pom.xml
===================================================================
--- trunk/openutils-mgnlcontrols/pom.xml	2010-01-31 16:13:49 UTC (rev 1725)
+++ trunk/openutils-mgnlcontrols/pom.xml	2010-01-31 16:26:25 UTC (rev 1726)
@@ -2,7 +2,7 @@
   <parent>
     <groupId>net.sourceforge.openutils</groupId>
     <artifactId>openutils-parent</artifactId>
-    <version>1.1</version>
+    <version>1.2</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <packaging>jar</packaging>

Modified: trunk/openutils-mgnlcriteria/pom.xml
===================================================================
--- trunk/openutils-mgnlcriteria/pom.xml	2010-01-31 16:13:49 UTC (rev 1725)
+++ trunk/openutils-mgnlcriteria/pom.xml	2010-01-31 16:26:25 UTC (rev 1726)
@@ -3,7 +3,7 @@
   <parent>
     <groupId>net.sourceforge.openutils</groupId>
     <artifactId>openutils-parent</artifactId>
-    <version>1.1</version>
+    <version>1.2</version>
   </parent>
   <artifactId>openutils-mgnlcriteria</artifactId>
   <name>Magnolia Criteria API</name>

Modified: trunk/openutils-mgnlext/pom.xml
===================================================================
--- trunk/openutils-mgnlext/pom.xml	2010-01-31 16:13:49 UTC (rev 1725)
+++ trunk/openutils-mgnlext/pom.xml	2010-01-31 16:26:25 UTC (rev 1726)
@@ -3,7 +3,7 @@
   <parent>
     <groupId>net.sourceforge.openutils</groupId>
     <artifactId>openutils-parent</artifactId>
-    <version>1.1</version>
+    <version>1.2</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <packaging>jar</packaging>

Modified: trunk/openutils-mgnlgroovy/pom.xml
===================================================================
--- trunk/openutils-mgnlgroovy/pom.xml	2010-01-31 16:13:49 UTC (rev 1725)
+++ trunk/openutils-mgnlgroovy/pom.xml	2010-01-31 16:26:25 UTC (rev 1726)
@@ -2,7 +2,7 @@
   <parent>
     <groupId>net.sourceforge.openutils</groupId>
     <artifactId>openutils-parent</artifactId>
-    <version>1.1</version>
+    <version>1.2</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <packaging>jar</packaging>

Modified: trunk/openutils-mgnlmedia/pom.xml
===================================================================
--- trunk/openutils-mgnlmedia/pom.xml	2010-01-31 16:13:49 UTC (rev 1725)
+++ trunk/openutils-mgnlmedia/pom.xml	2010-01-31 16:26:25 UTC (rev 1726)
@@ -3,7 +3,7 @@
   <parent>
     <groupId>net.sourceforge.openutils</groupId>
     <artifactId>openutils-parent</artifactId>
-    <version>1.1</version>
+    <version>1.2</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <packaging>jar</packaging>
@@ -89,7 +89,7 @@
       <plugin>
         <groupId>net.sourceforge.maven-taglib</groupId>
         <artifactId>maven-taglib-plugin</artifactId>
-        <version>2.4-SNAPSHOT</version>
+        <version>2.4</version>
         <configuration>
           <parseHtml>true</parseHtml>
           <dontRecurseIntoSubdirs>true</dontRecurseIntoSubdirs>
@@ -97,15 +97,11 @@
       </plugin>
       <plugin>
         <artifactId>maven-changes-plugin</artifactId>
-        <version>2.0-beta-3</version>
-        <configuration>
-          <xmlPath>${basedir}/src/site/changes/changes.xml</xmlPath>
-        </configuration>
+        <version>2.3</version>
         <reportSets>
           <reportSet>
             <reports>
               <report>jira-report</report>
-              <report>announcement-generate</report>
             </reports>
           </reportSet>
         </reportSets>
@@ -116,7 +112,7 @@
         <reportSets>
           <reportSet>
             <reports>
-              <!-- <report>changes-report</report>-->
+            <report>changes-report</report>
             </reports>
           </reportSet>
         </reportSets>

Modified: trunk/openutils-mgnlmessages/pom.xml
===================================================================
--- trunk/openutils-mgnlmessages/pom.xml	2010-01-31 16:13:49 UTC (rev 1725)
+++ trunk/openutils-mgnlmessages/pom.xml	2010-01-31 16:26:25 UTC (rev 1726)
@@ -3,7 +3,7 @@
   <parent>
     <groupId>net.sourceforge.openutils</groupId>
     <artifactId>openutils-parent</artifactId>
-    <version>1.1</version>
+    <version>1.2</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <packaging>jar</packaging>

Modified: trunk/openutils-mgnlrepoutils/pom.xml
===================================================================
--- trunk/openutils-mgnlrepoutils/pom.xml	2010-01-31 16:13:49 UTC (rev 1725)
+++ trunk/openutils-mgnlrepoutils/pom.xml	2010-01-31 16:26:25 UTC (rev 1726)
@@ -2,7 +2,7 @@
   <parent>
     <groupId>net.sourceforge.openutils</groupId>
     <artifactId>openutils-parent</artifactId>
-    <version>1.0</version>
+    <version>1.2</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <packaging>jar</packaging>

Modified: trunk/openutils-mgnlspring/pom.xml
===================================================================
--- trunk/openutils-mgnlspring/pom.xml	2010-01-31 16:13:49 UTC (rev 1725)
+++ trunk/openutils-mgnlspring/pom.xml	2010-01-31 16:26:25 UTC (rev 1726)
@@ -4,7 +4,7 @@
   <parent>
     <groupId>net.sourceforge.openutils</groupId>
     <artifactId>openutils-parent</artifactId>
-    <version>1.0</version>
+    <version>1.2</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <packaging>jar</packaging>

Modified: trunk/openutils-mgnlstripes/pom.xml
===================================================================
--- trunk/openutils-mgnlstripes/pom.xml	2010-01-31 16:13:49 UTC (rev 1725)
+++ trunk/openutils-mgnlstripes/pom.xml	2010-01-31 16:26:25 UTC (rev 1726)
@@ -4,7 +4,7 @@
   <parent>
     <groupId>net.sourceforge.openutils</groupId>
     <artifactId>openutils-parent</artifactId>
-    <version>1.1</version>
+    <version>1.2</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <packaging>jar</packaging>

Modified: trunk/openutils-mgnlstruts11/pom.xml
===================================================================
--- trunk/openutils-mgnlstruts11/pom.xml	2010-01-31 16:13:49 UTC (rev 1725)
+++ trunk/openutils-mgnlstruts11/pom.xml	2010-01-31 16:26:25 UTC (rev 1726)
@@ -3,7 +3,7 @@
   <parent>
     <groupId>net.sourceforge.openutils</groupId>
     <artifactId>openutils-parent</artifactId>
-    <version>1.1</version>
+    <version>1.2</version>
   </parent>
   <artifactId>openutils-mgnlstruts11</artifactId>
   <packaging>jar</packaging>

Modified: trunk/openutils-mgnltasks/pom.xml
===================================================================
--- trunk/openutils-mgnltasks/pom.xml	2010-01-31 16:13:49 UTC (rev 1725)
+++ trunk/openutils-mgnltasks/pom.xml	2010-01-31 16:26:25 UTC (rev 1726)
@@ -3,7 +3,7 @@
   <parent>
     <groupId>net.sourceforge.openutils</groupId>
     <artifactId>openutils-parent</artifactId>
-    <version>1.1</version>
+    <version>1.2</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <packaging>jar</packaging>

Modified: trunk/openutils-mgnlutils/pom.xml
===================================================================
--- trunk/openutils-mgnlutils/pom.xml	2010-01-31 16:13:49 UTC (rev 1725)
+++ trunk/openutils-mgnlutils/pom.xml	2010-01-31 16:26:25 UTC (rev 1726)
@@ -3,7 +3,7 @@
   <parent>
     <groupId>net.sourceforge.openutils</groupId>
     <artifactId>openutils-parent</artifactId>
-    <version>1.1</version>
+    <version>1.2</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <packaging>jar</packaging>

Modified: trunk/openutils-spring/pom.xml
===================================================================
--- trunk/openutils-spring/pom.xml	2010-01-31 16:13:49 UTC (rev 1725)
+++ trunk/openutils-spring/pom.xml	2010-01-31 16:26:25 UTC (rev 1726)
@@ -4,7 +4,7 @@
   <parent>
     <groupId>net.sourceforge.openutils</groupId>
     <artifactId>openutils-parent</artifactId>
-    <version>1.0</version>
+    <version>1.2</version>
   </parent>
   <artifactId>openutils-spring</artifactId>
   <name>openutils spring tools</name>

Modified: trunk/openutils-testing/pom.xml
===================================================================
--- trunk/openutils-testing/pom.xml	2010-01-31 16:13:49 UTC (rev 1725)
+++ trunk/openutils-testing/pom.xml	2010-01-31 16:26:25 UTC (rev 1726)
@@ -3,7 +3,7 @@
   <parent>
     <groupId>net.sourceforge.openutils</groupId>
     <artifactId>openutils-parent</artifactId>
-    <version>1.1</version>
+    <version>1.2</version>
   </parent>
   <artifactId>openutils-testing</artifactId>
   <name>Openutils testing library</name>

Modified: trunk/openutils-testing-junit/pom.xml
===================================================================
--- trunk/openutils-testing-junit/pom.xml	2010-01-31 16:13:49 UTC (rev 1725)
+++ trunk/openutils-testing-junit/pom.xml	2010-01-31 16:26:25 UTC (rev 1726)
@@ -3,7 +3,7 @@
   <parent>
     <groupId>net.sourceforge.openutils</groupId>
     <artifactId>openutils-parent</artifactId>
-    <version>1.1</version>
+    <version>1.2</version>
   </parent>
   <artifactId>openutils-testing-junit</artifactId>
   <name>Openutils testing library (JUnit)</name>

Modified: trunk/openutils-testing-testng/pom.xml
===================================================================
--- trunk/openutils-testing-testng/pom.xml	2010-01-31 16:13:49 UTC (rev 1725)
+++ trunk/openutils-testing-testng/pom.xml	2010-01-31 16:26:25 UTC (rev 1726)
@@ -3,7 +3,7 @@
   <parent>
     <groupId>net.sourceforge.openutils</groupId>
     <artifactId>openutils-parent</artifactId>
-    <version>1.1</version>
+    <version>1.2</version>
   </parent>
   <artifactId>openutils-testing-testng</artifactId>
   <name>Openutils testing library (TestNG)</name>

Modified: trunk/openutils-testing4dwr/pom.xml
===================================================================
--- trunk/openutils-testing4dwr/pom.xml	2010-01-31 16:13:49 UTC (rev 1725)
+++ trunk/openutils-testing4dwr/pom.xml	2010-01-31 16:26:25 UTC (rev 1726)
@@ -4,7 +4,7 @@
   <parent>
     <groupId>net.sourceforge.openutils</groupId>
     <artifactId>openutils-parent</artifactId>
-    <version>1.0</version>
+    <version>1.2</version>
   </parent>
   <artifactId>openutils-testing4dwr</artifactId>
   <name>openutils dwr test utils</name>

Modified: trunk/openutils-testing4dwr-junit/pom.xml
===================================================================
--- trunk/openutils-testing4dwr-junit/pom.xml	2010-01-31 16:13:49 UTC (rev 1725)
+++ trunk/openutils-testing4dwr-junit/pom.xml	2010-01-31 16:26:25 UTC (rev 1726)
@@ -4,7 +4,7 @@
   <parent>
     <groupId>net.sourceforge.openutils</groupId>
     <artifactId>openutils-parent</artifactId>
-    <version>1.0</version>
+    <version>1.2</version>
   </parent>
   <artifactId>openutils-testing4dwr-junit</artifactId>
   <name>openutils testing4dwr (junit)</name>

Modified: trunk/openutils-testing4dwr-testng/pom.xml
===================================================================
--- trunk/openutils-testing4dwr-testng/pom.xml	2010-01-31 16:13:49 UTC (rev 1725)
+++ trunk/openutils-testing4dwr-testng/pom.xml	2010-01-31 16:26:25 UTC (rev 1726)
@@ -4,7 +4,7 @@
   <parent>
     <groupId>net.sourceforge.openutils</groupId>
     <artifactId>openutils-parent</artifactId>
-    <version>1.0</version>
+    <version>1.2</version>
   </parent>
   <artifactId>openutils-testing4dwr-testng</artifactId>
   <name>openutils testing4dwr (testng)</name>

Modified: trunk/openutils-testing4web/pom.xml
===================================================================
--- trunk/openutils-testing4web/pom.xml	2010-01-31 16:13:49 UTC (rev 1725)
+++ trunk/openutils-testing4web/pom.xml	2010-01-31 16:26:25 UTC (rev 1726)
@@ -3,7 +3,7 @@
   <parent>
     <groupId>net.sourceforge.openutils</groupId>
     <artifactId>openutils-parent</artifactId>
-    <version>1.1</version>
+    <version>1.2</version>
   </parent>
   <artifactId>openutils-testing4web</artifactId>
   <name>Openutils web test utils</name>

Modified: trunk/openutils-testing4web/src/main/java/net/sourceforge/openutils/testing4web/BaseJspEmbeddedTest.java
===================================================================
--- trunk/openutils-testing4web/src/main/java/net/sourceforge/openutils/testing4web/BaseJspEmbeddedTest.java	2010-01-31 16:13:49 UTC (rev 1725)
+++ trunk/openutils-testing4web/src/main/java/net/sourceforge/openutils/testing4web/BaseJspEmbeddedTest.java	2010-01-31 16:26:25 UTC (rev 1726)
@@ -82,6 +82,11 @@
 
         Hashtable<String, String> params = new Hashtable<String, String>();
         params.put("javaEncoding", "utf-8");
+        params.put("development", "true");
+        params.put("keepgenerated", "false");
+        params.put("modificationTestInterval", Integer.toString(Integer.MAX_VALUE / 1000));
+        params.put("engineOptionsClass", TestServletOptions.class.getName());
+
         runner.registerServlet("*.jsp", "org.apache.jasper.servlet.JspServlet", params);
 
         log.debug("ServletRunner setup OK");

Added: trunk/openutils-testing4web/src/main/java/net/sourceforge/openutils/testing4web/TestServletOptions.java
===================================================================
--- trunk/openutils-testing4web/src/main/java/net/sourceforge/openutils/testing4web/TestServletOptions.java	                        (rev 0)
+++ trunk/openutils-testing4web/src/main/java/net/sourceforge/openutils/testing4web/TestServletOptions.java	2010-01-31 16:26:25 UTC (rev 1726)
@@ -0,0 +1,344 @@
+package net.sourceforge.openutils.testing4web;
+
+import java.io.File;
+import java.util.Map;
+
+import javax.servlet.ServletConfig;
+import javax.servlet.ServletContext;
+
+import org.apache.jasper.EmbeddedServletOptions;
+import org.apache.jasper.Options;
+import org.apache.jasper.compiler.JspConfig;
+import org.apache.jasper.compiler.TagPluginManager;
+import org.apache.jasper.compiler.TldLocationsCache;
+
+
+/**
+ * @author fgiust
+ * @version $Id$
+ */
+public class TestServletOptions implements Options
+{
+
+    private EmbeddedServletOptions options;
+
+    /**
+     * @param config
+     * @param context
+     */
+    public TestServletOptions(ServletConfig config, ServletContext context)
+    {
+        options = new EmbeddedServletOptions(config, context);
+        options.setTldLocationsCache(new TestTldLocationsCache(context));
+    }
+
+    /**
+     * @return
+     * @see java.lang.Object#hashCode()
+     */
+    public int hashCode()
+    {
+        return options.hashCode();
+    }
+
+    /**
+     * @param obj
+     * @return
+     * @see java.lang.Object#equals(java.lang.Object)
+     */
+    public boolean equals(Object obj)
+    {
+        return options.equals(obj);
+    }
+
+    /**
+     * @param name
+     * @return
+     * @see org.apache.jasper.EmbeddedServletOptions#getProperty(java.lang.String)
+     */
+    public String getProperty(String name)
+    {
+        return options.getProperty(name);
+    }
+
+    /**
+     * @param name
+     * @param value
+     * @see org.apache.jasper.EmbeddedServletOptions#setProperty(java.lang.String, java.lang.String)
+     */
+    public void setProperty(String name, String value)
+    {
+        options.setProperty(name, value);
+    }
+
+    /**
+     * @return
+     * @see org.apache.jasper.EmbeddedServletOptions#getKeepGenerated()
+     */
+    public boolean getKeepGenerated()
+    {
+        return options.getKeepGenerated();
+    }
+
+    /**
+     * @return
+     * @see org.apache.jasper.EmbeddedServletOptions#getTrimSpaces()
+     */
+    public boolean getTrimSpaces()
+    {
+        return options.getTrimSpaces();
+    }
+
+    /**
+     * @return
+     * @see org.apache.jasper.EmbeddedServletOptions#isPoolingEnabled()
+     */
+    public boolean isPoolingEnabled()
+    {
+        return options.isPoolingEnabled();
+    }
+
+    /**
+     * @return
+     * @see org.apache.jasper.EmbeddedServletOptions#getMappedFile()
+     */
+    public boolean getMappedFile()
+    {
+        return options.getMappedFile();
+    }
+
+    /**
+     * @return
+     * @see org.apache.jasper.EmbeddedServletOptions#getSendErrorToClient()
+     */
+    public boolean getSendErrorToClient()
+    {
+        return options.getSendErrorToClient();
+    }
+
+    /**
+     * @return
+     * @see org.apache.jasper.EmbeddedServletOptions#getClassDebugInfo()
+     */
+    public boolean getClassDebugInfo()
+    {
+        return options.getClassDebugInfo();
+    }
+
+    /**
+     * @return
+     * @see org.apache.jasper.EmbeddedServletOptions#getCheckInterval()
+     */
+    public int getCheckInterval()
+    {
+        return options.getCheckInterval();
+    }
+
+    /**
+     * @return
+     * @see org.apache.jasper.EmbeddedServletOptions#getModificationTestInterval()
+     */
+    public int getModificationTestInterval()
+    {
+        return options.getModificationTestInterval();
+    }
+
+    /**
+     * @return
+     * @see org.apache.jasper.EmbeddedServletOptions#getDevelopment()
+     */
+    public boolean getDevelopment()
+    {
+        return options.getDevelopment();
+    }
+
+    /**
+     * @return
+     * @see org.apache.jasper.EmbeddedServletOptions#isSmapSuppressed()
+     */
+    public boolean isSmapSuppressed()
+    {
+        return options.isSmapSuppressed();
+    }
+
+    /**
+     * @return
+     * @see org.apache.jasper.EmbeddedServletOptions#isSmapDumped()
+     */
+    public boolean isSmapDumped()
+    {
+        return options.isSmapDumped();
+    }
+
+    /**
+     * @return
+     * @see org.apache.jasper.EmbeddedServletOptions#genStringAsCharArray()
+     */
+    public boolean genStringAsCharArray()
+    {
+        return options.genStringAsCharArray();
+    }
+
+    /**
+     * @return
+     * @see org.apache.jasper.EmbeddedServletOptions#getIeClassId()
+     */
+    public String getIeClassId()
+    {
+        return options.getIeClassId();
+    }
+
+    /**
+     * @return
+     * @see org.apache.jasper.EmbeddedServletOptions#getScratchDir()
+     */
+    public File getScratchDir()
+    {
+        return options.getScratchDir();
+    }
+
+    /**
+     * @return
+     * @see org.apache.jasper.EmbeddedServletOptions#getClassPath()
+     */
+    public String getClassPath()
+    {
+        return options.getClassPath();
+    }
+
+    /**
+     * @return
+     * @see org.apache.jasper.EmbeddedServletOptions#isXpoweredBy()
+     */
+    public boolean isXpoweredBy()
+    {
+        return options.isXpoweredBy();
+    }
+
+    /**
+     * @return
+     * @see org.apache.jasper.EmbeddedServletOptions#getCompiler()
+     */
+    public String getCompiler()
+    {
+        return options.getCompiler();
+    }
+
+    /**
+     * @return
+     * @see org.apache.jasper.EmbeddedServletOptions#getCompilerTargetVM()
+     */
+    public String getCompilerTargetVM()
+    {
+        return options.getCompilerTargetVM();
+    }
+
+    /**
+     * @return
+     * @see org.apache.jasper.EmbeddedServletOptions#getCompilerSourceVM()
+     */
+    public String getCompilerSourceVM()
+    {
+        return options.getCompilerSourceVM();
+    }
+
+    /**
+     * @return
+     * @see org.apache.jasper.EmbeddedServletOptions#getErrorOnUseBeanInvalidClassAttribute()
+     */
+    public boolean getErrorOnUseBeanInvalidClassAttribute()
+    {
+        return options.getErrorOnUseBeanInvalidClassAttribute();
+    }
+
+    /**
+     * @param b
+     * @see org.apache.jasper.EmbeddedServletOptions#setErrorOnUseBeanInvalidClassAttribute(boolean)
+     */
+    public void setErrorOnUseBeanInvalidClassAttribute(boolean b)
+    {
+        options.setErrorOnUseBeanInvalidClassAttribute(b);
+    }
+
+    /**
+     * @return
+     * @see org.apache.jasper.EmbeddedServletOptions#getTldLocationsCache()
+     */
+    public TldLocationsCache getTldLocationsCache()
+    {
+        return options.getTldLocationsCache();
+    }
+
+    /**
+     * @param tldC
+     * @see org.apache.jasper.EmbeddedServletOptions#setTldLocationsCache(org.apache.jasper.compiler.TldLocationsCache)
+     */
+    public void setTldLocationsCache(TldLocationsCache tldC)
+    {
+        options.setTldLocationsCache(tldC);
+    }
+
+    /**
+     * @return
+     * @see org.apache.jasper.EmbeddedServletOptions#getJavaEncoding()
+     */
+    public String getJavaEncoding()
+    {
+        return options.getJavaEncoding();
+    }
+
+    /**
+     * @return
+     * @see org.apache.jasper.EmbeddedServletOptions#getFork()
+     */
+    public boolean getFork()
+    {
+        return options.getFork();
+    }
+
+    /**
+     * @return
+     * @see org.apache.jasper.EmbeddedServletOptions#getJspConfig()
+     */
+    public JspConfig getJspConfig()
+    {
+        return options.getJspConfig();
+    }
+
+    /**
+     * @return
+     * @see org.apache.jasper.EmbeddedServletOptions#getTagPluginManager()
+     */
+    public TagPluginManager getTagPluginManager()
+    {
+        return options.getTagPluginManager();
+    }
+
+    /**
+     * @return
+     * @see org.apache.jasper.EmbeddedServletOptions#isCaching()
+     */
+    public boolean isCaching()
+    {
+        return options.isCaching();
+    }
+
+    /**
+     * @return
+     * @see org.apache.jasper.EmbeddedServletOptions#getCache()
+     */
+    public Map getCache()
+    {
+        return options.getCache();
+    }
+
+    /**
+     * @return
+     * @see java.lang.Object#toString()
+     */
+    public String toString()
+    {
+        return options.toString();
+    }
+
+}


Property changes on: trunk/openutils-testing4web/src/main/java/net/sourceforge/openutils/testing4web/TestServletOptions.java
___________________________________________________________________
Added: svn:mime-type
   + text/plain
Added: svn:keywords
   + Author Date Id Revision
Added: svn:eol-style
   + native

Added: trunk/openutils-testing4web/src/main/java/net/sourceforge/openutils/testing4web/TestTldLocationsCache.java
===================================================================
--- trunk/openutils-testing4web/src/main/java/net/sourceforge/openutils/testing4web/TestTldLocationsCache.java	                        (rev 0)
+++ trunk/openutils-testing4web/src/main/java/net/sourceforge/openutils/testing4web/TestTldLocationsCache.java	2010-01-31 16:26:25 UTC (rev 1726)
@@ -0,0 +1,269 @@
+package net.sourceforge.openutils.testing4web;
+
+import java.io.BufferedInputStream;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileNotFoundException;
+import java.io.IOException;
+import java.io.InputStream;
+import java.net.URL;
+import java.net.URLClassLoader;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import javax.servlet.ServletContext;
+
+import org.apache.commons.io.IOUtils;
+import org.apache.commons.lang.StringUtils;
+import org.apache.jasper.JasperException;
+import org.apache.jasper.compiler.TldLocationsCache;
+import org.apache.jasper.xmlparser.ParserUtils;
+import org.apache.jasper.xmlparser.TreeNode;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+
+/**
+ * @author fgiust
+ * @version $Id$
+ */
+public class TestTldLocationsCache extends TldLocationsCache
+{
+
+    private boolean initialized;
+
+    private Map<String, String[]> filemappings;
+
+    /**
+     * Logger.
+     */
+    private Logger log = LoggerFactory.getLogger(TestTldLocationsCache.class);
+
+    private final ServletContext ctxt2;
+
+    /**
+     * @param ctxt
+     */
+    public TestTldLocationsCache(ServletContext ctxt)
+    {
+        super(ctxt);
+        ctxt2 = ctxt;
+    }
+
+    /**
+     * @param ctxt
+     * @param redeployMode
+     */
+    public TestTldLocationsCache(ServletContext ctxt, boolean redeployMode)
+    {
+        super(ctxt, redeployMode);
+        ctxt2 = ctxt;
+    }
+
+    public String[] getLocation(String uri) throws JasperException
+    {
+        if (!initialized)
+        {
+            initFilesInClasspath();
+        }
+
+        String[] location = super.getLocation(uri);
+
+        if (location != null)
+        {
+            return location;
+        }
+
+        return filemappings.get(uri);
+    }
+
+    /**
+     *
+     */
+    private void initFilesInClasspath()
+    {
+        filemappings = new HashMap<String, String[]>();
+
+        ClassLoader webappLoader = Thread.currentThread().getContextClassLoader();
+        ClassLoader loader = webappLoader;
+
+        while (loader != null)
+        {
+            if (loader instanceof URLClassLoader)
+            {
+                URL[] urls = ((URLClassLoader) loader).getURLs();
+                for (int i = 0; i < urls.length; i++)
+                {
+                    URL url = urls[i];
+                    if (!StringUtils.endsWithIgnoreCase(url.getFile(), ".jar"))
+                    {
+                        File file = new File(url.getFile());
+                        if (file.isDirectory())
+                        {
+                            log.debug("Processing {}", url.getFile());
+                            findTld(file);
+                        }
+                    }
+                }
+            }
+
+            loader = loader.getParent();
+        }
+
+    }
+
+    private void findTld(File f)
+    {
+        File[] list = f.listFiles();
+        for (File file : list)
+        {
+            if (file.isDirectory())
+            {
+                findTld(file);
+            }
+            else if (StringUtils.endsWithIgnoreCase(file.getName(), ".tld"))
+            {
+
+                String uri = getUriFromTld(file);
+                if (uri != null && filemappings.get(uri) == null)
+                {
+                    String base = ctxt2.getRealPath("/");
+
+                    String filepath = getRelativePath(new File(base), file);
+
+                    log.debug("Adding {} to cache with url {}", uri, filepath);
+                    filemappings.put(uri, new String[]{filepath, null });
+                }
+            }
+        }
+    }
+
+    private String getUriFromTld(File file)
+    {
+        String resourcePath = file.getAbsolutePath();
+        InputStream in;
+        try
+        {
+            in = new BufferedInputStream(new FileInputStream(file));
+        }
+        catch (FileNotFoundException e)
+        {
+            log.warn("File {} not found", file.getAbsolutePath());
+            return null;
+        }
+        try
+        {
+            TreeNode tld = new ParserUtils().parseXMLDocument(resourcePath, in);
+            TreeNode uri = tld.findChild("uri");
+            if (uri != null)
+            {
+                String body = uri.getBody();
+                if (body != null)
+                {
+                    return body;
+                }
+            }
+        }
+        catch (JasperException e)
+        {
+            log.error("Error processing " + file.getAbsolutePath(), e);
+            return null;
+        }
+        finally
+        {
+            IOUtils.closeQuietly(in);
+        }
+
+        return null;
+    }
+
+    /**
+     * break a path down into individual elements and add to a list. example : if a path is /a/b/c/d.txt, the breakdown
+     * will be [d.txt,c,b,a]
+     * @param f input file
+     * @return a List collection with the individual elements of the path in reverse order
+     */
+    private static List getPathList(File f)
+    {
+        List l = new ArrayList();
+        File r;
+        try
+        {
+            r = f.getCanonicalFile();
+            while (r != null)
+            {
+                l.add(r.getName());
+                r = r.getParentFile();
+            }
+        }
+        catch (IOException e)
+        {
+            l = null;
+        }
+        return l;
+    }
+
+    /**
+     * figure out a string representing the relative path of 'f' with respect to 'r'
+     * @param r home path
+     * @param f path of file
+     */
+    private static String matchPathLists(List r, List f)
+    {
+        int i;
+        int j;
+        String s;
+        // start at the beginning of the lists
+        // iterate while both lists are equal
+        s = "";
+        i = r.size() - 1;
+        j = f.size() - 1;
+
+        // first eliminate common root
+        while ((i >= 0) && (j >= 0) && (r.get(i).equals(f.get(j))))
+        {
+            i--;
+            j--;
+        }
+
+        // for each remaining level in the home path, add a ..
+        for (; i >= 0; i--)
+        {
+            s += ".." + File.separator;
+        }
+
+        // for each level in the file path, add the path
+        for (; j >= 1; j--)
+        {
+            s += f.get(j) + File.separator;
+        }
+
+        // file name
+        s += f.get(j);
+        return s;
+    }
+
+    /**
+     * get relative path of File 'f' with respect to 'home' directory example : home = /a/b/c f = /a/d/e/x.txt s =
+     * getRelativePath(home,f) = ../../d/e/x.txt
+     * @param home base path, should be a directory, not a file, or it doesn't make sense
+     * @param f file to generate path for
+     * @return path from home to f as a string
+     */
+    public static String getRelativePath(File home, File f)
+    {
+        File r;
+        List homelist;
+        List filelist;
+        String s;
+
+        homelist = getPathList(home);
+        filelist = getPathList(f);
+        s = matchPathLists(homelist, filelist);
+
+        return s;
+    }
+
+}


Property changes on: trunk/openutils-testing4web/src/main/java/net/sourceforge/openutils/testing4web/TestTldLocationsCache.java
___________________________________________________________________
Added: svn:mime-type
   + text/plain
Added: svn:keywords
   + Author Date Id Revision
Added: svn:eol-style
   + native


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

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

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

Revision: 1840
          http://openutils.svn.sourceforge.net/openutils/?rev=1840&view=rev
Author:   fgiust
Date:     2010-02-07 10:48:15 +0000 (Sun, 07 Feb 2010)

Log Message:
-----------
update mgnltasks to latest released version

Modified Paths:
--------------
    trunk/magnolia-test-webapp/pom.xml
    trunk/openutils-mgnlgroovy/pom.xml
    trunk/openutils-mgnlmedia/pom.xml
    trunk/openutils-mgnlmessages/pom.xml
    trunk/openutils-mgnlstripes/pom.xml
    trunk/openutils-mgnlstruts11/pom.xml

Modified: trunk/magnolia-test-webapp/pom.xml
===================================================================
--- trunk/magnolia-test-webapp/pom.xml	2010-02-07 10:32:19 UTC (rev 1839)
+++ trunk/magnolia-test-webapp/pom.xml	2010-02-07 10:48:15 UTC (rev 1840)
@@ -106,7 +106,7 @@
     <dependency>
       <groupId>net.sourceforge.openutils</groupId>
       <artifactId>openutils-mgnlcontrols</artifactId>
-      <version>4.0.5-SNAPSHOT</version>
+      <version>4.0.6-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>net.sourceforge.openutils</groupId>
@@ -156,7 +156,7 @@
     <dependency>
       <groupId>net.sourceforge.openutils</groupId>
       <artifactId>openutils-mgnltasks</artifactId>
-      <version>4.0.4-SNAPSHOT</version>
+      <version>4.0.5-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>net.sourceforge.openutils</groupId>

Modified: trunk/openutils-mgnlgroovy/pom.xml
===================================================================
--- trunk/openutils-mgnlgroovy/pom.xml	2010-02-07 10:32:19 UTC (rev 1839)
+++ trunk/openutils-mgnlgroovy/pom.xml	2010-02-07 10:48:15 UTC (rev 1840)
@@ -83,7 +83,7 @@
     <dependency>
       <groupId>net.sourceforge.openutils</groupId>
       <artifactId>openutils-mgnltasks</artifactId>
-      <version>4.0.3</version>
+      <version>4.0.4</version>
     </dependency>
   </dependencies>
   <repositories>

Modified: trunk/openutils-mgnlmedia/pom.xml
===================================================================
--- trunk/openutils-mgnlmedia/pom.xml	2010-02-07 10:32:19 UTC (rev 1839)
+++ trunk/openutils-mgnlmedia/pom.xml	2010-02-07 10:48:15 UTC (rev 1840)
@@ -133,7 +133,7 @@
     <dependency>
       <groupId>net.sourceforge.openutils</groupId>
       <artifactId>openutils-mgnltasks</artifactId>
-      <version>4.0.3</version>
+      <version>4.0.4</version>
     </dependency>
     <dependency>
       <groupId>net.sourceforge.openutils</groupId>

Modified: trunk/openutils-mgnlmessages/pom.xml
===================================================================
--- trunk/openutils-mgnlmessages/pom.xml	2010-02-07 10:32:19 UTC (rev 1839)
+++ trunk/openutils-mgnlmessages/pom.xml	2010-02-07 10:48:15 UTC (rev 1840)
@@ -73,7 +73,7 @@
     <dependency>
       <groupId>net.sourceforge.openutils</groupId>
       <artifactId>openutils-mgnltasks</artifactId>
-      <version>4.0.3</version>
+      <version>4.0.4</version>
     </dependency>
     <dependency>
       <groupId>net.sourceforge.openutils</groupId>

Modified: trunk/openutils-mgnlstripes/pom.xml
===================================================================
--- trunk/openutils-mgnlstripes/pom.xml	2010-02-07 10:32:19 UTC (rev 1839)
+++ trunk/openutils-mgnlstripes/pom.xml	2010-02-07 10:48:15 UTC (rev 1840)
@@ -85,7 +85,7 @@
     <dependency>
       <groupId>net.sourceforge.openutils</groupId>
       <artifactId>openutils-mgnltasks</artifactId>
-      <version>4.0.3</version>
+      <version>4.0.4</version>
     </dependency>
     <dependency>
       <groupId>javax.servlet</groupId>

Modified: trunk/openutils-mgnlstruts11/pom.xml
===================================================================
--- trunk/openutils-mgnlstruts11/pom.xml	2010-02-07 10:32:19 UTC (rev 1839)
+++ trunk/openutils-mgnlstruts11/pom.xml	2010-02-07 10:48:15 UTC (rev 1840)
@@ -84,7 +84,7 @@
     <dependency>
       <groupId>net.sourceforge.openutils</groupId>
       <artifactId>openutils-mgnltasks</artifactId>
-      <version>4.0.3</version>
+      <version>4.0.4</version>
     </dependency>
     <dependency>
       <groupId>struts</groupId>


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

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

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

Revision: 1875
          http://openutils.svn.sourceforge.net/openutils/?rev=1875&view=rev
Author:   diego_schivo
Date:     2010-02-10 14:18:30 +0000 (Wed, 10 Feb 2010)

Log Message:
-----------
Module store: webapp project "module-store-server-webapp", with pages for module list and details

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

Added Paths:
-----------
    trunk/module-store-server-webapp/
    trunk/module-store-server-webapp/pom.xml
    trunk/module-store-server-webapp/src/
    trunk/module-store-server-webapp/src/main/
    trunk/module-store-server-webapp/src/main/java/
    trunk/module-store-server-webapp/src/main/resources/
    trunk/module-store-server-webapp/src/main/resources/mgnl-bootstrap/
    trunk/module-store-server-webapp/src/main/resources/mgnl-bootstrap/templating/
    trunk/module-store-server-webapp/src/main/resources/mgnl-bootstrap/templating/config.modules.templating.dialogs.module-details.xml
    trunk/module-store-server-webapp/src/main/resources/mgnl-bootstrap/templating/config.modules.templating.templates.module-details.xml
    trunk/module-store-server-webapp/src/main/resources/mgnl-bootstrap/templating/config.modules.templating.templates.module-list.xml
    trunk/module-store-server-webapp/src/main/resources/mgnl-bootstrap/templating/website.module-list.xml
    trunk/module-store-server-webapp/src/main/webapp/
    trunk/module-store-server-webapp/src/main/webapp/WEB-INF/
    trunk/module-store-server-webapp/src/main/webapp/WEB-INF/config/
    trunk/module-store-server-webapp/src/main/webapp/WEB-INF/config/default/
    trunk/module-store-server-webapp/src/main/webapp/WEB-INF/config/default/log4j.xml
    trunk/module-store-server-webapp/src/main/webapp/WEB-INF/config/default/magnolia.properties
    trunk/module-store-server-webapp/src/main/webapp/WEB-INF/config/default/repositories.xml
    trunk/module-store-server-webapp/src/main/webapp/WEB-INF/config/jaas.config
    trunk/module-store-server-webapp/src/main/webapp/WEB-INF/config/repo-conf/
    trunk/module-store-server-webapp/src/main/webapp/WEB-INF/config/repo-conf/jackrabbit-memory-search.xml
    trunk/module-store-server-webapp/src/main/webapp/WEB-INF/web.xml
    trunk/module-store-server-webapp/src/main/webapp/templates/
    trunk/module-store-server-webapp/src/main/webapp/templates/pages/
    trunk/module-store-server-webapp/src/main/webapp/templates/pages/module-details.jsp
    trunk/module-store-server-webapp/src/main/webapp/templates/pages/module-list.jsp

Added: trunk/module-store-server-webapp/pom.xml
===================================================================
--- trunk/module-store-server-webapp/pom.xml	                        (rev 0)
+++ trunk/module-store-server-webapp/pom.xml	2010-02-10 14:18:30 UTC (rev 1875)
@@ -0,0 +1,140 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+  <parent>
+    <groupId>net.sourceforge.openutils</groupId>
+    <artifactId>openutils-parent</artifactId>
+    <version>1.2</version>
+  </parent>
+  <modelVersion>4.0.0</modelVersion>
+  <packaging>war</packaging>
+  <artifactId>module-store-server-webapp</artifactId>
+  <name>Module store server webapp</name>
+  <description></description>
+  <version>0.1-SNAPSHOT</version>
+  <dependencies>
+    <dependency>
+      <groupId>info.magnolia</groupId>
+      <artifactId>magnolia-module-templating</artifactId>
+      <version>${magnolia.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>info.magnolia</groupId>
+      <artifactId>magnolia-core</artifactId>
+      <version>${magnolia.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>info.magnolia</groupId>
+      <artifactId>magnolia-module-admininterface</artifactId>
+      <version>${magnolia.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>info.magnolia</groupId>
+      <artifactId>magnolia-taglib-utility</artifactId>
+      <version>${magnolia.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>info.magnolia</groupId>
+      <artifactId>magnolia-taglib-cms</artifactId>
+      <version>${magnolia.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>info.magnolia</groupId>
+      <artifactId>magnolia-module-cache</artifactId>
+      <version>${magnolia.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>info.magnolia</groupId>
+      <artifactId>magnolia-module-exchange-simple</artifactId>
+      <version>${magnolia.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>info.magnolia</groupId>
+      <artifactId>magnolia-gui</artifactId>
+      <version>${magnolia.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>info.magnolia</groupId>
+      <artifactId>magnolia-jaas</artifactId>
+      <version>${magnolia.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>info.magnolia</groupId>
+      <artifactId>magnolia-module-fckeditor</artifactId>
+      <version>${magnolia.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>info.magnolia</groupId>
+      <artifactId>magnolia-module-mail</artifactId>
+      <version>${magnolia.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>net.sourceforge.openutils</groupId>
+      <artifactId>openutils-log4j</artifactId>
+      <version>2.0.5</version>
+    </dependency>
+    <dependency>
+      <groupId>javax.servlet</groupId>
+      <artifactId>servlet-api</artifactId>
+      <version>2.4</version>
+      <scope>provided</scope>
+    </dependency>
+    <dependency>
+      <groupId>net.sourceforge.openutils</groupId>
+      <artifactId>openutils-elfunctions</artifactId>
+      <version>1.1.1-SNAPSHOT</version>
+    </dependency>
+  </dependencies>
+  <properties>
+    <magnolia.version>4.3-m1</magnolia.version>
+    <stk.version>1.2</stk.version>
+  </properties>
+  <build>
+    <plugins>
+      <plugin>
+        <artifactId>maven-eclipse-plugin</artifactId>
+        <configuration>
+          <wtpContextName>module-store-server</wtpContextName>
+          <classpathContainers>
+            <classpathContainer>org.eclipse.jdt.launching.JRE_CONTAINER</classpathContainer>
+            <classpathContainer><![CDATA[org.eclipse.jst.server.core.container/org.eclipse.jst.server.tomcat.runtimeTarget/Apache Tomcat v6.0]]></classpathContainer>
+          </classpathContainers>
+          <excludes>
+            <exclude>javax.servlet:jsp-api</exclude>
+          </excludes>
+        </configuration>
+      </plugin>
+    </plugins>
+  </build>
+  <repositories>
+    <repository>
+      <id>magnolia.enterprise</id>
+      <url>http://repo.magnolia-cms.com/enterprise</url>
+      <snapshots>
+        <enabled>false</enabled>
+      </snapshots>
+    </repository>
+    <repository>
+      <id>repository.magnolia-cms.com</id>
+      <name>magnolia repository</name>
+      <url>http://repository.magnolia-cms.com/m2</url>
+      <releases>
+        <enabled>true</enabled>
+      </releases>
+      <snapshots>
+        <enabled>false</enabled>
+      </snapshots>
+    </repository>
+    <repository>
+      <id>openutils.sourceforge.net</id>
+      <name>openutils.sourceforge.net</name>
+      <url>http://openutils.sourceforge.net/repository/releases</url>
+      <releases>
+        <enabled>true</enabled>
+      </releases>
+      <snapshots>
+        <enabled>false</enabled>
+      </snapshots>
+    </repository>
+  </repositories>
+</project>


Property changes on: trunk/module-store-server-webapp/pom.xml
___________________________________________________________________
Added: svn:mime-type
   + text/plain
Added: svn:keywords
   + Author Date Id Revision
Added: svn:eol-style
   + native

Added: trunk/module-store-server-webapp/src/main/resources/mgnl-bootstrap/templating/config.modules.templating.dialogs.module-details.xml
===================================================================
--- trunk/module-store-server-webapp/src/main/resources/mgnl-bootstrap/templating/config.modules.templating.dialogs.module-details.xml	                        (rev 0)
+++ trunk/module-store-server-webapp/src/main/resources/mgnl-bootstrap/templating/config.modules.templating.dialogs.module-details.xml	2010-02-10 14:18:30 UTC (rev 1875)
@@ -0,0 +1,279 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<sv:node sv:name="module-details" xmlns:sv="http://www.jcp.org/jcr/sv/1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <sv:property sv:name="jcr:primaryType" sv:type="Name">
+    <sv:value>mgnl:contentNode</sv:value>
+  </sv:property>
+  <sv:property sv:name="jcr:mixinTypes" sv:type="Name">
+    <sv:value>mix:lockable</sv:value>
+  </sv:property>
+  <sv:property sv:name="jcr:uuid" sv:type="String">
+    <sv:value>3b30141e-996a-4884-905e-8ea09aaf7f1e</sv:value>
+  </sv:property>
+  <sv:node sv:name="MetaData">
+    <sv:property sv:name="jcr:primaryType" sv:type="Name">
+      <sv:value>mgnl:metaData</sv:value>
+    </sv:property>
+    <sv:property sv:name="mgnl:authorid" sv:type="String">
+      <sv:value>superuser</sv:value>
+    </sv:property>
+    <sv:property sv:name="mgnl:creationdate" sv:type="Date">
+      <sv:value>2010-02-10T14:28:58.390+01:00</sv:value>
+    </sv:property>
+    <sv:property sv:name="mgnl:lastmodified" sv:type="Date">
+      <sv:value>2010-02-10T14:29:15.140+01:00</sv:value>
+    </sv:property>
+  </sv:node>
+  <sv:node sv:name="tabGeneral">
+    <sv:property sv:name="jcr:primaryType" sv:type="Name">
+      <sv:value>mgnl:contentNode</sv:value>
+    </sv:property>
+    <sv:property sv:name="jcr:mixinTypes" sv:type="Name">
+      <sv:value>mix:lockable</sv:value>
+    </sv:property>
+    <sv:property sv:name="jcr:uuid" sv:type="String">
+      <sv:value>4faf9c59-dd02-4e7e-ae09-d62eca6e4579</sv:value>
+    </sv:property>
+    <sv:property sv:name="controlType" sv:type="String">
+      <sv:value>tab</sv:value>
+    </sv:property>
+    <sv:property sv:name="label" sv:type="String">
+      <sv:value>Module details</sv:value>
+    </sv:property>
+    <sv:node sv:name="MetaData">
+      <sv:property sv:name="jcr:primaryType" sv:type="Name">
+        <sv:value>mgnl:metaData</sv:value>
+      </sv:property>
+      <sv:property sv:name="mgnl:authorid" sv:type="String">
+        <sv:value>superuser</sv:value>
+      </sv:property>
+      <sv:property sv:name="mgnl:creationdate" sv:type="Date">
+        <sv:value>2010-02-10T14:29:18.187+01:00</sv:value>
+      </sv:property>
+      <sv:property sv:name="mgnl:lastmodified" sv:type="Date">
+        <sv:value>2010-02-10T14:29:43.156+01:00</sv:value>
+      </sv:property>
+    </sv:node>
+    <sv:node sv:name="title">
+      <sv:property sv:name="jcr:primaryType" sv:type="Name">
+        <sv:value>mgnl:contentNode</sv:value>
+      </sv:property>
+      <sv:property sv:name="jcr:mixinTypes" sv:type="Name">
+        <sv:value>mix:lockable</sv:value>
+      </sv:property>
+      <sv:property sv:name="jcr:uuid" sv:type="String">
+        <sv:value>7332c49f-dfc1-49c2-9067-ebded82cfc18</sv:value>
+      </sv:property>
+      <sv:property sv:name="controlType" sv:type="String">
+        <sv:value>edit</sv:value>
+      </sv:property>
+      <sv:property sv:name="label" sv:type="String">
+        <sv:value>Title</sv:value>
+      </sv:property>
+      <sv:property sv:name="type" sv:type="String">
+        <sv:value>String</sv:value>
+      </sv:property>
+      <sv:node sv:name="MetaData">
+        <sv:property sv:name="jcr:primaryType" sv:type="Name">
+          <sv:value>mgnl:metaData</sv:value>
+        </sv:property>
+        <sv:property sv:name="mgnl:authorid" sv:type="String">
+          <sv:value>superuser</sv:value>
+        </sv:property>
+        <sv:property sv:name="mgnl:creationdate" sv:type="Date">
+          <sv:value>2010-02-10T14:29:45.703+01:00</sv:value>
+        </sv:property>
+        <sv:property sv:name="mgnl:lastmodified" sv:type="Date">
+          <sv:value>2010-02-10T14:30:20.187+01:00</sv:value>
+        </sv:property>
+      </sv:node>
+    </sv:node>
+    <sv:node sv:name="shortDescription">
+      <sv:property sv:name="jcr:primaryType" sv:type="Name">
+        <sv:value>mgnl:contentNode</sv:value>
+      </sv:property>
+      <sv:property sv:name="jcr:mixinTypes" sv:type="Name">
+        <sv:value>mix:lockable</sv:value>
+      </sv:property>
+      <sv:property sv:name="jcr:uuid" sv:type="String">
+        <sv:value>3a738295-362b-493a-8ff4-064e08c52d7c</sv:value>
+      </sv:property>
+      <sv:property sv:name="controlType" sv:type="String">
+        <sv:value>edit</sv:value>
+      </sv:property>
+      <sv:property sv:name="label" sv:type="String">
+        <sv:value>Short description</sv:value>
+      </sv:property>
+      <sv:property sv:name="rows" sv:type="String">
+        <sv:value>2</sv:value>
+      </sv:property>
+      <sv:property sv:name="type" sv:type="String">
+        <sv:value>String</sv:value>
+      </sv:property>
+      <sv:node sv:name="MetaData">
+        <sv:property sv:name="jcr:primaryType" sv:type="Name">
+          <sv:value>mgnl:metaData</sv:value>
+        </sv:property>
+        <sv:property sv:name="mgnl:activated" sv:type="Boolean">
+          <sv:value>false</sv:value>
+        </sv:property>
+        <sv:property sv:name="mgnl:authorid" sv:type="String">
+          <sv:value>superuser</sv:value>
+        </sv:property>
+        <sv:property sv:name="mgnl:creationdate" sv:type="Date">
+          <sv:value>2010-02-10T14:29:45.703+01:00</sv:value>
+        </sv:property>
+        <sv:property sv:name="mgnl:lastmodified" sv:type="Date">
+          <sv:value>2010-02-10T14:47:50.265+01:00</sv:value>
+        </sv:property>
+      </sv:node>
+    </sv:node>
+    <sv:node sv:name="longDescription">
+      <sv:property sv:name="jcr:primaryType" sv:type="Name">
+        <sv:value>mgnl:contentNode</sv:value>
+      </sv:property>
+      <sv:property sv:name="jcr:mixinTypes" sv:type="Name">
+        <sv:value>mix:lockable</sv:value>
+      </sv:property>
+      <sv:property sv:name="jcr:uuid" sv:type="String">
+        <sv:value>77b794e5-e2ae-4b3b-9179-73fe11eeb179</sv:value>
+      </sv:property>
+      <sv:property sv:name="controlType" sv:type="String">
+        <sv:value>fckEdit</sv:value>
+      </sv:property>
+      <sv:property sv:name="label" sv:type="String">
+        <sv:value>Long description</sv:value>
+      </sv:property>
+      <sv:property sv:name="type" sv:type="String">
+        <sv:value>String</sv:value>
+      </sv:property>
+      <sv:node sv:name="MetaData">
+        <sv:property sv:name="jcr:primaryType" sv:type="Name">
+          <sv:value>mgnl:metaData</sv:value>
+        </sv:property>
+        <sv:property sv:name="mgnl:activated" sv:type="Boolean">
+          <sv:value>false</sv:value>
+        </sv:property>
+        <sv:property sv:name="mgnl:authorid" sv:type="String">
+          <sv:value>superuser</sv:value>
+        </sv:property>
+        <sv:property sv:name="mgnl:creationdate" sv:type="Date">
+          <sv:value>2010-02-10T14:29:45.703+01:00</sv:value>
+        </sv:property>
+        <sv:property sv:name="mgnl:lastmodified" sv:type="Date">
+          <sv:value>2010-02-10T14:47:56.843+01:00</sv:value>
+        </sv:property>
+      </sv:node>
+    </sv:node>
+    <sv:node sv:name="author">
+      <sv:property sv:name="jcr:primaryType" sv:type="Name">
+        <sv:value>mgnl:contentNode</sv:value>
+      </sv:property>
+      <sv:property sv:name="jcr:mixinTypes" sv:type="Name">
+        <sv:value>mix:lockable</sv:value>
+      </sv:property>
+      <sv:property sv:name="jcr:uuid" sv:type="String">
+        <sv:value>ac7b25c6-fa6f-4518-ba9f-615e3941e2e1</sv:value>
+      </sv:property>
+      <sv:property sv:name="controlType" sv:type="String">
+        <sv:value>edit</sv:value>
+      </sv:property>
+      <sv:property sv:name="label" sv:type="String">
+        <sv:value>Author</sv:value>
+      </sv:property>
+      <sv:property sv:name="type" sv:type="String">
+        <sv:value>String</sv:value>
+      </sv:property>
+      <sv:node sv:name="MetaData">
+        <sv:property sv:name="jcr:primaryType" sv:type="Name">
+          <sv:value>mgnl:metaData</sv:value>
+        </sv:property>
+        <sv:property sv:name="mgnl:activated" sv:type="Boolean">
+          <sv:value>false</sv:value>
+        </sv:property>
+        <sv:property sv:name="mgnl:authorid" sv:type="String">
+          <sv:value>superuser</sv:value>
+        </sv:property>
+        <sv:property sv:name="mgnl:creationdate" sv:type="Date">
+          <sv:value>2010-02-10T14:29:45.703+01:00</sv:value>
+        </sv:property>
+        <sv:property sv:name="mgnl:lastmodified" sv:type="Date">
+          <sv:value>2010-02-10T14:48:01.093+01:00</sv:value>
+        </sv:property>
+      </sv:node>
+    </sv:node>
+    <sv:node sv:name="license">
+      <sv:property sv:name="jcr:primaryType" sv:type="Name">
+        <sv:value>mgnl:contentNode</sv:value>
+      </sv:property>
+      <sv:property sv:name="jcr:mixinTypes" sv:type="Name">
+        <sv:value>mix:lockable</sv:value>
+      </sv:property>
+      <sv:property sv:name="jcr:uuid" sv:type="String">
+        <sv:value>852b2370-de55-4099-a0f7-bdad6c932883</sv:value>
+      </sv:property>
+      <sv:property sv:name="controlType" sv:type="String">
+        <sv:value>edit</sv:value>
+      </sv:property>
+      <sv:property sv:name="label" sv:type="String">
+        <sv:value>License</sv:value>
+      </sv:property>
+      <sv:property sv:name="type" sv:type="String">
+        <sv:value>String</sv:value>
+      </sv:property>
+      <sv:node sv:name="MetaData">
+        <sv:property sv:name="jcr:primaryType" sv:type="Name">
+          <sv:value>mgnl:metaData</sv:value>
+        </sv:property>
+        <sv:property sv:name="mgnl:activated" sv:type="Boolean">
+          <sv:value>false</sv:value>
+        </sv:property>
+        <sv:property sv:name="mgnl:authorid" sv:type="String">
+          <sv:value>superuser</sv:value>
+        </sv:property>
+        <sv:property sv:name="mgnl:creationdate" sv:type="Date">
+          <sv:value>2010-02-10T14:29:45.703+01:00</sv:value>
+        </sv:property>
+        <sv:property sv:name="mgnl:lastmodified" sv:type="Date">
+          <sv:value>2010-02-10T14:48:06.015+01:00</sv:value>
+        </sv:property>
+      </sv:node>
+    </sv:node>
+    <sv:node sv:name="version">
+      <sv:property sv:name="jcr:primaryType" sv:type="Name">
+        <sv:value>mgnl:contentNode</sv:value>
+      </sv:property>
+      <sv:property sv:name="jcr:mixinTypes" sv:type="Name">
+        <sv:value>mix:lockable</sv:value>
+      </sv:property>
+      <sv:property sv:name="jcr:uuid" sv:type="String">
+        <sv:value>5779e2cb-c957-49a9-82c9-493af0c1068c</sv:value>
+      </sv:property>
+      <sv:property sv:name="controlType" sv:type="String">
+        <sv:value>edit</sv:value>
+      </sv:property>
+      <sv:property sv:name="label" sv:type="String">
+        <sv:value>Version</sv:value>
+      </sv:property>
+      <sv:property sv:name="type" sv:type="String">
+        <sv:value>String</sv:value>
+      </sv:property>
+      <sv:node sv:name="MetaData">
+        <sv:property sv:name="jcr:primaryType" sv:type="Name">
+          <sv:value>mgnl:metaData</sv:value>
+        </sv:property>
+        <sv:property sv:name="mgnl:activated" sv:type="Boolean">
+          <sv:value>false</sv:value>
+        </sv:property>
+        <sv:property sv:name="mgnl:authorid" sv:type="String">
+          <sv:value>superuser</sv:value>
+        </sv:property>
+        <sv:property sv:name="mgnl:creationdate" sv:type="Date">
+          <sv:value>2010-02-10T14:29:45.703+01:00</sv:value>
+        </sv:property>
+        <sv:property sv:name="mgnl:lastmodified" sv:type="Date">
+          <sv:value>2010-02-10T14:48:11.937+01:00</sv:value>
+        </sv:property>
+      </sv:node>
+    </sv:node>
+  </sv:node>
+</sv:node>


Property changes on: trunk/module-store-server-webapp/src/main/resources/mgnl-bootstrap/templating/config.modules.templating.dialogs.module-details.xml
___________________________________________________________________
Added: svn:mime-type
   + text/plain
Added: svn:keywords
   + Author Date Id Revision
Added: svn:eol-style
   + native

Added: trunk/module-store-server-webapp/src/main/resources/mgnl-bootstrap/templating/config.modules.templating.templates.module-details.xml
===================================================================
--- trunk/module-store-server-webapp/src/main/resources/mgnl-bootstrap/templating/config.modules.templating.templates.module-details.xml	                        (rev 0)
+++ trunk/module-store-server-webapp/src/main/resources/mgnl-bootstrap/templating/config.modules.templating.templates.module-details.xml	2010-02-10 14:18:30 UTC (rev 1875)
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<sv:node sv:name="module-details" xmlns:sv="http://www.jcp.org/jcr/sv/1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <sv:property sv:name="jcr:primaryType" sv:type="Name">
+    <sv:value>mgnl:contentNode</sv:value>
+  </sv:property>
+  <sv:property sv:name="jcr:mixinTypes" sv:type="Name">
+    <sv:value>mix:lockable</sv:value>
+  </sv:property>
+  <sv:property sv:name="jcr:uuid" sv:type="String">
+    <sv:value>a96c7b11-f667-4b51-91fc-c5ffc41962cf</sv:value>
+  </sv:property>
+  <sv:property sv:name="templatePath" sv:type="String">
+    <sv:value>/templates/pages/module-details.jsp</sv:value>
+  </sv:property>
+  <sv:property sv:name="title" sv:type="String">
+    <sv:value>Module details</sv:value>
+  </sv:property>
+  <sv:property sv:name="type" sv:type="String">
+    <sv:value>jsp</sv:value>
+  </sv:property>
+  <sv:property sv:name="visible" sv:type="String">
+    <sv:value>true</sv:value>
+  </sv:property>
+  <sv:node sv:name="MetaData">
+    <sv:property sv:name="jcr:primaryType" sv:type="Name">
+      <sv:value>mgnl:metaData</sv:value>
+    </sv:property>
+    <sv:property sv:name="mgnl:authorid" sv:type="String">
+      <sv:value>superuser</sv:value>
+    </sv:property>
+    <sv:property sv:name="mgnl:creationdate" sv:type="Date">
+      <sv:value>2010-02-10T14:26:29.046+01:00</sv:value>
+    </sv:property>
+    <sv:property sv:name="mgnl:lastmodified" sv:type="Date">
+      <sv:value>2010-02-10T14:28:20.578+01:00</sv:value>
+    </sv:property>
+  </sv:node>
+</sv:node>


Property changes on: trunk/module-store-server-webapp/src/main/resources/mgnl-bootstrap/templating/config.modules.templating.templates.module-details.xml
___________________________________________________________________
Added: svn:mime-type
   + text/plain
Added: svn:keywords
   + Author Date Id Revision
Added: svn:eol-style
   + native

Added: trunk/module-store-server-webapp/src/main/resources/mgnl-bootstrap/templating/config.modules.templating.templates.module-list.xml
===================================================================
--- trunk/module-store-server-webapp/src/main/resources/mgnl-bootstrap/templating/config.modules.templating.templates.module-list.xml	                        (rev 0)
+++ trunk/module-store-server-webapp/src/main/resources/mgnl-bootstrap/templating/config.modules.templating.templates.module-list.xml	2010-02-10 14:18:30 UTC (rev 1875)
@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<sv:node sv:name="module-list" xmlns:sv="http://www.jcp.org/jcr/sv/1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <sv:property sv:name="jcr:primaryType" sv:type="Name">
+    <sv:value>mgnl:contentNode</sv:value>
+  </sv:property>
+  <sv:property sv:name="jcr:mixinTypes" sv:type="Name">
+    <sv:value>mix:lockable</sv:value>
+  </sv:property>
+  <sv:property sv:name="jcr:uuid" sv:type="String">
+    <sv:value>fd8fb430-d193-4721-945f-f05772122900</sv:value>
+  </sv:property>
+  <sv:property sv:name="templatePath" sv:type="String">
+    <sv:value>/templates/pages/module-list.jsp</sv:value>
+  </sv:property>
+  <sv:property sv:name="title" sv:type="String">
+    <sv:value>Module list</sv:value>
+  </sv:property>
+  <sv:property sv:name="type" sv:type="String">
+    <sv:value>jsp</sv:value>
+  </sv:property>
+  <sv:property sv:name="visible" sv:type="String">
+    <sv:value>true</sv:value>
+  </sv:property>
+  <sv:node sv:name="MetaData">
+    <sv:property sv:name="jcr:primaryType" sv:type="Name">
+      <sv:value>mgnl:metaData</sv:value>
+    </sv:property>
+    <sv:property sv:name="mgnl:activated" sv:type="Boolean">
+      <sv:value>false</sv:value>
+    </sv:property>
+    <sv:property sv:name="mgnl:authorid" sv:type="String">
+      <sv:value>superuser</sv:value>
+    </sv:property>
+    <sv:property sv:name="mgnl:creationdate" sv:type="Date">
+      <sv:value>2010-02-10T14:26:29.046+01:00</sv:value>
+    </sv:property>
+    <sv:property sv:name="mgnl:lastmodified" sv:type="Date">
+      <sv:value>2010-02-10T14:51:43.750+01:00</sv:value>
+    </sv:property>
+  </sv:node>
+</sv:node>


Property changes on: trunk/module-store-server-webapp/src/main/resources/mgnl-bootstrap/templating/config.modules.templating.templates.module-list.xml
___________________________________________________________________
Added: svn:mime-type
   + text/plain
Added: svn:keywords
   + Author Date Id Revision
Added: svn:eol-style
   + native

Added: trunk/module-store-server-webapp/src/main/resources/mgnl-bootstrap/templating/website.module-list.xml
===================================================================
--- trunk/module-store-server-webapp/src/main/resources/mgnl-bootstrap/templating/website.module-list.xml	                        (rev 0)
+++ trunk/module-store-server-webapp/src/main/resources/mgnl-bootstrap/templating/website.module-list.xml	2010-02-10 14:18:30 UTC (rev 1875)
@@ -0,0 +1,298 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<sv:node sv:name="module-list" xmlns:sv="http://www.jcp.org/jcr/sv/1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <sv:property sv:name="jcr:primaryType" sv:type="Name">
+    <sv:value>mgnl:content</sv:value>
+  </sv:property>
+  <sv:property sv:name="jcr:mixinTypes" sv:type="Name">
+    <sv:value>mix:lockable</sv:value>
+  </sv:property>
+  <sv:property sv:name="jcr:uuid" sv:type="String">
+    <sv:value>ca7ed6bf-b023-4a18-a667-84aa31fee1a2</sv:value>
+  </sv:property>
+  <sv:property sv:name="title" sv:type="String">
+    <sv:value>Module list</sv:value>
+  </sv:property>
+  <sv:node sv:name="MetaData">
+    <sv:property sv:name="jcr:primaryType" sv:type="Name">
+      <sv:value>mgnl:metaData</sv:value>
+    </sv:property>
+    <sv:property sv:name="mgnl:authorid" sv:type="String">
+      <sv:value>superuser</sv:value>
+    </sv:property>
+    <sv:property sv:name="mgnl:creationdate" sv:type="Date">
+      <sv:value>2010-02-10T14:52:23.140+01:00</sv:value>
+    </sv:property>
+    <sv:property sv:name="mgnl:lastmodified" sv:type="Date">
+      <sv:value>2010-02-10T14:52:35.312+01:00</sv:value>
+    </sv:property>
+    <sv:property sv:name="mgnl:template" sv:type="String">
+      <sv:value>module-list</sv:value>
+    </sv:property>
+  </sv:node>
+  <sv:node sv:name="lorem">
+    <sv:property sv:name="jcr:primaryType" sv:type="Name">
+      <sv:value>mgnl:content</sv:value>
+    </sv:property>
+    <sv:property sv:name="jcr:mixinTypes" sv:type="Name">
+      <sv:value>mix:lockable</sv:value>
+    </sv:property>
+    <sv:property sv:name="jcr:uuid" sv:type="String">
+      <sv:value>3919f4d9-7de7-49c8-8ac8-58d7e684f5bf</sv:value>
+    </sv:property>
+    <sv:property sv:name="author" sv:type="String">
+      <sv:value>Acme ltd</sv:value>
+    </sv:property>
+    <sv:property sv:name="license" sv:type="String">
+      <sv:value>GPL</sv:value>
+    </sv:property>
+    <sv:property sv:name="longDescription" sv:type="String">
+      <sv:value>&lt;p&gt;Lorem ipsum dolor sit amet, consectetur adipisici elit, sed eiusmod tempor incidunt ut labore et dolore magna aliqua.&lt;/p&gt;</sv:value>
+    </sv:property>
+    <sv:property sv:name="shortDescription" sv:type="String">
+      <sv:value>Lorem ipsum dolor sit amet</sv:value>
+    </sv:property>
+    <sv:property sv:name="title" sv:type="String">
+      <sv:value>Lorem</sv:value>
+    </sv:property>
+    <sv:property sv:name="version" sv:type="String">
+      <sv:value>1.2.3</sv:value>
+    </sv:property>
+    <sv:node sv:name="MetaData">
+      <sv:property sv:name="jcr:primaryType" sv:type="Name">
+        <sv:value>mgnl:metaData</sv:value>
+      </sv:property>
+      <sv:property sv:name="mgnl:authorid" sv:type="String">
+        <sv:value>superuser</sv:value>
+      </sv:property>
+      <sv:property sv:name="mgnl:creationdate" sv:type="Date">
+        <sv:value>2010-02-10T14:52:37.234+01:00</sv:value>
+      </sv:property>
+      <sv:property sv:name="mgnl:lastmodified" sv:type="Date">
+        <sv:value>2010-02-10T14:54:50.531+01:00</sv:value>
+      </sv:property>
+      <sv:property sv:name="mgnl:template" sv:type="String">
+        <sv:value>module-details</sv:value>
+      </sv:property>
+    </sv:node>
+    <sv:node sv:name="longDescription_files">
+      <sv:property sv:name="jcr:primaryType" sv:type="Name">
+        <sv:value>mgnl:contentNode</sv:value>
+      </sv:property>
+      <sv:property sv:name="jcr:mixinTypes" sv:type="Name">
+        <sv:value>mix:lockable</sv:value>
+      </sv:property>
+      <sv:property sv:name="jcr:uuid" sv:type="String">
+        <sv:value>e8f89c35-259e-4f08-99c9-c0a986be09f7</sv:value>
+      </sv:property>
+      <sv:node sv:name="MetaData">
+        <sv:property sv:name="jcr:primaryType" sv:type="Name">
+          <sv:value>mgnl:metaData</sv:value>
+        </sv:property>
+        <sv:property sv:name="mgnl:creationdate" sv:type="Date">
+          <sv:value>2010-02-10T14:54:50.515+01:00</sv:value>
+        </sv:property>
+      </sv:node>
+    </sv:node>
+  </sv:node>
+  <sv:node sv:name="ipsum">
+    <sv:property sv:name="jcr:primaryType" sv:type="Name">
+      <sv:value>mgnl:content</sv:value>
+    </sv:property>
+    <sv:property sv:name="jcr:mixinTypes" sv:type="Name">
+      <sv:value>mix:lockable</sv:value>
+    </sv:property>
+    <sv:property sv:name="jcr:uuid" sv:type="String">
+      <sv:value>2ef27ef1-ae61-4648-816b-3ec1bb7758e1</sv:value>
+    </sv:property>
+    <sv:property sv:name="author" sv:type="String">
+      <sv:value>Acme ltd</sv:value>
+    </sv:property>
+    <sv:property sv:name="license" sv:type="String">
+      <sv:value>GPL</sv:value>
+    </sv:property>
+    <sv:property sv:name="longDescription" sv:type="String">
+      <sv:value>&lt;p&gt;Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquid ex ea commodi consequat.&lt;/p&gt;</sv:value>
+    </sv:property>
+    <sv:property sv:name="shortDescription" sv:type="String">
+      <sv:value>consectetur adipisici elit</sv:value>
+    </sv:property>
+    <sv:property sv:name="title" sv:type="String">
+      <sv:value>Ipsum</sv:value>
+    </sv:property>
+    <sv:property sv:name="version" sv:type="String">
+      <sv:value>1.2.3</sv:value>
+    </sv:property>
+    <sv:node sv:name="MetaData">
+      <sv:property sv:name="jcr:primaryType" sv:type="Name">
+        <sv:value>mgnl:metaData</sv:value>
+      </sv:property>
+      <sv:property sv:name="mgnl:authorid" sv:type="String">
+        <sv:value>superuser</sv:value>
+      </sv:property>
+      <sv:property sv:name="mgnl:creationdate" sv:type="Date">
+        <sv:value>2010-02-10T14:52:53.375+01:00</sv:value>
+      </sv:property>
+      <sv:property sv:name="mgnl:lastmodified" sv:type="Date">
+        <sv:value>2010-02-10T14:55:28.531+01:00</sv:value>
+      </sv:property>
+      <sv:property sv:name="mgnl:template" sv:type="String">
+        <sv:value>module-details</sv:value>
+      </sv:property>
+    </sv:node>
+    <sv:node sv:name="longDescription_files">
+      <sv:property sv:name="jcr:primaryType" sv:type="Name">
+        <sv:value>mgnl:contentNode</sv:value>
+      </sv:property>
+      <sv:property sv:name="jcr:mixinTypes" sv:type="Name">
+        <sv:value>mix:lockable</sv:value>
+      </sv:property>
+      <sv:property sv:name="jcr:uuid" sv:type="String">
+        <sv:value>7bd84f5d-8671-4c88-a666-0e89c3a6d4a0</sv:value>
+      </sv:property>
+      <sv:node sv:name="MetaData">
+        <sv:property sv:name="jcr:primaryType" sv:type="Name">
+          <sv:value>mgnl:metaData</sv:value>
+        </sv:property>
+        <sv:property sv:name="mgnl:creationdate" sv:type="Date">
+          <sv:value>2010-02-10T14:55:28.531+01:00</sv:value>
+        </sv:property>
+      </sv:node>
+    </sv:node>
+  </sv:node>
+  <sv:node sv:name="dolor">
+    <sv:property sv:name="jcr:primaryType" sv:type="Name">
+      <sv:value>mgnl:content</sv:value>
+    </sv:property>
+    <sv:property sv:name="jcr:mixinTypes" sv:type="Name">
+      <sv:value>mix:lockable</sv:value>
+    </sv:property>
+    <sv:property sv:name="jcr:uuid" sv:type="String">
+      <sv:value>94288263-ba53-4cd4-ac0d-6cb8389c0564</sv:value>
+    </sv:property>
+    <sv:property sv:name="author" sv:type="String">
+      <sv:value>Acme ltd</sv:value>
+    </sv:property>
+    <sv:property sv:name="license" sv:type="String">
+      <sv:value>GPL</sv:value>
+    </sv:property>
+    <sv:property sv:name="longDescription" sv:type="String">
+      <sv:value>&lt;p&gt;Quis aute iure reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur.&lt;/p&gt;</sv:value>
+    </sv:property>
+    <sv:property sv:name="shortDescription" sv:type="String">
+      <sv:value>sed eiusmod tempor incidunt</sv:value>
+    </sv:property>
+    <sv:property sv:name="title" sv:type="String">
+      <sv:value>Dolor</sv:value>
+    </sv:property>
+    <sv:property sv:name="version" sv:type="String">
+      <sv:value>1.2.3</sv:value>
+    </sv:property>
+    <sv:node sv:name="MetaData">
+      <sv:property sv:name="jcr:primaryType" sv:type="Name">
+        <sv:value>mgnl:metaData</sv:value>
+      </sv:property>
+      <sv:property sv:name="mgnl:activated" sv:type="Boolean">
+        <sv:value>false</sv:value>
+      </sv:property>
+      <sv:property sv:name="mgnl:authorid" sv:type="String">
+        <sv:value>superuser</sv:value>
+      </sv:property>
+      <sv:property sv:name="mgnl:creationdate" sv:type="Date">
+        <sv:value>2010-02-10T14:52:53.375+01:00</sv:value>
+      </sv:property>
+      <sv:property sv:name="mgnl:lastmodified" sv:type="Date">
+        <sv:value>2010-02-10T14:55:59.687+01:00</sv:value>
+      </sv:property>
+      <sv:property sv:name="mgnl:template" sv:type="String">
+        <sv:value>module-details</sv:value>
+      </sv:property>
+    </sv:node>
+    <sv:node sv:name="longDescription_files">
+      <sv:property sv:name="jcr:primaryType" sv:type="Name">
+        <sv:value>mgnl:contentNode</sv:value>
+      </sv:property>
+      <sv:property sv:name="jcr:mixinTypes" sv:type="Name">
+        <sv:value>mix:lockable</sv:value>
+      </sv:property>
+      <sv:property sv:name="jcr:uuid" sv:type="String">
+        <sv:value>a417f3dc-eb34-4325-8831-ee22a8701cef</sv:value>
+      </sv:property>
+      <sv:node sv:name="MetaData">
+        <sv:property sv:name="jcr:primaryType" sv:type="Name">
+          <sv:value>mgnl:metaData</sv:value>
+        </sv:property>
+        <sv:property sv:name="mgnl:creationdate" sv:type="Date">
+          <sv:value>2010-02-10T14:55:59.671+01:00</sv:value>
+        </sv:property>
+      </sv:node>
+    </sv:node>
+  </sv:node>
+  <sv:node sv:name="sit">
+    <sv:property sv:name="jcr:primaryType" sv:type="Name">
+      <sv:value>mgnl:content</sv:value>
+    </sv:property>
+    <sv:property sv:name="jcr:mixinTypes" sv:type="Name">
+      <sv:value>mix:lockable</sv:value>
+    </sv:property>
+    <sv:property sv:name="jcr:uuid" sv:type="String">
+      <sv:value>b2d3bf57-49fd-41c2-98e3-fbf6991957dc</sv:value>
+    </sv:property>
+    <sv:property sv:name="author" sv:type="String">
+      <sv:value>Acme ltd</sv:value>
+    </sv:property>
+    <sv:property sv:name="license" sv:type="String">
+      <sv:value>GPL</sv:value>
+    </sv:property>
+    <sv:property sv:name="longDescription" sv:type="String">
+      <sv:value>&lt;p&gt;Excepteur sint obcaecat cupiditat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.&lt;/p&gt;</sv:value>
+    </sv:property>
+    <sv:property sv:name="shortDescription" sv:type="String">
+      <sv:value>ut labore et dolore magna aliqua</sv:value>
+    </sv:property>
+    <sv:property sv:name="title" sv:type="String">
+      <sv:value>Sit</sv:value>
+    </sv:property>
+    <sv:property sv:name="version" sv:type="String">
+      <sv:value>1.2.3</sv:value>
+    </sv:property>
+    <sv:node sv:name="MetaData">
+      <sv:property sv:name="jcr:primaryType" sv:type="Name">
+        <sv:value>mgnl:metaData</sv:value>
+      </sv:property>
+      <sv:property sv:name="mgnl:activated" sv:type="Boolean">
+        <sv:value>false</sv:value>
+      </sv:property>
+      <sv:property sv:name="mgnl:authorid" sv:type="String">
+        <sv:value>superuser</sv:value>
+      </sv:property>
+      <sv:property sv:name="mgnl:creationdate" sv:type="Date">
+        <sv:value>2010-02-10T14:52:53.375+01:00</sv:value>
+      </sv:property>
+      <sv:property sv:name="mgnl:lastmodified" sv:type="Date">
+        <sv:value>2010-02-10T14:56:29.000+01:00</sv:value>
+      </sv:property>
+      <sv:property sv:name="mgnl:template" sv:type="String">
+        <sv:value>module-details</sv:value>
+      </sv:property>
+    </sv:node>
+    <sv:node sv:name="longDescription_files">
+      <sv:property sv:name="jcr:primaryType" sv:type="Name">
+        <sv:value>mgnl:contentNode</sv:value>
+      </sv:property>
+      <sv:property sv:name="jcr:mixinTypes" sv:type="Name">
+        <sv:value>mix:lockable</sv:value>
+      </sv:property>
+      <sv:property sv:name="jcr:uuid" sv:type="String">
+        <sv:value>587636ca-cf73-437b-900d-6ff156d7864b</sv:value>
+      </sv:property>
+      <sv:node sv:name="MetaData">
+        <sv:property sv:name="jcr:primaryType" sv:type="Name">
+          <sv:value>mgnl:metaData</sv:value>
+        </sv:property>
+        <sv:property sv:name="mgnl:creationdate" sv:type="Date">
+          <sv:value>2010-02-10T14:56:28.984+01:00</sv:value>
+        </sv:property>
+      </sv:node>
+    </sv:node>
+  </sv:node>
+</sv:node>


Property changes on: trunk/module-store-server-webapp/src/main/resources/mgnl-bootstrap/templating/website.module-list.xml
___________________________________________________________________
Added: svn:mime-type
   + text/plain
Added: svn:keywords
   + Author Date Id Revision
Added: svn:eol-style
   + native

Added: trunk/module-store-server-webapp/src/main/webapp/WEB-INF/config/default/log4j.xml
===================================================================
--- trunk/module-store-server-webapp/src/main/webapp/WEB-INF/config/default/log4j.xml	                        (rev 0)
+++ trunk/module-store-server-webapp/src/main/webapp/WEB-INF/config/default/log4j.xml	2010-02-10 14:18:30 UTC (rev 1875)
@@ -0,0 +1,50 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE log4j:configuration SYSTEM "log4j.dtd">
+<log4j:configuration xmlns:log4j="http://jakarta.apache.org/log4j/">
+  <!-- set <log4j:configuration debug="true"> for log4j initialization messages -->
+  <!--  debug appender, write to stdout -->
+  <appender name="console" class="org.apache.log4j.ConsoleAppender">
+    <layout class="org.apache.log4j.PatternLayout">
+      <param name="ConversionPattern" value="%d %-5p %c %F(%M:%L) %m%n"/>
+      <!-- this pattern can be used for debugging - has a performance impact.
+      <param name="ConversionPattern" value="%-5p  %c %F(%M:%L) %t %d %m (uri:%X{requesturi} userid:%X{userid})%n" />
+      -->
+    </layout>
+  </appender>
+
+  <!-- Magnolia categories -->
+  <category name="info.magnolia">
+    <priority value="INFO" />
+  </category>
+
+  <!-- External libraries -->
+  <category name="org">
+    <priority value="WARN" />
+  </category>
+  <category name="org.apache.jackrabbit">
+    <priority value="WARN" />
+  </category>
+  <category name="com">
+    <priority value="WARN" />
+  </category>
+  <category name="net">
+    <priority value="WARN" />
+  </category>
+  <category name="freemarker">
+    <priority value="WARN" />
+  </category>
+  <category name="httpclient">
+    <priority value="WARN" />
+  </category>
+  <category name="openwfe">
+    <priority value="WARN" />
+  </category>
+  <category name="info.magnolia.module.samples.filters.SampleFilter">
+    <priority value="WARN" />
+  </category>
+
+  <root>
+    <priority value="ALL" />
+    <appender-ref ref="console" />
+  </root>
+</log4j:configuration>


Property changes on: trunk/module-store-server-webapp/src/main/webapp/WEB-INF/config/default/log4j.xml
___________________________________________________________________
Added: svn:mime-type
   + text/plain
Added: svn:keywords
   + Author Date Id Revision
Added: svn:eol-style
   + native

Added: trunk/module-store-server-webapp/src/main/webapp/WEB-INF/config/default/magnolia.properties
===================================================================
--- trunk/module-store-server-webapp/src/main/webapp/WEB-INF/config/default/magnolia.properties	                        (rev 0)
+++ trunk/module-store-server-webapp/src/main/webapp/WEB-INF/config/default/magnolia.properties	2010-02-10 14:18:30 UTC (rev 1875)
@@ -0,0 +1,23 @@
+
+magnolia.datadir=../../../target/magnolia-data
+
+magnolia.cache.startdir=${magnolia.datadir}/cache
+magnolia.upload.tmpdir=${magnolia.datadir}/tmp
+magnolia.exchange.history=${magnolia.datadir}/history
+magnolia.repositories.config=WEB-INF/config/default/repositories.xml
+magnolia.repositories.home=${magnolia.datadir}/repositories
+magnolia.logs.dir=${magnolia.datadir}/logs
+
+magnolia.repositories.jackrabbit.config=WEB-INF/config/repo-conf/jackrabbit-memory-search.xml
+log4j.config=WEB-INF/config/default/log4j.xml
+magnolia.connection.jcr.userId = admin
+magnolia.connection.jcr.password = admin
+
+
+magnolia.bootstrap.dir=WEB-INF/bootstrap/author WEB-INF/bootstrap
+magnolia.bootstrap.authorInstance=true
+magnolia.bootstrap.samples=true
+magnolia.develop=true
+magnolia.update.auto=true
+
+


Property changes on: trunk/module-store-server-webapp/src/main/webapp/WEB-INF/config/default/magnolia.properties
___________________________________________________________________
Added: svn:mime-type
   + text/plain
Added: svn:keywords
   + Author Date Id Revision
Added: svn:eol-style
   + native

Added: trunk/module-store-server-webapp/src/main/webapp/WEB-INF/config/default/repositories.xml
===================================================================
--- trunk/module-store-server-webapp/src/main/webapp/WEB-INF/config/default/repositories.xml	                        (rev 0)
+++ trunk/module-store-server-webapp/src/main/webapp/WEB-INF/config/default/repositories.xml	2010-02-10 14:18:30 UTC (rev 1875)
@@ -0,0 +1,101 @@
+<!--
+    $Id$
+-->
+<!DOCTYPE JCR [
+<!ELEMENT Map (#PCDATA)>
+<!ATTLIST Map
+    name CDATA #REQUIRED
+    repositoryName CDATA #REQUIRED
+    workspaceName CDATA #REQUIRED>
+<!ELEMENT JCR (RepositoryMapping|Repository)*>
+<!ELEMENT param (#PCDATA)>
+<!ATTLIST param
+    name CDATA #REQUIRED
+    value CDATA #REQUIRED>
+<!ELEMENT Repository (param|workspace)*>
+<!ATTLIST Repository
+    loadOnStartup CDATA #REQUIRED
+    name CDATA #REQUIRED
+    provider CDATA #REQUIRED>
+<!ELEMENT workspace (#PCDATA)>
+<!ATTLIST workspace
+    name CDATA #REQUIRED>
+<!ELEMENT RepositoryMapping (Map)*>
+]><JCR>
+    <!--
+    Repository name mapping is used internally by the system to search for the defined repository
+    you can have different name defined to a single repository, for instance if you want to use
+    single repository model you can define 4 maps here with the same "repositoryName".
+
+    eg: if you wanna have 2 repository model, repository A for website and config and repository B
+    for users and roles
+
+    <RepositoryMapping>
+        <Map name="website" repositoryName="main" />
+        <Map name="config" repositoryName="main" />
+        <Map name="users" repositoryName="access" />
+        <Map name="userroles" repositoryName="access" />
+    </RepositoryMapping>
+
+    <Repository name="main" provider="info.magnolia.jackrabbit.ProviderImpl" loadOnStartup="true">
+        <param name="configFile" value="WEB-INF/config/repo-conf/jackrabbit-bdb-search.xml" />
+        <param name="repositoryHome" value="repositories/main" />
+        <param name="contextFactoryClass" value="org.apache.jackrabbit.core.jndi.provider.DummyInitialContextFactory" />
+        <param name="providerURL" value="localhost" />
+        <param name="bindName" value="mainAuthor" />
+        <workspace name="website" />
+        <workspace name="config" />
+    </Repository>
+
+    <Repository name="access" provider="info.magnolia.jackrabbit.ProviderImpl" loadOnStartup="true">
+        <param name="configFile" value="WEB-INF/config/repo-conf/jackrabbit-bundle-derby-search.xml" />
+        <param name="repositoryHome" value="repositories/access" />
+        <param name="contextFactoryClass" value="org.apache.jackrabbit.core.jndi.provider.DummyInitialContextFactory" />
+        <param name="providerURL" value="localhost" />
+        <param name="bindName" value="accessAuthor" />
+        <workspace name="users" />
+        <workspace name="userroles" />
+    </Repository>
+
+    and define workspaces website, config, users and userroles in repository specific config
+
+    ##################################################################
+    Parameters used by jackrabbit repository provider
+    ##################################################################
+        1) configFile - configuration file to be used to register repository
+        2) repositoryHome - repository home directory
+        3) customNodeTypes - (optional) if new node types needs to be defined for this repository
+        4) contextFactoryClass - used if Repopsitory is to be registered or retrieved via JNDI
+        5) providerURL - used as JNDI init param
+        6) bindName - this will be used to bind this repository or to find an existing repository with the same name
+
+    -->
+    <RepositoryMapping>
+        <Map name="website" repositoryName="magnolia" workspaceName="website" />
+        <Map name="config" repositoryName="magnolia" workspaceName="config" />
+        <Map name="users" repositoryName="magnolia" workspaceName="users" />
+        <Map name="userroles" repositoryName="magnolia" workspaceName="userroles" />
+        <Map name="usergroups" repositoryName="magnolia" workspaceName="usergroups" />
+        <Map name="mgnlSystem" repositoryName="magnolia" workspaceName="mgnlSystem" /> <!-- System internal data -->
+        <Map name="mgnlVersion" repositoryName="magnolia" workspaceName="mgnlVersion" /> <!-- magnolia version workspace -->
+    </RepositoryMapping>
+
+    <!-- magnolia default repository -->
+    <Repository name="magnolia" provider="info.magnolia.jackrabbit.ProviderImpl" loadOnStartup="true">
+        <param name="configFile" value="${magnolia.repositories.jackrabbit.config}" />
+        <param name="repositoryHome" value="${magnolia.repositories.home}/magnolia" />
+        <!-- the default node types are loaded automatically
+			<param name="customNodeTypes" value="WEB-INF/config/repo-conf/nodetypes/magnolia_nodetypes.xml" />
+		-->
+        <param name="contextFactoryClass" value="org.apache.jackrabbit.core.jndi.provider.DummyInitialContextFactory" />
+        <param name="providerURL" value="localhost" />
+        <param name="bindName" value="${magnolia.webapp}" />
+        <workspace name="website" />
+        <workspace name="config" />
+        <workspace name="users" />
+        <workspace name="userroles" />
+        <workspace name="usergroups" />
+        <workspace name="mgnlSystem" />
+        <workspace name="mgnlVersion" />
+    </Repository>
+</JCR>
\ No newline at end of file


Property changes on: trunk/module-store-server-webapp/src/main/webapp/WEB-INF/config/default/repositories.xml
___________________________________________________________________
Added: svn:mime-type
   + text/plain
Added: svn:keywords
   + Author Date Id Revision
Added: svn:eol-style
   + native

Added: trunk/module-store-server-webapp/src/main/webapp/WEB-INF/config/jaas.config
===================================================================
--- trunk/module-store-server-webapp/src/main/webapp/WEB-INF/config/jaas.config	                        (rev 0)
+++ trunk/module-store-server-webapp/src/main/webapp/WEB-INF/config/jaas.config	2010-02-10 14:18:30 UTC (rev 1875)
@@ -0,0 +1,19 @@
+/**
+ * options for JCRAuthenticationModule module:
+ *   realm: to restrict the login to a certain realm
+ *   use_realm_callback: to allow the GUI to pass the realm to login into
+ *   skip_on_previous_success: if true the login is scipped if a former module proceeded a successfull login
+ *
+ * example:
+ *    info.magnolia.jaas.sp.jcr.JCRAuthenticationModule requisite realm=public;
+ *    info.magnolia.jaas.sp.jcr.JCRAuthenticationModule requisite realm=admin skip_on_previous_success=true;
+ */
+
+magnolia {
+  info.magnolia.jaas.sp.jcr.JCRAuthenticationModule requisite;
+  info.magnolia.jaas.sp.jcr.JCRAuthorizationModule required;
+};
+
+Jackrabbit {
+  org.apache.jackrabbit.core.security.SimpleLoginModule required;
+};
\ No newline at end of file

Added: trunk/module-store-server-webapp/src/main/webapp/WEB-INF/config/repo-conf/jackrabbit-memory-search.xml
===================================================================
--- trunk/module-store-server-webapp/src/main/webapp/WEB-INF/config/repo-conf/jackrabbit-memory-search.xml	                        (rev 0)
+++ trunk/module-store-server-webapp/src/main/webapp/WEB-INF/config/repo-conf/jackrabbit-memory-search.xml	2010-02-10 14:18:30 UTC (rev 1875)
@@ -0,0 +1,84 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE Repository PUBLIC "-//The Apache Software Foundation//DTD Jackrabbit 1.6//EN" "http://jackrabbit.apache.org/dtd/repository-1.6.dtd">
+  <!--
+  TESTING-ONLY configuration!
+  repositories are in memory only and any change is lost upon restart
+-->
+<Repository>
+  <FileSystem class="org.apache.jackrabbit.core.fs.mem.MemoryFileSystem">
+  </FileSystem>
+  <Security appName="Jackrabbit">
+    <AccessManager class="org.apache.jackrabbit.core.security.SimpleAccessManager"></AccessManager>
+    <LoginModule class="org.apache.jackrabbit.core.security.SimpleLoginModule">
+      <param name="anonymousId" value="anonymous" />
+    </LoginModule>
+  </Security>
+  <Workspaces rootPath="${rep.home}/workspaces" defaultWorkspace="default" />
+  <Workspace name="default">
+    <FileSystem class="org.apache.jackrabbit.core.fs.mem.MemoryFileSystem">
+    </FileSystem>
+    <PersistenceManager class="org.apache.jackrabbit.core.state.mem.InMemPersistenceManager">
+      <param name="initialCapacity" value="100000" />
+      <param name="loadFactor" value="0.3" />
+      <param name="persistent" value="false" />
+    </PersistenceManager>
+    <SearchIndex class="org.apache.jackrabbit.core.query.lucene.SearchIndex">
+      <param name="path" value="${wsp.home}/index" />
+      <param name="useCompoundFile" value="true" />
+      <param name="minMergeDocs" value="100" />
+      <param name="volatileIdleTime" value="3" />
+      <param name="maxMergeDocs" value="100000" />
+      <param name="mergeFactor" value="10" />
+      <param name="maxFieldLength" value="10000" />
+      <param name="bufferSize" value="10" />
+      <param name="cacheSize" value="1000" />
+      <param name="autoRepair" value="true" />
+      <param name="analyzer" value="org.apache.lucene.analysis.standard.StandardAnalyzer" />
+      <param name="queryClass" value="org.apache.jackrabbit.core.query.QueryImpl" />
+      <param name="respectDocumentOrder" value="true" />
+      <param name="resultFetchSize" value="2147483647" />
+      <param name="extractorPoolSize" value="3" />
+      <param name="extractorTimeout" value="100" />
+      <param name="extractorBackLogSize" value="100" />
+      <param name="enableConsistencyCheck" value="true" />
+      <param name="autoRepair" value="true" />
+      <param name="forceConsistencyCheck" value="false" />
+      <param name="directoryManagerClass" value="org.apache.jackrabbit.core.query.lucene.directory.RAMDirectoryManager" />
+    </SearchIndex>
+  </Workspace>
+  <Versioning rootPath="${rep.home}/version">
+    <FileSystem class="org.apache.jackrabbit.core.fs.mem.MemoryFileSystem">
+    </FileSystem>
+    <PersistenceManager class="org.apache.jackrabbit.core.state.mem.InMemPersistenceManager">
+      <param name="initialCapacity" value="100000" />
+      <param name="loadFactor" value="0.3" />
+      <param name="persistent" value="false" />
+    </PersistenceManager>
+  </Versioning>
+  <SearchIndex class="org.apache.jackrabbit.core.query.lucene.SearchIndex">
+    <param name="path" value="${rep.home}/index" />
+    <param name="useCompoundFile" value="true" />
+    <param name="minMergeDocs" value="100" />
+    <param name="volatileIdleTime" value="3" />
+    <param name="maxMergeDocs" value="100000" />
+    <param name="mergeFactor" value="10" />
+    <param name="maxFieldLength" value="10000" />
+    <param name="bufferSize" value="10" />
+    <param name="cacheSize" value="1000" />
+    <param name="forceConsistencyCheck" value="false" />
+    <param name="autoRepair" value="true" />
+    <param name="analyzer" value="org.apache.lucene.analysis.standard.StandardAnalyzer" />
+    <param name="queryClass" value="org.apache.jackrabbit.core.query.QueryImpl" />
+    <param name="respectDocumentOrder" value="true" />
+    <param name="resultFetchSize" value="2147483647" />
+    <param name="extractorPoolSize" value="3" />
+    <param name="extractorTimeout" value="100" />
+    <param name="extractorBackLogSize" value="100" />
+    <param name="directoryManagerClass" value="org.apache.jackrabbit.core.query.lucene.directory.RAMDirectoryManager" />
+    <FileSystem class="org.apache.jackrabbit.core.fs.mem.MemoryFileSystem">
+    </FileSystem>
+  </SearchIndex>
+  <DataStore class="org.apache.jackrabbit.core.data.FileDataStore">
+    <param name="minRecordLength" value="10100" />
+  </DataStore>
+</Repository>
\ No newline at end of file


Property changes on: trunk/module-store-server-webapp/src/main/webapp/WEB-INF/config/repo-conf/jackrabbit-memory-search.xml
___________________________________________________________________
Added: svn:mime-type
   + text/plain
Added: svn:keywords
   + Author Date Id Revision
Added: svn:eol-style
   + native

Added: trunk/module-store-server-webapp/src/main/webapp/WEB-INF/web.xml
===================================================================
--- trunk/module-store-server-webapp/src/main/webapp/WEB-INF/web.xml	                        (rev 0)
+++ trunk/module-store-server-webapp/src/main/webapp/WEB-INF/web.xml	2010-02-10 14:18:30 UTC (rev 1875)
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<web-app xmlns="http://java.sun.com/xml/ns/j2ee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd" version="2.4">
+  <description>Magnolia</description>
+  <display-name>magnolia</display-name>
+  <distributable />
+  <filter>
+    <display-name>Magnolia global filters</display-name>
+    <filter-name>magnoliaFilterChain</filter-name>
+    <filter-class>info.magnolia.cms.filters.MgnlMainFilter</filter-class>
+  </filter>
+  <filter-mapping>
+    <filter-name>magnoliaFilterChain</filter-name>
+    <url-pattern>/*</url-pattern>
+    <dispatcher>REQUEST</dispatcher>
+    <dispatcher>FORWARD</dispatcher>
+    <dispatcher>ERROR</dispatcher>
+  </filter-mapping>
+  <listener>
+    <listener-class>info.magnolia.cms.servlets.MgnlServletContextListener</listener-class>
+  </listener>
+  <jsp-config>
+    <jsp-property-group>
+      <url-pattern>*.jsp</url-pattern>
+      <page-encoding>UTF-8</page-encoding>
+    </jsp-property-group>
+  </jsp-config>
+</web-app>
\ No newline at end of file


Property changes on: trunk/module-store-server-webapp/src/main/webapp/WEB-INF/web.xml
___________________________________________________________________
Added: svn:mime-type
   + text/plain
Added: svn:keywords
   + Author Date Id Revision
Added: svn:eol-style
   + native

Added: trunk/module-store-server-webapp/src/main/webapp/templates/pages/module-details.jsp
===================================================================
--- trunk/module-store-server-webapp/src/main/webapp/templates/pages/module-details.jsp	                        (rev 0)
+++ trunk/module-store-server-webapp/src/main/webapp/templates/pages/module-details.jsp	2010-02-10 14:18:30 UTC (rev 1875)
@@ -0,0 +1,31 @@
+<jsp:root version="2.0" 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">
+  <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">
+    <head>
+      <title>Module store server - ${actpage.title}</title>
+      <cms:links />
+      <c:set var="ctx" value="${pageContext.request.contextPath}" scope="request" />
+      <c:set var="docroot" value="${appCtx}/docroot" scope="request" />
+      <meta name="description" content="" />
+      <meta name="keywords" content="" />
+      <meta http-equiv="content-type" content="text/html; charset=UTF-8" />
+      <meta name="Author" content="openmind, http://www.openmindonline.it" />
+    </head>
+    <body>
+      <cms:mainBar>
+        <cms:button label="Module details" dialogName="module-details" position="right" />
+      </cms:mainBar>
+      <h1>${content.title}</h1>
+      <p>${content.shortDescription}</p>
+      <div>${content.longDescription}</div>
+      <p>${content.author}</p>
+      <p>${content.license}</p>
+      <p>${content.version}</p>
+    </body>
+  </html>
+</jsp:root>
\ No newline at end of file


Property changes on: trunk/module-store-server-webapp/src/main/webapp/templates/pages/module-details.jsp
___________________________________________________________________
Added: svn:mime-type
   + text/xml
Added: svn:keywords
   + Author Date Id Revision
Added: svn:eol-style
   + native

Added: trunk/module-store-server-webapp/src/main/webapp/templates/pages/module-list.jsp
===================================================================
--- trunk/module-store-server-webapp/src/main/webapp/templates/pages/module-list.jsp	                        (rev 0)
+++ trunk/module-store-server-webapp/src/main/webapp/templates/pages/module-list.jsp	2010-02-10 14:18:30 UTC (rev 1875)
@@ -0,0 +1,48 @@
+<jsp:root version="2.0" 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">
+  <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">
+    <head>
+      <title>Module store server - ${actpage.title}</title>
+      <cms:links />
+      <c:set var="ctx" value="${pageContext.request.contextPath}" scope="request" />
+      <c:set var="docroot" value="${appCtx}/docroot" scope="request" />
+      <meta name="description" content="" />
+      <meta name="keywords" content="" />
+      <meta http-equiv="content-type" content="text/html; charset=UTF-8" />
+      <meta name="Author" content="openmind, http://www.openmindonline.it" />
+    </head>
+    <body>
+      <cms:mainBar>
+        <cms:button label="Module details" dialogNam...
 
[truncated message content]

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

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

Revision: 1883
          http://openutils.svn.sourceforge.net/openutils/?rev=1883&view=rev
Author:   diego_schivo
Date:     2010-02-10 17:17:25 +0000 (Wed, 10 Feb 2010)

Log Message:
-----------
Module store: iframe auto-resizing

Modified Paths:
--------------
    trunk/magnolia-test-webapp/src/main/resources/info/magnolia/module/admininterface/pages/InstalledModulesListPage.html
    trunk/module-store-server-webapp/src/main/resources/mgnl-bootstrap/templating/website.module-list.xml
    trunk/module-store-server-webapp/src/main/webapp/templates/pages/module-details.jsp

Added Paths:
-----------
    trunk/module-store-server-webapp/src/main/resources/mgnl-bootstrap/templating/userroles.anonymous.xml

Modified: trunk/magnolia-test-webapp/src/main/resources/info/magnolia/module/admininterface/pages/InstalledModulesListPage.html
===================================================================
--- trunk/magnolia-test-webapp/src/main/resources/info/magnolia/module/admininterface/pages/InstalledModulesListPage.html	2010-02-10 16:17:19 UTC (rev 1882)
+++ trunk/magnolia-test-webapp/src/main/resources/info/magnolia/module/admininterface/pages/InstalledModulesListPage.html	2010-02-10 17:17:25 UTC (rev 1883)
@@ -4,9 +4,28 @@
     <title>Installed modules</title>
     <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
     <link href="${this.request.contextPath}/.resources/admin-css/admin-all.css" type="text/css" rel="stylesheet" />
+    <style type="text/css">
+body#mgnl {
+  margin: 0;
+  padding: 0;
+}
+    </style>
+    <script type="text/javascript">
+function resizeIframe(){
+  var container = window.parent.mgnlAdminCentral.divContent;
+  var iframe = document.getElementById('installedModulesList');
+  iframe.style.width = container.style.width;
+  iframe.style.height = container.style.height;
+}
+var parentResize = window.parent.mgnlAdminCentral.resize;
+window.parent.mgnlAdminCentral.resize = function(){
+  parentResize();
+  resizeIframe();
+};
+    </script>
   </head>
-  <body id="mgnl">
-    <iframe scrolling="no" frameborder="0" style="border: 0; width: 100%; height: 100%"
+  <body id="mgnl" onload="resizeIframe();">
+    <iframe id="installedModulesList" scrolling="no" frameborder="0" style="border: 0; width: 100%; height: 100%"
       src="/module-store-server/module-list.html?[#list this.installedModules?keys as key]${key}=${this.installedModules[key]}[#if key_has_next]&[/#if][/#list]"></iframe>
   </body>
 </html>
\ No newline at end of file

Added: trunk/module-store-server-webapp/src/main/resources/mgnl-bootstrap/templating/userroles.anonymous.xml
===================================================================
--- trunk/module-store-server-webapp/src/main/resources/mgnl-bootstrap/templating/userroles.anonymous.xml	                        (rev 0)
+++ trunk/module-store-server-webapp/src/main/resources/mgnl-bootstrap/templating/userroles.anonymous.xml	2010-02-10 17:17:25 UTC (rev 1883)
@@ -0,0 +1,376 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<sv:node sv:name="anonymous" xmlns:sv="http://www.jcp.org/jcr/sv/1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <sv:property sv:name="jcr:primaryType" sv:type="Name">
+    <sv:value>mgnl:role</sv:value>
+  </sv:property>
+  <sv:property sv:name="jcr:uuid" sv:type="String">
+    <sv:value>d98728c7-b80f-444d-bfda-b54b28dc240c</sv:value>
+  </sv:property>
+  <sv:node sv:name="MetaData">
+    <sv:property sv:name="jcr:primaryType" sv:type="Name">
+      <sv:value>mgnl:metaData</sv:value>
+    </sv:property>
+    <sv:property sv:name="mgnl:activated" sv:type="Boolean">
+      <sv:value>false</sv:value>
+    </sv:property>
+    <sv:property sv:name="mgnl:activatorid" sv:type="String">
+      <sv:value>superuser</sv:value>
+    </sv:property>
+    <sv:property sv:name="mgnl:authorid" sv:type="String">
+      <sv:value>superuser</sv:value>
+    </sv:property>
+    <sv:property sv:name="mgnl:creationdate" sv:type="Date">
+      <sv:value>2006-05-04T17:05:39.645+02:00</sv:value>
+    </sv:property>
+    <sv:property sv:name="mgnl:lastaction" sv:type="Date">
+      <sv:value>2006-05-04T17:05:45.177+02:00</sv:value>
+    </sv:property>
+    <sv:property sv:name="mgnl:lastmodified" sv:type="Date">
+      <sv:value>2010-02-10T17:33:06.750+01:00</sv:value>
+    </sv:property>
+    <sv:property sv:name="mgnl:template" sv:type="String">
+      <sv:value/>
+    </sv:property>
+  </sv:node>
+  <sv:node sv:name="acl_dms">
+    <sv:property sv:name="jcr:primaryType" sv:type="Name">
+      <sv:value>mgnl:contentNode</sv:value>
+    </sv:property>
+    <sv:property sv:name="jcr:uuid" sv:type="String">
+      <sv:value>51db7d40-c71e-4933-bacc-d21f5f921754</sv:value>
+    </sv:property>
+    <sv:node sv:name="MetaData">
+      <sv:property sv:name="jcr:primaryType" sv:type="Name">
+        <sv:value>mgnl:metaData</sv:value>
+      </sv:property>
+      <sv:property sv:name="mgnl:creationdate" sv:type="Date">
+        <sv:value>2006-06-22T11:02:19.959+09:00</sv:value>
+      </sv:property>
+    </sv:node>
+    <sv:node sv:name="0">
+      <sv:property sv:name="jcr:primaryType" sv:type="Name">
+        <sv:value>mgnl:contentNode</sv:value>
+      </sv:property>
+      <sv:property sv:name="jcr:uuid" sv:type="String">
+        <sv:value>2b0e3d7f-b607-4b24-8b79-4b3c0d1615b3</sv:value>
+      </sv:property>
+      <sv:property sv:name="path" sv:type="String">
+        <sv:value>/*</sv:value>
+      </sv:property>
+      <sv:property sv:name="permissions" sv:type="Long">
+        <sv:value>8</sv:value>
+      </sv:property>
+      <sv:node sv:name="MetaData">
+        <sv:property sv:name="jcr:primaryType" sv:type="Name">
+          <sv:value>mgnl:metaData</sv:value>
+        </sv:property>
+        <sv:property sv:name="mgnl:creationdate" sv:type="Date">
+          <sv:value>2006-06-22T11:02:19.962+09:00</sv:value>
+        </sv:property>
+      </sv:node>
+    </sv:node>
+  </sv:node>
+  <sv:node sv:name="acl_Store">
+    <sv:property sv:name="jcr:primaryType" sv:type="Name">
+      <sv:value>mgnl:contentNode</sv:value>
+    </sv:property>
+    <sv:property sv:name="jcr:uuid" sv:type="String">
+      <sv:value>f1c63218-b05d-41c4-a699-5a15b0f68317</sv:value>
+    </sv:property>
+    <sv:node sv:name="MetaData">
+      <sv:property sv:name="jcr:primaryType" sv:type="Name">
+        <sv:value>mgnl:metaData</sv:value>
+      </sv:property>
+      <sv:property sv:name="mgnl:creationdate" sv:type="Date">
+        <sv:value>2007-04-27T15:30:37.283+02:00</sv:value>
+      </sv:property>
+    </sv:node>
+    <sv:node sv:name="0">
+      <sv:property sv:name="jcr:primaryType" sv:type="Name">
+        <sv:value>mgnl:contentNode</sv:value>
+      </sv:property>
+      <sv:property sv:name="jcr:uuid" sv:type="String">
+        <sv:value>6c1b4e6f-179a-498f-ab89-81fea9207b04</sv:value>
+      </sv:property>
+      <sv:property sv:name="path" sv:type="String">
+        <sv:value>/*</sv:value>
+      </sv:property>
+      <sv:property sv:name="permissions" sv:type="Long">
+        <sv:value>8</sv:value>
+      </sv:property>
+      <sv:node sv:name="MetaData">
+        <sv:property sv:name="jcr:primaryType" sv:type="Name">
+          <sv:value>mgnl:metaData</sv:value>
+        </sv:property>
+        <sv:property sv:name="mgnl:creationdate" sv:type="Date">
+          <sv:value>2007-04-27T15:30:37.284+02:00</sv:value>
+        </sv:property>
+      </sv:node>
+    </sv:node>
+  </sv:node>
+  <sv:node sv:name="acl_Expressions">
+    <sv:property sv:name="jcr:primaryType" sv:type="Name">
+      <sv:value>mgnl:contentNode</sv:value>
+    </sv:property>
+    <sv:property sv:name="jcr:uuid" sv:type="String">
+      <sv:value>fc6d875a-13d8-4551-b667-86db6cd486e8</sv:value>
+    </sv:property>
+    <sv:node sv:name="MetaData">
+      <sv:property sv:name="jcr:primaryType" sv:type="Name">
+        <sv:value>mgnl:metaData</sv:value>
+      </sv:property>
+      <sv:property sv:name="mgnl:creationdate" sv:type="Date">
+        <sv:value>2007-04-27T15:30:37.543+02:00</sv:value>
+      </sv:property>
+    </sv:node>
+    <sv:node sv:name="0">
+      <sv:property sv:name="jcr:primaryType" sv:type="Name">
+        <sv:value>mgnl:contentNode</sv:value>
+      </sv:property>
+      <sv:property sv:name="jcr:uuid" sv:type="String">
+        <sv:value>1c8ca47b-5112-445a-b7b8-4aacdebfc59c</sv:value>
+      </sv:property>
+      <sv:property sv:name="path" sv:type="String">
+        <sv:value>/*</sv:value>
+      </sv:property>
+      <sv:property sv:name="permissions" sv:type="Long">
+        <sv:value>8</sv:value>
+      </sv:property>
+      <sv:node sv:name="MetaData">
+        <sv:property sv:name="jcr:primaryType" sv:type="Name">
+          <sv:value>mgnl:metaData</sv:value>
+        </sv:property>
+        <sv:property sv:name="mgnl:creationdate" sv:type="Date">
+          <sv:value>2007-04-27T15:30:37.544+02:00</sv:value>
+        </sv:property>
+      </sv:node>
+    </sv:node>
+  </sv:node>
+  <sv:node sv:name="acl_uri">
+    <sv:property sv:name="jcr:primaryType" sv:type="Name">
+      <sv:value>mgnl:contentNode</sv:value>
+    </sv:property>
+    <sv:property sv:name="jcr:mixinTypes" sv:type="Name">
+      <sv:value>mix:lockable</sv:value>
+    </sv:property>
+    <sv:property sv:name="jcr:uuid" sv:type="String">
+      <sv:value>b751b1a2-fa7f-4715-97d7-faf9523f13e7</sv:value>
+    </sv:property>
+    <sv:node sv:name="MetaData">
+      <sv:property sv:name="jcr:primaryType" sv:type="Name">
+        <sv:value>mgnl:metaData</sv:value>
+      </sv:property>
+      <sv:property sv:name="mgnl:creationdate" sv:type="Date">
+        <sv:value>2010-02-10T17:33:06.781+01:00</sv:value>
+      </sv:property>
+    </sv:node>
+    <sv:node sv:name="0">
+      <sv:property sv:name="jcr:primaryType" sv:type="Name">
+        <sv:value>mgnl:contentNode</sv:value>
+      </sv:property>
+      <sv:property sv:name="jcr:mixinTypes" sv:type="Name">
+        <sv:value>mix:lockable</sv:value>
+      </sv:property>
+      <sv:property sv:name="jcr:uuid" sv:type="String">
+        <sv:value>0d6e80b6-49e8-4df3-a44b-d808e87b83d8</sv:value>
+      </sv:property>
+      <sv:property sv:name="path" sv:type="String">
+        <sv:value>/*</sv:value>
+      </sv:property>
+      <sv:property sv:name="permissions" sv:type="Long">
+        <sv:value>63</sv:value>
+      </sv:property>
+      <sv:node sv:name="MetaData">
+        <sv:property sv:name="jcr:primaryType" sv:type="Name">
+          <sv:value>mgnl:metaData</sv:value>
+        </sv:property>
+        <sv:property sv:name="mgnl:creationdate" sv:type="Date">
+          <sv:value>2010-02-10T17:33:06.781+01:00</sv:value>
+        </sv:property>
+      </sv:node>
+    </sv:node>
+    <sv:node sv:name="00">
+      <sv:property sv:name="jcr:primaryType" sv:type="Name">
+        <sv:value>mgnl:contentNode</sv:value>
+      </sv:property>
+      <sv:property sv:name="jcr:mixinTypes" sv:type="Name">
+        <sv:value>mix:lockable</sv:value>
+      </sv:property>
+      <sv:property sv:name="jcr:uuid" sv:type="String">
+        <sv:value>d260077c-e8da-4e52-9c7c-816f8651a6a3</sv:value>
+      </sv:property>
+      <sv:property sv:name="path" sv:type="String">
+        <sv:value>/.magnolia*</sv:value>
+      </sv:property>
+      <sv:property sv:name="permissions" sv:type="Long">
+        <sv:value>0</sv:value>
+      </sv:property>
+      <sv:node sv:name="MetaData">
+        <sv:property sv:name="jcr:primaryType" sv:type="Name">
+          <sv:value>mgnl:metaData</sv:value>
+        </sv:property>
+        <sv:property sv:name="mgnl:creationdate" sv:type="Date">
+          <sv:value>2010-02-10T17:33:06.781+01:00</sv:value>
+        </sv:property>
+      </sv:node>
+    </sv:node>
+  </sv:node>
+  <sv:node sv:name="acl_mgnlSystem">
+    <sv:property sv:name="jcr:primaryType" sv:type="Name">
+      <sv:value>mgnl:contentNode</sv:value>
+    </sv:property>
+    <sv:property sv:name="jcr:mixinTypes" sv:type="Name">
+      <sv:value>mix:lockable</sv:value>
+    </sv:property>
+    <sv:property sv:name="jcr:uuid" sv:type="String">
+      <sv:value>5314e6b9-566c-49b4-9451-9e9d6ca39b60</sv:value>
+    </sv:property>
+    <sv:node sv:name="MetaData">
+      <sv:property sv:name="jcr:primaryType" sv:type="Name">
+        <sv:value>mgnl:metaData</sv:value>
+      </sv:property>
+      <sv:property sv:name="mgnl:creationdate" sv:type="Date">
+        <sv:value>2010-02-10T17:33:06.781+01:00</sv:value>
+      </sv:property>
+    </sv:node>
+  </sv:node>
+  <sv:node sv:name="acl_userroles">
+    <sv:property sv:name="jcr:primaryType" sv:type="Name">
+      <sv:value>mgnl:contentNode</sv:value>
+    </sv:property>
+    <sv:property sv:name="jcr:mixinTypes" sv:type="Name">
+      <sv:value>mix:lockable</sv:value>
+    </sv:property>
+    <sv:property sv:name="jcr:uuid" sv:type="String">
+      <sv:value>d3103bc5-fdd4-4561-9eae-77a1e7078023</sv:value>
+    </sv:property>
+    <sv:node sv:name="MetaData">
+      <sv:property sv:name="jcr:primaryType" sv:type="Name">
+        <sv:value>mgnl:metaData</sv:value>
+      </sv:property>
+      <sv:property sv:name="mgnl:creationdate" sv:type="Date">
+        <sv:value>2010-02-10T17:33:06.781+01:00</sv:value>
+      </sv:property>
+    </sv:node>
+  </sv:node>
+  <sv:node sv:name="acl_config">
+    <sv:property sv:name="jcr:primaryType" sv:type="Name">
+      <sv:value>mgnl:contentNode</sv:value>
+    </sv:property>
+    <sv:property sv:name="jcr:mixinTypes" sv:type="Name">
+      <sv:value>mix:lockable</sv:value>
+    </sv:property>
+    <sv:property sv:name="jcr:uuid" sv:type="String">
+      <sv:value>f823d26f-1a98-43cc-90ef-0a9f3adb3f65</sv:value>
+    </sv:property>
+    <sv:node sv:name="MetaData">
+      <sv:property sv:name="jcr:primaryType" sv:type="Name">
+        <sv:value>mgnl:metaData</sv:value>
+      </sv:property>
+      <sv:property sv:name="mgnl:creationdate" sv:type="Date">
+        <sv:value>2010-02-10T17:33:06.796+01:00</sv:value>
+      </sv:property>
+    </sv:node>
+  </sv:node>
+  <sv:node sv:name="acl_website">
+    <sv:property sv:name="jcr:primaryType" sv:type="Name">
+      <sv:value>mgnl:contentNode</sv:value>
+    </sv:property>
+    <sv:property sv:name="jcr:mixinTypes" sv:type="Name">
+      <sv:value>mix:lockable</sv:value>
+    </sv:property>
+    <sv:property sv:name="jcr:uuid" sv:type="String">
+      <sv:value>39d678e2-c8cd-40b6-9027-776a4d2c5746</sv:value>
+    </sv:property>
+    <sv:node sv:name="MetaData">
+      <sv:property sv:name="jcr:primaryType" sv:type="Name">
+        <sv:value>mgnl:metaData</sv:value>
+      </sv:property>
+      <sv:property sv:name="mgnl:creationdate" sv:type="Date">
+        <sv:value>2010-02-10T17:33:06.796+01:00</sv:value>
+      </sv:property>
+    </sv:node>
+    <sv:node sv:name="0">
+      <sv:property sv:name="jcr:primaryType" sv:type="Name">
+        <sv:value>mgnl:contentNode</sv:value>
+      </sv:property>
+      <sv:property sv:name="jcr:mixinTypes" sv:type="Name">
+        <sv:value>mix:lockable</sv:value>
+      </sv:property>
+      <sv:property sv:name="jcr:uuid" sv:type="String">
+        <sv:value>fd7908d7-3b58-4278-8ef8-d39c54c4b181</sv:value>
+      </sv:property>
+      <sv:property sv:name="path" sv:type="String">
+        <sv:value>/*</sv:value>
+      </sv:property>
+      <sv:property sv:name="permissions" sv:type="Long">
+        <sv:value>8</sv:value>
+      </sv:property>
+      <sv:node sv:name="MetaData">
+        <sv:property sv:name="jcr:primaryType" sv:type="Name">
+          <sv:value>mgnl:metaData</sv:value>
+        </sv:property>
+        <sv:property sv:name="mgnl:creationdate" sv:type="Date">
+          <sv:value>2010-02-10T17:33:06.796+01:00</sv:value>
+        </sv:property>
+      </sv:node>
+    </sv:node>
+  </sv:node>
+  <sv:node sv:name="acl_usergroups">
+    <sv:property sv:name="jcr:primaryType" sv:type="Name">
+      <sv:value>mgnl:contentNode</sv:value>
+    </sv:property>
+    <sv:property sv:name="jcr:mixinTypes" sv:type="Name">
+      <sv:value>mix:lockable</sv:value>
+    </sv:property>
+    <sv:property sv:name="jcr:uuid" sv:type="String">
+      <sv:value>41a3fbdf-59fa-40bc-a381-85759c0d0265</sv:value>
+    </sv:property>
+    <sv:node sv:name="MetaData">
+      <sv:property sv:name="jcr:primaryType" sv:type="Name">
+        <sv:value>mgnl:metaData</sv:value>
+      </sv:property>
+      <sv:property sv:name="mgnl:creationdate" sv:type="Date">
+        <sv:value>2010-02-10T17:33:06.796+01:00</sv:value>
+      </sv:property>
+    </sv:node>
+  </sv:node>
+  <sv:node sv:name="acl_mgnlVersion">
+    <sv:property sv:name="jcr:primaryType" sv:type="Name">
+      <sv:value>mgnl:contentNode</sv:value>
+    </sv:property>
+    <sv:property sv:name="jcr:mixinTypes" sv:type="Name">
+      <sv:value>mix:lockable</sv:value>
+    </sv:property>
+    <sv:property sv:name="jcr:uuid" sv:type="String">
+      <sv:value>62e2b597-ef5f-4786-96c2-6795bfe01b3a</sv:value>
+    </sv:property>
+    <sv:node sv:name="MetaData">
+      <sv:property sv:name="jcr:primaryType" sv:type="Name">
+        <sv:value>mgnl:metaData</sv:value>
+      </sv:property>
+      <sv:property sv:name="mgnl:creationdate" sv:type="Date">
+        <sv:value>2010-02-10T17:33:06.796+01:00</sv:value>
+      </sv:property>
+    </sv:node>
+  </sv:node>
+  <sv:node sv:name="acl_users">
+    <sv:property sv:name="jcr:primaryType" sv:type="Name">
+      <sv:value>mgnl:contentNode</sv:value>
+    </sv:property>
+    <sv:property sv:name="jcr:mixinTypes" sv:type="Name">
+      <sv:value>mix:lockable</sv:value>
+    </sv:property>
+    <sv:property sv:name="jcr:uuid" sv:type="String">
+      <sv:value>6d1555c9-15ce-4437-931b-6daa3d464011</sv:value>
+    </sv:property>
+    <sv:node sv:name="MetaData">
+      <sv:property sv:name="jcr:primaryType" sv:type="Name">
+        <sv:value>mgnl:metaData</sv:value>
+      </sv:property>
+      <sv:property sv:name="mgnl:creationdate" sv:type="Date">
+        <sv:value>2010-02-10T17:33:06.796+01:00</sv:value>
+      </sv:property>
+    </sv:node>
+  </sv:node>
+</sv:node>


Property changes on: trunk/module-store-server-webapp/src/main/resources/mgnl-bootstrap/templating/userroles.anonymous.xml
___________________________________________________________________
Added: svn:mime-type
   + text/plain
Added: svn:keywords
   + Author Date Id Revision
Added: svn:eol-style
   + native

Modified: trunk/module-store-server-webapp/src/main/resources/mgnl-bootstrap/templating/website.module-list.xml
===================================================================
--- trunk/module-store-server-webapp/src/main/resources/mgnl-bootstrap/templating/website.module-list.xml	2010-02-10 16:17:19 UTC (rev 1882)
+++ trunk/module-store-server-webapp/src/main/resources/mgnl-bootstrap/templating/website.module-list.xml	2010-02-10 17:17:25 UTC (rev 1883)
@@ -71,7 +71,7 @@
         <sv:value>2010-02-10T14:52:37.234+01:00</sv:value>
       </sv:property>
       <sv:property sv:name="mgnl:lastmodified" sv:type="Date">
-        <sv:value>2010-02-10T17:12:20.968+01:00</sv:value>
+        <sv:value>2010-02-10T17:43:19.843+01:00</sv:value>
       </sv:property>
       <sv:property sv:name="mgnl:template" sv:type="String">
         <sv:value>module-details</sv:value>
@@ -96,6 +96,41 @@
         </sv:property>
       </sv:node>
     </sv:node>
+    <sv:node sv:name="icon">
+      <sv:property sv:name="jcr:primaryType" sv:type="Name">
+        <sv:value>mgnl:resource</sv:value>
+      </sv:property>
+      <sv:property sv:name="jcr:uuid" sv:type="String">
+        <sv:value>7f280712-7b90-4375-8d9b-8359ffd11aab</sv:value>
+      </sv:property>
+      <sv:property sv:name="extension" sv:type="String">
+        <sv:value>png</sv:value>
+      </sv:property>
+      <sv:property sv:name="fileName" sv:type="String">
+        <sv:value>magnolia</sv:value>
+      </sv:property>
+      <sv:property sv:name="height" sv:type="String">
+        <sv:value>16</sv:value>
+      </sv:property>
+      <sv:property sv:name="jcr:data" sv:type="Binary">
+        <sv:value>iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAfdJREFUOE+lU0tLG1EUHtdu/AP+g64EhbrsqouKO6EKVgutdiG4ENyI0l1daEVEKjYLG5hYlYpvxQgmTl4atWKMRo2PJI2xZjJpTDJ5TPJ57rQoOrpJDwyzuPd853ucWzS49AIlxaVcIRVN+DnOYGlEocV6OV54U2g/WO+TANlcGoHwJn6ejmHLy8NxpIPVM4R9/yzCMa86lBcaHgcISXsYtzZhZLUGLt80xOsziNRkP9Shf+45+LV6yJkoxqzvtQByWgJvrkf35DMcX5juycvlFeiMVdCtVCMmhzBua9YCZBQZC9td6Jkug3AwiERKREZJIhI/x8ruJ2JQiVVXL5RcFqOWt1qARFqE2d2PH/YWCO4BbBx/w9bJKNEfJg++wB92Iquk/nnwiImL2x/xebYCM852nP22gflx9eeIfDihRvmeJE0K1/KlOkVveg29uY40NmHC9kGlynRPOlqJjQERMvU2BXaYz+fgJKoGoRF2iutCcpH2MFKZGKS4D8HIDjxBI3nTib6ZcgJtprM4vlvegWNT2OWh5ZcYNr5CkuJ5qkJR922MTI4K8JdBHjYySW+qpSkd2DmfgPdyTV0k35UDh8FlMvErptbb1CTuFumBiUnaAebyfmAB7sA8Dujv+bVEAEb4xU0kU5LWxP9+TOw5szgK+VjvDWgkRRGae28RAAAAAElFTkSuQmCC</sv:value>
+      </sv:property>
+      <sv:property sv:name="jcr:lastModified" sv:type="Date">
+        <sv:value>2010-02-10T17:43:19.843+01:00</sv:value>
+      </sv:property>
+      <sv:property sv:name="jcr:mimeType" sv:type="String">
+        <sv:value>image/png</sv:value>
+      </sv:property>
+      <sv:property sv:name="nodeDataTemplate" sv:type="String">
+        <sv:value/>
+      </sv:property>
+      <sv:property sv:name="size" sv:type="String">
+        <sv:value>633</sv:value>
+      </sv:property>
+      <sv:property sv:name="width" sv:type="String">
+        <sv:value>16</sv:value>
+      </sv:property>
+    </sv:node>
   </sv:node>
   <sv:node sv:name="media">
     <sv:property sv:name="jcr:primaryType" sv:type="Name">
@@ -254,7 +289,7 @@
         <sv:value>2010-02-10T14:52:53.375+01:00</sv:value>
       </sv:property>
       <sv:property sv:name="mgnl:lastmodified" sv:type="Date">
-        <sv:value>2010-02-10T17:13:09.828+01:00</sv:value>
+        <sv:value>2010-02-10T17:43:32.687+01:00</sv:value>
       </sv:property>
       <sv:property sv:name="mgnl:template" sv:type="String">
         <sv:value>module-details</sv:value>
@@ -279,6 +314,41 @@
         </sv:property>
       </sv:node>
     </sv:node>
+    <sv:node sv:name="icon">
+      <sv:property sv:name="jcr:primaryType" sv:type="Name">
+        <sv:value>mgnl:resource</sv:value>
+      </sv:property>
+      <sv:property sv:name="jcr:uuid" sv:type="String">
+        <sv:value>d2001627-8843-420c-b463-f2f502ab1c5e</sv:value>
+      </sv:property>
+      <sv:property sv:name="extension" sv:type="String">
+        <sv:value>png</sv:value>
+      </sv:property>
+      <sv:property sv:name="fileName" sv:type="String">
+        <sv:value>magnolia</sv:value>
+      </sv:property>
+      <sv:property sv:name="height" sv:type="String">
+        <sv:value>16</sv:value>
+      </sv:property>
+      <sv:property sv:name="jcr:data" sv:type="Binary">
+        <sv:value>iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAfdJREFUOE+lU0tLG1EUHtdu/AP+g64EhbrsqouKO6EKVgutdiG4ENyI0l1daEVEKjYLG5hYlYpvxQgmTl4atWKMRo2PJI2xZjJpTDJ5TPJ57rQoOrpJDwyzuPd853ucWzS49AIlxaVcIRVN+DnOYGlEocV6OV54U2g/WO+TANlcGoHwJn6ejmHLy8NxpIPVM4R9/yzCMa86lBcaHgcISXsYtzZhZLUGLt80xOsziNRkP9Shf+45+LV6yJkoxqzvtQByWgJvrkf35DMcX5juycvlFeiMVdCtVCMmhzBua9YCZBQZC9td6Jkug3AwiERKREZJIhI/x8ruJ2JQiVVXL5RcFqOWt1qARFqE2d2PH/YWCO4BbBx/w9bJKNEfJg++wB92Iquk/nnwiImL2x/xebYCM852nP22gflx9eeIfDihRvmeJE0K1/KlOkVveg29uY40NmHC9kGlynRPOlqJjQERMvU2BXaYz+fgJKoGoRF2iutCcpH2MFKZGKS4D8HIDjxBI3nTib6ZcgJtprM4vlvegWNT2OWh5ZcYNr5CkuJ5qkJR922MTI4K8JdBHjYySW+qpSkd2DmfgPdyTV0k35UDh8FlMvErptbb1CTuFumBiUnaAebyfmAB7sA8Dujv+bVEAEb4xU0kU5LWxP9+TOw5szgK+VjvDWgkRRGae28RAAAAAElFTkSuQmCC</sv:value>
+      </sv:property>
+      <sv:property sv:name="jcr:lastModified" sv:type="Date">
+        <sv:value>2010-02-10T17:43:32.687+01:00</sv:value>
+      </sv:property>
+      <sv:property sv:name="jcr:mimeType" sv:type="String">
+        <sv:value>image/png</sv:value>
+      </sv:property>
+      <sv:property sv:name="nodeDataTemplate" sv:type="String">
+        <sv:value/>
+      </sv:property>
+      <sv:property sv:name="size" sv:type="String">
+        <sv:value>633</sv:value>
+      </sv:property>
+      <sv:property sv:name="width" sv:type="String">
+        <sv:value>16</sv:value>
+      </sv:property>
+    </sv:node>
   </sv:node>
   <sv:node sv:name="groovyshell">
     <sv:property sv:name="jcr:primaryType" sv:type="Name">

Modified: trunk/module-store-server-webapp/src/main/webapp/templates/pages/module-details.jsp
===================================================================
--- trunk/module-store-server-webapp/src/main/webapp/templates/pages/module-details.jsp	2010-02-10 16:17:19 UTC (rev 1882)
+++ trunk/module-store-server-webapp/src/main/webapp/templates/pages/module-details.jsp	2010-02-10 17:17:25 UTC (rev 1883)
@@ -20,6 +20,7 @@
       <cms:mainBar>
         <cms:button label="Module details" dialogName="module-details" position="right" />
       </cms:mainBar>
+      <a href="javascript:back();">back to module list</a>
       <div>
         <c:if test="${not empty content.icon}">
           <img src="${ctx}${content.icon}" alt="${content.title}" width="250" height="250"


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

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

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

Revision: 1908
          http://openutils.svn.sourceforge.net/openutils/?rev=1908&view=rev
Author:   fgiust
Date:     2010-02-13 13:21:24 +0000 (Sat, 13 Feb 2010)

Log Message:
-----------
a bunch of license headers and assembly descriptors

Modified Paths:
--------------
    trunk/openutils-mgnlstripes/src/main/java/it/openutils/magnoliastripes/MagnoliaMultipartWrapper.java
    trunk/openutils-mgnlstripes/src/main/java/it/openutils/magnoliastripes/MgnlActionResolver.java
    trunk/openutils-mgnlstripes/src/main/java/it/openutils/magnoliastripes/MgnlStripesRequestWrapper.java
    trunk/openutils-mgnlstripes/src/main/java/it/openutils/magnoliastripes/MgnlStripesResponseWrapper.java
    trunk/openutils-mgnlstripes/src/main/java/it/openutils/magnoliastripes/StripesMagnoliaFilter.java
    trunk/openutils-mgnlstripes/src/main/java/it/openutils/magnoliastripes/StripesModule.java
    trunk/openutils-mgnlstripes/src/main/java/it/openutils/magnoliastripes/StripesParagraphRenderer.java
    trunk/openutils-mgnlstripes/src/main/java/it/openutils/magnoliastripes/StripesRenderer.java
    trunk/openutils-mgnlstripes/src/main/java/it/openutils/magnoliastripes/setup/StripesModuleVersionHandler.java
    trunk/openutils-spring/src/main/java/it/openutils/spring/context/WebApplicationContextHolder.java
    trunk/openutils-spring/src/main/java/it/openutils/spring/context/WebApplicationContextListener.java
    trunk/openutils-spring/src/main/java/it/openutils/spring/editors/GenericSetPropertyEditor.java
    trunk/openutils-spring/src/main/java/it/openutils/spring/editors/GenericSinglePropertyEditor.java
    trunk/openutils-spring/src/main/java/it/openutils/spring/email/FileMessageStore.java
    trunk/openutils-spring/src/main/java/it/openutils/spring/email/MessageStore.java
    trunk/openutils-spring/src/main/java/it/openutils/spring/email/TemplatedMailSender.java
    trunk/openutils-spring/src/main/java/it/openutils/spring/email/TemplatedMailSenderImpl.java
    trunk/openutils-spring/src/main/java/it/openutils/spring/remoting/exporters/JSONServiceExporter.java
    trunk/openutils-spring/src/main/java/it/openutils/spring/validation/hibernate/AnnotationValidator.java
    trunk/openutils-spring/src/main/java/it/openutils/web/spring/BaseFormController.java
    trunk/openutils-spring/src/main/java/it/openutils/web/spring/EasyDoubleCustomEditor.java
    trunk/openutils-spring/src/main/java/it/openutils/web/spring/MultiController.java
    trunk/openutils-spring/src/main/java/it/openutils/web/spring/ParamNameUrlHandlerMapping.java
    trunk/openutils-spring/src/main/java/it/openutils/web/spring/SimpleController.java
    trunk/openutils-spring/src/main/java/it/openutils/web/util/MessageUtils.java
    trunk/openutils-testing4dwr/src/main/java/it/openutils/testing/dwr/DwrTestContext.java
    trunk/openutils-testing4dwr/src/main/java/it/openutils/testing/dwr/JsException.java
    trunk/openutils-testing4dwr/src/main/java/it/openutils/testing/dwr/XMLHttpRequest.java
    trunk/openutils-testing4dwr-junit/src/main/java/it/openutils/testing/junit/dwr/DwrTestCase.java
    trunk/openutils-testing4dwr-testng/src/main/java/it/openutils/testing/testng/dwr/DwrTestCase.java

Added Paths:
-----------
    trunk/openutils-mgnlstripes/src/main/etc/
    trunk/openutils-mgnlstripes/src/main/etc/header.txt
    trunk/openutils-spring/src/main/assembly/
    trunk/openutils-spring/src/main/assembly/assembly-bundle.xml
    trunk/openutils-spring/src/main/bundle/
    trunk/openutils-spring/src/main/etc/
    trunk/openutils-spring/src/main/etc/header.txt
    trunk/openutils-testing/src/main/assembly/
    trunk/openutils-testing/src/main/assembly/assembly-bundle.xml
    trunk/openutils-testing/src/main/bundle/
    trunk/openutils-testing4dwr/src/main/assembly/
    trunk/openutils-testing4dwr/src/main/assembly/assembly-bundle.xml
    trunk/openutils-testing4dwr/src/main/bundle/
    trunk/openutils-testing4dwr/src/main/etc/
    trunk/openutils-testing4dwr/src/main/etc/header.txt
    trunk/openutils-testing4dwr-junit/src/main/assembly/
    trunk/openutils-testing4dwr-junit/src/main/assembly/assembly-bundle.xml
    trunk/openutils-testing4dwr-junit/src/main/bundle/
    trunk/openutils-testing4dwr-junit/src/main/etc/
    trunk/openutils-testing4dwr-junit/src/main/etc/header.txt
    trunk/openutils-testing4dwr-testng/src/main/assembly/
    trunk/openutils-testing4dwr-testng/src/main/assembly/assembly-bundle.xml
    trunk/openutils-testing4dwr-testng/src/main/bundle/
    trunk/openutils-testing4dwr-testng/src/main/etc/
    trunk/openutils-testing4dwr-testng/src/main/etc/header.txt

Added: trunk/openutils-mgnlstripes/src/main/etc/header.txt
===================================================================
--- trunk/openutils-mgnlstripes/src/main/etc/header.txt	                        (rev 0)
+++ trunk/openutils-mgnlstripes/src/main/etc/header.txt	2010-02-13 13:21:24 UTC (rev 1908)
@@ -0,0 +1,16 @@
+
+${name} (${url})
+Copyright(C) ${year}, 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/>.
\ No newline at end of file


Property changes on: trunk/openutils-mgnlstripes/src/main/etc/header.txt
___________________________________________________________________
Added: svn:mime-type
   + text/plain
Added: svn:keywords
   + Author Date Id Revision
Added: svn:eol-style
   + native

Modified: trunk/openutils-mgnlstripes/src/main/java/it/openutils/magnoliastripes/MagnoliaMultipartWrapper.java
===================================================================
--- trunk/openutils-mgnlstripes/src/main/java/it/openutils/magnoliastripes/MagnoliaMultipartWrapper.java	2010-02-13 13:19:45 UTC (rev 1907)
+++ trunk/openutils-mgnlstripes/src/main/java/it/openutils/magnoliastripes/MagnoliaMultipartWrapper.java	2010-02-13 13:21:24 UTC (rev 1908)
@@ -1,20 +1,22 @@
 /**
- * Copyright Openmind 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.
+ * Magnolia Stripes module (http://www.openmindlab.com/lab/products/mgnlstripes.html)
+ * Copyright(C) null-2010, Openmind S.r.l. http://www.openmindonline.it
  *
- * 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.
+ *  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.
  *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *  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.magnoliastripes;
 
 import info.magnolia.cms.beans.runtime.Document;

Modified: trunk/openutils-mgnlstripes/src/main/java/it/openutils/magnoliastripes/MgnlActionResolver.java
===================================================================
--- trunk/openutils-mgnlstripes/src/main/java/it/openutils/magnoliastripes/MgnlActionResolver.java	2010-02-13 13:19:45 UTC (rev 1907)
+++ trunk/openutils-mgnlstripes/src/main/java/it/openutils/magnoliastripes/MgnlActionResolver.java	2010-02-13 13:21:24 UTC (rev 1908)
@@ -1,20 +1,22 @@
 /**
- * Copyright Openmind 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.
+ * Magnolia Stripes module (http://www.openmindlab.com/lab/products/mgnlstripes.html)
+ * Copyright(C) null-2010, Openmind S.r.l. http://www.openmindonline.it
  *
- * 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.
+ *  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.
  *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *  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.magnoliastripes;
 
 import info.magnolia.module.templating.Paragraph;

Modified: trunk/openutils-mgnlstripes/src/main/java/it/openutils/magnoliastripes/MgnlStripesRequestWrapper.java
===================================================================
--- trunk/openutils-mgnlstripes/src/main/java/it/openutils/magnoliastripes/MgnlStripesRequestWrapper.java	2010-02-13 13:19:45 UTC (rev 1907)
+++ trunk/openutils-mgnlstripes/src/main/java/it/openutils/magnoliastripes/MgnlStripesRequestWrapper.java	2010-02-13 13:21:24 UTC (rev 1908)
@@ -1,20 +1,22 @@
 /**
- * Copyright Openmind 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.
+ * Magnolia Stripes module (http://www.openmindlab.com/lab/products/mgnlstripes.html)
+ * Copyright(C) null-2010, Openmind S.r.l. http://www.openmindonline.it
  *
- * 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.
+ *  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.
  *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *  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.magnoliastripes;
 
 import info.magnolia.context.MgnlContext;

Modified: trunk/openutils-mgnlstripes/src/main/java/it/openutils/magnoliastripes/MgnlStripesResponseWrapper.java
===================================================================
--- trunk/openutils-mgnlstripes/src/main/java/it/openutils/magnoliastripes/MgnlStripesResponseWrapper.java	2010-02-13 13:19:45 UTC (rev 1907)
+++ trunk/openutils-mgnlstripes/src/main/java/it/openutils/magnoliastripes/MgnlStripesResponseWrapper.java	2010-02-13 13:21:24 UTC (rev 1908)
@@ -1,20 +1,22 @@
 /**
- * Copyright Openmind 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.
+ * Magnolia Stripes module (http://www.openmindlab.com/lab/products/mgnlstripes.html)
+ * Copyright(C) null-2010, Openmind S.r.l. http://www.openmindonline.it
  *
- * 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.
+ *  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.
  *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *  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.magnoliastripes;
 
 import java.io.IOException;

Modified: trunk/openutils-mgnlstripes/src/main/java/it/openutils/magnoliastripes/StripesMagnoliaFilter.java
===================================================================
--- trunk/openutils-mgnlstripes/src/main/java/it/openutils/magnoliastripes/StripesMagnoliaFilter.java	2010-02-13 13:19:45 UTC (rev 1907)
+++ trunk/openutils-mgnlstripes/src/main/java/it/openutils/magnoliastripes/StripesMagnoliaFilter.java	2010-02-13 13:21:24 UTC (rev 1908)
@@ -1,20 +1,22 @@
 /**
- * Copyright Openmind 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.
+ * Magnolia Stripes module (http://www.openmindlab.com/lab/products/mgnlstripes.html)
+ * Copyright(C) null-2010, Openmind S.r.l. http://www.openmindonline.it
  *
- * 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.
+ *  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.
  *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *  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.magnoliastripes;
 
 import info.magnolia.cms.filters.MgnlFilter;

Modified: trunk/openutils-mgnlstripes/src/main/java/it/openutils/magnoliastripes/StripesModule.java
===================================================================
--- trunk/openutils-mgnlstripes/src/main/java/it/openutils/magnoliastripes/StripesModule.java	2010-02-13 13:19:45 UTC (rev 1907)
+++ trunk/openutils-mgnlstripes/src/main/java/it/openutils/magnoliastripes/StripesModule.java	2010-02-13 13:21:24 UTC (rev 1908)
@@ -1,20 +1,22 @@
 /**
- * Copyright Openmind 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.
+ * Magnolia Stripes module (http://www.openmindlab.com/lab/products/mgnlstripes.html)
+ * Copyright(C) null-2010, Openmind S.r.l. http://www.openmindonline.it
  *
- * 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.
+ *  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.
  *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *  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.magnoliastripes;
 
 import info.magnolia.module.ModuleLifecycle;

Modified: trunk/openutils-mgnlstripes/src/main/java/it/openutils/magnoliastripes/StripesParagraphRenderer.java
===================================================================
--- trunk/openutils-mgnlstripes/src/main/java/it/openutils/magnoliastripes/StripesParagraphRenderer.java	2010-02-13 13:19:45 UTC (rev 1907)
+++ trunk/openutils-mgnlstripes/src/main/java/it/openutils/magnoliastripes/StripesParagraphRenderer.java	2010-02-13 13:21:24 UTC (rev 1908)
@@ -1,20 +1,22 @@
 /**
- * Copyright Openmind 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.
+ * Magnolia Stripes module (http://www.openmindlab.com/lab/products/mgnlstripes.html)
+ * Copyright(C) null-2010, Openmind S.r.l. http://www.openmindonline.it
  *
- * 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.
+ *  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.
  *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *  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.magnoliastripes;
 
 /**

Modified: trunk/openutils-mgnlstripes/src/main/java/it/openutils/magnoliastripes/StripesRenderer.java
===================================================================
--- trunk/openutils-mgnlstripes/src/main/java/it/openutils/magnoliastripes/StripesRenderer.java	2010-02-13 13:19:45 UTC (rev 1907)
+++ trunk/openutils-mgnlstripes/src/main/java/it/openutils/magnoliastripes/StripesRenderer.java	2010-02-13 13:21:24 UTC (rev 1908)
@@ -1,20 +1,22 @@
 /**
- * Copyright Openmind 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.
+ * Magnolia Stripes module (http://www.openmindlab.com/lab/products/mgnlstripes.html)
+ * Copyright(C) null-2010, Openmind S.r.l. http://www.openmindonline.it
  *
- * 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.
+ *  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.
  *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *  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.magnoliastripes;
 
 import info.magnolia.cms.core.Content;

Modified: trunk/openutils-mgnlstripes/src/main/java/it/openutils/magnoliastripes/setup/StripesModuleVersionHandler.java
===================================================================
--- trunk/openutils-mgnlstripes/src/main/java/it/openutils/magnoliastripes/setup/StripesModuleVersionHandler.java	2010-02-13 13:19:45 UTC (rev 1907)
+++ trunk/openutils-mgnlstripes/src/main/java/it/openutils/magnoliastripes/setup/StripesModuleVersionHandler.java	2010-02-13 13:21:24 UTC (rev 1908)
@@ -1,20 +1,22 @@
 /**
- * Copyright Openmind 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.
+ * Magnolia Stripes module (http://www.openmindlab.com/lab/products/mgnlstripes.html)
+ * Copyright(C) null-2010, Openmind S.r.l. http://www.openmindonline.it
  *
- * 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.
+ *  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.
  *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *  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.magnoliastripes.setup;
 
 import info.magnolia.cms.beans.config.ContentRepository;

Added: trunk/openutils-spring/src/main/assembly/assembly-bundle.xml
===================================================================
--- trunk/openutils-spring/src/main/assembly/assembly-bundle.xml	                        (rev 0)
+++ trunk/openutils-spring/src/main/assembly/assembly-bundle.xml	2010-02-13 13:21:24 UTC (rev 1908)
@@ -0,0 +1,34 @@
+<assembly>
+  <id>bundle</id>
+  <formats>
+    <format>zip</format>
+  </formats>
+  <includeBaseDirectory>false</includeBaseDirectory>
+  <fileSets>
+    <fileSet>
+      <filtered>true</filtered>
+      <outputDirectory>/</outputDirectory>
+      <lineEnding>crlf</lineEnding>
+      <directory>${basedir}/src/main/bundle</directory>
+      <includes>
+        <include>*</include>
+      </includes>
+    </fileSet>
+    <fileSet>
+      <directory>.</directory>
+      <outputDirectory>/sources/</outputDirectory>
+      <includes>
+        <include>src/**/*</include>
+        <include>pom.xml</include>
+      </includes>
+    </fileSet>
+  </fileSets>
+  <dependencySets>
+    <dependencySet>
+      <outputDirectory>bin</outputDirectory>
+      <includes>
+        <include>net.sourceforge.openutils:*</include>
+      </includes>
+    </dependencySet>
+  </dependencySets>
+</assembly>
\ No newline at end of file


Property changes on: trunk/openutils-spring/src/main/assembly/assembly-bundle.xml
___________________________________________________________________
Added: svn:mime-type
   + text/xml
Added: svn:keywords
   + Author Date Id Revision
Added: svn:eol-style
   + native

Added: trunk/openutils-spring/src/main/etc/header.txt
===================================================================
--- trunk/openutils-spring/src/main/etc/header.txt	                        (rev 0)
+++ trunk/openutils-spring/src/main/etc/header.txt	2010-02-13 13:21:24 UTC (rev 1908)
@@ -0,0 +1,15 @@
+
+${name} (${url})
+Copyright(C) ${year}, Openmind S.r.l. http://www.openmindonline.it
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
\ No newline at end of file


Property changes on: trunk/openutils-spring/src/main/etc/header.txt
___________________________________________________________________
Added: svn:mime-type
   + text/plain
Added: svn:keywords
   + Author Date Id Revision
Added: svn:eol-style
   + native

Modified: trunk/openutils-spring/src/main/java/it/openutils/spring/context/WebApplicationContextHolder.java
===================================================================
--- trunk/openutils-spring/src/main/java/it/openutils/spring/context/WebApplicationContextHolder.java	2010-02-13 13:19:45 UTC (rev 1907)
+++ trunk/openutils-spring/src/main/java/it/openutils/spring/context/WebApplicationContextHolder.java	2010-02-13 13:21:24 UTC (rev 1908)
@@ -1,18 +1,21 @@
-/*
- * Copyright Openmind http://www.openmindonline.it
+/**
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * openutils spring tools (http://openutils.sourceforge.net/openutils-spring)
+ * Copyright(C) null-2010, Openmind S.r.l. http://www.openmindonline.it
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
  *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ *       http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
  */
+
 package it.openutils.spring.context;
 
 import org.springframework.web.context.WebApplicationContext;

Modified: trunk/openutils-spring/src/main/java/it/openutils/spring/context/WebApplicationContextListener.java
===================================================================
--- trunk/openutils-spring/src/main/java/it/openutils/spring/context/WebApplicationContextListener.java	2010-02-13 13:19:45 UTC (rev 1907)
+++ trunk/openutils-spring/src/main/java/it/openutils/spring/context/WebApplicationContextListener.java	2010-02-13 13:21:24 UTC (rev 1908)
@@ -1,18 +1,21 @@
-/*
- * Copyright Openmind http://www.openmindonline.it
+/**
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * openutils spring tools (http://openutils.sourceforge.net/openutils-spring)
+ * Copyright(C) null-2010, Openmind S.r.l. http://www.openmindonline.it
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
  *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ *       http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
  */
+
 package it.openutils.spring.context;
 
 import javax.servlet.ServletRequestEvent;

Modified: trunk/openutils-spring/src/main/java/it/openutils/spring/editors/GenericSetPropertyEditor.java
===================================================================
--- trunk/openutils-spring/src/main/java/it/openutils/spring/editors/GenericSetPropertyEditor.java	2010-02-13 13:19:45 UTC (rev 1907)
+++ trunk/openutils-spring/src/main/java/it/openutils/spring/editors/GenericSetPropertyEditor.java	2010-02-13 13:21:24 UTC (rev 1908)
@@ -1,18 +1,21 @@
-/*
- * Copyright Openmind http://www.openmindonline.it
+/**
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * openutils spring tools (http://openutils.sourceforge.net/openutils-spring)
+ * Copyright(C) null-2010, Openmind S.r.l. http://www.openmindonline.it
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
  *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ *       http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
  */
+
 package it.openutils.spring.editors;
 
 import java.beans.PropertyEditorSupport;

Modified: trunk/openutils-spring/src/main/java/it/openutils/spring/editors/GenericSinglePropertyEditor.java
===================================================================
--- trunk/openutils-spring/src/main/java/it/openutils/spring/editors/GenericSinglePropertyEditor.java	2010-02-13 13:19:45 UTC (rev 1907)
+++ trunk/openutils-spring/src/main/java/it/openutils/spring/editors/GenericSinglePropertyEditor.java	2010-02-13 13:21:24 UTC (rev 1908)
@@ -1,18 +1,21 @@
-/*
- * Copyright Openmind http://www.openmindonline.it
+/**
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * openutils spring tools (http://openutils.sourceforge.net/openutils-spring)
+ * Copyright(C) null-2010, Openmind S.r.l. http://www.openmindonline.it
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
  *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ *       http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
  */
+
 package it.openutils.spring.editors;
 
 import java.beans.PropertyEditorSupport;

Modified: trunk/openutils-spring/src/main/java/it/openutils/spring/email/FileMessageStore.java
===================================================================
--- trunk/openutils-spring/src/main/java/it/openutils/spring/email/FileMessageStore.java	2010-02-13 13:19:45 UTC (rev 1907)
+++ trunk/openutils-spring/src/main/java/it/openutils/spring/email/FileMessageStore.java	2010-02-13 13:21:24 UTC (rev 1908)
@@ -1,3 +1,21 @@
+/**
+ *
+ * openutils spring tools (http://openutils.sourceforge.net/openutils-spring)
+ * Copyright(C) null-2010, Openmind S.r.l. http://www.openmindonline.it
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *       http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+
 package it.openutils.spring.email;
 
 import java.io.File;

Modified: trunk/openutils-spring/src/main/java/it/openutils/spring/email/MessageStore.java
===================================================================
--- trunk/openutils-spring/src/main/java/it/openutils/spring/email/MessageStore.java	2010-02-13 13:19:45 UTC (rev 1907)
+++ trunk/openutils-spring/src/main/java/it/openutils/spring/email/MessageStore.java	2010-02-13 13:21:24 UTC (rev 1908)
@@ -1,3 +1,21 @@
+/**
+ *
+ * openutils spring tools (http://openutils.sourceforge.net/openutils-spring)
+ * Copyright(C) null-2010, Openmind S.r.l. http://www.openmindonline.it
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *       http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+
 package it.openutils.spring.email;
 
 import javax.mail.internet.MimeMessage;

Modified: trunk/openutils-spring/src/main/java/it/openutils/spring/email/TemplatedMailSender.java
===================================================================
--- trunk/openutils-spring/src/main/java/it/openutils/spring/email/TemplatedMailSender.java	2010-02-13 13:19:45 UTC (rev 1907)
+++ trunk/openutils-spring/src/main/java/it/openutils/spring/email/TemplatedMailSender.java	2010-02-13 13:21:24 UTC (rev 1908)
@@ -1,18 +1,21 @@
-/*
- * Copyright Openmind http://www.openmindonline.it
+/**
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * openutils spring tools (http://openutils.sourceforge.net/openutils-spring)
+ * Copyright(C) null-2010, Openmind S.r.l. http://www.openmindonline.it
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
  *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ *       http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
  */
+
 package it.openutils.spring.email;
 
 import java.io.File;

Modified: trunk/openutils-spring/src/main/java/it/openutils/spring/email/TemplatedMailSenderImpl.java
===================================================================
--- trunk/openutils-spring/src/main/java/it/openutils/spring/email/TemplatedMailSenderImpl.java	2010-02-13 13:19:45 UTC (rev 1907)
+++ trunk/openutils-spring/src/main/java/it/openutils/spring/email/TemplatedMailSenderImpl.java	2010-02-13 13:21:24 UTC (rev 1908)
@@ -1,18 +1,21 @@
-/*
- * Copyright Openmind http://www.openmindonline.it
+/**
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * openutils spring tools (http://openutils.sourceforge.net/openutils-spring)
+ * Copyright(C) null-2010, Openmind S.r.l. http://www.openmindonline.it
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
  *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ *       http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
  */
+
 package it.openutils.spring.email;
 
 import freemarker.template.Configuration;

Modified: trunk/openutils-spring/src/main/java/it/openutils/spring/remoting/exporters/JSONServiceExporter.java
===================================================================
--- trunk/openutils-spring/src/main/java/it/openutils/spring/remoting/exporters/JSONServiceExporter.java	2010-02-13 13:19:45 UTC (rev 1907)
+++ trunk/openutils-spring/src/main/java/it/openutils/spring/remoting/exporters/JSONServiceExporter.java	2010-02-13 13:21:24 UTC (rev 1908)
@@ -1,18 +1,21 @@
-/*
- * Copyright Openmind http://www.openmindonline.it
+/**
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * openutils spring tools (http://openutils.sourceforge.net/openutils-spring)
+ * Copyright(C) null-2010, Openmind S.r.l. http://www.openmindonline.it
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
  *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ *       http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
  */
+
 package it.openutils.spring.remoting.exporters;
 
 import java.beans.BeanInfo;

Modified: trunk/openutils-spring/src/main/java/it/openutils/spring/validation/hibernate/AnnotationValidator.java
===================================================================
--- trunk/openutils-spring/src/main/java/it/openutils/spring/validation/hibernate/AnnotationValidator.java	2010-02-13 13:19:45 UTC (rev 1907)
+++ trunk/openutils-spring/src/main/java/it/openutils/spring/validation/hibernate/AnnotationValidator.java	2010-02-13 13:21:24 UTC (rev 1908)
@@ -1,18 +1,21 @@
-/*
- * Copyright Openmind http://www.openmindonline.it
+/**
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * openutils spring tools (http://openutils.sourceforge.net/openutils-spring)
+ * Copyright(C) null-2010, Openmind S.r.l. http://www.openmindonline.it
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
  *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ *       http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
  */
+
 package it.openutils.spring.validation.hibernate;
 
 import java.util.Enumeration;

Modified: trunk/openutils-spring/src/main/java/it/openutils/web/spring/BaseFormController.java
===================================================================
--- trunk/openutils-spring/src/main/java/it/openutils/web/spring/BaseFormController.java	2010-02-13 13:19:45 UTC (rev 1907)
+++ trunk/openutils-spring/src/main/java/it/openutils/web/spring/BaseFormController.java	2010-02-13 13:21:24 UTC (rev 1908)
@@ -1,18 +1,21 @@
-/*
- * Copyright Openmind http://www.openmindonline.it
+/**
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * openutils spring tools (http://openutils.sourceforge.net/openutils-spring)
+ * Copyright(C) null-2010, Openmind S.r.l. http://www.openmindonline.it
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
  *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ *       http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
  */
+
 package it.openutils.web.spring;
 
 import it.openutils.web.util.MessageUtils;

Modified: trunk/openutils-spring/src/main/java/it/openutils/web/spring/EasyDoubleCustomEditor.java
===================================================================
--- trunk/openutils-spring/src/main/java/it/openutils/web/spring/EasyDoubleCustomEditor.java	2010-02-13 13:19:45 UTC (rev 1907)
+++ trunk/openutils-spring/src/main/java/it/openutils/web/spring/EasyDoubleCustomEditor.java	2010-02-13 13:21:24 UTC (rev 1908)
@@ -1,18 +1,21 @@
-/*
- * Copyright Openmind http://www.openmindonline.it
+/**
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * openutils spring tools (http://openutils.sourceforge.net/openutils-spring)
+ * Copyright(C) null-2010, Openmind S.r.l. http://www.openmindonline.it
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
  *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ *       http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
  */
+
 package it.openutils.web.spring;
 
 import java.text.NumberFormat;

Modified: trunk/openutils-spring/src/main/java/it/openutils/web/spring/MultiController.java
===================================================================
--- trunk/openutils-spring/src/main/java/it/openutils/web/spring/MultiController.java	2010-02-13 13:19:45 UTC (rev 1907)
+++ trunk/openutils-spring/src/main/java/it/openutils/web/spring/MultiController.java	2010-02-13 13:21:24 UTC (rev 1908)
@@ -1,18 +1,21 @@
-/*
- * Copyright Openmind http://www.openmindonline.it
+/**
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * openutils spring tools (http://openutils.sourceforge.net/openutils-spring)
+ * Copyright(C) null-2010, Openmind S.r.l. http://www.openmindonline.it
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
  *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ *       http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
  */
+
 package it.openutils.web.spring;
 
 import it.openutils.web.util.MessageUtils;

Modified: trunk/openutils-spring/src/main/java/it/openutils/web/spring/ParamNameUrlHandlerMapping.java
===================================================================
--- trunk/openutils-spring/src/main/java/it/openutils/web/spring/ParamNameUrlHandlerMapping.java	2010-02-13 13:19:45 UTC (rev 1907)
+++ trunk/openutils-spring/src/main/java/it/openutils/web/spring/ParamNameUrlHandlerMapping.java	2010-02-13 13:21:24 UTC (rev 1908)
@@ -1,18 +1,21 @@
-/*
- * Copyright Openmind http://www.openmindonline.it
+/**
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * openutils spring tools (http://openutils.sourceforge.net/openutils-spring)
+ * Copyright(C) null-2010, Openmind S.r.l. http://www.openmindonline.it
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
  *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ *       http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
  */
+
 package it.openutils.web.spring;
 
 import java.util.HashMap;

Modified: trunk/openutils-spring/src/main/java/it/openutils/web/spring/SimpleController.java
===================================================================
--- trunk/openutils-spring/src/main/java/it/openutils/web/spring/SimpleController.java	2010-02-13 13:19:45 UTC (rev 1907)
+++ trunk/openutils-spring/src/main/java/it/openutils/web/spring/SimpleController.java	2010-02-13 13:21:24 UTC (rev 1908)
@@ -1,18 +1,21 @@
-/*
- * Copyright Openmind http://www.openmindonline.it
+/**
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * openutils spring tools (http://openutils.sourceforge.net/openutils-spring)
+ * Copyright(C) null-2010, Openmind S.r.l. http://www.openmindonline.it
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
  *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ *       http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
  */
+
 package it.openutils.web.spring;
 
 import it.openutils.web.util.MessageUtils;

Modified: trunk/openutils-spring/src/main/java/it/openutils/web/util/MessageUtils.java
===================================================================
--- trunk/openutils-spring/src/main/java/it/openutils/web/util/MessageUtils.java	2010-02-13 13:19:45 UTC (rev 1907)
+++ trunk/openutils-spring/src/main/java/it/openutils/web/util/MessageUtils.java	2010-02-13 13:21:24 UTC (rev 1908)
@@ -1,18 +1,21 @@
-/*
- * Copyright Openmind http://www.openmindonline.it
+/**
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * openutils spring tools (http://openutils.sourceforge.net/openutils-spring)
+ * Copyright(C) null-2010, Openmind S.r.l. http://www.openmindonline.it
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
  *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ *       http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
  */
+
 package it.openutils.web.util;
 
 import java.util.ArrayList;

Added: trunk/openutils-testing/src/main/assembly/assembly-bundle.xml
===================================================================
--- trunk/openutils-testing/src/main/assembly/assembly-bundle.xml	                        (rev 0)
+++ trunk/openutils-testing/src/main/assembly/assembly-bundle.xml	2010-02-13 13:21:24 UTC (rev 1908)
@@ -0,0 +1,26 @@
+<assembly>
+	<id>bundle</id>
+	<formats>
+		<format>zip</format>
+	</formats>
+	<includeBaseDirectory>false</includeBaseDirectory>
+	<fileSets>
+		<fileSet>
+			<filtered>true</filtered>
+			<outputDirectory>/</outputDirectory>
+			<lineEnding>crlf</lineEnding>
+			<directory>${basedir}/src/main/bundle</directory>
+			<includes>
+				<include>*</include>
+			</includes>
+		</fileSet>
+	</fileSets>
+	<dependencySets>
+		<dependencySet>
+			<outputDirectory>${pom.artifactId}</outputDirectory>
+			<includes>
+				<include>net.sourceforge.openutils:*</include>
+			</includes>
+		</dependencySet>
+	</dependencySets>
+</assembly>
\ No newline at end of file


Property changes on: trunk/openutils-testing/src/main/assembly/assembly-bundle.xml
___________________________________________________________________
Added: svn:mime-type
   + text/xml
Added: svn:keywords
   + Author Date Id Revision
Added: svn:eol-style
   + native

Added: trunk/openutils-testing4dwr/src/main/assembly/assembly-bundle.xml
===================================================================
--- trunk/openutils-testing4dwr/src/main/assembly/assembly-bundle.xml	                        (rev 0)
+++ trunk/openutils-testing4dwr/src/main/assembly/assembly-bundle.xml	2010-02-13 13:21:24 UTC (rev 1908)
@@ -0,0 +1,26 @@
+<assembly>
+	<id>bundle</id>
+	<formats>
+		<format>zip</format>
+	</formats>
+	<includeBaseDirectory>false</includeBaseDirectory>
+	<fileSets>
+		<fileSet>
+			<filtered>true</filtered>
+			<outputDirectory>/</outputDirectory>
+			<lineEnding>crlf</lineEnding>
+			<directory>${basedir}/src/main/bundle</directory>
+			<includes>
+				<include>*</include>
+			</includes>
+		</fileSet>
+	</fileSets>
+	<dependencySets>
+		<dependencySet>
+			<outputDirectory>${pom.artifactId}</outputDirectory>
+			<includes>
+				<include>net.sourceforge.openutils:*</include>
+			</includes>
+		</dependencySet>
+	</dependencySets>
+</assembly>
\ No newline at end of file


Property changes on: trunk/openutils-testing4dwr/src/main/assembly/assembly-bundle.xml
___________________________________________________________________
Added: svn:mime-type
   + text/xml
Added: svn:keywords
   + Author Date Id Revision
Added: svn:eol-style
   + native

Added: trunk/openutils-testing4dwr/src/main/etc/header.txt
===================================================================
--- trunk/openutils-testing4dwr/src/main/etc/header.txt	                        (rev 0)
+++ trunk/openutils-testing4dwr/src/main/etc/header.txt	2010-02-13 13:21:24 UTC (rev 1908)
@@ -0,0 +1,15 @@
+
+${name} (${url})
+Copyright(C) ${year}, Openmind S.r.l. http://www.openmindonline.it
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
\ No newline at end of file


Property changes on: trunk/openutils-testing4dwr/src/main/etc/header.txt
___________________________________________________________________
Added: svn:mime-type
   + text/plain
Added: svn:keywords
   + Author Date Id Revision
Added: svn:eol-style
   + native

Modified: trunk/openutils-testing4dwr/src/main/java/it/openutils/testing/dwr/DwrTestContext.java
===================================================================
--- trunk/openutils-testing4dwr/src/main/java/it/openutils/testing/dwr/DwrTestContext.java	2010-02-13 13:19:...
 
[truncated message content]

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

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

Revision: 1910
          http://openutils.svn.sourceforge.net/openutils/?rev=1910&view=rev
Author:   fgiust
Date:     2010-02-13 14:14:14 +0000 (Sat, 13 Feb 2010)

Log Message:
-----------
bump media module version number, next version will be 4.1

Modified Paths:
--------------
    trunk/magnolia-test-webapp/pom.xml
    trunk/openutils-mgnlmedia/pom.xml

Modified: trunk/magnolia-test-webapp/pom.xml
===================================================================
--- trunk/magnolia-test-webapp/pom.xml	2010-02-13 13:22:06 UTC (rev 1909)
+++ trunk/magnolia-test-webapp/pom.xml	2010-02-13 14:14:14 UTC (rev 1910)
@@ -131,7 +131,7 @@
     <dependency>
       <groupId>net.sourceforge.openutils</groupId>
       <artifactId>openutils-mgnlmedia</artifactId>
-      <version>4.0.3-SNAPSHOT</version>
+      <version>4.1-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>net.sourceforge.openutils</groupId>

Modified: trunk/openutils-mgnlmedia/pom.xml
===================================================================
--- trunk/openutils-mgnlmedia/pom.xml	2010-02-13 13:22:06 UTC (rev 1909)
+++ trunk/openutils-mgnlmedia/pom.xml	2010-02-13 14:14:14 UTC (rev 1910)
@@ -10,7 +10,7 @@
   <artifactId>openutils-mgnlmedia</artifactId>
   <name>Magnolia SimpleMedia Module</name>
   <description>Magnolia SimpleMedia Module: a module for Magnolia CMS for easier management multimedia assets.</description>
-  <version>4.0.3-SNAPSHOT</version>
+  <version>4.1-SNAPSHOT</version>
   <inceptionYear>2008</inceptionYear>
   <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:[1949] trunk

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

Revision: 1949
          http://openutils.svn.sourceforge.net/openutils/?rev=1949&view=rev
Author:   diego_schivo
Date:     2010-02-15 15:49:04 +0000 (Mon, 15 Feb 2010)

Log Message:
-----------
Module store: json postdata

Modified Paths:
--------------
    trunk/magnolia-test-webapp/src/main/java/info/magnolia/module/admininterface/pages/AllModulesListPage.java
    trunk/magnolia-test-webapp/src/main/resources/info/magnolia/module/admininterface/pages/AllModulesListPage.html
    trunk/module-store-server-webapp/src/main/webapp/templates/pages/module-list.jsp

Added Paths:
-----------
    trunk/module-store-server-webapp/src/main/java/info/magnolia/module/
    trunk/module-store-server-webapp/src/main/java/info/magnolia/module/modulestore/
    trunk/module-store-server-webapp/src/main/java/info/magnolia/module/modulestore/el/
    trunk/module-store-server-webapp/src/main/java/info/magnolia/module/modulestore/el/ModuleStoreElFunctions.java
    trunk/module-store-server-webapp/src/main/resources/META-INF/
    trunk/module-store-server-webapp/src/main/resources/META-INF/modulestore-taglib.tld

Modified: trunk/magnolia-test-webapp/src/main/java/info/magnolia/module/admininterface/pages/AllModulesListPage.java
===================================================================
--- trunk/magnolia-test-webapp/src/main/java/info/magnolia/module/admininterface/pages/AllModulesListPage.java	2010-02-15 14:05:42 UTC (rev 1948)
+++ trunk/magnolia-test-webapp/src/main/java/info/magnolia/module/admininterface/pages/AllModulesListPage.java	2010-02-15 15:49:04 UTC (rev 1949)
@@ -6,13 +6,15 @@
 
 import java.util.ArrayList;
 import java.util.Collections;
-import java.util.LinkedHashMap;
 import java.util.List;
-import java.util.Map;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
+import net.sf.json.JSONArray;
+import net.sf.json.JSONObject;
+
+import org.apache.taglibs.standard.functions.Functions;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -29,7 +31,7 @@
      */
     private static Logger log = LoggerFactory.getLogger(AllModulesListPage.class);
 
-    private Map<String, String> installedModules = new LinkedHashMap<String, String>();
+    private String postdata;
 
     /**
      * 
@@ -41,12 +43,12 @@
     }
 
     /**
-     * Returns the installedModules.
-     * @return the installedModules
+     * Returns the postdata.
+     * @return the postdata
      */
-    public Map<String, String> getInstalledModules()
+    public String getPostdata()
     {
-        return installedModules;
+        return postdata;
     }
 
     /**
@@ -55,6 +57,7 @@
     @Override
     public String show()
     {
+        JSONArray installedModules = new JSONArray();
         ModuleRegistry registry = ModuleRegistry.Factory.getInstance();
         List<String> moduleNames = new ArrayList<String>(registry.getModuleNames());
         Collections.sort(moduleNames);
@@ -63,9 +66,15 @@
             ModuleDefinition def = registry.getDefinition(name);
             if (def != null)
             {
-                installedModules.put(def.getName(), def.getVersion().toString());
+                JSONObject module = new JSONObject();
+                module.set("name", def.getName());
+                module.set("version", def.getVersion().toString());
+                installedModules.put(module);
             }
         }
+        JSONObject json = new JSONObject();
+        json.set("installedModules", installedModules);
+        postdata = Functions.escapeXml(json.toString());
         return super.show();
     }
 }

Modified: trunk/magnolia-test-webapp/src/main/resources/info/magnolia/module/admininterface/pages/AllModulesListPage.html
===================================================================
--- trunk/magnolia-test-webapp/src/main/resources/info/magnolia/module/admininterface/pages/AllModulesListPage.html	2010-02-15 14:05:42 UTC (rev 1948)
+++ trunk/magnolia-test-webapp/src/main/resources/info/magnolia/module/admininterface/pages/AllModulesListPage.html	2010-02-15 15:49:04 UTC (rev 1949)
@@ -19,9 +19,7 @@
   <body id="mgnl" onload="setTimeout(loadModules, 1000);">
     <form id="loadModulesForm" action="/module-store-server/module-list.html" method="post">
       <div>
-        [#list this.installedModules?keys as key]
-          <input type="hidden" name="${key}" value="${this.installedModules[key]}" />
-        [/#list]
+        <input type="hidden" name="postdata" value="${this.postdata}" />
       </div>
     </form>
     <div style="display: block; width: 400px; background-color: #999; margin: 50px auto; text-align: center;">

Added: trunk/module-store-server-webapp/src/main/java/info/magnolia/module/modulestore/el/ModuleStoreElFunctions.java
===================================================================
--- trunk/module-store-server-webapp/src/main/java/info/magnolia/module/modulestore/el/ModuleStoreElFunctions.java	                        (rev 0)
+++ trunk/module-store-server-webapp/src/main/java/info/magnolia/module/modulestore/el/ModuleStoreElFunctions.java	2010-02-15 15:49:04 UTC (rev 1949)
@@ -0,0 +1,38 @@
+package info.magnolia.module.modulestore.el;
+
+import java.util.HashMap;
+import java.util.Map;
+
+import net.sf.json.JSONArray;
+import net.sf.json.JSONObject;
+
+
+/**
+ * @author dschivo
+ * @version $Id$
+ */
+public final class ModuleStoreElFunctions
+{
+
+    /**
+     * 
+     */
+    private ModuleStoreElFunctions()
+    {
+    }
+
+    public static Map<String, String> installedModuleVersionsFromJson(String jsonString)
+    {
+        JSONObject jsonObj = new JSONObject(jsonString);
+        JSONArray installedModules = jsonObj.getJSONArray("installedModules");
+        int length = installedModules.length();
+        Map<String, String> map = new HashMap<String, String>(length);
+        for (int index = 0; index < length; index++)
+        {
+            JSONObject module = installedModules.getJSONObject(index);
+            map.put(module.getString("name"), module.getString("version"));
+        }
+        return map;
+    }
+
+}


Property changes on: trunk/module-store-server-webapp/src/main/java/info/magnolia/module/modulestore/el/ModuleStoreElFunctions.java
___________________________________________________________________
Added: svn:mime-type
   + text/plain
Added: svn:keywords
   + Author Date Id Revision
Added: svn:eol-style
   + native

Added: trunk/module-store-server-webapp/src/main/resources/META-INF/modulestore-taglib.tld
===================================================================
--- trunk/module-store-server-webapp/src/main/resources/META-INF/modulestore-taglib.tld	                        (rev 0)
+++ trunk/module-store-server-webapp/src/main/resources/META-INF/modulestore-taglib.tld	2010-02-15 15:49:04 UTC (rev 1949)
@@ -0,0 +1,15 @@
+<taglib xmlns="http://java.sun.com/xml/ns/j2ee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-jsptaglibrary_2_0.xsd"
+  version="2.0">
+  <description>Module store functions</description>
+  <display-name>module store functions</display-name>
+  <tlib-version>1.0</tlib-version>
+  <short-name>modulestorefn</short-name>
+  <uri>http://www.magnolia.info/tlds/modulestore-taglib.tld</uri>
+  <function>
+    <description></description>
+    <name>installedModuleVersionsFromJson</name>
+    <function-class>info.magnolia.module.modulestore.el.ModuleStoreElFunctions</function-class>
+    <function-signature>java.util.Map installedModuleVersionsFromJson(java.lang.String)</function-signature>
+  </function>
+</taglib>


Property changes on: trunk/module-store-server-webapp/src/main/resources/META-INF/modulestore-taglib.tld
___________________________________________________________________
Added: svn:mime-type
   + text/xml
Added: svn:keywords
   + Author Date Id Revision
Added: svn:eol-style
   + native

Modified: trunk/module-store-server-webapp/src/main/webapp/templates/pages/module-list.jsp
===================================================================
--- trunk/module-store-server-webapp/src/main/webapp/templates/pages/module-list.jsp	2010-02-15 14:05:42 UTC (rev 1948)
+++ trunk/module-store-server-webapp/src/main/webapp/templates/pages/module-list.jsp	2010-02-15 15:49:04 UTC (rev 1949)
@@ -1,6 +1,7 @@
 <jsp:root version="2.0" 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:cmsu="urn:jsptld:cms-util-taglib" xmlns:cmsfn="http://www.magnolia.info/tlds/cmsfn-taglib.tld"
+  xmlns:modulestorefn="http://www.magnolia.info/tlds/modulestore-taglib.tld">
   <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"> ]]>
@@ -72,6 +73,7 @@
             <td>Status</td>
           </tr>
         </thead>
+        <c:set var="installedModuleVersions" value="${modulestorefn:installedModuleVersionsFromJson(param.postdata)}" />
         <cms:contentNodeIterator items="${detailPages}" varStatus="loop">
           <cms:setNode var="detailPage" />
           <tr class="${loop.index % 2 == 0 ? 'odd' : 'even'}">
@@ -92,7 +94,7 @@
               </c:if>
             </td>
             <td>${detailPage.version}</td>
-            <c:set var="version" value="${param[detailPage.name]}" />
+            <c:set var="version" value="${installedModuleVersions[detailPage.name]}" />
             <td>
               <c:choose>
                 <c:when test="${empty version}">Not installed</c:when>


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

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

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

Revision: 1950
          http://openutils.svn.sourceforge.net/openutils/?rev=1950&view=rev
Author:   diego_schivo
Date:     2010-02-16 08:29:05 +0000 (Tue, 16 Feb 2010)

Log Message:
-----------
Module store: magnolia-module-modulestore project

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

Added Paths:
-----------
    trunk/magnolia-module-modulestore/
    trunk/magnolia-module-modulestore/pom.xml
    trunk/magnolia-module-modulestore/src/
    trunk/magnolia-module-modulestore/src/main/
    trunk/magnolia-module-modulestore/src/main/java/
    trunk/magnolia-module-modulestore/src/main/resources/

Added: trunk/magnolia-module-modulestore/pom.xml
===================================================================
--- trunk/magnolia-module-modulestore/pom.xml	                        (rev 0)
+++ trunk/magnolia-module-modulestore/pom.xml	2010-02-16 08:29:05 UTC (rev 1950)
@@ -0,0 +1,55 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+  <parent>
+    <artifactId>magnolia-project</artifactId>
+    <groupId>info.magnolia</groupId>
+    <version>4.3-SNAPSHOT</version>
+    <relativePath>../pom.xml</relativePath>
+  </parent>
+  <modelVersion>4.0.0</modelVersion>
+  <artifactId>magnolia-module-modulestore</artifactId>
+  <name>magnolia-module-modulestore</name>
+  <dependencies>
+    <dependency>
+      <groupId>commons-lang</groupId>
+      <artifactId>commons-lang</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>info.magnolia</groupId>
+      <artifactId>magnolia-core</artifactId>
+      <version>4.3-SNAPSHOT</version>
+    </dependency>
+    <dependency>
+      <groupId>info.magnolia</groupId>
+      <artifactId>magnolia-module-admininterface</artifactId>
+      <version>4.3-SNAPSHOT</version>
+    </dependency>
+    <dependency>
+      <groupId>javax.servlet</groupId>
+      <artifactId>servlet-api</artifactId>
+      <scope>provided</scope>
+    </dependency>
+    <dependency>
+      <groupId>javax.servlet</groupId>
+      <artifactId>jsp-api</artifactId>
+      <scope>provided</scope>
+    </dependency>
+    <dependency>
+      <groupId>junit</groupId>
+      <artifactId>junit</artifactId>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.easymock</groupId>
+      <artifactId>easymock</artifactId>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>info.magnolia</groupId>
+      <artifactId>magnolia-core</artifactId>
+      <version>4.3-SNAPSHOT</version>
+      <type>test-jar</type>
+      <scope>test</scope>
+    </dependency>    
+  </dependencies>
+</project>
\ No newline at end of file


Property changes on: trunk/magnolia-module-modulestore/pom.xml
___________________________________________________________________
Added: svn:mime-type
   + text/plain
Added: svn:keywords
   + Author Date Id Revision
Added: svn:eol-style
   + native

Modified: trunk/pom.xml
===================================================================
--- trunk/pom.xml	2010-02-15 15:49:04 UTC (rev 1949)
+++ trunk/pom.xml	2010-02-16 08:29:05 UTC (rev 1950)
@@ -37,6 +37,7 @@
     <module>openutils-mgnlcriteria</module>
     <module>openutils-mgnlrepoutils</module>
     <module>openutils-mgnlutils</module>
+    <!--module>magnolia-module-modulestore</module-->
     <module>magnolia-test-webapp</module>
     <module>module-store-server-webapp</module>
   </modules>


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

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

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

Revision: 1952
          http://openutils.svn.sourceforge.net/openutils/?rev=1952&view=rev
Author:   diego_schivo
Date:     2010-02-16 09:03:01 +0000 (Tue, 16 Feb 2010)

Log Message:
-----------
Module store: magnolia-module-modulestore module + version-handler

Added Paths:
-----------
    trunk/magnolia-module-modulestore/src/main/java/info/
    trunk/magnolia-module-modulestore/src/main/java/info/magnolia/
    trunk/magnolia-module-modulestore/src/main/java/info/magnolia/module/
    trunk/magnolia-module-modulestore/src/main/java/info/magnolia/module/modulestore/
    trunk/magnolia-module-modulestore/src/main/java/info/magnolia/module/modulestore/ModuleStoreModule.java
    trunk/magnolia-module-modulestore/src/main/java/info/magnolia/module/modulestore/pages/
    trunk/magnolia-module-modulestore/src/main/java/info/magnolia/module/modulestore/pages/AllModulesListPage.java
    trunk/magnolia-module-modulestore/src/main/java/info/magnolia/module/modulestore/pages/InstalledModulesListPage.java
    trunk/magnolia-module-modulestore/src/main/java/info/magnolia/module/modulestore/setup/
    trunk/magnolia-module-modulestore/src/main/java/info/magnolia/module/modulestore/setup/ModuleStoreModuleVersionHandler.java
    trunk/magnolia-module-modulestore/src/main/resources/META-INF/
    trunk/magnolia-module-modulestore/src/main/resources/META-INF/magnolia/
    trunk/magnolia-module-modulestore/src/main/resources/META-INF/magnolia/modulestore.xml
    trunk/magnolia-module-modulestore/src/main/resources/info/
    trunk/magnolia-module-modulestore/src/main/resources/info/magnolia/
    trunk/magnolia-module-modulestore/src/main/resources/info/magnolia/module/
    trunk/magnolia-module-modulestore/src/main/resources/info/magnolia/module/modulestore/
    trunk/magnolia-module-modulestore/src/main/resources/info/magnolia/module/modulestore/pages/
    trunk/magnolia-module-modulestore/src/main/resources/info/magnolia/module/modulestore/pages/AllModulesListPage.html
    trunk/magnolia-module-modulestore/src/main/resources/info/magnolia/module/modulestore/pages/InstalledModulesListPage.html
    trunk/magnolia-module-modulestore/src/main/resources/mgnl-bootstrap/
    trunk/magnolia-module-modulestore/src/main/resources/mgnl-bootstrap/modulestore/
    trunk/magnolia-module-modulestore/src/main/resources/mgnl-bootstrap/modulestore/config.modules.admininterface.config.menu.moduleStore.xml
    trunk/magnolia-module-modulestore/src/main/resources/mgnl-bootstrap/modulestore/config.modules.modulestore.pages.allModulesList.xml
    trunk/magnolia-module-modulestore/src/main/resources/mgnl-bootstrap/modulestore/config.modules.modulestore.pages.installedModulesList.xml
    trunk/magnolia-module-modulestore/src/main/resources/mgnl-resources/
    trunk/magnolia-module-modulestore/src/main/resources/mgnl-resources/admin-images/
    trunk/magnolia-module-modulestore/src/main/resources/mgnl-resources/admin-images/loading.gif
    trunk/magnolia-module-modulestore/src/main/resources/mgnl-resources/icons/
    trunk/magnolia-module-modulestore/src/main/resources/mgnl-resources/icons/24/
    trunk/magnolia-module-modulestore/src/main/resources/mgnl-resources/icons/24/todo.gif

Removed Paths:
-------------
    trunk/magnolia-test-webapp/src/main/java/info/magnolia/module/admininterface/pages/AllModulesListPage.java
    trunk/magnolia-test-webapp/src/main/java/info/magnolia/module/admininterface/pages/InstalledModulesListPage.java
    trunk/magnolia-test-webapp/src/main/resources/info/magnolia/module/admininterface/pages/AllModulesListPage.html
    trunk/magnolia-test-webapp/src/main/resources/info/magnolia/module/admininterface/pages/InstalledModulesListPage.html
    trunk/magnolia-test-webapp/src/main/resources/mgnl-bootstrap/adminInterface/config.modules.adminInterface.config.menu.moduleStore.xml
    trunk/magnolia-test-webapp/src/main/resources/mgnl-bootstrap/adminInterface/config.modules.adminInterface.pages.allModulesList.xml
    trunk/magnolia-test-webapp/src/main/resources/mgnl-bootstrap/adminInterface/config.modules.adminInterface.pages.installedModulesList.xml
    trunk/magnolia-test-webapp/src/main/resources/mgnl-resources/admin-images/loading.gif
    trunk/magnolia-test-webapp/src/main/resources/mgnl-resources/icons/24/todo.gif

Added: trunk/magnolia-module-modulestore/src/main/java/info/magnolia/module/modulestore/ModuleStoreModule.java
===================================================================
--- trunk/magnolia-module-modulestore/src/main/java/info/magnolia/module/modulestore/ModuleStoreModule.java	                        (rev 0)
+++ trunk/magnolia-module-modulestore/src/main/java/info/magnolia/module/modulestore/ModuleStoreModule.java	2010-02-16 09:03:01 UTC (rev 1952)
@@ -0,0 +1,27 @@
+package info.magnolia.module.modulestore;
+
+import info.magnolia.module.ModuleLifecycle;
+import info.magnolia.module.ModuleLifecycleContext;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+
+/**
+ * @author dschivo
+ * @version $Id$
+ */
+public class ModuleStoreModule implements ModuleLifecycle
+{
+
+    private static final Logger log = LoggerFactory.getLogger(ModuleStoreModule.class);
+
+    public void start(ModuleLifecycleContext ctx)
+    {
+    }
+
+    public void stop(ModuleLifecycleContext ctx)
+    {
+    }
+
+}


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

Added: trunk/magnolia-module-modulestore/src/main/java/info/magnolia/module/modulestore/pages/AllModulesListPage.java
===================================================================
--- trunk/magnolia-module-modulestore/src/main/java/info/magnolia/module/modulestore/pages/AllModulesListPage.java	                        (rev 0)
+++ trunk/magnolia-module-modulestore/src/main/java/info/magnolia/module/modulestore/pages/AllModulesListPage.java	2010-02-16 09:03:01 UTC (rev 1952)
@@ -0,0 +1,80 @@
+package info.magnolia.module.modulestore.pages;
+
+import info.magnolia.module.ModuleRegistry;
+import info.magnolia.module.admininterface.TemplatedMVCHandler;
+import info.magnolia.module.model.ModuleDefinition;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+import net.sf.json.JSONArray;
+import net.sf.json.JSONObject;
+
+import org.apache.taglibs.standard.functions.Functions;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+
+/**
+ * @author dschivo
+ * @version $Id$
+ */
+public class AllModulesListPage extends TemplatedMVCHandler
+{
+
+    /**
+     * Logger.
+     */
+    private static Logger log = LoggerFactory.getLogger(AllModulesListPage.class);
+
+    private String postdata;
+
+    /**
+     * 
+     */
+    public AllModulesListPage(String name, HttpServletRequest request, HttpServletResponse response)
+    {
+
+        super(name, request, response);
+    }
+
+    /**
+     * Returns the postdata.
+     * @return the postdata
+     */
+    public String getPostdata()
+    {
+        return postdata;
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public String show()
+    {
+        JSONArray installedModules = new JSONArray();
+        ModuleRegistry registry = ModuleRegistry.Factory.getInstance();
+        List<String> moduleNames = new ArrayList<String>(registry.getModuleNames());
+        Collections.sort(moduleNames);
+        for (String name : moduleNames)
+        {
+            ModuleDefinition def = registry.getDefinition(name);
+            if (def != null)
+            {
+                JSONObject module = new JSONObject();
+                module.set("name", def.getName());
+                module.set("version", def.getVersion().toString());
+                installedModules.put(module);
+            }
+        }
+        JSONObject json = new JSONObject();
+        json.set("installedModules", installedModules);
+        postdata = Functions.escapeXml(json.toString());
+        return super.show();
+    }
+}


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

Added: trunk/magnolia-module-modulestore/src/main/java/info/magnolia/module/modulestore/pages/InstalledModulesListPage.java
===================================================================
--- trunk/magnolia-module-modulestore/src/main/java/info/magnolia/module/modulestore/pages/InstalledModulesListPage.java	                        (rev 0)
+++ trunk/magnolia-module-modulestore/src/main/java/info/magnolia/module/modulestore/pages/InstalledModulesListPage.java	2010-02-16 09:03:01 UTC (rev 1952)
@@ -0,0 +1,69 @@
+package info.magnolia.module.modulestore.pages;
+
+import info.magnolia.module.ModuleRegistry;
+import info.magnolia.module.admininterface.TemplatedMVCHandler;
+import info.magnolia.module.model.ModuleDefinition;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+
+/**
+ * @author dschivo
+ * @version $Id$
+ */
+public class InstalledModulesListPage extends TemplatedMVCHandler
+{
+
+    /**
+     * Logger.
+     */
+    private static Logger log = LoggerFactory.getLogger(InstalledModulesListPage.class);
+
+    private List<ModuleDefinition> installedModules = new ArrayList<ModuleDefinition>();
+
+    /**
+     * 
+     */
+    public InstalledModulesListPage(String name, HttpServletRequest request, HttpServletResponse response)
+    {
+
+        super(name, request, response);
+    }
+
+    /**
+     * Returns the installedModules.
+     * @return the installedModules
+     */
+    public List<ModuleDefinition> getInstalledModules()
+    {
+        return installedModules;
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public String show()
+    {
+        ModuleRegistry registry = ModuleRegistry.Factory.getInstance();
+        List<String> moduleNames = new ArrayList<String>(registry.getModuleNames());
+        Collections.sort(moduleNames);
+        for (String name : moduleNames)
+        {
+            ModuleDefinition def = registry.getDefinition(name);
+            if (def != null)
+            {
+                installedModules.add(def);
+            }
+        }
+        return super.show();
+    }
+}


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

Added: trunk/magnolia-module-modulestore/src/main/java/info/magnolia/module/modulestore/setup/ModuleStoreModuleVersionHandler.java
===================================================================
--- trunk/magnolia-module-modulestore/src/main/java/info/magnolia/module/modulestore/setup/ModuleStoreModuleVersionHandler.java	                        (rev 0)
+++ trunk/magnolia-module-modulestore/src/main/java/info/magnolia/module/modulestore/setup/ModuleStoreModuleVersionHandler.java	2010-02-16 09:03:01 UTC (rev 1952)
@@ -0,0 +1,36 @@
+package info.magnolia.module.modulestore.setup;
+
+import info.magnolia.module.DefaultModuleVersionHandler;
+import info.magnolia.module.delta.BootstrapSingleModuleResource;
+import info.magnolia.module.delta.DeltaBuilder;
+
+
+/**
+ * @author dschivo
+ * @version $Id$
+ */
+public class ModuleStoreModuleVersionHandler extends DefaultModuleVersionHandler
+{
+
+    /**
+     * 
+     */
+    public ModuleStoreModuleVersionHandler()
+    {
+        register(DeltaBuilder.update("4.3", "").addTask(
+            new BootstrapSingleModuleResource(
+                "Module store menu",
+                "Adds the module store menu",
+                "config.modules.admininterface.config.menu.moduleStore.xml")));
+        register(DeltaBuilder.update("4.3", "").addTask(
+            new BootstrapSingleModuleResource(
+                "All modules list page",
+                "Adds the all modules list page",
+                "config.modules.modulestore.pages.allModulesList.xml")));
+        register(DeltaBuilder.update("4.3", "").addTask(
+            new BootstrapSingleModuleResource(
+                "Installed modules list page",
+                "Adds the installed modules list page",
+                "config.modules.modulestore.pages.installedModulesList.xml")));
+    }
+}


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

Added: trunk/magnolia-module-modulestore/src/main/resources/META-INF/magnolia/modulestore.xml
===================================================================
--- trunk/magnolia-module-modulestore/src/main/resources/META-INF/magnolia/modulestore.xml	                        (rev 0)
+++ trunk/magnolia-module-modulestore/src/main/resources/META-INF/magnolia/modulestore.xml	2010-02-16 09:03:01 UTC (rev 1952)
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE module SYSTEM "module.dtd" >
+<module>
+  <name>modulestore</name>
+  <displayName>Magnolia Module Store Module</displayName>
+  <description></description>
+  <class>info.magnolia.module.modulestore.ModuleStoreModule</class>
+  <versionHandler>info.magnolia.module.modulestore.setup.ModuleStoreModuleVersionHandler</versionHandler>
+  <version>4.3-m1</version>
+  <dependencies>
+    <dependency>
+      <name>core</name>
+      <version>4.3/*</version>
+    </dependency>
+  </dependencies>
+</module>


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

Added: trunk/magnolia-module-modulestore/src/main/resources/info/magnolia/module/modulestore/pages/AllModulesListPage.html
===================================================================
--- trunk/magnolia-module-modulestore/src/main/resources/info/magnolia/module/modulestore/pages/AllModulesListPage.html	                        (rev 0)
+++ trunk/magnolia-module-modulestore/src/main/resources/info/magnolia/module/modulestore/pages/AllModulesListPage.html	2010-02-16 09:03:01 UTC (rev 1952)
@@ -0,0 +1,30 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html>
+  <head>
+    <title>All modules</title>
+    <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
+    <link href="${this.request.contextPath}/.resources/admin-css/admin-all.css" type="text/css" rel="stylesheet" />
+    <style type="text/css">
+body#mgnl {
+  margin: 0;
+  padding: 0;
+}
+    </style>
+    <script type="text/javascript">
+function loadModules(){
+  document.getElementById('loadModulesForm').submit();
+}
+    </script>
+  </head>
+  <body id="mgnl" onload="setTimeout(loadModules, 1000);">
+    <form id="loadModulesForm" action="/module-store-server/module-list.html" method="post">
+      <div>
+        <input type="hidden" name="postdata" value="${this.postdata}" />
+      </div>
+    </form>
+    <div style="display: block; width: 400px; background-color: #999; margin: 50px auto; text-align: center;">
+      <h2>Contacting server...</h2>
+      <img src="${this.request.contextPath}/.resources/admin-images/loading.gif" alt="Loading..." />
+    </div>
+  </body>
+</html>
\ No newline at end of file


Property changes on: trunk/magnolia-module-modulestore/src/main/resources/info/magnolia/module/modulestore/pages/AllModulesListPage.html
___________________________________________________________________
Added: svn:mime-type
   + text/html
Added: svn:keywords
   + Author Date Id Revision
Added: svn:eol-style
   + native

Added: trunk/magnolia-module-modulestore/src/main/resources/info/magnolia/module/modulestore/pages/InstalledModulesListPage.html
===================================================================
--- trunk/magnolia-module-modulestore/src/main/resources/info/magnolia/module/modulestore/pages/InstalledModulesListPage.html	                        (rev 0)
+++ trunk/magnolia-module-modulestore/src/main/resources/info/magnolia/module/modulestore/pages/InstalledModulesListPage.html	2010-02-16 09:03:01 UTC (rev 1952)
@@ -0,0 +1,63 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html>
+  <head>
+    <title>Installed modules</title>
+    <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
+    <link href="${this.request.contextPath}/.resources/admin-css/admin-all.css" type="text/css" rel="stylesheet" />
+    <style type="text/css">
+body#mgnl {
+  margin: 0;
+  padding: 0;
+}
+
+table {
+  border-collapse: collapse;
+  width: 100%;
+  border-bottom: 1px solid #CCCCCC;
+}
+
+table td {
+  font-family: Verdana,sans-serif;
+  font-size: 11px;
+  height: 20px;
+  padding: 0 8px;
+  border-left: 1px solid #D8EFB6;
+}
+
+table tr.odd td {
+  background-color: #EDF3EE;
+}
+
+table thead td {
+  font-weight: bold;
+  border-left: 1px solid #ADBC61;
+  background: transparent url('${this.request.contextPath}/.resources/controls/list/headerBackgroundGreen.gif') repeat-x scroll left top;
+}
+
+table td.icon {
+  border-left: 0;
+  width: 16px;
+}
+    </style>
+  </head>
+  <body id="mgnl">
+    <table>
+      <thead>
+        <tr>
+          <td>Name</td>
+          <td>Display name</td>
+          <td>Description</td>
+          <td>Version</td>
+        </tr>
+      </thead>
+      [#list this.installedModules as def]
+        <tr>
+          <td>${def.name!''}</td>
+          <td>${def.displayName!''}</td>
+          <td>${def.description!''}</td>
+          <td>${def.version!''}</td>
+        </tr>
+      [/#list]
+    </table>
+  </body>
+</html>
\ No newline at end of file


Property changes on: trunk/magnolia-module-modulestore/src/main/resources/info/magnolia/module/modulestore/pages/InstalledModulesListPage.html
___________________________________________________________________
Added: svn:mime-type
   + text/html
Added: svn:keywords
   + Author Date Id Revision
Added: svn:eol-style
   + native

Added: trunk/magnolia-module-modulestore/src/main/resources/mgnl-bootstrap/modulestore/config.modules.admininterface.config.menu.moduleStore.xml
===================================================================
--- trunk/magnolia-module-modulestore/src/main/resources/mgnl-bootstrap/modulestore/config.modules.admininterface.config.menu.moduleStore.xml	                        (rev 0)
+++ trunk/magnolia-module-modulestore/src/main/resources/mgnl-bootstrap/modulestore/config.modules.admininterface.config.menu.moduleStore.xml	2010-02-16 09:03:01 UTC (rev 1952)
@@ -0,0 +1,99 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<sv:node sv:name="moduleStore" xmlns:sv="http://www.jcp.org/jcr/sv/1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <sv:property sv:name="jcr:primaryType" sv:type="Name">
+    <sv:value>mgnl:contentNode</sv:value>
+  </sv:property>
+  <sv:property sv:name="jcr:uuid" sv:type="String">
+    <sv:value>349bab23-d565-4690-8fce-fd434fb0b470</sv:value>
+  </sv:property>
+  <sv:property sv:name="icon" sv:type="String">
+    <sv:value>/.resources/icons/24/todo.gif</sv:value>
+  </sv:property>
+  <sv:property sv:name="jcr:createdBy" sv:type="String">
+    <sv:value>admin</sv:value>
+  </sv:property>
+  <sv:property sv:name="label" sv:type="String">
+    <sv:value>Module store</sv:value>
+  </sv:property>
+  <sv:property sv:name="onclick" sv:type="String">
+    <sv:value>MgnlAdminCentral.showContent('/.magnolia/pages/allModulesList.html');</sv:value>
+  </sv:property>
+  <sv:node sv:name="MetaData">
+    <sv:property sv:name="jcr:primaryType" sv:type="Name">
+      <sv:value>mgnl:metaData</sv:value>
+    </sv:property>
+    <sv:property sv:name="jcr:createdBy" sv:type="String">
+      <sv:value>admin</sv:value>
+    </sv:property>
+    <sv:property sv:name="mgnl:Data" sv:type="String">
+      <sv:value>MetaData</sv:value>
+    </sv:property>
+    <sv:property sv:name="mgnl:activated" sv:type="Boolean">
+      <sv:value>false</sv:value>
+    </sv:property>
+    <sv:property sv:name="mgnl:activatorid" sv:type="String">
+      <sv:value>superuser</sv:value>
+    </sv:property>
+    <sv:property sv:name="mgnl:authorid" sv:type="String">
+      <sv:value>superuser</sv:value>
+    </sv:property>
+    <sv:property sv:name="mgnl:creationdate" sv:type="Date">
+      <sv:value>2005-05-16T20:45:54.530+02:00</sv:value>
+    </sv:property>
+    <sv:property sv:name="mgnl:lastaction" sv:type="Date">
+      <sv:value>2008-06-17T14:32:32.595Z</sv:value>
+    </sv:property>
+    <sv:property sv:name="mgnl:lastmodified" sv:type="Date">
+      <sv:value>2010-02-11T11:42:51.156+01:00</sv:value>
+    </sv:property>
+  </sv:node>
+  <sv:node sv:name="installedModules">
+    <sv:property sv:name="jcr:primaryType" sv:type="Name">
+      <sv:value>mgnl:contentNode</sv:value>
+    </sv:property>
+    <sv:property sv:name="jcr:mixinTypes" sv:type="Name">
+      <sv:value>mix:lockable</sv:value>
+    </sv:property>
+    <sv:property sv:name="jcr:uuid" sv:type="String">
+      <sv:value>5e775bb6-5e9b-423d-bff3-3a9a86f0e646</sv:value>
+    </sv:property>
+    <sv:property sv:name="icon" sv:type="String">
+      <sv:value>/.resources/icons/16/dot.gif</sv:value>
+    </sv:property>
+    <sv:property sv:name="jcr:createdBy" sv:type="String">
+      <sv:value>admin</sv:value>
+    </sv:property>
+    <sv:property sv:name="label" sv:type="String">
+      <sv:value>Installed modules</sv:value>
+    </sv:property>
+    <sv:property sv:name="onclick" sv:type="String">
+      <sv:value>MgnlAdminCentral.showContent('/.magnolia/pages/installedModulesList.html');</sv:value>
+    </sv:property>
+    <sv:node sv:name="MetaData">
+      <sv:property sv:name="jcr:primaryType" sv:type="Name">
+        <sv:value>mgnl:metaData</sv:value>
+      </sv:property>
+      <sv:property sv:name="jcr:createdBy" sv:type="String">
+        <sv:value>admin</sv:value>
+      </sv:property>
+      <sv:property sv:name="mgnl:activated" sv:type="Boolean">
+        <sv:value>false</sv:value>
+      </sv:property>
+      <sv:property sv:name="mgnl:activatorid" sv:type="String">
+        <sv:value>superuser</sv:value>
+      </sv:property>
+      <sv:property sv:name="mgnl:authorid" sv:type="String">
+        <sv:value>superuser</sv:value>
+      </sv:property>
+      <sv:property sv:name="mgnl:creationdate" sv:type="Date">
+        <sv:value>2008-06-17T14:45:51.521Z</sv:value>
+      </sv:property>
+      <sv:property sv:name="mgnl:lastaction" sv:type="Date">
+        <sv:value>2008-06-17T14:45:58.283Z</sv:value>
+      </sv:property>
+      <sv:property sv:name="mgnl:lastmodified" sv:type="Date">
+        <sv:value>2010-02-10T11:22:45.796+01:00</sv:value>
+      </sv:property>
+    </sv:node>
+  </sv:node>
+</sv:node>


Property changes on: trunk/magnolia-module-modulestore/src/main/resources/mgnl-bootstrap/modulestore/config.modules.admininterface.config.menu.moduleStore.xml
___________________________________________________________________
Added: svn:mime-type
   + text/plain
Added: svn:keywords
   + Author Date Id Revision
Added: svn:eol-style
   + native

Added: trunk/magnolia-module-modulestore/src/main/resources/mgnl-bootstrap/modulestore/config.modules.modulestore.pages.allModulesList.xml
===================================================================
--- trunk/magnolia-module-modulestore/src/main/resources/mgnl-bootstrap/modulestore/config.modules.modulestore.pages.allModulesList.xml	                        (rev 0)
+++ trunk/magnolia-module-modulestore/src/main/resources/mgnl-bootstrap/modulestore/config.modules.modulestore.pages.allModulesList.xml	2010-02-16 09:03:01 UTC (rev 1952)
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<sv:node sv:name="allModulesList" xmlns:sv="http://www.jcp.org/jcr/sv/1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <sv:property sv:name="jcr:primaryType" sv:type="Name">
+    <sv:value>mgnl:contentNode</sv:value>
+  </sv:property>
+  <sv:property sv:name="jcr:uuid" sv:type="String">
+    <sv:value>9540c394-7663-4572-bf38-2c610a17c995</sv:value>
+  </sv:property>
+  <sv:property sv:name="class" sv:type="String">
+    <sv:value>info.magnolia.module.modulestore.pages.AllModulesListPage</sv:value>
+  </sv:property>
+  <sv:node sv:name="MetaData">
+    <sv:property sv:name="jcr:primaryType" sv:type="Name">
+      <sv:value>mgnl:metaData</sv:value>
+    </sv:property>
+    <sv:property sv:name="mgnl:Data" sv:type="String">
+      <sv:value>MetaData</sv:value>
+    </sv:property>
+    <sv:property sv:name="mgnl:activated" sv:type="Boolean">
+      <sv:value>false</sv:value>
+    </sv:property>
+    <sv:property sv:name="mgnl:activatorid" sv:type="String">
+      <sv:value>superuser</sv:value>
+    </sv:property>
+    <sv:property sv:name="mgnl:authorid" sv:type="String">
+      <sv:value>superuser</sv:value>
+    </sv:property>
+    <sv:property sv:name="mgnl:creationdate" sv:type="Date">
+      <sv:value>2005-07-15T14:26:11.205+02:00</sv:value>
+    </sv:property>
+    <sv:property sv:name="mgnl:lastaction" sv:type="Date">
+      <sv:value>2006-05-07T10:04:20.253+02:00</sv:value>
+    </sv:property>
+    <sv:property sv:name="mgnl:lastmodified" sv:type="Date">
+      <sv:value>2010-02-11T11:41:41.765+01:00</sv:value>
+    </sv:property>
+  </sv:node>
+</sv:node>


Property changes on: trunk/magnolia-module-modulestore/src/main/resources/mgnl-bootstrap/modulestore/config.modules.modulestore.pages.allModulesList.xml
___________________________________________________________________
Added: svn:mime-type
   + text/plain
Added: svn:keywords
   + Author Date Id Revision
Added: svn:eol-style
   + native

Added: trunk/magnolia-module-modulestore/src/main/resources/mgnl-bootstrap/modulestore/config.modules.modulestore.pages.installedModulesList.xml
===================================================================
--- trunk/magnolia-module-modulestore/src/main/resources/mgnl-bootstrap/modulestore/config.modules.modulestore.pages.installedModulesList.xml	                        (rev 0)
+++ trunk/magnolia-module-modulestore/src/main/resources/mgnl-bootstrap/modulestore/config.modules.modulestore.pages.installedModulesList.xml	2010-02-16 09:03:01 UTC (rev 1952)
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<sv:node sv:name="installedModulesList" xmlns:sv="http://www.jcp.org/jcr/sv/1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <sv:property sv:name="jcr:primaryType" sv:type="Name">
+    <sv:value>mgnl:contentNode</sv:value>
+  </sv:property>
+  <sv:property sv:name="jcr:uuid" sv:type="String">
+    <sv:value>3637fc26-2609-4d90-bdda-184162efc9b9</sv:value>
+  </sv:property>
+  <sv:property sv:name="class" sv:type="String">
+    <sv:value>info.magnolia.module.modulestore.pages.InstalledModulesListPage</sv:value>
+  </sv:property>
+  <sv:node sv:name="MetaData">
+    <sv:property sv:name="jcr:primaryType" sv:type="Name">
+      <sv:value>mgnl:metaData</sv:value>
+    </sv:property>
+    <sv:property sv:name="mgnl:Data" sv:type="String">
+      <sv:value>MetaData</sv:value>
+    </sv:property>
+    <sv:property sv:name="mgnl:activated" sv:type="Boolean">
+      <sv:value>false</sv:value>
+    </sv:property>
+    <sv:property sv:name="mgnl:activatorid" sv:type="String">
+      <sv:value>superuser</sv:value>
+    </sv:property>
+    <sv:property sv:name="mgnl:authorid" sv:type="String">
+      <sv:value>superuser</sv:value>
+    </sv:property>
+    <sv:property sv:name="mgnl:creationdate" sv:type="Date">
+      <sv:value>2005-07-15T14:26:11.205+02:00</sv:value>
+    </sv:property>
+    <sv:property sv:name="mgnl:lastaction" sv:type="Date">
+      <sv:value>2006-05-07T10:04:20.253+02:00</sv:value>
+    </sv:property>
+    <sv:property sv:name="mgnl:lastmodified" sv:type="Date">
+      <sv:value>2010-02-11T11:42:19.390+01:00</sv:value>
+    </sv:property>
+  </sv:node>
+</sv:node>


Property changes on: trunk/magnolia-module-modulestore/src/main/resources/mgnl-bootstrap/modulestore/config.modules.modulestore.pages.installedModulesList.xml
___________________________________________________________________
Added: svn:mime-type
   + text/plain
Added: svn:keywords
   + Author Date Id Revision
Added: svn:eol-style
   + native

Added: trunk/magnolia-module-modulestore/src/main/resources/mgnl-resources/admin-images/loading.gif
===================================================================
(Binary files differ)


Property changes on: trunk/magnolia-module-modulestore/src/main/resources/mgnl-resources/admin-images/loading.gif
___________________________________________________________________
Added: svn:mime-type
   + image/gif

Added: trunk/magnolia-module-modulestore/src/main/resources/mgnl-resources/icons/24/todo.gif
===================================================================
(Binary files differ)


Property changes on: trunk/magnolia-module-modulestore/src/main/resources/mgnl-resources/icons/24/todo.gif
___________________________________________________________________
Added: svn:mime-type
   + image/gif

Deleted: trunk/magnolia-test-webapp/src/main/java/info/magnolia/module/admininterface/pages/AllModulesListPage.java
===================================================================
--- trunk/magnolia-test-webapp/src/main/java/info/magnolia/module/admininterface/pages/AllModulesListPage.java	2010-02-16 08:30:13 UTC (rev 1951)
+++ trunk/magnolia-test-webapp/src/main/java/info/magnolia/module/admininterface/pages/AllModulesListPage.java	2010-02-16 09:03:01 UTC (rev 1952)
@@ -1,80 +0,0 @@
-package info.magnolia.module.admininterface.pages;
-
-import info.magnolia.module.ModuleRegistry;
-import info.magnolia.module.admininterface.TemplatedMVCHandler;
-import info.magnolia.module.model.ModuleDefinition;
-
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
-import net.sf.json.JSONArray;
-import net.sf.json.JSONObject;
-
-import org.apache.taglibs.standard.functions.Functions;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-
-/**
- * @author dschivo
- * @version $Id$
- */
-public class AllModulesListPage extends TemplatedMVCHandler
-{
-
-    /**
-     * Logger.
-     */
-    private static Logger log = LoggerFactory.getLogger(AllModulesListPage.class);
-
-    private String postdata;
-
-    /**
-     * 
-     */
-    public AllModulesListPage(String name, HttpServletRequest request, HttpServletResponse response)
-    {
-
-        super(name, request, response);
-    }
-
-    /**
-     * Returns the postdata.
-     * @return the postdata
-     */
-    public String getPostdata()
-    {
-        return postdata;
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    @Override
-    public String show()
-    {
-        JSONArray installedModules = new JSONArray();
-        ModuleRegistry registry = ModuleRegistry.Factory.getInstance();
-        List<String> moduleNames = new ArrayList<String>(registry.getModuleNames());
-        Collections.sort(moduleNames);
-        for (String name : moduleNames)
-        {
-            ModuleDefinition def = registry.getDefinition(name);
-            if (def != null)
-            {
-                JSONObject module = new JSONObject();
-                module.set("name", def.getName());
-                module.set("version", def.getVersion().toString());
-                installedModules.put(module);
-            }
-        }
-        JSONObject json = new JSONObject();
-        json.set("installedModules", installedModules);
-        postdata = Functions.escapeXml(json.toString());
-        return super.show();
-    }
-}

Deleted: trunk/magnolia-test-webapp/src/main/java/info/magnolia/module/admininterface/pages/InstalledModulesListPage.java
===================================================================
--- trunk/magnolia-test-webapp/src/main/java/info/magnolia/module/admininterface/pages/InstalledModulesListPage.java	2010-02-16 08:30:13 UTC (rev 1951)
+++ trunk/magnolia-test-webapp/src/main/java/info/magnolia/module/admininterface/pages/InstalledModulesListPage.java	2010-02-16 09:03:01 UTC (rev 1952)
@@ -1,69 +0,0 @@
-package info.magnolia.module.admininterface.pages;
-
-import info.magnolia.module.ModuleRegistry;
-import info.magnolia.module.admininterface.TemplatedMVCHandler;
-import info.magnolia.module.model.ModuleDefinition;
-
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-
-/**
- * @author dschivo
- * @version $Id$
- */
-public class InstalledModulesListPage extends TemplatedMVCHandler
-{
-
-    /**
-     * Logger.
-     */
-    private static Logger log = LoggerFactory.getLogger(InstalledModulesListPage.class);
-
-    private List<ModuleDefinition> installedModules = new ArrayList<ModuleDefinition>();
-
-    /**
-     * 
-     */
-    public InstalledModulesListPage(String name, HttpServletRequest request, HttpServletResponse response)
-    {
-
-        super(name, request, response);
-    }
-
-    /**
-     * Returns the installedModules.
-     * @return the installedModules
-     */
-    public List<ModuleDefinition> getInstalledModules()
-    {
-        return installedModules;
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    @Override
-    public String show()
-    {
-        ModuleRegistry registry = ModuleRegistry.Factory.getInstance();
-        List<String> moduleNames = new ArrayList<String>(registry.getModuleNames());
-        Collections.sort(moduleNames);
-        for (String name : moduleNames)
-        {
-            ModuleDefinition def = registry.getDefinition(name);
-            if (def != null)
-            {
-                installedModules.add(def);
-            }
-        }
-        return super.show();
-    }
-}

Deleted: trunk/magnolia-test-webapp/src/main/resources/info/magnolia/module/admininterface/pages/AllModulesListPage.html
===================================================================
--- trunk/magnolia-test-webapp/src/main/resources/info/magnolia/module/admininterface/pages/AllModulesListPage.html	2010-02-16 08:30:13 UTC (rev 1951)
+++ trunk/magnolia-test-webapp/src/main/resources/info/magnolia/module/admininterface/pages/AllModulesListPage.html	2010-02-16 09:03:01 UTC (rev 1952)
@@ -1,30 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html>
-  <head>
-    <title>All modules</title>
-    <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
-    <link href="${this.request.contextPath}/.resources/admin-css/admin-all.css" type="text/css" rel="stylesheet" />
-    <style type="text/css">
-body#mgnl {
-  margin: 0;
-  padding: 0;
-}
-    </style>
-    <script type="text/javascript">
-function loadModules(){
-  document.getElementById('loadModulesForm').submit();
-}
-    </script>
-  </head>
-  <body id="mgnl" onload="setTimeout(loadModules, 1000);">
-    <form id="loadModulesForm" action="/module-store-server/module-list.html" method="post">
-      <div>
-        <input type="hidden" name="postdata" value="${this.postdata}" />
-      </div>
-    </form>
-    <div style="display: block; width: 400px; background-color: #999; margin: 50px auto; text-align: center;">
-      <h2>Contacting server...</h2>
-      <img src="${this.request.contextPath}/.resources/admin-images/loading.gif" alt="Loading..." />
-    </div>
-  </body>
-</html>
\ No newline at end of file

Deleted: trunk/magnolia-test-webapp/src/main/resources/info/magnolia/module/admininterface/pages/InstalledModulesListPage.html
===================================================================
--- trunk/magnolia-test-webapp/src/main/resources/info/magnolia/module/admininterface/pages/InstalledModulesListPage.html	2010-02-16 08:30:13 UTC (rev 1951)
+++ trunk/magnolia-test-webapp/src/main/resources/info/magnolia/module/admininterface/pages/InstalledModulesListPage.html	2010-02-16 09:03:01 UTC (rev 1952)
@@ -1,63 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html>
-  <head>
-    <title>Installed modules</title>
-    <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
-    <link href="${this.request.contextPath}/.resources/admin-css/admin-all.css" type="text/css" rel="stylesheet" />
-    <style type="text/css">
-body#mgnl {
-  margin: 0;
-  padding: 0;
-}
-
-table {
-  border-collapse: collapse;
-  width: 100%;
-  border-bottom: 1px solid #CCCCCC;
-}
-
-table td {
-  font-family: Verdana,sans-serif;
-  font-size: 11px;
-  height: 20px;
-  padding: 0 8px;
-  border-left: 1px solid #D8EFB6;
-}
-
-table tr.odd td {
-  background-color: #EDF3EE;
-}
-
-table thead td {
-  font-weight: bold;
-  border-left: 1px solid #ADBC61;
-  background: transparent url('${this.request.contextPath}/.resources/controls/list/headerBackgroundGreen.gif') repeat-x scroll left top;
-}
-
-table td.icon {
-  border-left: 0;
-  width: 16px;
-}
-    </style>
-  </head>
-  <body id="mgnl">
-    <table>
-      <thead>
-        <tr>
-          <td>Name</td>
-          <td>Display name</td>
-          <td>Description</td>
-          <td>Version</td>
-        </tr>
-      </thead>
-      [#list this.installedModules as def]
-        <tr>
-          <td>${def.name!''}</td>
-          <td>${def.displayName!''}</td>
-          <td>${def.description!''}</td>
-          <td>${def.version!''}</td>
-        </tr>
-      [/#list]
-    </table>
-  </body>
-</html>
\ No newline at end of file

Deleted: trunk/magnolia-test-webapp/src/main/resources/mgnl-bootstrap/adminInterface/config.modules.adminInterface.config.menu.moduleStore.xml
===================================================================
--- trunk/magnolia-test-webapp/src/main/resources/mgnl-bootstrap/adminInterface/config.modules.adminInterface.config.menu.moduleStore.xml	2010-02-16 08:30:13 UTC (rev 1951)
+++ trunk/magnolia-test-webapp/src/main/resources/mgnl-bootstrap/adminInterface/config.modules.adminInterface.config.menu.moduleStore.xml	2010-02-16 09:03:01 UTC (rev 1952)
@@ -1,99 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<sv:node sv:name="moduleStore" xmlns:sv="http://www.jcp.org/jcr/sv/1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-  <sv:property sv:name="jcr:primaryType" sv:type="Name">
-    <sv:value>mgnl:contentNode</sv:value>
-  </sv:property>
-  <sv:property sv:name="jcr:uuid" sv:type="String">
-    <sv:value>349bab23-d565-4690-8fce-fd434fb0b470</sv:value>
-  </sv:property>
-  <sv:property sv:name="icon" sv:type="String">
-    <sv:value>/.resources/icons/24/todo.gif</sv:value>
-  </sv:property>
-  <sv:property sv:name="jcr:createdBy" sv:type="String">
-    <sv:value>admin</sv:value>
-  </sv:property>
-  <sv:property sv:name="label" sv:type="String">
-    <sv:value>Module store</sv:value>
-  </sv:property>
-  <sv:property sv:name="onclick" sv:type="String">
-    <sv:value>MgnlAdminCentral.showContent('/.magnolia/pages/allModulesList.html');</sv:value>
-  </sv:property>
-  <sv:node sv:name="MetaData">
-    <sv:property sv:name="jcr:primaryType" sv:type="Name">
-      <sv:value>mgnl:metaData</sv:value>
-    </sv:property>
-    <sv:property sv:name="jcr:createdBy" sv:type="String">
-      <sv:value>admin</sv:value>
-    </sv:property>
-    <sv:property sv:name="mgnl:Data" sv:type="String">
-      <sv:value>MetaData</sv:value>
-    </sv:property>
-    <sv:property sv:name="mgnl:activated" sv:type="Boolean">
-      <sv:value>false</sv:value>
-    </sv:property>
-    <sv:property sv:name="mgnl:activatorid" sv:type="String">
-      <sv:value>superuser</sv:value>
-    </sv:property>
-    <sv:property sv:name="mgnl:authorid" sv:type="String">
-      <sv:value>superuser</sv:value>
-    </sv:property>
-    <sv:property sv:name="mgnl:creationdate" sv:type="Date">
-      <sv:value>2005-05-16T20:45:54.530+02:00</sv:value>
-    </sv:property>
-    <sv:property sv:name="mgnl:lastaction" sv:type="Date">
-      <sv:value>2008-06-17T14:32:32.595Z</sv:value>
-    </sv:property>
-    <sv:property sv:name="mgnl:lastmodified" sv:type="Date">
-      <sv:value>2010-02-11T11:42:51.156+01:00</sv:value>
-    </sv:property>
-  </sv:node>
-  <sv:node sv:name="installedModules">
-    <sv:property sv:name="jcr:primaryType" sv:type="Name">
-      <sv:value>mgnl:contentNode</sv:value>
-    </sv:property>
-    <sv:property sv:name="jcr:mixinTypes" sv:type="Name">
-      <sv:value>mix:lockable</sv:value>
-    </sv:property>
-    <sv:property sv:name="jcr:uuid" sv:type="String">
-      <sv:value>5e775bb6-5e9b-423d-bff3-3a9a86f0e646</sv:value>
-    </sv:property>
-    <sv:property sv:name="icon" sv:type="String">
-      <sv:value>/.resources/icons/16/dot.gif</sv:value>
-    </sv:property>
-    <sv:property sv:name="jcr:createdBy" sv:type="String">
-      <sv:value>admin</sv:value>
-    </sv:property>
-    <sv:property sv:name="label" sv:type="String">
-      <sv:value>Installed modules</sv:value>
-    </sv:property>
-    <sv:property sv:name="onclick" sv:type="String">
-      <sv:value>MgnlAdminCentral.showContent('/.magnolia/pages/installedModulesList.html');</sv:value>
-    </sv:property>
-    <sv:node sv:name="MetaData">
-      <sv:property sv:name="jcr:primaryType" sv:type="Name">
-        <sv:value>mgnl:metaData</sv:value>
-      </sv:property>
-      <sv:property sv:name="jcr:createdBy" sv:type="String">
-        <sv:value>admin</sv:value>
-      </sv:property>
-      <sv:property sv:name="mgnl:activated" sv:type="Boolean">
-        <sv:value>false</sv:value>
-      </sv:property>
-      <sv:property sv:name="mgnl:activatorid" sv:type="String">
-        <sv:value>superuser</sv:value>
-      </sv:property>
-      <sv:property sv:name="mgnl:authorid" sv:type="String">
-        <sv:value>superuser</sv:value>
-      </sv:property>
-      <sv:property sv:name="mgnl:creationdate" sv:type="Date">
-        <sv:value>2008-06-17T14:45:51.521Z</sv:value>
-      </sv:property>
-      <sv:property sv:name="mgnl:lastaction" sv:type="Date">
-        <sv:value>2008-06-17T14:45:58.283Z</sv:value>
-      </sv:property>
-      <sv:property sv:name="mgnl:lastmodified" sv:type="Date">
-        <sv:value>2010-02-10T11:22:45.796+01:00</sv:value>
-      </sv:property>
-    </sv:node>
-  </sv:node>
-</sv:node>

Deleted: trunk/magnolia-test-webapp/src/main/resources/mgnl-bootstrap/adminInterface/config.modules.adminInterface.pages.allModulesList.xml
===================================================================
--- trunk/magnolia-test-webapp/src/main/resources/mgnl-bootstrap/adminInterface/config.modules.adminInterface.pages.allModulesList.xml	2010-02-16 08:30:13 UTC (rev 1951)
+++ trunk/magnolia-test-webapp/src/main/resources/mgnl-bootstrap/adminInterface/config.modules.adminInterface.pages.allModulesList.xml	2010-02-16 09:03:01 UTC (rev 1952)
@@ -1,38 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<sv:node sv:name="allModulesList" xmlns:sv="http://www.jcp.org/jcr/sv/1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-  <sv:property sv:name="jcr:primaryType" sv:type="Name">
-    <sv:value>mgnl:contentNode</sv:value>
-  </sv:property>
-  <sv:property sv:name="jcr:uuid" sv:type="String">
-    <sv:value>9540c394-7663-4572-bf38-2c610a17c995</sv:value>
-  </sv:property>
-  <sv:property sv:name="class" sv:type="String">
-    <sv:value>info.magnolia.module.admininterface.pages.AllModulesListPage</sv:value>
-  </sv:property>
-  <sv:node sv:name="MetaData">
-    <sv:property sv:name="jcr:primaryType" sv:type="Name">
-      <sv:value>mgnl:metaData</sv:value>
-    </sv:property>
-    <sv:property sv:name="mgnl:Data" sv:type="String">
-      <sv:value>MetaData</sv:value>
-    </sv:property>
-    <sv:property sv:name="mgnl:activated" sv:type="Boolean">
-      <sv:value>false</sv:value>
-    </sv:property>
-    <sv:property sv:name="mgnl:activatorid" sv:type="String">
-      <sv:value>superuser</sv:value>
-    </sv:property>
-    <sv:property sv:name="mgnl:authorid" sv:type="String">
-      <sv:value>superuser</sv:value>
-    </sv:property>
-    <sv:property sv:name="mgnl:creationdate" sv:type="Date">
-      <sv:value>2005-07-15T14:26:11.205+02:00</sv:value>
-    </sv:property>
-    <sv:property sv:name="mgnl:lastaction" sv:type="Date">
-      <sv:value>2006-05-07T10:04:20.253+02:00</sv:value>
-    </sv:property>
-    <sv:property sv:name="mgnl:lastmodified" sv:type="Date">
-      <sv:value>2010-02-11T11:41:41.765+01:00</sv:value>
-    </sv:property>
-  </sv:node>
-</sv:node>

Deleted: trunk/magnolia-test-webapp/src/main/resources/mgnl-bootstrap/adminInterface/config.modules.adminInterface.pages.installedModulesList.xml
===================================================================
--- trunk/magnolia-test-webapp/src/main/resources/mgnl-bootstrap/adminInterface/config.modules.adminInterface.pages.installedModulesList.xml	2010-02-16 08:30:13 UTC (rev 1951)
+++ trunk/magnolia-test-webapp/src/main/resources/mgnl-bootstrap/adminInterface/config.modules.adminInterface.pages.installedModulesList.xml	2010-02-16 09:03:01 UTC (rev 1952)
@@ -1,38 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<sv:node sv:name="installedModulesList" xmlns:sv="http://www.jcp.org/jcr/sv/1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-  <sv:property sv:name="jcr:primaryType" sv:type="Name">
-    <sv:value>mgnl:contentNode</sv:value>
-  </sv:property>
-  <sv:property sv:name="jcr:uuid" sv:type="String">
-    <sv:value>3637fc26-2609-4d90-bdda-184162efc9b9</sv:value>
-  </sv:property>
-  <sv:property sv:name="class" sv:type="String">
-    <sv:value>info.magnolia.module.admininterface.pages.InstalledModulesListPage</sv:value>
-  </sv:property>
-  <sv:node sv:name="MetaData">
-    <sv:property sv:name="jcr:primaryType" sv:type="Name">
-      <sv:value>mgnl:metaData</sv:value>
-    </sv:property>
-    <sv:property sv:name="mgnl:Data" sv:type="String">
-      <sv:value>MetaData</sv:value>
-    </sv:property>
-    <sv:property sv:name="mgnl:activated" sv:type="Boolean">
-      <sv:value>false</sv:value>
-    </sv:property>
-    <sv:property sv:name="mgnl:activatorid" sv:type="String">
-      <sv:value>superuser</sv:value>
-    </sv:property>
-    <sv:property sv:name="mgnl:authorid" sv:type="String">
-      <sv:value>superuser</sv:value>
-    </sv:property>
-    <sv:property sv:name="mgnl:creationdate" sv:type="Date">
-      <sv:value>2005-07-15T14:26:11.205+02:00</sv:value>
-    </sv:property>
-    <sv:property sv:name="mgnl:lastaction" sv:type="Date">
-      <sv:value>2006-05-07T10:04:20.253+02:00</sv:value>
-    </sv:property>
-    <sv:property sv:name="mgnl:lastmodified" sv:type="Date">
-      <sv:value>2010-02-11T11:42:19.390+01:00</sv:value>
-    </sv:property>
-  </sv:node>
-</sv:node>

Deleted: trunk/magnolia-test-webapp/src/main/resources/mgnl-resources/admin-images/loading.gif
===================================================================
(Binary files differ)

Deleted: trunk/magnolia-test-webapp/src/main/resources/mgnl-resources/icons/24/todo.gif
===================================================================
(Binary files differ)


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

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

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

Revision: 2005
          http://openutils.svn.sourceforge.net/openutils/?rev=2005&view=rev
Author:   diego_schivo
Date:     2010-02-19 15:03:42 +0000 (Fri, 19 Feb 2010)

Log Message:
-----------
MEDIA-105 Playlist management, first commit

Modified Paths:
--------------
    trunk/openutils-mgnlmedia/src/main/resources/META-INF/magnolia/media.xml

Added Paths:
-----------
    trunk/magnolia-test-webapp/src/main/resources/mgnl-resources/admin-js/
    trunk/magnolia-test-webapp/src/main/resources/mgnl-resources/admin-js/contextmenu.js
    trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/playlist/
    trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/playlist/PlaylistConstants.java
    trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/playlist/dialog/
    trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/playlist/dialog/PlaylistEntryDialogMVC.java
    trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/playlist/pages/
    trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/playlist/pages/PlaylistBean.java
    trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/playlist/pages/PlaylistEntryBean.java
    trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/playlist/pages/PlaylistView.java
    trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/playlist/pages/PlaylistsBrowserPage.java
    trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/playlist/tree/
    trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/playlist/tree/PlaylistsJcrBrowserTreeConfiguration.java
    trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/playlist/tree/PlaylistsTree.java
    trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/playlist/tree/PlaylistsTreeConfiguration.java
    trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/playlist/tree/PlaylistsTreeMVCHandler.java
    trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap/media/config.modules.adminInterface.config.menu.media.playlists.xml
    trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap/media/config.modules.adminInterface.config.menu.tools.playlistsJCR.xml
    trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap/media/config.modules.media.pages.playlistView.xml
    trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap/media/config.modules.media.pages.playlistsBrowser.xml
    trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap/media/config.modules.media.trees.playlists-jcr.xml
    trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap/media/config.modules.media.trees.playlists.xml
    trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap/media-nooverwrite/config.modules.media.dialogs.playlistentry.xml
    trunk/openutils-mgnlmedia/src/main/resources/mgnl-nodetypes/media/magnolia-nodetypes-playlist.xml
    trunk/openutils-mgnlmedia/src/main/resources/mgnl-resources/media/css/playlist-view.css
    trunk/openutils-mgnlmedia/src/main/resources/mgnl-resources/media/icons/ico16-add.png
    trunk/openutils-mgnlmedia/src/main/resources/mgnl-resources/media/icons/ico16-folder_inactive.png
    trunk/openutils-mgnlmedia/src/main/resources/mgnl-resources/media/icons/ico16-playlist.png
    trunk/openutils-mgnlmedia/src/main/resources/mgnl-resources/media/icons/ico16-playlist_inactive.png
    trunk/openutils-mgnlmedia/src/main/resources/mgnl-resources/media/icons/ico16-remove.png
    trunk/openutils-mgnlmedia/src/main/resources/mgnl-resources/media/js/ext-grid-dd-roworder.js
    trunk/openutils-mgnlmedia/src/main/resources/mgnl-resources/media/js/playlist-view.js
    trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/playlist/
    trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/playlist/pages/
    trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/playlist/pages/PlaylistView.html
    trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/playlist/pages/PlaylistsBrowserPage.html

Added: trunk/magnolia-test-webapp/src/main/resources/mgnl-resources/admin-js/contextmenu.js
===================================================================
--- trunk/magnolia-test-webapp/src/main/resources/mgnl-resources/admin-js/contextmenu.js	                        (rev 0)
+++ trunk/magnolia-test-webapp/src/main/resources/mgnl-resources/admin-js/contextmenu.js	2010-02-19 15:03:42 UTC (rev 2005)
@@ -0,0 +1,259 @@
+/* ###################################
+### contextmenu.js
+################################### */
+
+/* ###################################
+### ContextMenu Class
+################################### */
+
+/* ###################################
+### Constructor
+################################### */
+
+function mgnlContextMenu(name){
+    this.divMenu=document.getElementById(name+"_DivMenu");
+    this.menuItems=new Array();
+    this.colors=new Object();
+    this.colors.menuHighlight="#F0F2E6";
+    // true if this is keep showing
+    this.showing = false;
+
+    if(!this.divMenu){
+        alert('no div for the context [' + name + '] menu found');
+    }
+}
+
+mgnlContextMenu.prototype.show = function(event){
+    if (this.divMenu)
+        {
+        //todo: (hack) find out height/width of div
+        var divMenuHeight=0;
+        var divMenuWidth=150;
+        for (var i=0;i<this.menuItems.length;i++)
+            {
+            divMenuHeight+=18; //17: item height; 1: possible line
+            var item=this.menuItems[i];
+
+            //reset class name: remove _DISABLED (if existing)
+            item.div.className=item.div.className.replace("_DISABLED","");
+            var disabled=false;
+            for (var elem in item.conditions) {
+                var condition = item.conditions[elem];
+                var testResult;
+                if(typeof condition == "function"){
+                    testResult = condition();
+                }
+                else{
+                    testResult = condition.test();
+                }
+                if (testResult == false){
+                    disabled=true;
+                    break;
+                }
+            }
+
+            img = item.div.firstChild;
+            if (disabled) {
+                item.div.className+="_DISABLED";
+                item.div.onclick="";
+                // change image path to disabled
+                if (img && img.tagName && img.tagName.toUpperCase () == 'IMG') {
+                    img.src = img.src.replace(/(_inactive)?\.(\w+)$/, '_inactive.$2');
+                }
+            }
+            else {
+                item.div.onclick=item.onclick;
+                // change image path to enabled
+                if (img && img.tagName && img.tagName.toUpperCase () == 'IMG') {
+                    img.src = img.src.replace(/_inactive\.(\w+)$/, '.$1');
+                }
+            }
+        }
+        var pos=mgnlGetMousePos(event);
+
+        var left=pos.x-4;
+        var top=pos.y-4;
+        var windowSize=mgnlGetWindowSize();
+        if (windowSize.h<top+divMenuHeight+25)
+            {
+            top=windowSize.h-divMenuHeight-25;
+            if (top<0) top=0;
+            }
+        if (windowSize.w<left+divMenuWidth+30)
+            {
+            left=windowSize.w-divMenuWidth-30;
+            if (left<0) left=5;
+            }
+
+        this.divMenu.style.left=left + 'px';
+        this.divMenu.style.top=top + 'px';
+        this.divMenu.style.visibility="visible";
+        }
+    this.showing = true;
+    event.returnValue=false;
+    event.cancelBubble = true;
+    if (event.stopPropagation) event.stopPropagation();
+}
+
+mgnlContextMenu.prototype.keepShowing = function(){
+    this.showing = true;
+}
+
+mgnlContextMenu.prototype.hide = function(){
+    this.showing = false;
+    var tmp = this;
+    _mgnlContextMenuHide = function(){
+        if(tmp.showing == true)
+            return;
+        if (tmp.divMenu){
+            tmp.divMenu.style.visibility="hidden";
+        }
+    }
+    window.setTimeout("_mgnlContextMenuHide();",1000);
+}
+
+
+mgnlContextMenu.prototype.menuItemHighlight = function(item)
+    {
+    if (item.className.indexOf("_DISABLED")==-1)
+        {
+        item.style.backgroundColor=this.colors.menuHighlight;
+        }
+    }
+
+mgnlContextMenu.prototype.menuItemReset = function(item)
+    {
+    item.style.backgroundColor="";
+    }
+
+//#################
+//### TreeMenuItem
+//#################
+
+function mgnlContextMenuItem(id){
+    this.id=id;
+    this.div=document.getElementById(id);
+    this.onclick=this.div.onclick;
+}
+
+
+//##########################################
+//### Conditions for coloring the menu items
+//##########################################
+
+function mgnlTreeMenuItemConditionBoolean(bool){
+    this.bool = bool;
+
+    this.test = function(){
+        return bool;
+    }
+}
+
+function mgnlTreeMenuItemConditionSelectedRoot(tree){
+    this.tree = tree;
+
+    this.test = function(){
+        if (this.tree.selectedNode.id==this.tree.path) return true;
+        else return false;
+    }
+}
+
+function mgnlTreeMenuItemConditionSelectedNotRoot(tree){
+    this.tree = tree;
+
+    this.test = function(){
+        if (this.tree.selectedNode.id!=this.tree.path) return true;
+        else return false;
+    }
+}
+
+function mgnlTreeMenuItemConditionSelectedRootOrItemType(tree, itemType){
+    this.tree = tree;
+    this.itemType = itemType;
+
+    this.test = function(){
+        return ((this.tree.selectedNode.itemType==this.itemType)
+         || (this.tree.selectedNode.id==this.tree.path));
+    }
+}
+
+function mgnlTreeMenuItemConditionSelectedNotItemType(tree, itemType){
+    this.tree = tree;
+    this.itemType = itemType;
+
+    this.test = function(){
+        if (this.tree.selectedNode.itemType!=this.itemType)
+            return true;
+        else
+            return false;
+    }
+}
+
+function mgnlTreeMenuItemConditionSelectedItemType(tree, itemType){
+    this.tree = tree;
+    this.itemType = itemType;
+
+    this.test = function(){
+        if (this.tree.selectedNode.itemType==this.itemType)
+            return true;
+        else
+            return false;
+    }
+}
+
+function mgnlTreeMenuItemConditionSelectedNotNodeData(tree)
+    {
+    this.tree = tree;
+
+    this.test = function(){
+        if (this.tree.selectedNode.itemType!="mgnl:nodeData") return true;
+        else return false;
+    }
+}
+
+function mgnlTreeMenuItemConditionSelectedNotContentNode(tree)
+    {
+    this.tree = tree;
+
+    this.test = function(){
+        if (this.tree.selectedNode.itemType!="mgnl:contentNode") return true;
+        else return false;
+    }
+}
+
+function mgnlTreeMenuItemConditionSelectedNotContent(tree)
+    {
+    this.tree = tree;
+
+    this.test = function(){
+        if (this.tree.selectedNode.itemType!="mgnl:content") return true;
+        else return false;
+    }
+}
+
+function mgnlTreeMenuItemConditionPermissionWrite(tree)
+    {
+    this.tree = tree;
+
+    this.test = function(){
+        if (this.tree.selectedNode.permissionWrite) return true;
+        else return false;
+    }
+}
+
+//#################
+//### Common Commands
+//#################
+
+function mgnlTreeMenuItemOpen(tree){
+    var url= contextPath + tree.selectedNode.path+".html";
+    var w=window.open(url,"mgnlInline","");
+    if (w)
+        w.focus();
+}
+
+function mgnlTreeMenuOpenDialog(tree,dialogPath){
+    var path=tree.selectedNode.id;
+    mgnlOpenDialog(path,'','','',tree.repository,dialogPath);
+}
+


Property changes on: trunk/magnolia-test-webapp/src/main/resources/mgnl-resources/admin-js/contextmenu.js
___________________________________________________________________
Added: svn:mime-type
   + text/plain
Added: svn:keywords
   + Author Date Id Revision
Added: svn:eol-style
   + native

Added: trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/playlist/PlaylistConstants.java
===================================================================
--- trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/playlist/PlaylistConstants.java	                        (rev 0)
+++ trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/playlist/PlaylistConstants.java	2010-02-19 15:03:42 UTC (rev 2005)
@@ -0,0 +1,42 @@
+package net.sourceforge.openutils.mgnlmedia.playlist;
+
+import info.magnolia.cms.core.ItemType;
+
+
+/**
+ * @author dschivo
+ */
+public final class PlaylistConstants
+{
+
+    /**
+     * Playlists repository name
+     */
+    public static final String REPO = "playlists";
+
+    private static final String MGNL_PLAYLIST_TYPE = "mgnl:playlist";
+
+    private static final String MGNL_PLAYLIST_ENTRY_TYPE = "mgnl:playlistentry";
+
+    /**
+     * Folder type
+     */
+    public static final ItemType FOLDER = ItemType.CONTENT;
+
+    /**
+     * Playlist type
+     */
+    public static final ItemType PLAYLIST = new ItemType(MGNL_PLAYLIST_TYPE);
+
+    /**
+     * Playlist entry type
+     */
+    public static final ItemType PLAYLIST_ENTRY = new ItemType(MGNL_PLAYLIST_ENTRY_TYPE);
+
+    /**
+     * 
+     */
+    private PlaylistConstants()
+    {
+    }
+}


Property changes on: trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/playlist/PlaylistConstants.java
___________________________________________________________________
Added: svn:mime-type
   + text/plain
Added: svn:keywords
   + Author Date Id Revision
Added: svn:eol-style
   + native

Added: trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/playlist/dialog/PlaylistEntryDialogMVC.java
===================================================================
--- trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/playlist/dialog/PlaylistEntryDialogMVC.java	                        (rev 0)
+++ trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/playlist/dialog/PlaylistEntryDialogMVC.java	2010-02-19 15:03:42 UTC (rev 2005)
@@ -0,0 +1,129 @@
+package net.sourceforge.openutils.mgnlmedia.playlist.dialog;
+
+import info.magnolia.cms.core.Content;
+import info.magnolia.cms.core.HierarchyManager;
+import info.magnolia.cms.core.Path;
+import info.magnolia.cms.gui.misc.Sources;
+import info.magnolia.context.MgnlContext;
+import info.magnolia.module.admininterface.SaveHandler;
+import info.magnolia.module.admininterface.dialogs.ConfiguredDialog;
+
+import java.io.IOException;
+import java.io.PrintWriter;
+
+import javax.jcr.RepositoryException;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+import net.sourceforge.openutils.mgnlmedia.media.lifecycle.MediaModule;
+import net.sourceforge.openutils.mgnlmedia.media.tags.el.MediaEl;
+import net.sourceforge.openutils.mgnlmedia.playlist.PlaylistConstants;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+
+/**
+ * @author dschivo
+ */
+public class PlaylistEntryDialogMVC extends ConfiguredDialog
+{
+
+    /**
+     * Logger.
+     */
+    private Logger log = LoggerFactory.getLogger(PlaylistEntryDialogMVC.class);
+
+    /**
+     * 
+     */
+    public PlaylistEntryDialogMVC(
+        String name,
+        HttpServletRequest request,
+        HttpServletResponse response,
+        Content configNode)
+    {
+        super(name, request, response, configNode);
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public void renderHtml(String view) throws IOException
+    {
+        if (VIEW_CLOSE_WINDOW.equals(view))
+        {
+            PrintWriter out = this.getResponse().getWriter();
+            out.write("<!DOCTYPE html PUBLIC \"-//W3C//DTD XHTML 1.0 Strict//EN\" ");
+            out.write(" \"http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd\">\n");
+            out.println("<html>"); //$NON-NLS-1$
+            out.println(new Sources(this.getRequest().getContextPath()).getHtmlJs());
+            out.println("<script type=\"text/javascript\">"); //$NON-NLS-1$
+            out.println("parent.openPlaylist('" + path + "');");
+            out.println("parent.closeLayer();"); //$NON-NLS-1$
+            out.println("</script></html>"); //$NON-NLS-1$
+        }
+        else
+        {
+            super.renderHtml(view);
+        }
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    protected void configureSaveHandler(SaveHandler saveHandler)
+    {
+        super.configureSaveHandler(saveHandler);
+        saveHandler.setCreationItemType(PlaylistConstants.PLAYLIST_ENTRY);
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    protected boolean onPreSave(SaveHandler control)
+    {
+        HierarchyManager hm = MgnlContext.getHierarchyManager(PlaylistConstants.REPO);
+        Content c = null;
+        try
+        {
+            c = hm.getContent(control.getPath());
+        }
+        catch (RepositoryException e)
+        {
+            log.error("error getting {}", control.getPath(), e);
+            return false;
+        }
+        control.setNodeName(Path.getUniqueLabel(c, "entry"));
+        return super.onPreSave(control);
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    protected boolean onPostSave(SaveHandler control)
+    {
+        boolean result = super.onPostSave(control);
+        if (result)
+        {
+            Content node = this.getStorageNode();
+            if (node != null && MediaEl.module().isSingleinstance())
+            {
+                try
+                {
+                    node.getMetaData().setActivated();
+                    node.save();
+                }
+                catch (RepositoryException e)
+                {
+                    log.error("Error adding activated status to playlist entry node", e);
+                }
+            }
+        }
+        return result;
+    }
+}


Property changes on: trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/playlist/dialog/PlaylistEntryDialogMVC.java
___________________________________________________________________
Added: svn:mime-type
   + text/plain
Added: svn:keywords
   + Author Date Id Revision
Added: svn:eol-style
   + native

Added: trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/playlist/pages/PlaylistBean.java
===================================================================
--- trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/playlist/pages/PlaylistBean.java	                        (rev 0)
+++ trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/playlist/pages/PlaylistBean.java	2010-02-19 15:03:42 UTC (rev 2005)
@@ -0,0 +1,91 @@
+package net.sourceforge.openutils.mgnlmedia.playlist.pages;
+
+import java.util.List;
+
+
+/**
+ * @author dschivo
+ */
+public class PlaylistBean
+{
+
+    private String handle;
+
+    private String title;
+
+    private String description;
+
+    private List<PlaylistEntryBean> entries;
+
+    /**
+     * Returns the handle.
+     * @return the handle
+     */
+    public String getHandle()
+    {
+        return handle;
+    }
+
+    /**
+     * Sets the handle.
+     * @param handle the handle to set
+     */
+    public void setHandle(String handle)
+    {
+        this.handle = handle;
+    }
+
+    /**
+     * Returns the title.
+     * @return the title
+     */
+    public String getTitle()
+    {
+        return title;
+    }
+
+    /**
+     * Sets the title.
+     * @param title the title to set
+     */
+    public void setTitle(String title)
+    {
+        this.title = title;
+    }
+
+    /**
+     * Returns the description.
+     * @return the description
+     */
+    public String getDescription()
+    {
+        return description;
+    }
+
+    /**
+     * Sets the description.
+     * @param description the description to set
+     */
+    public void setDescription(String description)
+    {
+        this.description = description;
+    }
+
+    /**
+     * Returns the entries.
+     * @return the entries
+     */
+    public List<PlaylistEntryBean> getEntries()
+    {
+        return entries;
+    }
+
+    /**
+     * Sets the entries.
+     * @param entries the entries to set
+     */
+    public void setEntries(List<PlaylistEntryBean> entries)
+    {
+        this.entries = entries;
+    }
+}


Property changes on: trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/playlist/pages/PlaylistBean.java
___________________________________________________________________
Added: svn:mime-type
   + text/plain
Added: svn:keywords
   + Author Date Id Revision
Added: svn:eol-style
   + native

Added: trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/playlist/pages/PlaylistEntryBean.java
===================================================================
--- trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/playlist/pages/PlaylistEntryBean.java	                        (rev 0)
+++ trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/playlist/pages/PlaylistEntryBean.java	2010-02-19 15:03:42 UTC (rev 2005)
@@ -0,0 +1,149 @@
+package net.sourceforge.openutils.mgnlmedia.playlist.pages;
+
+/**
+ * @author dschivo
+ */
+public class PlaylistEntryBean
+{
+
+    private String handle;
+
+    private String media;
+
+    private String thumbnail;
+
+    private String type;
+
+    private String title;
+
+    private String description;
+
+    private String tags;
+
+    /**
+     * Returns the handle.
+     * @return the handle
+     */
+    public String getHandle()
+    {
+        return handle;
+    }
+
+    /**
+     * Sets the handle.
+     * @param handle the handle to set
+     */
+    public void setHandle(String handle)
+    {
+        this.handle = handle;
+    }
+
+    /**
+     * Returns the media.
+     * @return the media
+     */
+    public String getMedia()
+    {
+        return media;
+    }
+
+    /**
+     * Sets the media.
+     * @param media the media to set
+     */
+    public void setMedia(String media)
+    {
+        this.media = media;
+    }
+
+    /**
+     * Returns the thumbnail.
+     * @return the thumbnail
+     */
+    public String getThumbnail()
+    {
+        return thumbnail;
+    }
+
+    /**
+     * Sets the thumbnail.
+     * @param thumbnail the thumbnail to set
+     */
+    public void setThumbnail(String thumbnail)
+    {
+        this.thumbnail = thumbnail;
+    }
+
+    /**
+     * Returns the type.
+     * @return the type
+     */
+    public String getType()
+    {
+        return type;
+    }
+
+    /**
+     * Sets the type.
+     * @param type the type to set
+     */
+    public void setType(String type)
+    {
+        this.type = type;
+    }
+
+    /**
+     * Returns the title.
+     * @return the title
+     */
+    public String getTitle()
+    {
+        return title;
+    }
+
+    /**
+     * Sets the title.
+     * @param title the title to set
+     */
+    public void setTitle(String title)
+    {
+        this.title = title;
+    }
+
+    /**
+     * Returns the description.
+     * @return the description
+     */
+    public String getDescription()
+    {
+        return description;
+    }
+
+    /**
+     * Sets the description.
+     * @param description the description to set
+     */
+    public void setDescription(String description)
+    {
+        this.description = description;
+    }
+
+    /**
+     * Returns the tags.
+     * @return the tags
+     */
+    public String getTags()
+    {
+        return tags;
+    }
+
+    /**
+     * Sets the tags.
+     * @param tags the tags to set
+     */
+    public void setTags(String tags)
+    {
+        this.tags = tags;
+    }
+
+}


Property changes on: trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/playlist/pages/PlaylistEntryBean.java
___________________________________________________________________
Added: svn:mime-type
   + text/plain
Added: svn:keywords
   + Author Date Id Revision
Added: svn:eol-style
   + native

Added: trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/playlist/pages/PlaylistView.java
===================================================================
--- trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/playlist/pages/PlaylistView.java	                        (rev 0)
+++ trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/playlist/pages/PlaylistView.java	2010-02-19 15:03:42 UTC (rev 2005)
@@ -0,0 +1,134 @@
+package net.sourceforge.openutils.mgnlmedia.playlist.pages;
+
+import info.magnolia.cms.core.Content;
+import info.magnolia.cms.util.ContentUtil;
+import info.magnolia.cms.util.NodeDataUtil;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import javax.jcr.RepositoryException;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+import net.sourceforge.openutils.mgnlmedia.media.lifecycle.MediaModule;
+import net.sourceforge.openutils.mgnlmedia.media.pages.MessagesTemplatedMVCHandler;
+import net.sourceforge.openutils.mgnlmedia.media.tags.el.MediaEl;
+import net.sourceforge.openutils.mgnlmedia.playlist.PlaylistConstants;
+
+import org.apache.commons.lang.StringUtils;
+
+
+/**
+ * @author dschivo
+ */
+public class PlaylistView extends MessagesTemplatedMVCHandler
+{
+
+    private String path;
+
+    private PlaylistBean playlist;
+
+    private String title;
+
+    private String description;
+
+    /**
+     * 
+     */
+    public PlaylistView(String name, HttpServletRequest request, HttpServletResponse response)
+    {
+        super(name, request, response);
+    }
+
+    /**
+     * Sets the path.
+     * @param path the path to set
+     */
+    public void setPath(String path)
+    {
+        this.path = path;
+    }
+
+    /**
+     * Returns the playlist.
+     * @return the playlist
+     */
+    public PlaylistBean getPlaylist()
+    {
+        return playlist;
+    }
+
+    /**
+     * Sets the title.
+     * @param title the title to set
+     */
+    public void setTitle(String title)
+    {
+        this.title = title;
+    }
+
+    /**
+     * Sets the description.
+     * @param description the description to set
+     */
+    public void setDescription(String description)
+    {
+        this.description = description;
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public String show()
+    {
+        if (StringUtils.isNotBlank(path))
+        {
+            Content node = ContentUtil.getContent(PlaylistConstants.REPO, path);
+            playlist = new PlaylistBean();
+            playlist.setHandle(node.getHandle());
+            playlist.setTitle(NodeDataUtil.getString(node, "title"));
+            playlist.setDescription(NodeDataUtil.getString(node, "description"));
+            List<PlaylistEntryBean> entries = new ArrayList<PlaylistEntryBean>();
+            for (Content subNode : node.getChildren(PlaylistConstants.PLAYLIST_ENTRY))
+            {
+                String mediaUUID = NodeDataUtil.getString(subNode, "media");
+                Content media = ContentUtil.getContentByUUID(MediaModule.REPO, mediaUUID);
+                PlaylistEntryBean entry = new PlaylistEntryBean();
+                entry.setHandle(subNode.getHandle());
+                entry.setMedia(media.getUUID());
+                entry.setThumbnail(MediaEl.thumbnail(media));
+                entry.setType(NodeDataUtil.getString(media, "type"));
+                entry.setTitle(MediaEl.title(media));
+                entry.setDescription(MediaEl.desc(media));
+                entry.setTags(StringUtils.join(MediaEl.tags(media), ", "));
+                entries.add(entry);
+            }
+            playlist.setEntries(entries);
+        }
+        return super.show();
+    }
+
+    public String save()
+    {
+        Content node = ContentUtil.getContent(PlaylistConstants.REPO, path);
+        if (node != null)
+        {
+            try
+            {
+                NodeDataUtil.getOrCreateAndSet(node, "title", title);
+                NodeDataUtil.getOrCreateAndSet(node, "description", description);
+                if (MediaEl.module().isSingleinstance())
+                {
+                    node.getMetaData().setActivated();
+                }
+                node.save();
+            }
+            catch (RepositoryException e)
+            {
+            }
+        }
+        return null;
+    }
+}


Property changes on: trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/playlist/pages/PlaylistView.java
___________________________________________________________________
Added: svn:mime-type
   + text/plain
Added: svn:keywords
   + Author Date Id Revision
Added: svn:eol-style
   + native

Added: trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/playlist/pages/PlaylistsBrowserPage.java
===================================================================
--- trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/playlist/pages/PlaylistsBrowserPage.java	                        (rev 0)
+++ trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/playlist/pages/PlaylistsBrowserPage.java	2010-02-19 15:03:42 UTC (rev 2005)
@@ -0,0 +1,22 @@
+package net.sourceforge.openutils.mgnlmedia.playlist.pages;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+import net.sourceforge.openutils.mgnlmedia.media.pages.MessagesTemplatedMVCHandler;
+
+
+/**
+ * @author dschivo
+ */
+public class PlaylistsBrowserPage extends MessagesTemplatedMVCHandler
+{
+
+    /**
+     * 
+     */
+    public PlaylistsBrowserPage(String name, HttpServletRequest request, HttpServletResponse response)
+    {
+        super(name, request, response);
+    }
+}


Property changes on: trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/playlist/pages/PlaylistsBrowserPage.java
___________________________________________________________________
Added: svn:mime-type
   + text/plain
Added: svn:keywords
   + Author Date Id Revision
Added: svn:eol-style
   + native

Added: trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/playlist/tree/PlaylistsJcrBrowserTreeConfiguration.java
===================================================================
--- trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/playlist/tree/PlaylistsJcrBrowserTreeConfiguration.java	                        (rev 0)
+++ trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/playlist/tree/PlaylistsJcrBrowserTreeConfiguration.java	2010-02-19 15:03:42 UTC (rev 2005)
@@ -0,0 +1,27 @@
+package net.sourceforge.openutils.mgnlmedia.playlist.tree;
+
+import info.magnolia.cms.gui.control.Tree;
+import info.magnolia.module.admininterface.trees.JcrBrowserTreeConfiguration;
+
+import javax.servlet.http.HttpServletRequest;
+
+import net.sourceforge.openutils.mgnlmedia.playlist.PlaylistConstants;
+
+
+/**
+ * @author dschivo
+ */
+public class PlaylistsJcrBrowserTreeConfiguration extends JcrBrowserTreeConfiguration
+{
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public void prepareTree(Tree tree, boolean browseMode, HttpServletRequest request)
+    {
+        super.prepareTree(tree, browseMode, request);
+        tree.addItemType(PlaylistConstants.PLAYLIST);
+        tree.addItemType(PlaylistConstants.PLAYLIST_ENTRY);
+    }
+}


Property changes on: trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/playlist/tree/PlaylistsJcrBrowserTreeConfiguration.java
___________________________________________________________________
Added: svn:mime-type
   + text/plain
Added: svn:keywords
   + Author Date Id Revision
Added: svn:eol-style
   + native

Added: trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/playlist/tree/PlaylistsTree.java
===================================================================
--- trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/playlist/tree/PlaylistsTree.java	                        (rev 0)
+++ trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/playlist/tree/PlaylistsTree.java	2010-02-19 15:03:42 UTC (rev 2005)
@@ -0,0 +1,48 @@
+package net.sourceforge.openutils.mgnlmedia.playlist.tree;
+
+import info.magnolia.cms.core.Content;
+import info.magnolia.cms.gui.control.Tree;
+
+import javax.jcr.RepositoryException;
+
+import net.sourceforge.openutils.mgnlmedia.playlist.PlaylistConstants;
+
+import org.apache.commons.lang.StringUtils;
+
+
+/**
+ * @author dschivo
+ */
+public class PlaylistsTree extends Tree
+{
+
+    /**
+     * 
+     */
+    public PlaylistsTree(String name, String repository)
+    {
+        super(name, repository);
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    protected void getHtmlOfSingleItem(StringBuffer html, Content parentNode, String itemType, Object item)
+        throws RepositoryException
+    {
+        StringBuffer sb = new StringBuffer();
+        super.getHtmlOfSingleItem(sb, parentNode, itemType, item);
+        if (item instanceof Content)
+        {
+            Content node = (Content) item;
+            String s = new String(sb);
+            sb.insert(
+                StringUtils.indexOf(s, '>', s.indexOf("mgnlTreeControl.nodeHighlight")),
+                "onclick=\"mgnlTreeControl.openPlaylist('"
+                    + (PlaylistConstants.PLAYLIST.getSystemName().equals(itemType) ? node.getHandle() : "")
+                    + "');\"");
+        }
+        html.append(sb);
+    }
+}


Property changes on: trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/playlist/tree/PlaylistsTree.java
___________________________________________________________________
Added: svn:mime-type
   + text/plain
Added: svn:keywords
   + Author Date Id Revision
Added: svn:eol-style
   + native

Added: trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/playlist/tree/PlaylistsTreeConfiguration.java
===================================================================
--- trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/playlist/tree/PlaylistsTreeConfiguration.java	                        (rev 0)
+++ trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/playlist/tree/PlaylistsTreeConfiguration.java	2010-02-19 15:03:42 UTC (rev 2005)
@@ -0,0 +1,189 @@
+package net.sourceforge.openutils.mgnlmedia.playlist.tree;
+
+import info.magnolia.cms.beans.config.ServerConfiguration;
+import info.magnolia.cms.exchange.ActivationManagerFactory;
+import info.magnolia.cms.gui.control.ContextMenuItem;
+import info.magnolia.cms.gui.control.FunctionBarItem;
+import info.magnolia.cms.gui.control.Tree;
+import info.magnolia.cms.gui.control.TreeColumn;
+import info.magnolia.cms.i18n.Messages;
+import info.magnolia.module.admininterface.AbstractTreeConfiguration;
+
+import javax.servlet.http.HttpServletRequest;
+
+import net.sourceforge.openutils.mgnlmedia.media.configuration.MediaConfigurationManager;
+import net.sourceforge.openutils.mgnlmedia.media.tags.el.MediaEl;
+import net.sourceforge.openutils.mgnlmedia.playlist.PlaylistConstants;
+
+import org.apache.commons.lang.StringUtils;
+
+
+/**
+ * @author dschivo
+ */
+public class PlaylistsTreeConfiguration extends AbstractTreeConfiguration
+{
+
+    /**
+     * {@inheritDoc}
+     */
+    public void prepareContextMenu(Tree tree, boolean browseMode, HttpServletRequest request)
+    {
+        final Messages msgs = getMessages();
+
+        ContextMenuItem menuNewFolder = new ContextMenuItem("newFolder");
+        menuNewFolder.setLabel(msgs.get("tree.config.menu.newFolder")); //$NON-NLS-1$
+        menuNewFolder.setIcon(request.getContextPath() + "/.resources/media/icons/ico16-folder.png"); //$NON-NLS-1$
+        menuNewFolder.setOnclick(tree.getJavascriptTree()
+            + ".createNode('" + MediaConfigurationManager.FOLDER.getSystemName() + "');"); //$NON-NLS-1$ //$NON-NLS-2$
+        menuNewFolder.addJavascriptCondition("new mgnlTreeMenuItemConditionSelectedNotItemType(" //$NON-NLS-1$
+            + tree.getJavascriptTree()
+            + ", '" + PlaylistConstants.PLAYLIST.getSystemName() + "')"); //$NON-NLS-1$
+        menuNewFolder.addJavascriptCondition("new mgnlTreeMenuItemConditionPermissionWrite("
+            + tree.getJavascriptTree()
+            + ")");
+
+        ContextMenuItem menuNewPlaylist = new ContextMenuItem("newPlaylist"); //$NON-NLS-1$
+        menuNewPlaylist.setLabel("New playlist");
+        menuNewPlaylist.setIcon(request.getContextPath() + "/.resources/media/icons/ico16-playlist.png"); //$NON-NLS-1$
+        menuNewPlaylist.setOnclick(tree.getJavascriptTree()
+            + ".createNode('" + PlaylistConstants.PLAYLIST.getSystemName() + "');"); //$NON-NLS-1$ //$NON-NLS-2$
+        menuNewPlaylist.addJavascriptCondition("new mgnlTreeMenuItemConditionSelectedItemType(" //$NON-NLS-1$
+            + tree.getJavascriptTree()
+            + ", '" + PlaylistConstants.FOLDER.getSystemName() + "')"); //$NON-NLS-1$
+        menuNewPlaylist.addJavascriptCondition("new mgnlTreeMenuItemConditionPermissionWrite("
+            + tree.getJavascriptTree()
+            + ")");
+
+        ContextMenuItem menuDelete = new ContextMenuItem("delete");
+        menuDelete.setLabel(msgs.get("tree.config.menu.delete")); //$NON-NLS-1$
+        menuDelete.setIcon(request.getContextPath() + "/.resources/icons/16/delete2.gif"); //$NON-NLS-1$
+        menuDelete.setOnclick(tree.getJavascriptTree() + ".deleteNode();"); //$NON-NLS-1$
+        menuDelete.addJavascriptCondition("new mgnlTreeMenuItemConditionSelectedNotRoot(" //$NON-NLS-1$
+            + tree.getJavascriptTree()
+            + ")"); //$NON-NLS-1$
+        menuDelete.addJavascriptCondition("new mgnlTreeMenuItemConditionPermissionWrite("
+            + tree.getJavascriptTree()
+            + ")");
+
+        ContextMenuItem menuCopy = new ContextMenuItem("copy");
+        menuCopy.setLabel(msgs.get("tree.config.menu.copy")); //$NON-NLS-1$
+        menuCopy.setIcon(request.getContextPath() + "/.resources/icons/16/copy.gif"); //$NON-NLS-1$
+        menuCopy.addJavascriptCondition("new mgnlTreeMenuItemConditionSelectedNotRoot(" //$NON-NLS-1$
+            + tree.getJavascriptTree()
+            + ")"); //$NON-NLS-1$
+        menuCopy.addJavascriptCondition("new mgnlTreeMenuItemConditionSelectedNotNodeData(" //$NON-NLS-1$
+            + tree.getJavascriptTree()
+            + ")"); //$NON-NLS-1$
+        menuCopy.setOnclick(tree.getJavascriptTree() + ".copyNode();"); //$NON-NLS-1$
+
+        ContextMenuItem menuCut = new ContextMenuItem("move");
+        menuCut.setLabel(msgs.get("tree.config.menu.move")); //$NON-NLS-1$
+        menuCut.setIcon(request.getContextPath() + "/.resources/icons/16/up_down.gif"); //$NON-NLS-1$
+        menuCut
+            .addJavascriptCondition("new mgnlTreeMenuItemConditionSelectedNotRoot(" + tree.getJavascriptTree() + ")"); //$NON-NLS-1$ //$NON-NLS-2$
+        menuCut.addJavascriptCondition("new mgnlTreeMenuItemConditionSelectedNotNodeData(" //$NON-NLS-1$
+            + tree.getJavascriptTree()
+            + ")"); //$NON-NLS-1$
+        menuCut.setOnclick(tree.getJavascriptTree() + ".cutNode();"); //$NON-NLS-1$
+        menuCut
+            .addJavascriptCondition("new mgnlTreeMenuItemConditionPermissionWrite(" + tree.getJavascriptTree() + ")");
+
+        ContextMenuItem menuActivateExcl = new ContextMenuItem("activate");
+        menuActivateExcl.setLabel(msgs.get("tree.config.menu.activate")); //$NON-NLS-1$
+        menuActivateExcl.setIcon(request.getContextPath() + "/.resources/icons/16/arrow_right_green.gif"); //$NON-NLS-1$
+        menuActivateExcl.setOnclick(tree.getJavascriptTree() + ".activateNode(" + Tree.ACTION_ACTIVATE + ",false);"); //$NON-NLS-1$ //$NON-NLS-2$
+        menuActivateExcl.addJavascriptCondition("new mgnlTreeMenuItemConditionSelectedNotRoot(" //$NON-NLS-1$
+            + tree.getJavascriptTree()
+            + ")"); //$NON-NLS-1$
+        menuActivateExcl.addJavascriptCondition("new mgnlTreeMenuItemConditionSelectedNotNodeData(" //$NON-NLS-1$
+            + tree.getJavascriptTree()
+            + ")"); //$NON-NLS-1$
+        menuActivateExcl.addJavascriptCondition("new mgnlTreeMenuItemConditionPermissionWrite("
+            + tree.getJavascriptTree()
+            + ")");
+
+        ContextMenuItem menuActivate = new ContextMenuItem("activateInclSubs");
+        menuActivate.setLabel(msgs.get("tree.config.menu.activateInclSubs")); //$NON-NLS-1$
+        menuActivate.setIcon(request.getContextPath() + "/.resources/icons/16/arrow_right_green.gif"); //$NON-NLS-1$
+        menuActivate.setOnclick(tree.getJavascriptTree() + ".activateNode(" + Tree.ACTION_ACTIVATE + ",true);"); //$NON-NLS-1$ //$NON-NLS-2$
+        menuActivate.addJavascriptCondition("new mgnlTreeMenuItemConditionSelectedNotRoot(" //$NON-NLS-1$
+            + tree.getJavascriptTree()
+            + ")"); //$NON-NLS-1$
+        menuActivate.addJavascriptCondition("new mgnlTreeMenuItemConditionSelectedNotNodeData(" //$NON-NLS-1$
+            + tree.getJavascriptTree()
+            + ")"); //$NON-NLS-1$
+        menuActivate.addJavascriptCondition("new mgnlTreeMenuItemConditionPermissionWrite("
+            + tree.getJavascriptTree()
+            + ")");
+
+        ContextMenuItem menuDeactivate = new ContextMenuItem("deactivate");
+        menuDeactivate.setLabel(msgs.get("tree.config.menu.deactivate")); //$NON-NLS-1$
+        menuDeactivate.setIcon(request.getContextPath() + "/.resources/icons/16/arrow_left_red.gif"); //$NON-NLS-1$
+        menuDeactivate.setOnclick(tree.getJavascriptTree() + ".deactivateNode(" + Tree.ACTION_DEACTIVATE + ");"); //$NON-NLS-1$ //$NON-NLS-2$
+        menuDeactivate.addJavascriptCondition("new mgnlTreeMenuItemConditionSelectedNotRoot(" //$NON-NLS-1$
+            + tree.getJavascriptTree()
+            + ")"); //$NON-NLS-1$
+        menuDeactivate.addJavascriptCondition("new mgnlTreeMenuItemConditionSelectedNotNodeData(" //$NON-NLS-1$
+            + tree.getJavascriptTree()
+            + ")"); //$NON-NLS-1$
+        menuDeactivate.addJavascriptCondition("new mgnlTreeMenuItemConditionPermissionWrite("
+            + tree.getJavascriptTree()
+            + ")");
+
+        tree.addMenuItem(menuNewFolder);
+        tree.addMenuItem(menuNewPlaylist);
+        tree.addSeparator();
+        tree.addMenuItem(menuDelete);
+        tree.addSeparator();
+        tree.addMenuItem(menuCut);
+        tree.addMenuItem(menuCopy);
+        if (!MediaEl.module().isSingleinstance())
+        {
+            tree.addSeparator();
+            tree.addMenuItem(menuActivateExcl);
+            tree.addMenuItem(menuActivate);
+            tree.addMenuItem(menuDeactivate);
+        }
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public void prepareFunctionBar(Tree tree, boolean browseMode, HttpServletRequest request)
+    {
+        tree.addFunctionBarItem(FunctionBarItem.getRefreshFunctionBarItem(tree, getMessages(), request));
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public void prepareTree(Tree tree, boolean browseMode, HttpServletRequest request)
+    {
+        final Messages msgs = getMessages();
+
+        tree.addItemType(PlaylistConstants.FOLDER.getSystemName(), "/.resources/media/icons/ico16-folder.png");
+        tree.addItemType(
+            PlaylistConstants.PLAYLIST.getSystemName(),
+            "/.resources/media/icons/ico16-playlist.png");
+
+        TreeColumn column0 = TreeColumn.createLabelColumn(tree, "Playlists", true);
+        column0.setWidth(3);
+        tree.addColumn(column0);
+
+        if (!browseMode && !MediaEl.module().isSingleinstance())
+        {
+
+            if (ServerConfiguration.getInstance().isAdmin()
+                || ActivationManagerFactory.getActivationManager().hasAnyActiveSubscriber())
+            {
+                TreeColumn column1 = TreeColumn.createIconColumn(tree, msgs.get("tree.config.status"), null);
+                column1.setCssClass(StringUtils.EMPTY);
+                column1.setWidth(1);
+                column1.setIconsActivation(true);
+                column1.setIconsPermission(true);
+                tree.addColumn(column1);
+            }
+        }
+    }
+}


Property changes on: trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/playlist/tree/PlaylistsTreeConfiguration.java
___________________________________________________________________
Added: svn:mime-type
   + text/plain
Added: svn:keywords
   + Author Date Id Revision
Added: svn:eol-style
   + native

Added: trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/playlist/tree/PlaylistsTreeMVCHandler.java
===================================================================
--- trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/playlist/tree/PlaylistsTreeMVCHandler.java	                        (rev 0)
+++ trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/playlist/tree/PlaylistsTreeMVCHandler.java	2010-02-19 15:03:42 UTC (rev 2005)
@@ -0,0 +1,43 @@
+package net.sourceforge.openutils.mgnlmedia.playlist.tree;
+
+import info.magnolia.module.admininterface.AdminTreeMVCHandler;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+
+/**
+ * @author dschivo
+ */
+public class PlaylistsTreeMVCHandler extends AdminTreeMVCHandler
+{
+
+    /**
+     * 
+     */
+    public PlaylistsTreeMVCHandler(String name, HttpServletRequest request, HttpServletResponse response)
+    {
+        super(name, request, response);
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    protected void renderHeaderIncludes(StringBuffer html)
+    {
+        super.renderHeaderIncludes(html);
+        html.append("<script type=\"text/javascript\">");
+        html.append("mgnlTree.prototype.openPlaylist = function(path){ parent.openPlaylist(path); };");
+        html.append("</script>");
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public String getTreeClass()
+    {
+        return PlaylistsTree.class.getName();
+    }
+}


Property changes on: trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/playlist/tree/PlaylistsTreeMVCHandler.java
___________________________________________________________________
Added: svn:mime-type
   + text/plain
Added: svn:keywords
   + Author Date Id Revision
Added: svn:eol-style
   + native

Modified: trunk/openutils-mgnlmedia/src/main/resources/META-INF/magnolia/media.xml
===================================================================
--- trunk/openutils-mgnlmedia/src/main/resources/META-INF/magnolia/media.xml	2010-02-18 16:38:58 UTC (rev 2004)
+++ trunk/openutils-mgnlmedia/src/main/resources/META-INF/magnolia/media.xml	2010-02-19 15:03:42 UTC (rev 2005)
@@ -34,5 +34,12 @@
       </workspaces>
       <nodeTypeFile>/mgnl-nodetypes/media/magnolia-nodetypes.xml</nodeTypeFile>
     </repository>
+    <repository>
+      <name>magnolia</name>
+      <workspaces>
+        <workspace>playlists</workspace>
+      </workspaces>
+      <nodeTypeFile>/mgnl-nodetypes/media/magnolia-nodetypes-playlist.xml</nodeTypeFile>
+    </repository>
   </repositories>
 </module>
\ No newline at end of file

Added: trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap/media/config.modules.adminInterface.config.menu.media.playlists.xml
===================================================================
--- trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap/media/config.modules.adminInterface.config.menu.media.playlists.xml	                        (rev 0)
+++ trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap/media/config.modules.adminInterface.config.menu.media.playlists.xml	2010-02-19 15:03:42 UTC (rev 2005)
@@ -0,0 +1,50 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<sv:node sv:name="playlists" xmlns:sv="http://www.jcp.org/jcr/sv/1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <sv:property sv:name="jcr:primaryType" sv:type="Name">
+    <sv:value>mgnl:contentNode</sv:value>
+  </sv:property>
+  <sv:property sv:name="jcr:mixinTypes" sv:type="Name">
+    <sv:value>mix:lockable</sv:value>
+  </sv:property>
+  <sv:property sv:name="jcr:uuid" sv:type="String">
+    <sv:value>9114d5b9-cb54-414e-8a86-9c3fdab31dd8</sv:value>
+  </sv:property>
+  <sv:property sv:name="icon" sv:type="String">
+    <sv:value>/.resources/media/icons/ico16-playlist.png</sv:value>
+  </sv:property>
+  <sv:property sv:name="jcr:createdBy" sv:type="String">
+    <sv:value>admin</sv:value>
+  </sv:property>
+  <sv:property sv:name="label" sv:type="String">
+    <sv:value>Playlists</sv:value>
+  </sv:property>
+  <sv:property sv:name="onclick" sv:type="String">
+    <sv:value>MgnlAdminCentral.showContent('/.magnolia/pages/playlistsBrowser.html');</sv:value>
+  </sv:property>
+  <sv:node sv:name="MetaData">
+    <sv:property sv:name="jcr:primaryType" sv:type="Name">
+      <sv:value>mgnl:metaData</sv:value>
+    </sv:property>
+    <sv:property sv:name="jcr:createdBy" sv:type="String">
+      <sv:value>admin</sv:value>
+    </sv:property>
+    <sv:property sv:name="mgnl:activated" sv:type="Boolean">
+      <sv:value>false</sv:value>
+    </sv:property>
+    <sv:property sv:name="mgnl:activatorid" sv:type="String">
+      <sv:value>superuser</sv:value>
+    </sv:property>
+    <sv:property sv:name="mgnl:authorid" sv:type="String">
+      <sv:value>superuser</sv:value>
+    </sv:property>
+    <sv:property sv:name="mgnl:creationdate" sv:type="Date">
+      <sv:value>2008-06-17T14:45:51.521Z</sv:value>
+    </sv:property>
+    <sv:property sv:name="mgnl:lastaction" sv:type="Date">
+      <sv:value>2008-06-17T14:45:58.283Z</sv:value>
+    </sv:property>
+    <sv:property sv:name="mgnl:lastmodified" sv:type="Date">
+      <sv:value>2010-02-19T14:36:28.328+01:00</sv:value>
+    </sv:property>
+  </sv:node>
+</sv:node>


Property changes on: trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap/media/config.modules.adminInterface.config.menu.media.playlists.xml
___________________________________________________________________
Added: svn:mime-type
   + text/plain
Added: svn:keywords
   + Author Date Id Revision
Added: svn:eol-style
   + native

Added: trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap/media/config.modules.adminInterface.config.menu.tools.playlistsJCR.xml
===================================================================
--- trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap/media/config.modules.adminInterface.config.menu.tools.playlistsJCR.xml	                        (rev 0)
+++ trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap/media/config.modules.adminInterface.config.menu.tools.playlistsJCR.xml	2010-02-19 15:03:42 UTC (rev 2005)
@@ -0,0 +1,50 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<sv:node sv:name="playlistsJCR" xmlns:sv="http://www.jcp.org/jcr/sv/1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <sv:property sv:name="jcr:primaryType" sv:type="Name">
+    <sv:value>mgnl:contentNode</sv:value>
+  </sv:property>
+  <sv:property sv:name="jcr:uuid" sv:type="String">
+    <sv:value>4de73c16-5e49-409d-9c8c-bd8acefb9399</sv:value>
+  </sv:property>
+  <sv:property sv:name="icon" sv:type="String">
+    <sv:value>/.resources/icons/16/gears.gif</sv:value>
+  </sv:property>
+  <sv:property sv:name="jcr:createdBy" sv:type="String">
+    <sv:value>admin</sv:value>
+  </sv:property>
+  <sv:property sv:name="label" sv:type="String">
+    <sv:value>Playlists JCR</sv:value>
+  </sv:property>
+  <sv:property sv:name="onclick" sv:type="String">
+    <sv:value>MgnlAdminCentral.showTree('playlists-jcr');</sv:value>
+  </sv:property>
+  <sv:node sv:name="MetaData">
+    <sv:property sv:name="jcr:primaryType" sv:type="Name">
+      <sv:value>mgnl:metaData</sv:value>
+    </sv:property>
+    <sv:property sv:name="jcr:createdBy" sv:type="String">
+      <sv:value>admin</sv:value>
+    </sv:property>
+    <sv:property sv:name="mgnl:Data" sv:type="String">
+      <sv:value>MetaData</sv:value>
+    </sv:property>
+    <sv:property sv:name="mgnl:activated" sv:type="Boolean">
+      <sv:value>false</sv:value>
+    </sv:property>
+    <sv:property sv:name="mgnl:activatorid" sv:type="String">
+      <sv:value>superuser</sv:value>
+    </sv:property>
+    <sv:property sv:name="mgnl:authorid" sv:type="String">
+      <sv:value>superuser</sv:value>
+    </sv:property>
+    <sv:property sv:name="mgnl:creationdate" sv:type="Date">
+      <sv:value>2005-05-16T20:46:43.549+02:00</sv:value>
+    </sv:property>
+    <sv:property sv:name="mgnl:lastaction" sv:type="Date">
+      <sv:value>2008-06-20T11:50:30.531Z</sv:value>
+    </sv:property>
+    <sv:property sv:name="mgnl:lastmodified" sv:type="Date">
+      <sv:value>2010-02-15T18:13:19.189+01:00</sv:value>
+    </sv:property>
+  </sv:node>
+</sv:node>


Property changes on: trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap/media/config.modules.adminInterface.config.menu.tools.playlistsJCR.xml
___________________________________________________________________
Added: svn:mime-type
   + text/plain
Added: svn:keywords
   + Author Date Id Revision
Added: svn:eol-style
   + native

Added: trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap/media/config.modules.media.pages.playlistView.xml
===================================================================
--- trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap/media/config.modules.media.pages.playlistView.xml	                        (rev 0)
+++ trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap/media/config.modules.media.pages.playlistView.xml	2010-02-19 15:03:42 UTC (rev 2005)
@@ -0,0 +1,44 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<sv:node sv:name="playlistView" xmlns:sv="http://www.jcp.org/jcr/sv/1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <sv:property sv:name="jcr:primaryType" sv:type="Name">
+    <sv:value>mgnl:contentNode</sv:value>
+  </sv:property>
+  <sv:property sv:name="jcr:mixinTypes" sv:type="Name">
+    <sv:value>mix:lockable</sv:value>
+  </sv:property>
+  <sv:property sv:name="jcr:uuid" sv:type="String">
+    <sv:value>604b3826-7c61-4c74-9e63-c4ffb933aecf</sv:value>
+  </sv:property>
+  <sv:property sv:name="class" sv:type="String">
+    <sv:value>net.sourceforge.openutils.mgnlmedia.playlist.pages.PlaylistView</sv:value>
+  </sv:property>
+  <sv:property sv:name="jcr:createdBy" sv:type="String">
+    <sv:value>admin</sv:value>
+  </sv:property>
+  <sv:node sv:name="MetaData">
+    <sv:property sv:name="jcr:primaryType" sv:type="Name">
+      <sv:value>mgnl:metaData</sv:value>
+    </sv:property>
+    <sv:property sv:name="jcr:createdBy" sv:type="String">
+      <sv:value>admin</sv:value>
+    </sv:property>
+    <sv:property sv:name="mgnl:activated" sv:type="Boolean">
+      <sv:value>false</sv:value>
+    </sv:property>
+    <sv:property sv:name="mgnl:activatorid" sv:type="String">
+      <sv:value>superuser</sv:value>
+    </sv:property>
+    <sv:property sv:name="mgnl:authorid" sv:type="String">
+      <sv:value>superuser</sv:value>
+    </sv:property>
+    <sv:property sv:name="mgnl:creationdate" sv:type="Date">
+      <sv:value>2008-06-18T15:49:04.038Z</sv:value>
+    </sv:property>
+    <sv:property sv:name="mgnl:lastaction" sv:type="Date">
+      <sv:value>2008-06-18T16:32:03.891Z</sv:value>
+    </sv:property>
+    <sv:property sv:name="mgnl:lastmodified" sv:type="Date">
+      <sv:value>2010-02-13T11:04:28.500+01:00</sv:value>
+    </sv:property>
+  </sv:node>
+</sv:node>


Property changes on: trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap/media/config.modules.media.pages.playlistView.xml
___________________________________________________________________
Added: svn:mime-type
   + text/plain
Added: svn:keywords
   + Author Date Id Revision
Added: svn:eol-style
   + native

Added: trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap/media/config.modules.media.pages.playlistsBrowser.xml
===================================================================
--- trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap/media/config.modules.media.pages.playlistsBrowser.xml	                        (rev 0)
+++ trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap/media/config.modules.media.pages.playlistsBrowser.xml	2010-02-19 15:03:42 UTC (rev 2005)
@@ -0,0 +1,44 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<sv:node sv:name="playlistsBrowser" xmlns:sv="http://www.jcp.org/jcr/sv/1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <sv:property sv:name="jcr:primaryType" sv:type="Name">
+    <sv:value>mgnl:contentNode</sv:value>
+  </sv:property>
+  <sv:property sv:name="jcr:mixinTypes" sv:type="Name">
+    <sv:value>mix:lockable</sv:value>
+  </sv:property>
+  <sv:property sv:name="jcr:uuid" sv:type="String">
+    <sv:value>7c9f1314-0bda-4cff-a1dc-88c3bb98e50c</sv:value>
+  </sv:property>
+  <sv:property sv:name="class" sv:type="String">
+    <sv:value>net.sourceforge.openutils.mgnlmedia.playlist.pages.PlaylistsBrowserPage</sv:value>
+  </sv:property>
+  <sv:property sv:name="jcr:createdBy" sv:type="String">
+    <sv:value>admin</sv:value>
+  </sv:property>
+  <sv:node sv:name="MetaData">
+    <sv:property sv:name="jcr:primaryType" sv:type="Name">
+      <sv:value>mgnl:metaData</sv:value>
+    </sv:property>
+    <sv:property sv:name="jcr:createdBy" sv:type="String">
+      <sv:value>admin</sv:value>
+    </sv:property>
+    <sv:property sv:name="mgnl:activated" sv:type="Boolean">
+      <sv:value>false</sv:value>
+    </sv:property>
+    <sv:property sv:name="mgnl:activatorid" sv:type="String">
+      <sv:value>superuser</sv:value>
+    </sv:property>
+    <sv:property sv:name="mgnl:authorid" sv:type="String">
+      <sv:value>superuser</sv:value>
+    </sv:property>
+    <sv:property sv:name="mgnl:creationdate" sv:type="Date">
+      <sv:value>2008-06-18T15:49:04.038Z</sv:value>
+    </sv:property>
+    <sv:property sv:name="mgnl:lastaction" sv:type="Date">
+      <sv:value>2008-06-18T16:32:03.891Z</sv:value>
+    </sv:property>
+    <sv:property sv:name="mgnl:lastmodified" sv:type="Date">
+      <sv:value>2010-02-13T11:21:52.531+01:00</sv:value>
+    </sv:property>
+  </sv:node>
+</sv:node>


Property changes on: trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap/media/config.modules.media.pages.playlistsBrowser.xml
___________________________________________________________________
Added: svn:mime-type
   + text/plain
Added: svn:keywords
   + Author Date Id Revision
Added: svn:eol-style
   + native

Added: trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap/media/config.modules.media.trees.playlists-jcr.xml
===================================================================
--- trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap/media/config.modules.media.trees.playlists-jcr.xml	                        (rev 0)
+++ trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap/media/config.modules.media.trees.playlists-jcr.xml	2010-02-19 15:03:42 UTC (rev 2005)
@@ -0,0 +1,50 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<sv:node sv:name="playlists-jcr" xmlns:sv="http://www.jcp.org/jcr/sv/1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <sv:property sv:name="jcr:primaryType" sv:type="Name">
+    <sv:value>mgnl:contentNode</sv:value>
+  </sv:property>
+  <sv:property sv:name="jcr:uuid" sv:type="String">
+    <sv:value>0ebfcc77-d3c5-4179-acda-1cca3639a6ce</sv:value>
+  </sv:property>
+  <sv:property sv:name="class" sv:type="String">
+    <sv:value>info.magnolia.module.admininterface.AdminTreeMVCHandler</sv:value>
+  </sv:property>
+  <sv:property sv:name="configurationClass" sv:type="String">
+    <sv:value>net.sourceforge.openutils.mgnlmedia.playlist.tree.PlaylistsJcrBrowserTreeConfiguration</sv:value>
+  </sv:property>
+  <sv:property sv:name="jcr:createdBy" sv:type="String">
+    <sv:value>admin</sv:value>
+  </sv:property>
+  <sv:property sv:name="repository" sv:type="String">
+    <sv:value>playlists</sv:value>
+  </sv:property>
+  <sv:node sv:name="MetaData">
+    <sv:property sv:name=...
 
[truncated message content]

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

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

Revision: 2023
          http://openutils.svn.sourceforge.net/openutils/?rev=2023&view=rev
Author:   fgiust
Date:     2010-02-22 18:30:38 +0000 (Mon, 22 Feb 2010)

Log Message:
-----------
tag cloud module, first import

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

Added Paths:
-----------
    trunk/openutils-mgnltagcloud/
    trunk/openutils-mgnltagcloud/pom.xml
    trunk/openutils-mgnltagcloud/src/
    trunk/openutils-mgnltagcloud/src/main/
    trunk/openutils-mgnltagcloud/src/main/assembly/
    trunk/openutils-mgnltagcloud/src/main/assembly/assembly-bundle.xml
    trunk/openutils-mgnltagcloud/src/main/bundle/
    trunk/openutils-mgnltagcloud/src/main/bundle/LICENSE.txt
    trunk/openutils-mgnltagcloud/src/main/bundle/README.txt
    trunk/openutils-mgnltagcloud/src/main/etc/
    trunk/openutils-mgnltagcloud/src/main/etc/header.txt
    trunk/openutils-mgnltagcloud/src/main/java/
    trunk/openutils-mgnltagcloud/src/main/java/net/
    trunk/openutils-mgnltagcloud/src/main/java/net/sourceforge/
    trunk/openutils-mgnltagcloud/src/main/java/net/sourceforge/openutils/
    trunk/openutils-mgnltagcloud/src/main/java/net/sourceforge/openutils/mgnltagcloud/
    trunk/openutils-mgnltagcloud/src/main/java/net/sourceforge/openutils/mgnltagcloud/bean/
    trunk/openutils-mgnltagcloud/src/main/java/net/sourceforge/openutils/mgnltagcloud/bean/TagCloud.java
    trunk/openutils-mgnltagcloud/src/main/java/net/sourceforge/openutils/mgnltagcloud/dialog/
    trunk/openutils-mgnltagcloud/src/main/java/net/sourceforge/openutils/mgnltagcloud/dialog/TagCloudDialog.java
    trunk/openutils-mgnltagcloud/src/main/java/net/sourceforge/openutils/mgnltagcloud/dialog/TagCloudDialogSafeMultivalueSaveHandler.java
    trunk/openutils-mgnltagcloud/src/main/java/net/sourceforge/openutils/mgnltagcloud/el/
    trunk/openutils-mgnltagcloud/src/main/java/net/sourceforge/openutils/mgnltagcloud/el/TagCloudElFunctions.java
    trunk/openutils-mgnltagcloud/src/main/java/net/sourceforge/openutils/mgnltagcloud/manager/
    trunk/openutils-mgnltagcloud/src/main/java/net/sourceforge/openutils/mgnltagcloud/manager/HierarchyBoboIndexReader.java
    trunk/openutils-mgnltagcloud/src/main/java/net/sourceforge/openutils/mgnltagcloud/manager/TagCloudManager.java
    trunk/openutils-mgnltagcloud/src/main/java/net/sourceforge/openutils/mgnltagcloud/manager/TagCloudRepositoryObserver.java
    trunk/openutils-mgnltagcloud/src/main/java/net/sourceforge/openutils/mgnltagcloud/module/
    trunk/openutils-mgnltagcloud/src/main/java/net/sourceforge/openutils/mgnltagcloud/module/TagCloudModule.java
    trunk/openutils-mgnltagcloud/src/main/java/net/sourceforge/openutils/mgnltagcloud/setup/
    trunk/openutils-mgnltagcloud/src/main/java/net/sourceforge/openutils/mgnltagcloud/setup/TagCloudModuleVersionHandler.java
    trunk/openutils-mgnltagcloud/src/main/java/net/sourceforge/openutils/mgnltagcloud/util/
    trunk/openutils-mgnltagcloud/src/main/java/net/sourceforge/openutils/mgnltagcloud/util/JackrabbitUtil.java
    trunk/openutils-mgnltagcloud/src/main/resources/
    trunk/openutils-mgnltagcloud/src/main/resources/META-INF/
    trunk/openutils-mgnltagcloud/src/main/resources/META-INF/magnolia/
    trunk/openutils-mgnltagcloud/src/main/resources/META-INF/magnolia/tagcloud.xml
    trunk/openutils-mgnltagcloud/src/main/resources/META-INF/tagcloud.tld
    trunk/openutils-mgnltagcloud/src/main/resources/META-INF/tags/
    trunk/openutils-mgnltagcloud/src/main/resources/META-INF/tags/tagcloud/
    trunk/openutils-mgnltagcloud/src/main/resources/META-INF/tags/tagcloud/tagcloud.tag
    trunk/openutils-mgnltagcloud/src/main/resources/dialog/
    trunk/openutils-mgnltagcloud/src/main/resources/dialog/tagcloud.ftl
    trunk/openutils-mgnltagcloud/src/main/resources/mgnl-bootstrap/
    trunk/openutils-mgnltagcloud/src/main/resources/mgnl-bootstrap/tagcloud/
    trunk/openutils-mgnltagcloud/src/main/resources/mgnl-bootstrap/tagcloud/config.modules.tagcloud.controls.tagcloud.xml
    trunk/openutils-mgnltagcloud/src/main/resources/mgnl-resources/
    trunk/openutils-mgnltagcloud/src/main/resources/mgnl-resources/tagcloud/
    trunk/openutils-mgnltagcloud/src/main/resources/mgnl-resources/tagcloud/css/
    trunk/openutils-mgnltagcloud/src/main/resources/mgnl-resources/tagcloud/css/close.gif
    trunk/openutils-mgnltagcloud/src/main/resources/mgnl-resources/tagcloud/css/loading.gif
    trunk/openutils-mgnltagcloud/src/main/resources/mgnl-resources/tagcloud/css/style.css
    trunk/openutils-mgnltagcloud/src/main/resources/mgnl-resources/tagcloud/js/
    trunk/openutils-mgnltagcloud/src/main/resources/mgnl-resources/tagcloud/js/jquery.fcbkcomplete.js
    trunk/openutils-mgnltagcloud/src/main/resources/mgnl-resources/tagcloud/js/jquery.fcbkcomplete.min.js
    trunk/openutils-mgnltagcloud/src/main/resources/mgnl-resources/tagcloud/js/jquery.min.js
    trunk/openutils-mgnltagcloud/src/site/
    trunk/openutils-mgnltagcloud/src/site/site.xml
    trunk/openutils-mgnltagcloud/src/test/
    trunk/openutils-mgnltagcloud/src/test/java/
    trunk/openutils-mgnltagcloud/src/test/java/net/
    trunk/openutils-mgnltagcloud/src/test/java/net/sourceforge/
    trunk/openutils-mgnltagcloud/src/test/java/net/sourceforge/openutils/
    trunk/openutils-mgnltagcloud/src/test/java/net/sourceforge/openutils/mgnltagcloud/
    trunk/openutils-mgnltagcloud/src/test/java/net/sourceforge/openutils/mgnltagcloud/manager/
    trunk/openutils-mgnltagcloud/src/test/java/net/sourceforge/openutils/mgnltagcloud/manager/TagCloudManagerTest.java
    trunk/openutils-mgnltagcloud/src/test/resources/
    trunk/openutils-mgnltagcloud/src/test/resources/groovyscripts/
    trunk/openutils-mgnltagcloud/src/test/resources/groovyscripts/testCreatingPageTag.groovy
    trunk/openutils-mgnltagcloud/src/test/resources/indexing_configuration.xml
    trunk/openutils-mgnltagcloud/src/test/resources/repo-conf/
    trunk/openutils-mgnltagcloud/src/test/resources/repo-conf/jackrabbit-memory-search.xml

Added: trunk/openutils-mgnltagcloud/pom.xml
===================================================================
--- trunk/openutils-mgnltagcloud/pom.xml	                        (rev 0)
+++ trunk/openutils-mgnltagcloud/pom.xml	2010-02-22 18:30:38 UTC (rev 2023)
@@ -0,0 +1,143 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+  <parent>
+    <groupId>net.sourceforge.openutils</groupId>
+    <artifactId>openutils-parent</artifactId>
+    <version>1.2</version>
+  </parent>
+  <modelVersion>4.0.0</modelVersion>
+  <packaging>jar</packaging>
+  <artifactId>openutils-mgnltagcloud</artifactId>
+  <name>Magnolia tag cloud module</name>
+  <version>1.0.0-SNAPSHOT</version>
+  <description>A magnolia module for generating tag clouds</description>
+  <licenses>
+    <license>
+      <name>GPLv3</name>
+      <url>http://www.gnu.org/licenses/gpl-3.0.txt</url>
+    </license>
+  </licenses>
+  <url>http://www.openmindlab.com/lab/products/mgnltagcloud.html</url>
+  <issueManagement>
+    <system>jira</system>
+    <url>http://jira.openmindlab.com/browse/TAGCLOUD</url>
+  </issueManagement>
+  <build>
+    <plugins>
+      <plugin>
+        <artifactId>maven-assembly-plugin</artifactId>
+        <executions>
+          <execution>
+            <id>bundle</id>
+            <phase>package</phase>
+            <goals>
+              <goal>single</goal>
+            </goals>
+          </execution>
+        </executions>
+        <configuration>
+          <descriptors>
+            <descriptor>/src/main/assembly/assembly-bundle.xml</descriptor>
+          </descriptors>
+        </configuration>
+      </plugin>
+    </plugins>
+    <resources>
+      <resource>
+        <filtering>false</filtering>
+        <directory>src/main/resources</directory>
+        <includes>
+          <include>**/*</include>
+        </includes>
+      </resource>
+      <resource>
+        <filtering>true</filtering>
+        <directory>src/main/resources</directory>
+        <includes>
+          <include>META-INF/magnolia/*</include>
+        </includes>
+      </resource>
+    </resources>
+  </build>
+  <dependencies>
+    <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>info.magnolia</groupId>
+      <artifactId>magnolia-core</artifactId>
+      <classifier>tests</classifier>
+      <scope>test</scope>
+      <version>${magnolia.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>info.magnolia</groupId>
+      <artifactId>magnolia-module-cache</artifactId>
+      <version>${magnolia.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>com.browseengine.bobo</groupId>
+      <artifactId>bobo-browse</artifactId>
+      <version>2.0.7</version>
+    </dependency>
+    <dependency>
+      <groupId>net.sourceforge.openutils</groupId>
+      <artifactId>openutils-mgnlcontrols</artifactId>
+      <version>4.0.4</version>
+    </dependency>
+    <dependency>
+      <groupId>javax.servlet</groupId>
+      <artifactId>servlet-api</artifactId>
+      <version>2.4</version>
+      <scope>provided</scope>
+    </dependency>
+    <dependency>
+      <groupId>javax.servlet</groupId>
+      <artifactId>jsp-api</artifactId>
+      <version>2.0</version>
+      <scope>provided</scope>
+    </dependency>
+    <dependency>
+      <groupId>junit</groupId>
+      <artifactId>junit</artifactId>
+      <version>4.7</version>
+      <scope>test</scope>
+    </dependency>
+  </dependencies>
+  <repositories>
+    <repository>
+      <id>repository.magnolia-cms.com</id>
+      <name>magnolia repository</name>
+      <url>http://repository.magnolia-cms.com/m2</url>
+      <releases>
+        <enabled>true</enabled>
+      </releases>
+      <snapshots>
+        <enabled>false</enabled>
+      </snapshots>
+    </repository>
+  </repositories>
+  <properties>
+    <magnolia.version>4.2.3</magnolia.version>
+  </properties>
+</project>
\ No newline at end of file


Property changes on: trunk/openutils-mgnltagcloud/pom.xml
___________________________________________________________________
Added: svn:executable
   + *
Added: svn:mime-type
   + text/xml
Added: svn:keywords
   + Author Date Id Revision
Added: svn:eol-style
   + native

Added: trunk/openutils-mgnltagcloud/src/main/assembly/assembly-bundle.xml
===================================================================
--- trunk/openutils-mgnltagcloud/src/main/assembly/assembly-bundle.xml	                        (rev 0)
+++ trunk/openutils-mgnltagcloud/src/main/assembly/assembly-bundle.xml	2010-02-22 18:30:38 UTC (rev 2023)
@@ -0,0 +1,34 @@
+<assembly>
+  <id>bundle</id>
+  <formats>
+    <format>zip</format>
+  </formats>
+  <includeBaseDirectory>false</includeBaseDirectory>
+  <fileSets>
+    <fileSet>
+      <filtered>true</filtered>
+      <outputDirectory>/</outputDirectory>
+      <lineEnding>crlf</lineEnding>
+      <directory>${basedir}/src/main/bundle</directory>
+      <includes>
+        <include>*</include>
+      </includes>
+    </fileSet>
+    <fileSet>
+      <directory>.</directory>
+      <outputDirectory>/sources/</outputDirectory>
+      <includes>
+        <include>src/**/*</include>
+        <include>pom.xml</include>
+      </includes>
+    </fileSet>
+  </fileSets>
+  <dependencySets>
+    <dependencySet>
+      <outputDirectory>bin</outputDirectory>
+      <includes>
+        <include>net.sourceforge.openutils:*</include>
+      </includes>
+    </dependencySet>
+  </dependencySets>
+</assembly>
\ No newline at end of file


Property changes on: trunk/openutils-mgnltagcloud/src/main/assembly/assembly-bundle.xml
___________________________________________________________________
Added: svn:mime-type
   + text/xml
Added: svn:keywords
   + Author Date Id Revision
Added: svn:eol-style
   + native

Added: trunk/openutils-mgnltagcloud/src/main/bundle/LICENSE.txt
===================================================================
--- trunk/openutils-mgnltagcloud/src/main/bundle/LICENSE.txt	                        (rev 0)
+++ trunk/openutils-mgnltagcloud/src/main/bundle/LICENSE.txt	2010-02-22 18:30:38 UTC (rev 2023)
@@ -0,0 +1,674 @@
+                    GNU GENERAL PUBLIC LICENSE
+                       Version 3, 29 June 2007
+
+ Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+                            Preamble
+
+  The GNU General Public License is a free, copyleft license for
+software and other kinds of works.
+
+  The licenses for most software and other practical works are designed
+to take away your freedom to share and change the works.  By contrast,
+the GNU General Public License is intended to guarantee your freedom to
+share and change all versions of a program--to make sure it remains free
+software for all its users.  We, the Free Software Foundation, use the
+GNU General Public License for most of our software; it applies also to
+any other work released this way by its authors.  You can apply it to
+your programs, too.
+
+  When we speak of free software, we are referring to freedom, not
+price.  Our General Public Licenses are designed to make sure that you
+have the freedom to distribute copies of free software (and charge for
+them if you wish), that you receive source code or can get it if you
+want it, that you can change the software or use pieces of it in new
+free programs, and that you know you can do these things.
+
+  To protect your rights, we need to prevent others from denying you
+these rights or asking you to surrender the rights.  Therefore, you have
+certain responsibilities if you distribute copies of the software, or if
+you modify it: responsibilities to respect the freedom of others.
+
+  For example, if you distribute copies of such a program, whether
+gratis or for a fee, you must pass on to the recipients the same
+freedoms that you received.  You must make sure that they, too, receive
+or can get the source code.  And you must show them these terms so they
+know their rights.
+
+  Developers that use the GNU GPL protect your rights with two steps:
+(1) assert copyright on the software, and (2) offer you this License
+giving you legal permission to copy, distribute and/or modify it.
+
+  For the developers' and authors' protection, the GPL clearly explains
+that there is no warranty for this free software.  For both users' and
+authors' sake, the GPL requires that modified versions be marked as
+changed, so that their problems will not be attributed erroneously to
+authors of previous versions.
+
+  Some devices are designed to deny users access to install or run
+modified versions of the software inside them, although the manufacturer
+can do so.  This is fundamentally incompatible with the aim of
+protecting users' freedom to change the software.  The systematic
+pattern of such abuse occurs in the area of products for individuals to
+use, which is precisely where it is most unacceptable.  Therefore, we
+have designed this version of the GPL to prohibit the practice for those
+products.  If such problems arise substantially in other domains, we
+stand ready to extend this provision to those domains in future versions
+of the GPL, as needed to protect the freedom of users.
+
+  Finally, every program is threatened constantly by software patents.
+States should not allow patents to restrict development and use of
+software on general-purpose computers, but in those that do, we wish to
+avoid the special danger that patents applied to a free program could
+make it effectively proprietary.  To prevent this, the GPL assures that
+patents cannot be used to render the program non-free.
+
+  The precise terms and conditions for copying, distribution and
+modification follow.
+
+                       TERMS AND CONDITIONS
+
+  0. Definitions.
+
+  "This License" refers to version 3 of the GNU General Public License.
+
+  "Copyright" also means copyright-like laws that apply to other kinds of
+works, such as semiconductor masks.
+
+  "The Program" refers to any copyrightable work licensed under this
+License.  Each licensee is addressed as "you".  "Licensees" and
+"recipients" may be individuals or organizations.
+
+  To "modify" a work means to copy from or adapt all or part of the work
+in a fashion requiring copyright permission, other than the making of an
+exact copy.  The resulting work is called a "modified version" of the
+earlier work or a work "based on" the earlier work.
+
+  A "covered work" means either the unmodified Program or a work based
+on the Program.
+
+  To "propagate" a work means to do anything with it that, without
+permission, would make you directly or secondarily liable for
+infringement under applicable copyright law, except executing it on a
+computer or modifying a private copy.  Propagation includes copying,
+distribution (with or without modification), making available to the
+public, and in some countries other activities as well.
+
+  To "convey" a work means any kind of propagation that enables other
+parties to make or receive copies.  Mere interaction with a user through
+a computer network, with no transfer of a copy, is not conveying.
+
+  An interactive user interface displays "Appropriate Legal Notices"
+to the extent that it includes a convenient and prominently visible
+feature that (1) displays an appropriate copyright notice, and (2)
+tells the user that there is no warranty for the work (except to the
+extent that warranties are provided), that licensees may convey the
+work under this License, and how to view a copy of this License.  If
+the interface presents a list of user commands or options, such as a
+menu, a prominent item in the list meets this criterion.
+
+  1. Source Code.
+
+  The "source code" for a work means the preferred form of the work
+for making modifications to it.  "Object code" means any non-source
+form of a work.
+
+  A "Standard Interface" means an interface that either is an official
+standard defined by a recognized standards body, or, in the case of
+interfaces specified for a particular programming language, one that
+is widely used among developers working in that language.
+
+  The "System Libraries" of an executable work include anything, other
+than the work as a whole, that (a) is included in the normal form of
+packaging a Major Component, but which is not part of that Major
+Component, and (b) serves only to enable use of the work with that
+Major Component, or to implement a Standard Interface for which an
+implementation is available to the public in source code form.  A
+"Major Component", in this context, means a major essential component
+(kernel, window system, and so on) of the specific operating system
+(if any) on which the executable work runs, or a compiler used to
+produce the work, or an object code interpreter used to run it.
+
+  The "Corresponding Source" for a work in object code form means all
+the source code needed to generate, install, and (for an executable
+work) run the object code and to modify the work, including scripts to
+control those activities.  However, it does not include the work's
+System Libraries, or general-purpose tools or generally available free
+programs which are used unmodified in performing those activities but
+which are not part of the work.  For example, Corresponding Source
+includes interface definition files associated with source files for
+the work, and the source code for shared libraries and dynamically
+linked subprograms that the work is specifically designed to require,
+such as by intimate data communication or control flow between those
+subprograms and other parts of the work.
+
+  The Corresponding Source need not include anything that users
+can regenerate automatically from other parts of the Corresponding
+Source.
+
+  The Corresponding Source for a work in source code form is that
+same work.
+
+  2. Basic Permissions.
+
+  All rights granted under this License are granted for the term of
+copyright on the Program, and are irrevocable provided the stated
+conditions are met.  This License explicitly affirms your unlimited
+permission to run the unmodified Program.  The output from running a
+covered work is covered by this License only if the output, given its
+content, constitutes a covered work.  This License acknowledges your
+rights of fair use or other equivalent, as provided by copyright law.
+
+  You may make, run and propagate covered works that you do not
+convey, without conditions so long as your license otherwise remains
+in force.  You may convey covered works to others for the sole purpose
+of having them make modifications exclusively for you, or provide you
+with facilities for running those works, provided that you comply with
+the terms of this License in conveying all material for which you do
+not control copyright.  Those thus making or running the covered works
+for you must do so exclusively on your behalf, under your direction
+and control, on terms that prohibit them from making any copies of
+your copyrighted material outside their relationship with you.
+
+  Conveying under any other circumstances is permitted solely under
+the conditions stated below.  Sublicensing is not allowed; section 10
+makes it unnecessary.
+
+  3. Protecting Users' Legal Rights From Anti-Circumvention Law.
+
+  No covered work shall be deemed part of an effective technological
+measure under any applicable law fulfilling obligations under article
+11 of the WIPO copyright treaty adopted on 20 December 1996, or
+similar laws prohibiting or restricting circumvention of such
+measures.
+
+  When you convey a covered work, you waive any legal power to forbid
+circumvention of technological measures to the extent such circumvention
+is effected by exercising rights under this License with respect to
+the covered work, and you disclaim any intention to limit operation or
+modification of the work as a means of enforcing, against the work's
+users, your or third parties' legal rights to forbid circumvention of
+technological measures.
+
+  4. Conveying Verbatim Copies.
+
+  You may convey verbatim copies of the Program's source code as you
+receive it, in any medium, provided that you conspicuously and
+appropriately publish on each copy an appropriate copyright notice;
+keep intact all notices stating that this License and any
+non-permissive terms added in accord with section 7 apply to the code;
+keep intact all notices of the absence of any warranty; and give all
+recipients a copy of this License along with the Program.
+
+  You may charge any price or no price for each copy that you convey,
+and you may offer support or warranty protection for a fee.
+
+  5. Conveying Modified Source Versions.
+
+  You may convey a work based on the Program, or the modifications to
+produce it from the Program, in the form of source code under the
+terms of section 4, provided that you also meet all of these conditions:
+
+    a) The work must carry prominent notices stating that you modified
+    it, and giving a relevant date.
+
+    b) The work must carry prominent notices stating that it is
+    released under this License and any conditions added under section
+    7.  This requirement modifies the requirement in section 4 to
+    "keep intact all notices".
+
+    c) You must license the entire work, as a whole, under this
+    License to anyone who comes into possession of a copy.  This
+    License will therefore apply, along with any applicable section 7
+    additional terms, to the whole of the work, and all its parts,
+    regardless of how they are packaged.  This License gives no
+    permission to license the work in any other way, but it does not
+    invalidate such permission if you have separately received it.
+
+    d) If the work has interactive user interfaces, each must display
+    Appropriate Legal Notices; however, if the Program has interactive
+    interfaces that do not display Appropriate Legal Notices, your
+    work need not make them do so.
+
+  A compilation of a covered work with other separate and independent
+works, which are not by their nature extensions of the covered work,
+and which are not combined with it such as to form a larger program,
+in or on a volume of a storage or distribution medium, is called an
+"aggregate" if the compilation and its resulting copyright are not
+used to limit the access or legal rights of the compilation's users
+beyond what the individual works permit.  Inclusion of a covered work
+in an aggregate does not cause this License to apply to the other
+parts of the aggregate.
+
+  6. Conveying Non-Source Forms.
+
+  You may convey a covered work in object code form under the terms
+of sections 4 and 5, provided that you also convey the
+machine-readable Corresponding Source under the terms of this License,
+in one of these ways:
+
+    a) Convey the object code in, or embodied in, a physical product
+    (including a physical distribution medium), accompanied by the
+    Corresponding Source fixed on a durable physical medium
+    customarily used for software interchange.
+
+    b) Convey the object code in, or embodied in, a physical product
+    (including a physical distribution medium), accompanied by a
+    written offer, valid for at least three years and valid for as
+    long as you offer spare parts or customer support for that product
+    model, to give anyone who possesses the object code either (1) a
+    copy of the Corresponding Source for all the software in the
+    product that is covered by this License, on a durable physical
+    medium customarily used for software interchange, for a price no
+    more than your reasonable cost of physically performing this
+    conveying of source, or (2) access to copy the
+    Corresponding Source from a network server at no charge.
+
+    c) Convey individual copies of the object code with a copy of the
+    written offer to provide the Corresponding Source.  This
+    alternative is allowed only occasionally and noncommercially, and
+    only if you received the object code with such an offer, in accord
+    with subsection 6b.
+
+    d) Convey the object code by offering access from a designated
+    place (gratis or for a charge), and offer equivalent access to the
+    Corresponding Source in the same way through the same place at no
+    further charge.  You need not require recipients to copy the
+    Corresponding Source along with the object code.  If the place to
+    copy the object code is a network server, the Corresponding Source
+    may be on a different server (operated by you or a third party)
+    that supports equivalent copying facilities, provided you maintain
+    clear directions next to the object code saying where to find the
+    Corresponding Source.  Regardless of what server hosts the
+    Corresponding Source, you remain obligated to ensure that it is
+    available for as long as needed to satisfy these requirements.
+
+    e) Convey the object code using peer-to-peer transmission, provided
+    you inform other peers where the object code and Corresponding
+    Source of the work are being offered to the general public at no
+    charge under subsection 6d.
+
+  A separable portion of the object code, whose source code is excluded
+from the Corresponding Source as a System Library, need not be
+included in conveying the object code work.
+
+  A "User Product" is either (1) a "consumer product", which means any
+tangible personal property which is normally used for personal, family,
+or household purposes, or (2) anything designed or sold for incorporation
+into a dwelling.  In determining whether a product is a consumer product,
+doubtful cases shall be resolved in favor of coverage.  For a particular
+product received by a particular user, "normally used" refers to a
+typical or common use of that class of product, regardless of the status
+of the particular user or of the way in which the particular user
+actually uses, or expects or is expected to use, the product.  A product
+is a consumer product regardless of whether the product has substantial
+commercial, industrial or non-consumer uses, unless such uses represent
+the only significant mode of use of the product.
+
+  "Installation Information" for a User Product means any methods,
+procedures, authorization keys, or other information required to install
+and execute modified versions of a covered work in that User Product from
+a modified version of its Corresponding Source.  The information must
+suffice to ensure that the continued functioning of the modified object
+code is in no case prevented or interfered with solely because
+modification has been made.
+
+  If you convey an object code work under this section in, or with, or
+specifically for use in, a User Product, and the conveying occurs as
+part of a transaction in which the right of possession and use of the
+User Product is transferred to the recipient in perpetuity or for a
+fixed term (regardless of how the transaction is characterized), the
+Corresponding Source conveyed under this section must be accompanied
+by the Installation Information.  But this requirement does not apply
+if neither you nor any third party retains the ability to install
+modified object code on the User Product (for example, the work has
+been installed in ROM).
+
+  The requirement to provide Installation Information does not include a
+requirement to continue to provide support service, warranty, or updates
+for a work that has been modified or installed by the recipient, or for
+the User Product in which it has been modified or installed.  Access to a
+network may be denied when the modification itself materially and
+adversely affects the operation of the network or violates the rules and
+protocols for communication across the network.
+
+  Corresponding Source conveyed, and Installation Information provided,
+in accord with this section must be in a format that is publicly
+documented (and with an implementation available to the public in
+source code form), and must require no special password or key for
+unpacking, reading or copying.
+
+  7. Additional Terms.
+
+  "Additional permissions" are terms that supplement the terms of this
+License by making exceptions from one or more of its conditions.
+Additional permissions that are applicable to the entire Program shall
+be treated as though they were included in this License, to the extent
+that they are valid under applicable law.  If additional permissions
+apply only to part of the Program, that part may be used separately
+under those permissions, but the entire Program remains governed by
+this License without regard to the additional permissions.
+
+  When you convey a copy of a covered work, you may at your option
+remove any additional permissions from that copy, or from any part of
+it.  (Additional permissions may be written to require their own
+removal in certain cases when you modify the work.)  You may place
+additional permissions on material, added by you to a covered work,
+for which you have or can give appropriate copyright permission.
+
+  Notwithstanding any other provision of this License, for material you
+add to a covered work, you may (if authorized by the copyright holders of
+that material) supplement the terms of this License with terms:
+
+    a) Disclaiming warranty or limiting liability differently from the
+    terms of sections 15 and 16 of this License; or
+
+    b) Requiring preservation of specified reasonable legal notices or
+    author attributions in that material or in the Appropriate Legal
+    Notices displayed by works containing it; or
+
+    c) Prohibiting misrepresentation of the origin of that material, or
+    requiring that modified versions of such material be marked in
+    reasonable ways as different from the original version; or
+
+    d) Limiting the use for publicity purposes of names of licensors or
+    authors of the material; or
+
+    e) Declining to grant rights under trademark law for use of some
+    trade names, trademarks, or service marks; or
+
+    f) Requiring indemnification of licensors and authors of that
+    material by anyone who conveys the material (or modified versions of
+    it) with contractual assumptions of liability to the recipient, for
+    any liability that these contractual assumptions directly impose on
+    those licensors and authors.
+
+  All other non-permissive additional terms are considered "further
+restrictions" within the meaning of section 10.  If the Program as you
+received it, or any part of it, contains a notice stating that it is
+governed by this License along with a term that is a further
+restriction, you may remove that term.  If a license document contains
+a further restriction but permits relicensing or conveying under this
+License, you may add to a covered work material governed by the terms
+of that license document, provided that the further restriction does
+not survive such relicensing or conveying.
+
+  If you add terms to a covered work in accord with this section, you
+must place, in the relevant source files, a statement of the
+additional terms that apply to those files, or a notice indicating
+where to find the applicable terms.
+
+  Additional terms, permissive or non-permissive, may be stated in the
+form of a separately written license, or stated as exceptions;
+the above requirements apply either way.
+
+  8. Termination.
+
+  You may not propagate or modify a covered work except as expressly
+provided under this License.  Any attempt otherwise to propagate or
+modify it is void, and will automatically terminate your rights under
+this License (including any patent licenses granted under the third
+paragraph of section 11).
+
+  However, if you cease all violation of this License, then your
+license from a particular copyright holder is reinstated (a)
+provisionally, unless and until the copyright holder explicitly and
+finally terminates your license, and (b) permanently, if the copyright
+holder fails to notify you of the violation by some reasonable means
+prior to 60 days after the cessation.
+
+  Moreover, your license from a particular copyright holder is
+reinstated permanently if the copyright holder notifies you of the
+violation by some reasonable means, this is the first time you have
+received notice of violation of this License (for any work) from that
+copyright holder, and you cure the violation prior to 30 days after
+your receipt of the notice.
+
+  Termination of your rights under this section does not terminate the
+licenses of parties who have received copies or rights from you under
+this License.  If your rights have been terminated and not permanently
+reinstated, you do not qualify to receive new licenses for the same
+material under section 10.
+
+  9. Acceptance Not Required for Having Copies.
+
+  You are not required to accept this License in order to receive or
+run a copy of the Program.  Ancillary propagation of a covered work
+occurring solely as a consequence of using peer-to-peer transmission
+to receive a copy likewise does not require acceptance.  However,
+nothing other than this License grants you permission to propagate or
+modify any covered work.  These actions infringe copyright if you do
+not accept this License.  Therefore, by modifying or propagating a
+covered work, you indicate your acceptance of this License to do so.
+
+  10. Automatic Licensing of Downstream Recipients.
+
+  Each time you convey a covered work, the recipient automatically
+receives a license from the original licensors, to run, modify and
+propagate that work, subject to this License.  You are not responsible
+for enforcing compliance by third parties with this License.
+
+  An "entity transaction" is a transaction transferring control of an
+organization, or substantially all assets of one, or subdividing an
+organization, or merging organizations.  If propagation of a covered
+work results from an entity transaction, each party to that
+transaction who receives a copy of the work also receives whatever
+licenses to the work the party's predecessor in interest had or could
+give under the previous paragraph, plus a right to possession of the
+Corresponding Source of the work from the predecessor in interest, if
+the predecessor has it or can get it with reasonable efforts.
+
+  You may not impose any further restrictions on the exercise of the
+rights granted or affirmed under this License.  For example, you may
+not impose a license fee, royalty, or other charge for exercise of
+rights granted under this License, and you may not initiate litigation
+(including a cross-claim or counterclaim in a lawsuit) alleging that
+any patent claim is infringed by making, using, selling, offering for
+sale, or importing the Program or any portion of it.
+
+  11. Patents.
+
+  A "contributor" is a copyright holder who authorizes use under this
+License of the Program or a work on which the Program is based.  The
+work thus licensed is called the contributor's "contributor version".
+
+  A contributor's "essential patent claims" are all patent claims
+owned or controlled by the contributor, whether already acquired or
+hereafter acquired, that would be infringed by some manner, permitted
+by this License, of making, using, or selling its contributor version,
+but do not include claims that would be infringed only as a
+consequence of further modification of the contributor version.  For
+purposes of this definition, "control" includes the right to grant
+patent sublicenses in a manner consistent with the requirements of
+this License.
+
+  Each contributor grants you a non-exclusive, worldwide, royalty-free
+patent license under the contributor's essential patent claims, to
+make, use, sell, offer for sale, import and otherwise run, modify and
+propagate the contents of its contributor version.
+
+  In the following three paragraphs, a "patent license" is any express
+agreement or commitment, however denominated, not to enforce a patent
+(such as an express permission to practice a patent or covenant not to
+sue for patent infringement).  To "grant" such a patent license to a
+party means to make such an agreement or commitment not to enforce a
+patent against the party.
+
+  If you convey a covered work, knowingly relying on a patent license,
+and the Corresponding Source of the work is not available for anyone
+to copy, free of charge and under the terms of this License, through a
+publicly available network server or other readily accessible means,
+then you must either (1) cause the Corresponding Source to be so
+available, or (2) arrange to deprive yourself of the benefit of the
+patent license for this particular work, or (3) arrange, in a manner
+consistent with the requirements of this License, to extend the patent
+license to downstream recipients.  "Knowingly relying" means you have
+actual knowledge that, but for the patent license, your conveying the
+covered work in a country, or your recipient's use of the covered work
+in a country, would infringe one or more identifiable patents in that
+country that you have reason to believe are valid.
+
+  If, pursuant to or in connection with a single transaction or
+arrangement, you convey, or propagate by procuring conveyance of, a
+covered work, and grant a patent license to some of the parties
+receiving the covered work authorizing them to use, propagate, modify
+or convey a specific copy of the covered work, then the patent license
+you grant is automatically extended to all recipients of the covered
+work and works based on it.
+
+  A patent license is "discriminatory" if it does not include within
+the scope of its coverage, prohibits the exercise of, or is
+conditioned on the non-exercise of one or more of the rights that are
+specifically granted under this License.  You may not convey a covered
+work if you are a party to an arrangement with a third party that is
+in the business of distributing software, under which you make payment
+to the third party based on the extent of your activity of conveying
+the work, and under which the third party grants, to any of the
+parties who would receive the covered work from you, a discriminatory
+patent license (a) in connection with copies of the covered work
+conveyed by you (or copies made from those copies), or (b) primarily
+for and in connection with specific products or compilations that
+contain the covered work, unless you entered into that arrangement,
+or that patent license was granted, prior to 28 March 2007.
+
+  Nothing in this License shall be construed as excluding or limiting
+any implied license or other defenses to infringement that may
+otherwise be available to you under applicable patent law.
+
+  12. No Surrender of Others' Freedom.
+
+  If conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License.  If you cannot convey a
+covered work so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you may
+not convey it at all.  For example, if you agree to terms that obligate you
+to collect a royalty for further conveying from those to whom you convey
+the Program, the only way you could satisfy both those terms and this
+License would be to refrain entirely from conveying the Program.
+
+  13. Use with the GNU Affero General Public License.
+
+  Notwithstanding any other provision of this License, you have
+permission to link or combine any covered work with a work licensed
+under version 3 of the GNU Affero General Public License into a single
+combined work, and to convey the resulting work.  The terms of this
+License will continue to apply to the part which is the covered work,
+but the special requirements of the GNU Affero General Public License,
+section 13, concerning interaction through a network will apply to the
+combination as such.
+
+  14. Revised Versions of this License.
+
+  The Free Software Foundation may publish revised and/or new versions of
+the GNU General Public License from time to time.  Such new versions will
+be similar in spirit to the present version, but may differ in detail to
+address new problems or concerns.
+
+  Each version is given a distinguishing version number.  If the
+Program specifies that a certain numbered version of the GNU General
+Public License "or any later version" applies to it, you have the
+option of following the terms and conditions either of that numbered
+version or of any later version published by the Free Software
+Foundation.  If the Program does not specify a version number of the
+GNU General Public License, you may choose any version ever published
+by the Free Software Foundation.
+
+  If the Program specifies that a proxy can decide which future
+versions of the GNU General Public License can be used, that proxy's
+public statement of acceptance of a version permanently authorizes you
+to choose that version for the Program.
+
+  Later license versions may give you additional or different
+permissions.  However, no additional obligations are imposed on any
+author or copyright holder as a result of your choosing to follow a
+later version.
+
+  15. Disclaimer of Warranty.
+
+  THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
+APPLICABLE LAW.  EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
+HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY
+OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,
+THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM
+IS WITH YOU.  SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF
+ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
+
+  16. Limitation of Liability.
+
+  IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
+THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY
+GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE
+USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF
+DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD
+PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),
+EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF
+SUCH DAMAGES.
+
+  17. Interpretation of Sections 15 and 16.
+
+  If the disclaimer of warranty and limitation of liability provided
+above cannot be given local legal effect according to their terms,
+reviewing courts shall apply local law that most closely approximates
+an absolute waiver of all civil liability in connection with the
+Program, unless a warranty or assumption of liability accompanies a
+copy of the Program in return for a fee.
+
+                     END OF TERMS AND CONDITIONS
+
+            How to Apply These Terms to Your New Programs
+
+  If you develop a new program, and you want it to be of the greatest
+possible use to the public, the best way to achieve this is to make it
+free software which everyone can redistribute and change under these terms.
+
+  To do so, attach the following notices to the program.  It is safest
+to attach them to the start of each source file to most effectively
+state the exclusion of warranty; and each file should have at least
+the "copyright" line and a pointer to where the full notice is found.
+
+    <one line to give the program's name and a brief idea of what it does.>
+    Copyright (C) <year>  <name of author>
+
+    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/>.
+
+Also add information on how to contact you by electronic and paper mail.
+
+  If the program does terminal interaction, make it output a short
+notice like this when it starts in an interactive mode:
+
+    <program>  Copyright (C) <year>  <name of author>
+    This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
+    This is free software, and you are welcome to redistribute it
+    under certain conditions; type `show c' for details.
+
+The hypothetical commands `show w' and `show c' should show the appropriate
+parts of the General Public License.  Of course, your program's commands
+might be different; for a GUI interface, you would use an "about box".
+
+  You should also get your employer (if you work as a programmer) or school,
+if any, to sign a "copyright disclaimer" for the program, if necessary.
+For more information on this, and how to apply and follow the GNU GPL, see
+<http://www.gnu.org/licenses/>.
+
+  The GNU General Public License does not permit incorporating your program
+into proprietary programs.  If your program is a subroutine library, you
+may consider it more useful to permit linking proprietary applications with
+the library.  If this is what you want to do, use the GNU Lesser General
+Public License instead of this License.  But first, please read
+<http://www.gnu.org/philosophy/why-not-lgpl.html>.


Property changes on: trunk/openutils-mgnltagcloud/src/main/bundle/LICENSE.txt
___________________________________________________________________
Added: svn:mime-type
   + text/plain
Added: svn:keywords
   + Author Date Id Revision
Added: svn:eol-style
   + native

Added: trunk/openutils-mgnltagcloud/src/main/bundle/README.txt
===================================================================
--- trunk/openutils-mgnltagcloud/src/main/bundle/README.txt	                        (rev 0)
+++ trunk/openutils-mgnltagcloud/src/main/bundle/README.txt	2010-02-22 18:30:38 UTC (rev 2023)
@@ -0,0 +1,76 @@
+===========================================================
+
+${pom.name} ${pom.version}
+by ${pom.organization.name}
+
+===========================================================
+
+${pom.description}
+
+More information about this project can be found at:
+${pom.url}
+
+Change log and known issues can be found at:
+${pom.issueManagement.url}
+
+Source is available from the subversion repository at:
+${pom.scm.url}
+
+
+=========================================
+ INSTALLATION
+=========================================
+
+The bundle is provided as a zip file; the archive contains a number of .jar files
+(the module itself plus the required dependencies not already available in a
+standard Magnolia installation.
+
+Copy to your all the jar files in the bundle into your Magnolia instances'
+WEB-INF/lib folder, just like any other module.
+
+Please check the documentation website for information about required Magnolia
+versions.
+
+
+=========================================
+ USING MAVEN
+=========================================
+
+The preferred way to add ${pom.name} to your project is using maven.
+You can declare the following dependency in your pom.xml:
+
+    <dependency>
+      <groupId>${pom.groupId}</groupId>
+      <artifactId>${pom.artifactId}</artifactId>
+      <version>${pom.version}</version>
+    </dependency>
+
+
+
+=========================================
+ LICENSE
+=========================================
+
+Copyright Openmind 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/>.
+
+
+
+=========================================
+ GENERAL LEGAL NOTICES
+=========================================
+
+Magnolia is a registered trademark of Magnolia International Ltd.
+


Property changes on: trunk/openutils-mgnltagcloud/src/main/bundle/README.txt
___________________________________________________________________
Added: svn:mime-type
   + text/plain
Added: svn:keywords
   + Author Date Id Revision
Added: svn:eol-style
   + native

Added: trunk/openutils-mgnltagcloud/src/main/etc/header.txt
===================================================================
--- trunk/openutils-mgnltagcloud/src/main/etc/header.txt	                        (rev 0)
+++ trunk/openutils-mgnltagcloud/src/main/etc/header.txt	2010-02-22 18:30:38 UTC (rev 2023)
@@ -0,0 +1,16 @@
+
+${name} (${url})
+Copyright(C) ${year}, 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/>.
\ No newline at end of file


Property changes on: trunk/openutils-mgnltagcloud/src/main/etc/header.txt
___________________________________________________________________
Added: svn:mime-type
   + text/plain
Added: svn:keywords
   + Author Date Id Revision
Added: svn:eol-style
   + native

Added: trunk/openutils-mgnltagcloud/src/main/java/net/sourceforge/openutils/mgnltagcloud/bean/TagCloud.java
===================================================================
--- trunk/openutils-mgnltagcloud/src/main/java/net/sourceforge/openutils/mgnltagcloud/bean/TagCloud.java	                        (rev 0)
+++ trunk/openutils-mgnltagcloud/src/main/java/net/sourceforge/openutils/mgnltagcloud/bean/TagCloud.java	2010-02-22 18:30:38 UTC (rev 2023)
@@ -0,0 +1,221 @@
+/**
+ *
+ * Magnolia tag cloud module (http://www.openmindlab.com/lab/products/mgnltasks.html)
+ * Copyright(C) null-2010, Openmind S.r.l. http://www.openmindonline.it
+ *
+ *  This program is free software: you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation, either version 3 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package net.sourceforge.openutils.mgnltagcloud.bean;
+
+import info.magnolia.cms.beans.config.ContentRepository;
+
+import java.util.HashMap;
+import java.util.Map;
+
+import org.apache.commons.lang.builder.EqualsBuilder;
+
+
+/**
+ * @author molaschi
+ * @version $Id$
+ */
+public class TagCloud
+{
+
+    private String repository = ContentRepository.WEBSITE;
+
+    private String path = "/";
+
+    private String name;
+
+    private String propertyName = "tags";
+
+    private int count = 20;
+
+    private boolean enabled = true;
+
+    private boolean cacheAndObserve = true;
+
+    private Map<String, Integer> tags = new HashMap<String, Integer>();
+
+    /**
+     * Returns the repository.
+     * @return the repository
+     */
+    public String getRepository()
+    {
+        return repository;
+    }
+
+    /**
+     * Sets the repository.
+     * @param repository the repository to set
+     */
+    public void setRepository(String repository)
+    {
+        this.repository = repository;
+    }
+
+    /**
+     * Returns the path.
+     * @return the path
+     */
+    public String getPath()
+    {
+        return path;
+    }
+
+    /**
+     * Sets the path.
+     * @param path the path to set
+     */
+    public void setPath(String path)
+    {
+        this.path = path;
+    }
+
+    /**
+     * Returns the name.
+     * @return the name
+     */
+    public String getName()
+    {
+        return name;
+    }
+
+    /**
+     * Sets the name.
+     * @param name the name to set
+     */
+    public void setName(String name)
+    {
+        this.name = name;
+    }
+
+    /**
+     * Returns the propertyName.
+     * @return the propertyName
+     */
+    public String getPropertyName()
+    {
+        return propertyName;
+    }
+
+    /**
+     * Sets the propertyName.
+     * @param propertyName the propertyName to set
+     */
+    public void setPropertyName(String propertyName)
+    {
+        this.propertyName = propertyName;
+    }
+
+    /**
+     * Returns the count.
+     * @return the count
+     */
+    public int getCount()
+    {
+        return count;
+    }
+
+    /**
+     * Sets the count.
+     * @param count the count to set
+     */
+    public void setCount(int count)
+    {
+        this.count = count;
+    }
+
+    /**
+     * Returns the enabled.
+     * @return the enabled
+     */
+    public boolean isEnabled()
+    {
+        return enabled;
+    }
+
+    /**
+     * Sets the enabled.
+     * @param enabled the enabled to set
+     */
+    public void setEnabled(boolean enabled)
+    {
+        this.enabled = enabled;
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public String toString()
+    {
+        StringBuffer sb = new StringBuffer();
+        sb.append(repository).append("@").append(path).append("@").append(propertyName).append("@").append(count);
+        return sb.toString();
+    }
+
+    /**
+     * Returns the tags.
+     * @return the tags
+     */
+    public Map<String, Integer> getTags()
+    {
+        return tags;
+    }
+
+    /**
+     * Sets the tags.
+     * @param tags the tags to set
+     */
+    public void setTags(Map<String, Integer> tags)
+    {
+        this.tags = tags;
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public boolean equals(Object obj)
+    {
+        if (obj == null || !(obj instanceof TagCloud))
+        {
+            return false;
+        }
+        return EqualsBuilder.reflectionEquals(this, obj, new String[]{"tags", "enabled", "name" });
+    }
+
+    /**
+     * Returns the cacheAndObserve.
+     * @return the cacheAndObserve
+     */
+    public boolean isCacheAndObserve()
+    {
+        return cacheAndObserve;
+    }
+
+    /**
+     * Sets the cacheAndObserve.
+     * @param cacheAndObserve the cacheAndObserve to set
+     */
+    public void setCacheAndObserve(boolean cacheAndObserve)
+    {
+        this.cacheAndObserve = cacheAndObserve;
+    }
+
+}


Property changes on: trunk/openutils-mgnltagcloud/src/main/java/net/sourceforge/openutils/mgnltagcloud/bean/TagCloud.java
___________________________________________________________________
Added: svn:mime-type
   + text/plain
Added: svn:keywords
   + Author Date Id Revision
Added: svn:eol-style
   + native

Added: trunk/openutils-mgnltagcloud/src/main/java/net/sourceforge/openutils/mgnltagcloud/dialog/TagCloudDialog.java
===================================================================
--- trunk/openutils-mgnltagcloud/src/main/java/net/sourceforge/openutils/mgnltagcloud/dialog/TagCloudDialog.java	                        (rev 0)
+++ trunk/openutils-mgnltagcloud/src/main/java/net/sourceforge/openutils/mgnltagcloud/dialog/TagCloudDialog.java	2010-02-22 18:30:38 UTC (rev 2023)
@@ -0,0 +1,205 @@
+/**
+ *
+ * Magnolia tag cloud module (http://www.openmindlab.com/lab/products/mgnltasks.html)
+ * Copyright(C) null-2010, Openmind S.r.l. http://www.openmindonline.it
+ *
+ *  This program is free software: you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation, either version 3 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package net.sourceforge.openutils.mgnltagcloud.dialog;
+
+import info.magnolia.cms.core.Content;
+import info.magnolia.cms.security.AccessDeniedException;
+import info.magnolia.module.admininterface.dialogs.ConfiguredDialog;
+
+import java.lang.reflect.InvocationTargetException;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.Map;
+
+import javax.jcr.RepositoryException;
+import javax.jcr.Value;
+import javax.servle...
 
[truncated message content]

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

[<cs...@us...>]

Revision: 2115
          http://openutils.svn.sourceforge.net/openutils/?rev=2115&view=rev
Author:   cstrap
Date:     2010-03-09 16:13:07 +0000 (Tue, 09 Mar 2010)

Log Message:
-----------
TAGCLOUD-2 Added develop property to dialog: it allows to show the hidden select
New minified fcbkcomplete.js

Modified Paths:
--------------
    trunk/openutils-mgnltagcloud/src/main/java/net/sourceforge/openutils/mgnltagcloud/dialog/TagCloudDialog.java
    trunk/openutils-mgnltagcloud/src/main/java/net/sourceforge/openutils/mgnltagcloud/dialog/TagCloudDialogSafeMultivalueSaveHandler.java
    trunk/openutils-mgnltagcloud/src/main/resources/dialog/tagcloud.ftl
    trunk/openutils-mgnltagcloud/src/main/resources/mgnl-resources/tagcloud/js/jquery.fcbkcomplete.js
    trunk/openutils-mgnltagcloud/src/main/resources/mgnl-resources/tagcloud/js/jquery.fcbkcomplete.min.js
    trunk/openutils-mgnltagcloud/src/test/java/net/sourceforge/openutils/mgnltagcloud/manager/TagCloudManagerTest.java
    trunk/openutils-testing4web/src/main/java/net/sourceforge/openutils/testing4web/TestServletOptions.java
    trunk/openutils-testing4web/src/main/java/net/sourceforge/openutils/testing4web/TestTldLocationsCache.java

Modified: trunk/openutils-mgnltagcloud/src/main/java/net/sourceforge/openutils/mgnltagcloud/dialog/TagCloudDialog.java
===================================================================
--- trunk/openutils-mgnltagcloud/src/main/java/net/sourceforge/openutils/mgnltagcloud/dialog/TagCloudDialog.java	2010-03-08 17:50:58 UTC (rev 2114)
+++ trunk/openutils-mgnltagcloud/src/main/java/net/sourceforge/openutils/mgnltagcloud/dialog/TagCloudDialog.java	2010-03-09 16:13:07 UTC (rev 2115)
@@ -20,6 +20,7 @@
 package net.sourceforge.openutils.mgnltagcloud.dialog;
 
 import info.magnolia.cms.core.Content;
+import info.magnolia.cms.core.SystemProperty;
 import info.magnolia.cms.security.AccessDeniedException;
 import info.magnolia.module.admininterface.dialogs.ConfiguredDialog;
 
@@ -96,7 +97,8 @@
         Collection<String> tagList = new ArrayList<String>();
         try
         {
-            if (getStorageNode() != null && getStorageNode().getNodeData(this.getName()) != null
+            if (getStorageNode() != null
+                && getStorageNode().getNodeData(this.getName()) != null
                 && getStorageNode().getNodeData(this.getName()).getValues() != null)
             {
                 for (Value value : getStorageNode().getNodeData(this.getName()).getValues())
@@ -174,25 +176,9 @@
             values.put("count", tagCloud.getTags().get(key));
             tags.put(key, values);
         }
+
         parameters.put("configuredTagList", tags);
-        // MapUtils.lazyMap(tagCloud.getTags(), new Transformer()
-// {
-//
-// public Object transform(Object input)
-// {
-// Map<String, Object> values = new HashMap<String, Object>(2);
-// values.put("selected", null);
-// values.put("count", tagCloud.getTags().get(input));
-// return null;
-// }
-// }));
 
-// Content content = hmConfig.getContent("/modules/tagcloud/tagCloudsRepoConfig");
-// content = content.getContent(this.getConfigValue("tagCloudName"));
-// log.info("TagList: {}", content.getNodeData("tagList").getString());
-// String[] configuredTagList = (content.getNodeData("tagList").getString()).split(",");
-//            
-
         // load the script once: if there are multiple instances
         String jQueryAttributeName = "info.magnolia.cms.gui.dialog.jquery.loaded";
         boolean includejquery = getRequest().getAttribute(jQueryAttributeName) == null;
@@ -201,5 +187,7 @@
         {
             getRequest().setAttribute(jQueryAttributeName, "true");
         }
+
+        parameters.put("develop", SystemProperty.getBooleanProperty("magnolia.develop"));
     }
 }

Modified: trunk/openutils-mgnltagcloud/src/main/java/net/sourceforge/openutils/mgnltagcloud/dialog/TagCloudDialogSafeMultivalueSaveHandler.java
===================================================================
--- trunk/openutils-mgnltagcloud/src/main/java/net/sourceforge/openutils/mgnltagcloud/dialog/TagCloudDialogSafeMultivalueSaveHandler.java	2010-03-08 17:50:58 UTC (rev 2114)
+++ trunk/openutils-mgnltagcloud/src/main/java/net/sourceforge/openutils/mgnltagcloud/dialog/TagCloudDialogSafeMultivalueSaveHandler.java	2010-03-09 16:13:07 UTC (rev 2115)
@@ -91,7 +91,6 @@
 
     }
 
-    @SuppressWarnings("deprecation")
     private NodeData getOrCreateAndSet(Content node, String name, Value[] value) throws AccessDeniedException,
         RepositoryException
     {

Modified: trunk/openutils-mgnltagcloud/src/main/resources/dialog/tagcloud.ftl
===================================================================
--- trunk/openutils-mgnltagcloud/src/main/resources/dialog/tagcloud.ftl	2010-03-08 17:50:58 UTC (rev 2114)
+++ trunk/openutils-mgnltagcloud/src/main/resources/dialog/tagcloud.ftl	2010-03-09 16:13:07 UTC (rev 2115)
@@ -1,7 +1,12 @@
 [#if includejquery]
 <script type="text/javascript" src="${request.contextPath}/.resources/tagcloud/js/jquery.min.js"></script>
 [/#if]
+
+[#if develop]
 <script type="text/javascript" src="${request.contextPath}/.resources/tagcloud/js/jquery.fcbkcomplete.js"></script>
+[#else]
+<script type="text/javascript" src="${request.contextPath}/.resources/tagcloud/js/jquery.fcbkcomplete.min.js"></script>
+[/#if]
 
 <link rel="stylesheet" type="text/css" href="${request.contextPath}/.resources/tagcloud/css/style.css" />
 
@@ -14,11 +19,10 @@
   [/#if]
 </select>
 
-
-
 <script language="JavaScript">
-  $(document).ready(function() {        
-      var tagCloud = $("#${name}");
+  // <![CDATA[
+  jQuery(document).ready(function() {        
+      var tagCloud = jQuery("#${name}");
       
       tagCloud.fcbkcomplete({
         cache: true,
@@ -30,5 +34,5 @@
         maxshownitems: 10        
       });    
   });
-  
+  // ]]>
 </script>

Modified: trunk/openutils-mgnltagcloud/src/main/resources/mgnl-resources/tagcloud/js/jquery.fcbkcomplete.js
===================================================================
--- trunk/openutils-mgnltagcloud/src/main/resources/mgnl-resources/tagcloud/js/jquery.fcbkcomplete.js	2010-03-08 17:50:58 UTC (rev 2114)
+++ trunk/openutils-mgnltagcloud/src/main/resources/mgnl-resources/tagcloud/js/jquery.fcbkcomplete.js	2010-03-09 16:13:07 UTC (rev 2115)
@@ -67,7 +67,7 @@
 	        	
 		        function createFCBK()
 		        {	    
-		        	element.hide();
+		           // This element is hide not in normal mode: element.hide();
 		           /*
 		            * Magnolia FIX
 		            * */

Modified: trunk/openutils-mgnltagcloud/src/main/resources/mgnl-resources/tagcloud/js/jquery.fcbkcomplete.min.js
===================================================================
--- trunk/openutils-mgnltagcloud/src/main/resources/mgnl-resources/tagcloud/js/jquery.fcbkcomplete.min.js	2010-03-08 17:50:58 UTC (rev 2114)
+++ trunk/openutils-mgnltagcloud/src/main/resources/mgnl-resources/tagcloud/js/jquery.fcbkcomplete.min.js	2010-03-09 16:13:07 UTC (rev 2115)
@@ -50,4 +50,4 @@
  * onselect			- fire event on item select
  * onremove			- fire event on item remove
  */
-jQuery(function($){$.fn.fcbkcomplete=function(opt){return this.each(function(){function init(){createFCBK();preSet();addInput(0)}function createFCBK(){element.hide();element.attr("multiple","multiple");if(element.attr("name").indexOf("[]")==-1){element.attr("name",element.attr("name")+"[]")}holder=$(document.createElement("ul"));holder.attr("class","holder");element.after(holder);complete=$(document.createElement("div"));complete.addClass("facebook-auto");complete.append('<div class="default">'+options.complete_text+"</div>");if(browser_msie){complete.append('<iframe class="ie6fix" scrolling="no" frameborder="0"></iframe>');browser_msie_frame=complete.children('.ie6fix')}feed=$(document.createElement("ul"));feed.attr("id",elemid+"_feed");complete.prepend(feed);holder.after(complete);feed.css("width",complete.width())}function preSet(){element.children("option").each(function(i,option){option=$(option);if(option.hasClass("selected")){addItem(option.text(),option.val(),true);option.attr("selected","selected")}else{option.removeAttr("selected")}cache.push({caption:option.text(),value:option.val()});search_string+=""+(cache.length-1)+":"+option.text()+";"})}$(this).bind("addItem",function(event,data){addItem(data.title,data.value)});function addItem(title,value,preadded){var li=document.createElement("li");var txt=document.createTextNode(title);var aclose=document.createElement("a");$(li).attr({"class":"bit-box","rel":value});$(li).prepend(txt);$(aclose).attr({"class":"closebutton","href":"#"});li.appendChild(aclose);holder.append(li);$(aclose).click(function(){$(this).parent("li").fadeOut("fast",function(){removeItem($(this))});return false});if(!preadded){$("#"+elemid+"_annoninput").remove();var _item;addInput(1);if(element.children("option[value="+value+"]").length){_item=element.children("option[value="+value+"]");_item.get(0).setAttribute("selected","selected");if(!_item.hasClass("selected")){_item.addClass("selected")}}else{var _item=$(document.createElement("option"));_item.attr("value",value).get(0).setAttribute("selected","selected");_item.attr("value",value).addClass("selected");_item.text(title);element.append(_item)}if(options.onselect.length){funCall(options.onselect,_item)}}holder.children("li.bit-box.deleted").removeClass("deleted");feed.hide();browser_msie?browser_msie_frame.hide():''}function removeItem(item){if(options.onremove.length){var _item=element.children("option[value="+item.attr("rel")+"]");funCall(options.onremove,_item)}element.children("option[value="+item.attr("rel")+"]").removeAttr("selected");element.children("option[value="+item.attr("rel")+"]").removeClass("selected");item.remove();deleting=0}function addInput(focusme){var li=$(document.createElement("li"));var input=$(document.createElement("input"));li.attr({"class":"bit-input","id":elemid+"_annoninput"});input.attr({"type":"text","class":"maininput","size":"1"});holder.append(li.append(input));input.focus(function(){complete.fadeIn("fast")});input.blur(function(){complete.fadeOut("fast")});holder.click(function(){input.focus();if(feed.length&&input.val().length){feed.show()}else{feed.hide();browser_msie?browser_msie_frame.hide():'';complete.children(".default").show()}});input.keypress(function(event){if(event.keyCode==13){return false}input.attr("size",input.val().length+1)});input.keydown(function(event){if(event.keyCode==191){event.preventDefault();return false}});input.keyup(function(event){var etext=xssPrevent(input.val());if(event.keyCode==8&&etext.length==0){feed.hide();browser_msie?browser_msie_frame.hide():'';if(holder.children("li.bit-box.deleted").length==0){holder.children("li.bit-box:last").addClass("deleted");return false}else{if(deleting){return}deleting=1;holder.children("li.bit-box.deleted").fadeOut("fast",function(){removeItem($(this));return false})}}if(event.keyCode!=40&&event.keyCode!=38&&etext.length!=0){counter=0;if(options.json_url){if(options.cache&&json_cache){addMembers(etext);bindEvents()}else{$.getJSON(options.json_url+"?tag="+etext,null,function(data){addMembers(etext,data);json_cache=true;bindEvents()})}}else{addMembers(etext);bindEvents()}complete.children(".default").hide();feed.show()}});if(focusme){setTimeout(function(){input.focus();complete.children(".default").show()},1)}}function addMembers(etext,data){feed.html('');if(!options.cache){cache=new Array();search_string=""}addTextItem(etext);if(data!=null&&data.length){$.each(data,function(i,val){cache.push({caption:val.caption,value:val.value});search_string+=""+(cache.length-1)+":"+val.caption+";"})}var maximum=options.maxshownitems<cache.length?options.maxshownitems:cache.length;var filter="i";if(options.filter_case){filter=""}var myregexp,match;try{myregexp=eval('/(?:^|;)\\s*(\\d+)\\s*:[^;]*?'+etext+'[^;]*/g'+filter);match=myregexp.exec(search_string)}catch(ex){};var content='';while(match!=null&&maximum>0){var id=match[1];var object=cache[id];if(options.filter_selected&&element.children("option[value="+object.value+"]").hasClass("selected")){}else{content+='<li rel="'+object.value+'">'+itemIllumination(object.caption,etext)+'</li>';counter++;maximum--}match=myregexp.exec(search_string)}feed.append(content);if(options.firstselected){focuson=feed.children("li:visible:first");focuson.addClass("auto-focus")}if(counter>options.height){feed.css({"height":(options.height*24)+"px","overflow":"auto"});if(browser_msie){browser_msie_frame.css({"height":(options.height*24)+"px","width":feed.width()+"px"}).show()}}else{feed.css("height","auto");if(browser_msie){browser_msie_frame.css({"height":feed.height()+"px","width":feed.width()+"px"}).show()}}}function itemIllumination(text,etext){if(options.filter_case){try{eval("var text = text.replace(/(.*)("+etext+")(.*)/gi,'$1<em>$2</em>$3');")}catch(ex){}}else{try{eval("var text = text.replace(/(.*)("+etext.toLowerCase()+")(.*)/gi,'$1<em>$2</em>$3');")}catch(ex){}}return text}function bindFeedEvent(){feed.children("li").mouseover(function(){feed.children("li").removeClass("auto-focus");$(this).addClass("auto-focus");focuson=$(this)});feed.children("li").mouseout(function(){$(this).removeClass("auto-focus");focuson=null})}function removeFeedEvent(){feed.children("li").unbind("mouseover");feed.children("li").unbind("mouseout");feed.mousemove(function(){bindFeedEvent();feed.unbind("mousemove")})}function bindEvents(){var maininput=$("#"+elemid+"_annoninput").children(".maininput");bindFeedEvent();feed.children("li").unbind("mousedown");feed.children("li").mousedown(function(){var option=$(this);addItem(option.text(),option.attr("rel"));feed.hide();browser_msie?browser_msie_frame.hide():'';complete.hide()});maininput.unbind("keydown");maininput.keydown(function(event){if(event.keyCode==191){event.preventDefault();return false}if(event.keyCode!=8){holder.children("li.bit-box.deleted").removeClass("deleted")}if(event.keyCode==13&&checkFocusOn()){var option=focuson;addItem(option.text(),option.attr("rel"));complete.hide();event.preventDefault();focuson=null;return false}if(event.keyCode==13&&!checkFocusOn()){if(options.newel){var value=xssPrevent($(this).val());addItem(value,value);complete.hide();event.preventDefault();focuson=null}return false}if(event.keyCode==40){removeFeedEvent();if(focuson==null||focuson.length==0){focuson=feed.children("li:visible:first");feed.get(0).scrollTop=0}else{focuson.removeClass("auto-focus");focuson=focuson.nextAll("li:visible:first");var prev=parseInt(focuson.prevAll("li:visible").length,10);var next=parseInt(focuson.nextAll("li:visible").length,10);if((prev>Math.round(options.height/2)||next<=Math.round(options.height/2))&&typeof(focuson.get(0))!="undefined"){feed.get(0).scrollTop=parseInt(focuson.get(0).scrollHeight,10)*(prev-Math.round(options.height/2))}}feed.children("li").removeClass("auto-focus");focuson.addClass("auto-focus")}if(event.keyCode==38){removeFeedEvent();if(focuson==null||focuson.length==0){focuson=feed.children("li:visible:last");feed.get(0).scrollTop=parseInt(focuson.get(0).scrollHeight,10)*(parseInt(feed.children("li:visible").length,10)-Math.round(options.height/2))}else{focuson.removeClass("auto-focus");focuson=focuson.prevAll("li:visible:first");var prev=parseInt(focuson.prevAll("li:visible").length,10);var next=parseInt(focuson.nextAll("li:visible").length,10);if((next>Math.round(options.height/2)||prev<=Math.round(options.height/2))&&typeof(focuson.get(0))!="undefined"){feed.get(0).scrollTop=parseInt(focuson.get(0).scrollHeight,10)*(prev-Math.round(options.height/2))}}feed.children("li").removeClass("auto-focus");focuson.addClass("auto-focus")}})}function addTextItem(value){if(options.newel){feed.children("li[fckb=1]").remove();if(value.length==0){return}var li=$(document.createElement("li"));li.attr({"rel":value,"fckb":"1"}).html(value);feed.prepend(li);counter++}else{return}}function funCall(func,item){var _object="";for(i=0;i<item.get(0).attributes.length;i++){if(item.get(0).attributes[i].nodeValue!=null){_object+="\"_"+item.get(0).attributes[i].nodeName+"\": \""+item.get(0).attributes[i].nodeValue+"\","}}_object="{"+_object+" notinuse: 0}";try{eval(func+"("+_object+")")}catch(ex){}}function checkFocusOn(){if(focuson==null){return false}if(focuson.length==0){return false}return true}function xssPrevent(string){string=string.replace(/[\"\'][\s]*javascript:(.*)[\"\']/g,"\"\"");string=string.replace(/script(.*)/g,"");string=string.replace(/eval\((.*)\)/g,"");string=string.replace('/([\x00-\x08,\x0b-\x0c,\x0e-\x19])/','');return string}var options=$.extend({json_url:null,cache:false,height:"10",newel:false,firstselected:false,filter_case:false,filter_hide:false,complete_text:"Start to type...",maxshownitems:30,onselect:"",onremove:""},opt);var holder=null;var feed=null;var complete=null;var counter=0;var cache=new Array();var json_cache=false;var search_string="";var focuson=null;var deleting=0;var browser_msie="\v"=="v";var browser_msie_frame;var element=$(this);var elemid=element.attr("id");init();return this})}});
\ No newline at end of file
+jQuery(function($){$.fn.fcbkcomplete=function(opt){return this.each(function(){function init(){createFCBK();preSet();addInput(0)}function createFCBK(){element.hide();holder=$(document.createElement("ul"));holder.attr("class","holder");element.after(holder);complete=$(document.createElement("div"));complete.addClass("facebook-auto");complete.append('<div class="default">'+options.complete_text+"</div>");if(browser_msie){complete.append('<iframe class="ie6fix" scrolling="no" frameborder="0"></iframe>');browser_msie_frame=complete.children(".ie6fix")}feed=$(document.createElement("ul"));feed.attr("id",elemid+"_feed");complete.prepend(feed);holder.after(complete);feed.css("width",complete.width())}function preSet(){element.children("option").each(function(i,option){option=$(option);if(option.hasClass("selected")){addItem(option.text(),option.val(),true);option.attr("selected","selected")}else{option.removeAttr("selected")}cache.push({caption:option.text(),value:option.val()});search_string+=""+(cache.length-1)+":"+option.text()+";"})}$(this).bind("addItem",function(event,data){addItem(data.title,data.value)});function addItem(title,value,preadded){var li=document.createElement("li");var txt=document.createTextNode(title.replace(/\s\(\d\)/,""));var aclose=document.createElement("a");$(li).attr({"class":"bit-box",rel:value});$(li).prepend(txt);$(aclose).attr({"class":"closebutton",href:"#"});li.appendChild(aclose);holder.append(li);$(aclose).click(function(){$(this).parent("li").fadeOut("fast",function(){removeItem($(this))});return false});if(!preadded){$("#"+elemid+"_annoninput").remove();var _item;addInput(1);if(element.children("option[value="+value+"]").length){_item=element.children("option[value="+value+"]");_item.get(0).setAttribute("selected","selected");if(!_item.hasClass("selected")){_item.addClass("selected")}}else{var _item=$(document.createElement("option"));_item.attr("value",value).get(0).setAttribute("selected","selected");_item.attr("value",value).addClass("selected");_item.text(title);element.append(_item)}if(options.onselect.length){funCall(options.onselect,_item)}}holder.children("li.bit-box.deleted").removeClass("deleted");feed.hide();browser_msie?browser_msie_frame.hide():""}function removeItem(item){if(options.onremove.length){var _item=element.children("option[value="+item.attr("rel")+"]");funCall(options.onremove,_item)}element.children("option[value="+item.attr("rel")+"]").removeAttr("selected");element.children("option[value="+item.attr("rel")+"]").removeClass("selected");item.remove();deleting=0}function addInput(focusme){var li=$(document.createElement("li"));var input=$(document.createElement("input"));li.attr({"class":"bit-input",id:elemid+"_annoninput"});input.attr({type:"text","class":"maininput",size:"1"});holder.append(li.append(input));input.focus(function(){complete.fadeIn("fast")});input.blur(function(){complete.fadeOut("fast")});holder.click(function(){input.focus();if(feed.length&&input.val().length){feed.show()}else{feed.hide();browser_msie?browser_msie_frame.hide():"";complete.children(".default").show()}});input.keypress(function(event){if(event.keyCode==13||event.keyCode==188){return false}input.attr("size",input.val().length+1)});input.keydown(function(event){if(event.keyCode==191){event.preventDefault();return false}});input.keyup(function(event){var etext=xssPrevent(input.val());if(event.keyCode==8&&etext.length==0){feed.hide();browser_msie?browser_msie_frame.hide():"";if(holder.children("li.bit-box.deleted").length==0){holder.children("li.bit-box:last").addClass("deleted");return false}else{if(deleting){return}deleting=1;holder.children("li.bit-box.deleted").fadeOut("fast",function(){removeItem($(this));return false})}}if(event.keyCode!=40&&event.keyCode!=38&&etext.length!=0){counter=0;if(options.json_url){if(options.cache&&json_cache){addMembers(etext);bindEvents()}else{$.getJSON(options.json_url+"?tag="+etext,null,function(data){addMembers(etext,data);json_cache=true;bindEvents()})}}else{addMembers(etext);bindEvents()}complete.children(".default").hide();feed.show()}});if(focusme){setTimeout(function(){input.focus();complete.children(".default").show()},1)}}function addMembers(etext,data){feed.html("");if(!options.cache){cache=new Array();search_string=""}addTextItem(etext);if(data!=null&&data.length){$.each(data,function(i,val){cache.push({caption:val.caption,value:val.value});search_string+=""+(cache.length-1)+":"+val.caption+";"})}var maximum=options.maxshownitems<cache.length?options.maxshownitems:cache.length;var filter="i";if(options.filter_case){filter=""}var myregexp,match;try{myregexp=eval("/(?:^|;)\\s*(\\d+)\\s*:[^;]*?"+etext+"[^;]*/g"+filter);match=myregexp.exec(search_string)}catch(ex){}var content="";while(match!=null&&maximum>0){var id=match[1];var object=cache[id];if(options.filter_selected&&element.children("option[value="+object.value+"]").hasClass("selected")){}else{content+='<li rel="'+object.value+'">'+itemIllumination(object.caption,etext)+"</li>";counter++;maximum--}match=myregexp.exec(search_string)}feed.append(content);if(options.firstselected){focuson=feed.children("li:visible:first");focuson.addClass("auto-focus")}if(counter>options.height){feed.css({height:(options.height*24)+"px",overflow:"auto"});if(browser_msie){browser_msie_frame.css({height:(options.height*24)+"px",width:feed.width()+"px"}).show()}}else{feed.css("height","auto");if(browser_msie){browser_msie_frame.css({height:feed.height()+"px",width:feed.width()+"px"}).show()}}}function itemIllumination(text,etext){if(options.filter_case){try{eval("var text = text.replace(/(.*)("+etext+")(.*)/gi,'$1<em>$2</em>$3');")}catch(ex){}}else{try{eval("var text = text.replace(/(.*)("+etext.toLowerCase()+")(.*)/gi,'$1<em>$2</em>$3');")}catch(ex){}}return text}function bindFeedEvent(){feed.children("li").mouseover(function(){feed.children("li").removeClass("auto-focus");$(this).addClass("auto-focus");focuson=$(this)});feed.children("li").mouseout(function(){$(this).removeClass("auto-focus");focuson=null})}function removeFeedEvent(){feed.children("li").unbind("mouseover");feed.children("li").unbind("mouseout");feed.mousemove(function(){bindFeedEvent();feed.unbind("mousemove")})}function bindEvents(){var maininput=$("#"+elemid+"_annoninput").children(".maininput");bindFeedEvent();feed.children("li").unbind("mousedown");feed.children("li").mousedown(function(){var option=$(this);addItem(option.text(),option.attr("rel"));feed.hide();browser_msie?browser_msie_frame.hide():"";complete.hide()});maininput.unbind("keydown");maininput.keydown(function(event){if(event.keyCode==191){event.preventDefault();return false}if(event.keyCode!=8){holder.children("li.bit-box.deleted").removeClass("deleted")}if((event.keyCode==13||event.keyCode==188)&&checkFocusOn()){var option=focuson;addItem(option.text(),option.attr("rel"));complete.hide();event.preventDefault();focuson=null;return false}if((event.keyCode==13||event.keyCode==188)&&!checkFocusOn()){if(options.newel){var value=xssPrevent($(this).val());addItem(value,value);complete.hide();event.preventDefault();focuson=null}return false}if(event.keyCode==40){removeFeedEvent();if(focuson==null||focuson.length==0){focuson=feed.children("li:visible:first");feed.get(0).scrollTop=0}else{focuson.removeClass("auto-focus");focuson=focuson.nextAll("li:visible:first");var prev=parseInt(focuson.prevAll("li:visible").length,10);var next=parseInt(focuson.nextAll("li:visible").length,10);if((prev>Math.round(options.height/2)||next<=Math.round(options.height/2))&&typeof(focuson.get(0))!="undefined"){feed.get(0).scrollTop=parseInt(focuson.get(0).scrollHeight,10)*(prev-Math.round(options.height/2))}}feed.children("li").removeClass("auto-focus");focuson.addClass("auto-focus")}if(event.keyCode==38){removeFeedEvent();if(focuson==null||focuson.length==0){focuson=feed.children("li:visible:last");feed.get(0).scrollTop=parseInt(focuson.get(0).scrollHeight,10)*(parseInt(feed.children("li:visible").length,10)-Math.round(options.height/2))}else{focuson.removeClass("auto-focus");focuson=focuson.prevAll("li:visible:first");var prev=parseInt(focuson.prevAll("li:visible").length,10);var next=parseInt(focuson.nextAll("li:visible").length,10);if((next>Math.round(options.height/2)||prev<=Math.round(options.height/2))&&typeof(focuson.get(0))!="undefined"){feed.get(0).scrollTop=parseInt(focuson.get(0).scrollHeight,10)*(prev-Math.round(options.height/2))}}feed.children("li").removeClass("auto-focus");focuson.addClass("auto-focus")}})}function addTextItem(value){if(options.newel){feed.children("li[fckb=1]").remove();if(value.length==0){return}var li=$(document.createElement("li"));li.attr({rel:value,fckb:"1"}).html(value);feed.prepend(li);counter++}else{return}}function funCall(func,item){var _object="";for(i=0;i<item.get(0).attributes.length;i++){if(item.get(0).attributes[i].nodeValue!=null){_object+='"_'+item.get(0).attributes[i].nodeName+'": "'+item.get(0).attributes[i].nodeValue+'",'}}_object="{"+_object+" notinuse: 0}";try{eval(func+"("+_object+")")}catch(ex){}}function checkFocusOn(){if(focuson==null){return false}if(focuson.length==0){return false}return true}function xssPrevent(string){string=string.replace(/[\"\'][\s]*javascript:(.*)[\"\']/g,'""');string=string.replace(/script(.*)/g,"");string=string.replace(/eval\((.*)\)/g,"");string=string.replace("/([\x00-\x08,\x0b-\x0c,\x0e-\x19])/","");return string}var options=$.extend({json_url:null,cache:false,height:"10",newel:false,firstselected:false,filter_case:false,filter_hide:false,complete_text:"Start to type...",maxshownitems:30,onselect:"",onremove:""},opt);var holder=null;var feed=null;var complete=null;var counter=0;var cache=new Array();var json_cache=false;var search_string="";var focuson=null;var deleting=0;var browser_msie="\v"=="v";var browser_msie_frame;var element=$(this);var elemid=element.attr("id");init();return this})}});
\ No newline at end of file

Modified: trunk/openutils-mgnltagcloud/src/test/java/net/sourceforge/openutils/mgnltagcloud/manager/TagCloudManagerTest.java
===================================================================
--- trunk/openutils-mgnltagcloud/src/test/java/net/sourceforge/openutils/mgnltagcloud/manager/TagCloudManagerTest.java	2010-03-08 17:50:58 UTC (rev 2114)
+++ trunk/openutils-mgnltagcloud/src/test/java/net/sourceforge/openutils/mgnltagcloud/manager/TagCloudManagerTest.java	2010-03-09 16:13:07 UTC (rev 2115)
@@ -228,7 +228,6 @@
         assertEquals(tags.get("tag1 tag4"), mapProperties.get("max"));
     }
 
-    @SuppressWarnings("deprecation")
     @Override
     protected void setUp() throws Exception
     {

Modified: trunk/openutils-testing4web/src/main/java/net/sourceforge/openutils/testing4web/TestServletOptions.java
===================================================================
--- trunk/openutils-testing4web/src/main/java/net/sourceforge/openutils/testing4web/TestServletOptions.java	2010-03-08 17:50:58 UTC (rev 2114)
+++ trunk/openutils-testing4web/src/main/java/net/sourceforge/openutils/testing4web/TestServletOptions.java	2010-03-09 16:13:07 UTC (rev 2115)
@@ -55,6 +55,7 @@
      * @return
      * @see java.lang.Object#hashCode()
      */
+    @Override
     public int hashCode()
     {
         return options.hashCode();
@@ -65,6 +66,7 @@
      * @return
      * @see java.lang.Object#equals(java.lang.Object)
      */
+    @Override
     public boolean equals(Object obj)
     {
         return options.equals(obj);
@@ -355,6 +357,7 @@
      * @return
      * @see java.lang.Object#toString()
      */
+    @Override
     public String toString()
     {
         return options.toString();

Modified: trunk/openutils-testing4web/src/main/java/net/sourceforge/openutils/testing4web/TestTldLocationsCache.java
===================================================================
--- trunk/openutils-testing4web/src/main/java/net/sourceforge/openutils/testing4web/TestTldLocationsCache.java	2010-03-08 17:50:58 UTC (rev 2114)
+++ trunk/openutils-testing4web/src/main/java/net/sourceforge/openutils/testing4web/TestTldLocationsCache.java	2010-03-09 16:13:07 UTC (rev 2115)
@@ -82,6 +82,7 @@
         ctxt2 = ctxt;
     }
 
+    @Override
     public String[] getLocation(String uri) throws JasperException
     {
         if (!initialized)


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

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

[<cs...@us...>]

Revision: 2116
          http://openutils.svn.sourceforge.net/openutils/?rev=2116&view=rev
Author:   cstrap
Date:     2010-03-09 16:17:58 +0000 (Tue, 09 Mar 2010)

Log Message:
-----------
TAGCLOUD-3 Added sample dialog and template

Modified Paths:
--------------
    trunk/openutils-mgnltagcloud/src/main/java/net/sourceforge/openutils/mgnltagcloud/setup/TagCloudModuleVersionHandler.java

Added Paths:
-----------
    trunk/magnolia-test-webapp/src/main/webapp/templates/samples-tagcloud/
    trunk/magnolia-test-webapp/src/main/webapp/templates/samples-tagcloud/p-tagclouds.jsp
    trunk/magnolia-test-webapp/src/main/webapp/templates/samples-tagcloud/template.jsp
    trunk/openutils-mgnltagcloud/src/main/java/net/sourceforge/openutils/mgnltagcloud/setup/SamplesExtractionTask.java
    trunk/openutils-mgnltagcloud/src/main/resources/mgnl-bootstrap-samples/
    trunk/openutils-mgnltagcloud/src/main/resources/mgnl-bootstrap-samples/tagcloud/
    trunk/openutils-mgnltagcloud/src/main/resources/mgnl-bootstrap-samples/tagcloud/config.modules.tagcloud.clouds.xml
    trunk/openutils-mgnltagcloud/src/main/resources/mgnl-bootstrap-samples/tagcloud/config.modules.tagcloud.dialogs.xml
    trunk/openutils-mgnltagcloud/src/main/resources/mgnl-bootstrap-samples/tagcloud/config.modules.tagcloud.templates.xml
    trunk/openutils-mgnltagcloud/src/main/resources/mgnl-files/
    trunk/openutils-mgnltagcloud/src/main/resources/mgnl-files/templates/
    trunk/openutils-mgnltagcloud/src/main/resources/mgnl-files/templates/samples-tagcloud/
    trunk/openutils-mgnltagcloud/src/main/resources/mgnl-files/templates/samples-tagcloud/template.jsp

Added: trunk/magnolia-test-webapp/src/main/webapp/templates/samples-tagcloud/p-tagclouds.jsp
===================================================================
--- trunk/magnolia-test-webapp/src/main/webapp/templates/samples-tagcloud/p-tagclouds.jsp	                        (rev 0)
+++ trunk/magnolia-test-webapp/src/main/webapp/templates/samples-tagcloud/p-tagclouds.jsp	2010-03-09 16:17:58 UTC (rev 2116)
@@ -0,0 +1 @@
+${content.tags}
\ No newline at end of file


Property changes on: trunk/magnolia-test-webapp/src/main/webapp/templates/samples-tagcloud/p-tagclouds.jsp
___________________________________________________________________
Added: svn:mime-type
   + text/xml
Added: svn:keywords
   + Author Date Id Revision
Added: svn:eol-style
   + native

Added: trunk/magnolia-test-webapp/src/main/webapp/templates/samples-tagcloud/template.jsp
===================================================================
--- trunk/magnolia-test-webapp/src/main/webapp/templates/samples-tagcloud/template.jsp	                        (rev 0)
+++ trunk/magnolia-test-webapp/src/main/webapp/templates/samples-tagcloud/template.jsp	2010-03-09 16:17:58 UTC (rev 2116)
@@ -0,0 +1,39 @@
+<jsp:root version="2.0" 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="urn:jsptld:cms-taglib"
+  xmlns:cmsfn="http://www.magnolia.info/tlds/cmsfn-taglib.tld" xmlns:cmsu="urn:jsptld:cms-util-taglib"
+  xmlns:tagcloud="http://net.sourceforge.openutils/mgnlTagCloud" xmlns:su="http://openutils.sf.net/openutils-stringutils"
+  xmlns:bc="barilla-corporate" xmlns:pm="pirellimedia" xmlns:bctags="urn:jsptagdir:/WEB-INF/tags/barilla-corporate-tags">
+  <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>
+    <head>
+      <title>TEST</title>
+    </head>
+    <cms:mainBar paragraph="sample-tagcloud" />
+    <body>
+      <br />
+      0 tag:
+      <br />
+      <tagcloud:tagcloud id="cloud1" url="${actpage.handle}/" showFreq="true" />
+      1 tag:
+      <br />
+      <tagcloud:tagcloud id="cloud2" orderby="count asc" path="/test/untitled1" />
+      2 tag:
+      <br />
+      <tagcloud:tagcloud id="cloud3" name="tags" orderby="name asc" showFreq="true" />
+      3 tag:
+      <br />
+      <tagcloud:tagcloud id="cloud3" orderby="count asc" path="/test/untitled" />
+      4 tag:
+      <br />
+      <tagcloud:tagcloud id="cloudMedia" name="tagsMedia" orderby="name asc" showFreq="true" />
+      <cms:contentNodeIterator contentNodeCollectionName="main">
+        <cms:editBar adminOnly="true" />
+        <cms:includeTemplate />
+      </cms:contentNodeIterator>
+      <cms:newBar contentNodeCollectionName="main" paragraph="localeaware" adminOnly="true" />
+    </body>
+  </html>
+</jsp:root>
\ No newline at end of file


Property changes on: trunk/magnolia-test-webapp/src/main/webapp/templates/samples-tagcloud/template.jsp
___________________________________________________________________
Added: svn:mime-type
   + text/xml
Added: svn:keywords
   + Author Date Id Revision
Added: svn:eol-style
   + native

Added: trunk/openutils-mgnltagcloud/src/main/java/net/sourceforge/openutils/mgnltagcloud/setup/SamplesExtractionTask.java
===================================================================
--- trunk/openutils-mgnltagcloud/src/main/java/net/sourceforge/openutils/mgnltagcloud/setup/SamplesExtractionTask.java	                        (rev 0)
+++ trunk/openutils-mgnltagcloud/src/main/java/net/sourceforge/openutils/mgnltagcloud/setup/SamplesExtractionTask.java	2010-03-09 16:17:58 UTC (rev 2116)
@@ -0,0 +1,91 @@
+/**
+ *
+ * Magnolia Tagcloud Module (http://www.openmindlab.com/lab/products/tagcloud.html)
+ * Copyright (C)2008 - 2010, Openmind S.r.l. http://www.openmindonline.it
+ *
+ *  This program is free software: you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation, either version 3 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package net.sourceforge.openutils.mgnltagcloud.setup;
+
+import info.magnolia.cms.core.HierarchyManager;
+import info.magnolia.cms.core.Path;
+import info.magnolia.module.InstallContext;
+import info.magnolia.module.delta.AbstractTask;
+import info.magnolia.module.delta.TaskExecutionException;
+import info.magnolia.module.files.FileExtractionLogger;
+import info.magnolia.module.files.FileExtractor;
+import info.magnolia.module.files.MD5CheckingFileExtractor;
+
+import java.io.IOException;
+
+import org.apache.commons.lang.StringUtils;
+
+
+/**
+ * Extract samples files to webapp root.
+ * @author cstrappazzon
+ * @version $Id$
+ */
+public class SamplesExtractionTask extends AbstractTask
+{
+
+    public SamplesExtractionTask()
+    {
+        super("Samples extraction", "Extracts jsp files for samples.");
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public void execute(final InstallContext ctx) throws TaskExecutionException
+    {
+        final HierarchyManager hm = ctx.getConfigHierarchyManager();
+        final MD5CheckingFileExtractor extractor = new MD5CheckingFileExtractor(new FileExtractionLogger()
+        {
+
+            public void error(String message)
+            {
+                ctx.warn(message);
+            }
+        }, hm);
+        try
+        {
+            extractor.extractFiles(new FileExtractor.Transformer()
+            {
+
+                public String accept(String resourcePath)
+                {
+                    final boolean thisIsAFileWeWant = resourcePath.startsWith("/mgnl-files/")
+                        && StringUtils.contains(resourcePath, "/samples-tagcloud/");
+                    if (!thisIsAFileWeWant)
+                    {
+                        return null;
+                    }
+                    final String relTargetPath = StringUtils.removeStart(resourcePath, "/mgnl-files/");
+                    return Path.getAbsoluteFileSystemPath(relTargetPath);
+                }
+
+            });
+        }
+        catch (IOException e)
+        {
+            throw new TaskExecutionException("Could not extract files for module "
+                + ctx.getCurrentModuleDefinition()
+                + ": "
+                + e.getMessage(), e);
+        }
+    }
+
+}


Property changes on: trunk/openutils-mgnltagcloud/src/main/java/net/sourceforge/openutils/mgnltagcloud/setup/SamplesExtractionTask.java
___________________________________________________________________
Added: svn:mime-type
   + text/plain
Added: svn:keywords
   + Author Date Id Revision
Added: svn:eol-style
   + native

Modified: trunk/openutils-mgnltagcloud/src/main/java/net/sourceforge/openutils/mgnltagcloud/setup/TagCloudModuleVersionHandler.java
===================================================================
--- trunk/openutils-mgnltagcloud/src/main/java/net/sourceforge/openutils/mgnltagcloud/setup/TagCloudModuleVersionHandler.java	2010-03-09 16:13:07 UTC (rev 2115)
+++ trunk/openutils-mgnltagcloud/src/main/java/net/sourceforge/openutils/mgnltagcloud/setup/TagCloudModuleVersionHandler.java	2010-03-09 16:17:58 UTC (rev 2116)
@@ -19,9 +19,15 @@
 
 package net.sourceforge.openutils.mgnltagcloud.setup;
 
+import info.magnolia.cms.core.SystemProperty;
+import info.magnolia.module.InstallContext;
+import info.magnolia.module.delta.Task;
 import it.openutils.mgnltasks.SimpleModuleVersionHandler;
 
+import java.util.ArrayList;
+import java.util.List;
 
+
 /**
  * @author cstrappazzon
  * @version $Id$
@@ -29,4 +35,20 @@
 public class TagCloudModuleVersionHandler extends SimpleModuleVersionHandler
 {
 
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    protected List<Task> getStartupTasks(InstallContext installContext)
+    {
+
+        List<Task> tasks = new ArrayList<Task>();
+
+        if (SystemProperty.getBooleanProperty(SystemProperty.MAGNOLIA_BOOTSTRAP_SAMPLES))
+        {
+            tasks.add(new SamplesExtractionTask());
+        }
+
+        return tasks;
+    }
 }

Added: trunk/openutils-mgnltagcloud/src/main/resources/mgnl-bootstrap-samples/tagcloud/config.modules.tagcloud.clouds.xml
===================================================================
--- trunk/openutils-mgnltagcloud/src/main/resources/mgnl-bootstrap-samples/tagcloud/config.modules.tagcloud.clouds.xml	                        (rev 0)
+++ trunk/openutils-mgnltagcloud/src/main/resources/mgnl-bootstrap-samples/tagcloud/config.modules.tagcloud.clouds.xml	2010-03-09 16:17:58 UTC (rev 2116)
@@ -0,0 +1,63 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<sv:node sv:name="clouds" xmlns:sv="http://www.jcp.org/jcr/sv/1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <sv:property sv:name="jcr:primaryType" sv:type="Name">
+    <sv:value>mgnl:content</sv:value>
+  </sv:property>
+  <sv:property sv:name="jcr:mixinTypes" sv:type="Name">
+    <sv:value>mix:lockable</sv:value>
+  </sv:property>
+  <sv:property sv:name="jcr:uuid" sv:type="String">
+    <sv:value>4730afb7-3548-4026-997b-0f2df4ad8357</sv:value>
+  </sv:property>
+  <sv:node sv:name="MetaData">
+    <sv:property sv:name="jcr:primaryType" sv:type="Name">
+      <sv:value>mgnl:metaData</sv:value>
+    </sv:property>
+    <sv:property sv:name="mgnl:authorid" sv:type="String">
+      <sv:value>superuser</sv:value>
+    </sv:property>
+    <sv:property sv:name="mgnl:creationdate" sv:type="Date">
+      <sv:value>2010-03-09T16:04:19.602+01:00</sv:value>
+    </sv:property>
+    <sv:property sv:name="mgnl:lastmodified" sv:type="Date">
+      <sv:value>2010-03-09T16:04:23.928+01:00</sv:value>
+    </sv:property>
+  </sv:node>
+  <sv:node sv:name="tags">
+    <sv:property sv:name="jcr:primaryType" sv:type="Name">
+      <sv:value>mgnl:contentNode</sv:value>
+    </sv:property>
+    <sv:property sv:name="jcr:mixinTypes" sv:type="Name">
+      <sv:value>mix:lockable</sv:value>
+    </sv:property>
+    <sv:property sv:name="jcr:uuid" sv:type="String">
+      <sv:value>94da4810-7417-43eb-b39b-010e8e1dbe63</sv:value>
+    </sv:property>
+    <sv:property sv:name="jcr:createdBy" sv:type="String">
+      <sv:value>admin</sv:value>
+    </sv:property>
+    <sv:property sv:name="path" sv:type="String">
+      <sv:value>/</sv:value>
+    </sv:property>
+    <sv:property sv:name="repository" sv:type="String">
+      <sv:value>website</sv:value>
+    </sv:property>
+    <sv:node sv:name="MetaData">
+      <sv:property sv:name="jcr:primaryType" sv:type="Name">
+        <sv:value>mgnl:metaData</sv:value>
+      </sv:property>
+      <sv:property sv:name="jcr:createdBy" sv:type="String">
+        <sv:value>admin</sv:value>
+      </sv:property>
+      <sv:property sv:name="mgnl:authorid" sv:type="String">
+        <sv:value>superuser</sv:value>
+      </sv:property>
+      <sv:property sv:name="mgnl:creationdate" sv:type="Date">
+        <sv:value>2010-02-02T17:58:45.701+01:00</sv:value>
+      </sv:property>
+      <sv:property sv:name="mgnl:lastmodified" sv:type="Date">
+        <sv:value>2010-03-09T16:04:27.772+01:00</sv:value>
+      </sv:property>
+    </sv:node>
+  </sv:node>
+</sv:node>


Property changes on: trunk/openutils-mgnltagcloud/src/main/resources/mgnl-bootstrap-samples/tagcloud/config.modules.tagcloud.clouds.xml
___________________________________________________________________
Added: svn:mime-type
   + text/xml
Added: svn:keywords
   + Author Date Id Revision
Added: svn:eol-style
   + native

Added: trunk/openutils-mgnltagcloud/src/main/resources/mgnl-bootstrap-samples/tagcloud/config.modules.tagcloud.dialogs.xml
===================================================================
--- trunk/openutils-mgnltagcloud/src/main/resources/mgnl-bootstrap-samples/tagcloud/config.modules.tagcloud.dialogs.xml	                        (rev 0)
+++ trunk/openutils-mgnltagcloud/src/main/resources/mgnl-bootstrap-samples/tagcloud/config.modules.tagcloud.dialogs.xml	2010-03-09 16:17:58 UTC (rev 2116)
@@ -0,0 +1,155 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<sv:node sv:name="dialogs" xmlns:sv="http://www.jcp.org/jcr/sv/1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <sv:property sv:name="jcr:primaryType" sv:type="Name">
+    <sv:value>mgnl:content</sv:value>
+  </sv:property>
+  <sv:property sv:name="jcr:mixinTypes" sv:type="Name">
+    <sv:value>mix:lockable</sv:value>
+  </sv:property>
+  <sv:property sv:name="jcr:uuid" sv:type="String">
+    <sv:value>51b6bd61-5dde-49fb-b548-7dbfa3edacf5</sv:value>
+  </sv:property>
+  <sv:node sv:name="MetaData">
+    <sv:property sv:name="jcr:primaryType" sv:type="Name">
+      <sv:value>mgnl:metaData</sv:value>
+    </sv:property>
+    <sv:property sv:name="mgnl:activated" sv:type="Boolean">
+      <sv:value>false</sv:value>
+    </sv:property>
+    <sv:property sv:name="mgnl:authorid" sv:type="String">
+      <sv:value>superuser</sv:value>
+    </sv:property>
+    <sv:property sv:name="mgnl:creationdate" sv:type="Date">
+      <sv:value>2010-03-09T16:26:39.067+01:00</sv:value>
+    </sv:property>
+    <sv:property sv:name="mgnl:lastmodified" sv:type="Date">
+      <sv:value>2010-03-09T16:34:38.761+01:00</sv:value>
+    </sv:property>
+  </sv:node>
+  <sv:node sv:name="sample-tagcloud">
+    <sv:property sv:name="jcr:primaryType" sv:type="Name">
+      <sv:value>mgnl:contentNode</sv:value>
+    </sv:property>
+    <sv:property sv:name="jcr:mixinTypes" sv:type="Name">
+      <sv:value>mix:lockable</sv:value>
+    </sv:property>
+    <sv:property sv:name="jcr:uuid" sv:type="String">
+      <sv:value>dfdabce9-2d1a-4606-90f8-e627bee271c2</sv:value>
+    </sv:property>
+    <sv:property sv:name="height" sv:type="String">
+      <sv:value>800</sv:value>
+    </sv:property>
+    <sv:property sv:name="jcr:createdBy" sv:type="String">
+      <sv:value>admin</sv:value>
+    </sv:property>
+    <sv:property sv:name="label" sv:type="String">
+      <sv:value>General</sv:value>
+    </sv:property>
+    <sv:property sv:name="width" sv:type="String">
+      <sv:value>800</sv:value>
+    </sv:property>
+    <sv:node sv:name="MetaData">
+      <sv:property sv:name="jcr:primaryType" sv:type="Name">
+        <sv:value>mgnl:metaData</sv:value>
+      </sv:property>
+      <sv:property sv:name="jcr:createdBy" sv:type="String">
+        <sv:value>admin</sv:value>
+      </sv:property>
+      <sv:property sv:name="mgnl:activated" sv:type="Boolean">
+        <sv:value>false</sv:value>
+      </sv:property>
+      <sv:property sv:name="mgnl:authorid" sv:type="String">
+        <sv:value>superuser</sv:value>
+      </sv:property>
+      <sv:property sv:name="mgnl:creationdate" sv:type="Date">
+        <sv:value>2009-03-19T09:55:33.575+01:00</sv:value>
+      </sv:property>
+      <sv:property sv:name="mgnl:lastmodified" sv:type="Date">
+        <sv:value>2010-03-09T16:37:52.622+01:00</sv:value>
+      </sv:property>
+    </sv:node>
+    <sv:node sv:name="tabGeneral">
+      <sv:property sv:name="jcr:primaryType" sv:type="Name">
+        <sv:value>mgnl:contentNode</sv:value>
+      </sv:property>
+      <sv:property sv:name="jcr:mixinTypes" sv:type="Name">
+        <sv:value>mix:lockable</sv:value>
+      </sv:property>
+      <sv:property sv:name="jcr:uuid" sv:type="String">
+        <sv:value>ee025e3f-6ee0-45cb-9400-ee0391fb5ff2</sv:value>
+      </sv:property>
+      <sv:property sv:name="controlType" sv:type="String">
+        <sv:value>tab</sv:value>
+      </sv:property>
+      <sv:property sv:name="jcr:createdBy" sv:type="String">
+        <sv:value>admin</sv:value>
+      </sv:property>
+      <sv:property sv:name="label" sv:type="String">
+        <sv:value>Properties</sv:value>
+      </sv:property>
+      <sv:node sv:name="MetaData">
+        <sv:property sv:name="jcr:primaryType" sv:type="Name">
+          <sv:value>mgnl:metaData</sv:value>
+        </sv:property>
+        <sv:property sv:name="jcr:createdBy" sv:type="String">
+          <sv:value>admin</sv:value>
+        </sv:property>
+        <sv:property sv:name="mgnl:authorid" sv:type="String">
+          <sv:value>superuser</sv:value>
+        </sv:property>
+        <sv:property sv:name="mgnl:creationdate" sv:type="Date">
+          <sv:value>2009-03-19T09:55:51.980+01:00</sv:value>
+        </sv:property>
+        <sv:property sv:name="mgnl:lastmodified" sv:type="Date">
+          <sv:value>2010-03-09T16:37:57.194+01:00</sv:value>
+        </sv:property>
+      </sv:node>
+      <sv:node sv:name="tags">
+        <sv:property sv:name="jcr:primaryType" sv:type="Name">
+          <sv:value>mgnl:contentNode</sv:value>
+        </sv:property>
+        <sv:property sv:name="jcr:mixinTypes" sv:type="Name">
+          <sv:value>mix:lockable</sv:value>
+        </sv:property>
+        <sv:property sv:name="jcr:uuid" sv:type="String">
+          <sv:value>0b3d54fb-17ee-469b-b731-834ea2ae8755</sv:value>
+        </sv:property>
+        <sv:property sv:name="controlType" sv:type="String">
+          <sv:value>tagcloud</sv:value>
+        </sv:property>
+        <sv:property sv:name="description" sv:type="String">
+          <sv:value>Start insert your tags</sv:value>
+        </sv:property>
+        <sv:property sv:name="jcr:createdBy" sv:type="String">
+          <sv:value>admin</sv:value>
+        </sv:property>
+        <sv:property sv:name="label" sv:type="String">
+          <sv:value>Tags</sv:value>
+        </sv:property>
+        <sv:property sv:name="tagCloudName" sv:type="String">
+          <sv:value>tags</sv:value>
+        </sv:property>
+        <sv:node sv:name="MetaData">
+          <sv:property sv:name="jcr:primaryType" sv:type="Name">
+            <sv:value>mgnl:metaData</sv:value>
+          </sv:property>
+          <sv:property sv:name="jcr:createdBy" sv:type="String">
+            <sv:value>admin</sv:value>
+          </sv:property>
+          <sv:property sv:name="mgnl:activated" sv:type="Boolean">
+            <sv:value>false</sv:value>
+          </sv:property>
+          <sv:property sv:name="mgnl:authorid" sv:type="String">
+            <sv:value>superuser</sv:value>
+          </sv:property>
+          <sv:property sv:name="mgnl:creationdate" sv:type="Date">
+            <sv:value>2009-03-26T11:53:31.667+01:00</sv:value>
+          </sv:property>
+          <sv:property sv:name="mgnl:lastmodified" sv:type="Date">
+            <sv:value>2010-03-09T16:38:49.074+01:00</sv:value>
+          </sv:property>
+        </sv:node>
+      </sv:node>
+    </sv:node>
+  </sv:node>
+</sv:node>


Property changes on: trunk/openutils-mgnltagcloud/src/main/resources/mgnl-bootstrap-samples/tagcloud/config.modules.tagcloud.dialogs.xml
___________________________________________________________________
Added: svn:mime-type
   + text/xml
Added: svn:keywords
   + Author Date Id Revision
Added: svn:eol-style
   + native

Added: trunk/openutils-mgnltagcloud/src/main/resources/mgnl-bootstrap-samples/tagcloud/config.modules.tagcloud.templates.xml
===================================================================
--- trunk/openutils-mgnltagcloud/src/main/resources/mgnl-bootstrap-samples/tagcloud/config.modules.tagcloud.templates.xml	                        (rev 0)
+++ trunk/openutils-mgnltagcloud/src/main/resources/mgnl-bootstrap-samples/tagcloud/config.modules.tagcloud.templates.xml	2010-03-09 16:17:58 UTC (rev 2116)
@@ -0,0 +1,69 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<sv:node sv:name="templates" xmlns:sv="http://www.jcp.org/jcr/sv/1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <sv:property sv:name="jcr:primaryType" sv:type="Name">
+    <sv:value>mgnl:content</sv:value>
+  </sv:property>
+  <sv:property sv:name="jcr:mixinTypes" sv:type="Name">
+    <sv:value>mix:lockable</sv:value>
+  </sv:property>
+  <sv:property sv:name="jcr:uuid" sv:type="String">
+    <sv:value>72d57f56-7ace-4202-9dea-0d342c08723b</sv:value>
+  </sv:property>
+  <sv:node sv:name="MetaData">
+    <sv:property sv:name="jcr:primaryType" sv:type="Name">
+      <sv:value>mgnl:metaData</sv:value>
+    </sv:property>
+    <sv:property sv:name="mgnl:activated" sv:type="Boolean">
+      <sv:value>false</sv:value>
+    </sv:property>
+    <sv:property sv:name="mgnl:authorid" sv:type="String">
+      <sv:value>superuser</sv:value>
+    </sv:property>
+    <sv:property sv:name="mgnl:creationdate" sv:type="Date">
+      <sv:value>2010-03-09T16:26:39.077+01:00</sv:value>
+    </sv:property>
+    <sv:property sv:name="mgnl:lastmodified" sv:type="Date">
+      <sv:value>2010-03-09T16:32:13.932+01:00</sv:value>
+    </sv:property>
+  </sv:node>
+  <sv:node sv:name="sampleTagcloud">
+    <sv:property sv:name="jcr:primaryType" sv:type="Name">
+      <sv:value>mgnl:contentNode</sv:value>
+    </sv:property>
+    <sv:property sv:name="jcr:mixinTypes" sv:type="Name">
+      <sv:value>mix:lockable</sv:value>
+    </sv:property>
+    <sv:property sv:name="jcr:uuid" sv:type="String">
+      <sv:value>35e87ec7-0f73-4d3c-a723-b3821936996e</sv:value>
+    </sv:property>
+    <sv:property sv:name="templatePath" sv:type="String">
+      <sv:value>/templates/samples-tagcloud/template.jsp</sv:value>
+    </sv:property>
+    <sv:property sv:name="title" sv:type="String">
+      <sv:value>Tagcloud sample template</sv:value>
+    </sv:property>
+    <sv:property sv:name="type" sv:type="String">
+      <sv:value>jsp</sv:value>
+    </sv:property>
+    <sv:property sv:name="visible" sv:type="String">
+      <sv:value>true</sv:value>
+    </sv:property>
+    <sv:node sv:name="MetaData">
+      <sv:property sv:name="jcr:primaryType" sv:type="Name">
+        <sv:value>mgnl:metaData</sv:value>
+      </sv:property>
+      <sv:property sv:name="mgnl:activated" sv:type="Boolean">
+        <sv:value>false</sv:value>
+      </sv:property>
+      <sv:property sv:name="mgnl:authorid" sv:type="String">
+        <sv:value>superuser</sv:value>
+      </sv:property>
+      <sv:property sv:name="mgnl:creationdate" sv:type="Date">
+        <sv:value>2008-09-23T16:56:46.344+02:00</sv:value>
+      </sv:property>
+      <sv:property sv:name="mgnl:lastmodified" sv:type="Date">
+        <sv:value>2010-03-09T16:32:49.373+01:00</sv:value>
+      </sv:property>
+    </sv:node>
+  </sv:node>
+</sv:node>


Property changes on: trunk/openutils-mgnltagcloud/src/main/resources/mgnl-bootstrap-samples/tagcloud/config.modules.tagcloud.templates.xml
___________________________________________________________________
Added: svn:mime-type
   + text/xml
Added: svn:keywords
   + Author Date Id Revision
Added: svn:eol-style
   + native

Added: trunk/openutils-mgnltagcloud/src/main/resources/mgnl-files/templates/samples-tagcloud/template.jsp
===================================================================
--- trunk/openutils-mgnltagcloud/src/main/resources/mgnl-files/templates/samples-tagcloud/template.jsp	                        (rev 0)
+++ trunk/openutils-mgnltagcloud/src/main/resources/mgnl-files/templates/samples-tagcloud/template.jsp	2010-03-09 16:17:58 UTC (rev 2116)
@@ -0,0 +1,39 @@
+<jsp:root version="2.0" 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="urn:jsptld:cms-taglib"
+  xmlns:cmsfn="http://www.magnolia.info/tlds/cmsfn-taglib.tld" xmlns:cmsu="urn:jsptld:cms-util-taglib"
+  xmlns:tagcloud="http://net.sourceforge.openutils/mgnlTagCloud" xmlns:su="http://openutils.sf.net/openutils-stringutils"
+  xmlns:bc="barilla-corporate" xmlns:pm="pirellimedia" xmlns:bctags="urn:jsptagdir:/WEB-INF/tags/barilla-corporate-tags">
+  <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>
+    <head>
+      <title>TEST</title>
+    </head>
+    <cms:mainBar paragraph="sample-tagcloud" />
+    <body>
+      <br />
+      0 tag:
+      <br />
+      <tagcloud:tagcloud id="cloud1" url="${actpage.handle}/" showFreq="true" />
+      1 tag:
+      <br />
+      <tagcloud:tagcloud id="cloud2" orderby="count asc" path="/test/untitled1" />
+      2 tag:
+      <br />
+      <tagcloud:tagcloud id="cloud3" name="tags" orderby="name asc" showFreq="true" />
+      3 tag:
+      <br />
+      <tagcloud:tagcloud id="cloud3" orderby="count asc" path="/test/untitled" />
+      4 tag:
+      <br />
+      <tagcloud:tagcloud id="cloudMedia" name="tagsMedia" orderby="name asc" showFreq="true" />
+      <cms:contentNodeIterator contentNodeCollectionName="main">
+        <cms:editBar adminOnly="true" />
+        <cms:includeTemplate />
+      </cms:contentNodeIterator>
+      <cms:newBar contentNodeCollectionName="main" paragraph="localeaware" adminOnly="true" />
+    </body>
+  </html>
+</jsp:root>
\ No newline at end of file


Property changes on: trunk/openutils-mgnltagcloud/src/main/resources/mgnl-files/templates/samples-tagcloud/template.jsp
___________________________________________________________________
Added: svn:mime-type
   + text/xml
Added: svn:keywords
   + Author Date Id Revision
Added: svn:eol-style
   + native


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

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

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

Revision: 2121
          http://openutils.svn.sourceforge.net/openutils/?rev=2121&view=rev
Author:   fgiust
Date:     2010-03-09 19:35:45 +0000 (Tue, 09 Mar 2010)

Log Message:
-----------
testing4web 1.2.1

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

Modified: trunk/openutils-elfunctions/pom.xml
===================================================================
--- trunk/openutils-elfunctions/pom.xml	2010-03-09 19:34:07 UTC (rev 2120)
+++ trunk/openutils-elfunctions/pom.xml	2010-03-09 19:35:45 UTC (rev 2121)
@@ -104,7 +104,7 @@
     <dependency>
       <groupId>net.sourceforge.openutils</groupId>
       <artifactId>openutils-testing4web</artifactId>
-      <version>1.2</version>
+      <version>1.2.1</version>
       <scope>test</scope>
     </dependency>
     <dependency>

Modified: trunk/openutils-mgnlutils/pom.xml
===================================================================
--- trunk/openutils-mgnlutils/pom.xml	2010-03-09 19:34:07 UTC (rev 2120)
+++ trunk/openutils-mgnlutils/pom.xml	2010-03-09 19:35:45 UTC (rev 2121)
@@ -119,7 +119,7 @@
     <dependency>
       <groupId>net.sourceforge.openutils</groupId>
       <artifactId>openutils-testing4web</artifactId>
-      <version>1.2</version>
+      <version>1.2.1</version>
       <scope>test</scope>
     </dependency>
   </dependencies>


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

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

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

Revision: 2204
          http://openutils.svn.sourceforge.net/openutils/?rev=2204&view=rev
Author:   fgiust
Date:     2010-03-21 17:51:05 +0000 (Sun, 21 Mar 2010)

Log Message:
-----------
update scm urls

Modified Paths:
--------------
    trunk/openutils-elfunctions/pom.xml
    trunk/openutils-maven-skin/pom.xml
    trunk/openutils-mgnlbootstrapsync/pom.xml
    trunk/openutils-mgnlcontrols/pom.xml
    trunk/openutils-mgnlcriteria/pom.xml
    trunk/openutils-mgnlext/pom.xml
    trunk/openutils-mgnlgroovy/pom.xml
    trunk/openutils-mgnlmessages/pom.xml
    trunk/openutils-mgnlrepoutils/pom.xml
    trunk/openutils-mgnlspring/pom.xml
    trunk/openutils-mgnlstripes/pom.xml
    trunk/openutils-mgnlstruts11/pom.xml
    trunk/openutils-mgnltasks/pom.xml
    trunk/openutils-mgnlutils/pom.xml
    trunk/openutils-testing/pom.xml
    trunk/openutils-testing-junit/pom.xml
    trunk/openutils-testing-testng/pom.xml
    trunk/openutils-testing4dwr/pom.xml
    trunk/openutils-testing4dwr-junit/pom.xml
    trunk/openutils-testing4dwr-testng/pom.xml
    trunk/openutils-testing4web/pom.xml
    trunk/pom.xml

Modified: trunk/openutils-elfunctions/pom.xml
===================================================================
--- trunk/openutils-elfunctions/pom.xml	2010-03-21 17:37:34 UTC (rev 2203)
+++ trunk/openutils-elfunctions/pom.xml	2010-03-21 17:51:05 UTC (rev 2204)
@@ -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>
@@ -87,6 +88,7 @@
       <plugin>
         <groupId>net.sourceforge.maven-taglib</groupId>
         <artifactId>maven-taglib-plugin</artifactId>
+        <version>2.4</version>
       </plugin>
     </plugins>
   </reporting>

Modified: trunk/openutils-maven-skin/pom.xml
===================================================================
--- trunk/openutils-maven-skin/pom.xml	2010-03-21 17:37:34 UTC (rev 2203)
+++ trunk/openutils-maven-skin/pom.xml	2010-03-21 17:51:05 UTC (rev 2204)
@@ -5,7 +5,7 @@
   <parent>
     <groupId>net.sourceforge.openutils</groupId>
     <artifactId>openutils-parent</artifactId>
-    <version>1.0</version>
+    <version>1.3</version>
   </parent>
   <artifactId>openutils-maven-skin</artifactId>
   <packaging>jar</packaging>

Modified: trunk/openutils-mgnlbootstrapsync/pom.xml
===================================================================
--- trunk/openutils-mgnlbootstrapsync/pom.xml	2010-03-21 17:37:34 UTC (rev 2203)
+++ trunk/openutils-mgnlbootstrapsync/pom.xml	2010-03-21 17:51:05 UTC (rev 2204)
@@ -23,6 +23,11 @@
     <system>jira</system>
     <url>http://jira.openmindlab.com/browse/SYNC</url>
   </issueManagement>
+  <scm>
+    <connection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/trunk/openutils-mgnlbootstrapsync</connection>
+    <developerConnection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/trunk/openutils-mgnlbootstrapsync</developerConnection>
+    <url>http://openutils.svn.sourceforge.net/viewcvs.cgi/openutils/trunk/openutils-mgnlbootstrapsync</url>
+  </scm>
   <build>
     <resources>
       <resource>

Modified: trunk/openutils-mgnlcontrols/pom.xml
===================================================================
--- trunk/openutils-mgnlcontrols/pom.xml	2010-03-21 17:37:34 UTC (rev 2203)
+++ trunk/openutils-mgnlcontrols/pom.xml	2010-03-21 17:51:05 UTC (rev 2204)
@@ -22,6 +22,11 @@
     <system>jira</system>
     <url>http://jira.openmindlab.com/browse/CONTROLS</url>
   </issueManagement>
+  <scm>
+    <connection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/trunk/openutils-mgnlcontrols</connection>
+    <developerConnection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/trunk/openutils-mgnlcontrols</developerConnection>
+    <url>http://openutils.svn.sourceforge.net/viewcvs.cgi/openutils/trunk/openutils-mgnlcontrols</url>
+  </scm>
   <build>
     <resources>
       <resource>

Modified: trunk/openutils-mgnlcriteria/pom.xml
===================================================================
--- trunk/openutils-mgnlcriteria/pom.xml	2010-03-21 17:37:34 UTC (rev 2203)
+++ trunk/openutils-mgnlcriteria/pom.xml	2010-03-21 17:51:05 UTC (rev 2204)
@@ -21,6 +21,11 @@
     <system>jira</system>
     <url>http://jira.openmindlab.com/browse/CRIT</url>
   </issueManagement>
+  <scm>
+    <connection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/trunk/openutils-mgnlcriteria</connection>
+    <developerConnection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/trunk/openutils-mgnlcriteria</developerConnection>
+    <url>http://openutils.svn.sourceforge.net/viewcvs.cgi/openutils/trunk/openutils-mgnlcriteria</url>
+  </scm>
   <build>
     <plugins>
       <plugin>

Modified: trunk/openutils-mgnlext/pom.xml
===================================================================
--- trunk/openutils-mgnlext/pom.xml	2010-03-21 17:37:34 UTC (rev 2203)
+++ trunk/openutils-mgnlext/pom.xml	2010-03-21 17:51:05 UTC (rev 2204)
@@ -10,6 +10,11 @@
   <artifactId>openutils-mgnlext</artifactId>
   <name>openutils-mgnlext</name>
   <version>2.2-SNAPSHOT</version>
+  <scm>
+    <connection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/trunk/openutils-mgnlext</connection>
+    <developerConnection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/trunk/openutils-mgnlext</developerConnection>
+    <url>http://openutils.svn.sourceforge.net/viewcvs.cgi/openutils/trunk/openutils-mgnlext</url>
+  </scm>
   <licenses>
     <license>
       <name>GPLv3</name>

Modified: trunk/openutils-mgnlgroovy/pom.xml
===================================================================
--- trunk/openutils-mgnlgroovy/pom.xml	2010-03-21 17:37:34 UTC (rev 2203)
+++ trunk/openutils-mgnlgroovy/pom.xml	2010-03-21 17:51:05 UTC (rev 2204)
@@ -21,6 +21,11 @@
     <system>jira</system>
     <url>http://jira.openmindlab.com/browse/GROOVY</url>
   </issueManagement>
+  <scm>
+    <connection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/trunk/openutils-mgnlgroovy</connection>
+    <developerConnection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/trunk/openutils-mgnlgroovy</developerConnection>
+    <url>http://openutils.svn.sourceforge.net/viewcvs.cgi/openutils/trunk/openutils-mgnlgroovy</url>
+  </scm>
   <build>
     <resources>
       <resource>

Modified: trunk/openutils-mgnlmessages/pom.xml
===================================================================
--- trunk/openutils-mgnlmessages/pom.xml	2010-03-21 17:37:34 UTC (rev 2203)
+++ trunk/openutils-mgnlmessages/pom.xml	2010-03-21 17:51:05 UTC (rev 2204)
@@ -22,6 +22,11 @@
     <system>jira</system>
     <url>http://jira.openmindlab.com/browse/GROOVY</url>
   </issueManagement>
+  <scm>
+    <connection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/trunk/openutils-mgnlmessages</connection>
+    <developerConnection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/trunk/openutils-mgnlmessages</developerConnection>
+    <url>http://openutils.svn.sourceforge.net/viewcvs.cgi/openutils/trunk/openutils-mgnlmessages</url>
+  </scm>
   <build>
     <resources>
       <resource>

Modified: trunk/openutils-mgnlrepoutils/pom.xml
===================================================================
--- trunk/openutils-mgnlrepoutils/pom.xml	2010-03-21 17:37:34 UTC (rev 2203)
+++ trunk/openutils-mgnlrepoutils/pom.xml	2010-03-21 17:51:05 UTC (rev 2204)
@@ -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>
@@ -22,6 +23,11 @@
       <url>http://www.gnu.org/licenses/gpl-3.0.txt</url>
     </license>
   </licenses>
+  <scm>
+    <connection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/trunk/openutils-mgnlrepoutils</connection>
+    <developerConnection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/trunk/openutils-mgnlrepoutils</developerConnection>
+    <url>http://openutils.svn.sourceforge.net/viewcvs.cgi/openutils/trunk/openutils-mgnlrepoutils</url>
+  </scm>
   <build>
     <resources>
       <resource>

Modified: trunk/openutils-mgnlspring/pom.xml
===================================================================
--- trunk/openutils-mgnlspring/pom.xml	2010-03-21 17:37:34 UTC (rev 2203)
+++ trunk/openutils-mgnlspring/pom.xml	2010-03-21 17:51:05 UTC (rev 2204)
@@ -17,6 +17,11 @@
       <url>http://www.gnu.org/licenses/gpl-3.0.txt</url>
     </license>
   </licenses>
+  <scm>
+    <connection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/trunk/openutils-mgnlspring</connection>
+    <developerConnection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/trunk/openutils-mgnlspring</developerConnection>
+    <url>http://openutils.svn.sourceforge.net/viewcvs.cgi/openutils/trunk/openutils-mgnlspring</url>
+  </scm>
   <dependencies>
     <dependency>
       <groupId>org.slf4j</groupId>

Modified: trunk/openutils-mgnlstripes/pom.xml
===================================================================
--- trunk/openutils-mgnlstripes/pom.xml	2010-03-21 17:37:34 UTC (rev 2203)
+++ trunk/openutils-mgnlstripes/pom.xml	2010-03-21 17:51:05 UTC (rev 2204)
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
   <parent>
     <groupId>net.sourceforge.openutils</groupId>
     <artifactId>openutils-parent</artifactId>
@@ -23,6 +24,11 @@
     <system>jira</system>
     <url>http://jira.openmindlab.com/browse/MGNLSTRIPES</url>
   </issueManagement>
+  <scm>
+    <connection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/trunk/openutils-mgnlstripes</connection>
+    <developerConnection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/trunk/openutils-mgnlstripes</developerConnection>
+    <url>http://openutils.svn.sourceforge.net/viewcvs.cgi/openutils/trunk/openutils-mgnlstripes</url>
+  </scm>
   <build>
     <resources>
       <resource>

Modified: trunk/openutils-mgnlstruts11/pom.xml
===================================================================
--- trunk/openutils-mgnlstruts11/pom.xml	2010-03-21 17:37:34 UTC (rev 2203)
+++ trunk/openutils-mgnlstruts11/pom.xml	2010-03-21 17:51:05 UTC (rev 2204)
@@ -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">
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <groupId>net.sourceforge.openutils</groupId>
@@ -21,6 +22,11 @@
     <system>jira</system>
     <url>http://jira.openmindlab.com/browse/MGNLSTRUTS</url>
   </issueManagement>
+  <scm>
+    <connection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/trunk/openutils-mgnlstruts11</connection>
+    <developerConnection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/trunk/openutils-mgnlstruts11</developerConnection>
+    <url>http://openutils.svn.sourceforge.net/viewcvs.cgi/openutils/trunk/openutils-mgnlstruts11</url>
+  </scm>
   <build>
     <resources>
       <resource>

Modified: trunk/openutils-mgnltasks/pom.xml
===================================================================
--- trunk/openutils-mgnltasks/pom.xml	2010-03-21 17:37:34 UTC (rev 2203)
+++ trunk/openutils-mgnltasks/pom.xml	2010-03-21 17:51:05 UTC (rev 2204)
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
   <parent>
     <groupId>net.sourceforge.openutils</groupId>
     <artifactId>openutils-parent</artifactId>
@@ -12,6 +13,11 @@
   <version>4.0.5-SNAPSHOT</version>
   <description>A collection of useful magnolia update tasks that can be reused in custom modules</description>
   <inceptionYear>2008</inceptionYear>
+  <scm>
+    <connection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/trunk/openutils-mgnltasks</connection>
+    <developerConnection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/trunk/openutils-mgnltasks</developerConnection>
+    <url>http://openutils.svn.sourceforge.net/viewcvs.cgi/openutils/trunk/openutils-mgnltasks</url>
+  </scm>
   <licenses>
     <license>
       <name>GPLv3</name>
@@ -123,6 +129,6 @@
     </repository>
   </repositories>
   <properties>
-    <magnolia.version>4.2.3</magnolia.version>
+    <magnolia.version>4.3</magnolia.version>
   </properties>
 </project>
\ No newline at end of file

Modified: trunk/openutils-mgnlutils/pom.xml
===================================================================
--- trunk/openutils-mgnlutils/pom.xml	2010-03-21 17:37:34 UTC (rev 2203)
+++ trunk/openutils-mgnlutils/pom.xml	2010-03-21 17:51:05 UTC (rev 2204)
@@ -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>
@@ -93,6 +94,7 @@
       <plugin>
         <groupId>net.sourceforge.maven-taglib</groupId>
         <artifactId>maven-taglib-plugin</artifactId>
+        <version>2.4</version>
       </plugin>
     </plugins>
   </reporting>

Modified: trunk/openutils-testing/pom.xml
===================================================================
--- trunk/openutils-testing/pom.xml	2010-03-21 17:37:34 UTC (rev 2203)
+++ trunk/openutils-testing/pom.xml	2010-03-21 17:51:05 UTC (rev 2204)
@@ -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">
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <groupId>net.sourceforge.openutils</groupId>
@@ -21,6 +22,11 @@
     <system>jira</system>
     <url>http://jira.openmindlab.com/browse/TEST</url>
   </issueManagement>
+  <scm>
+    <connection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/trunk/openutils-testing</connection>
+    <developerConnection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/trunk/openutils-testing</developerConnection>
+    <url>http://openutils.svn.sourceforge.net/viewcvs.cgi/openutils/trunk/openutils-testing</url>
+  </scm>
   <build>
     <plugins>
       <plugin>

Modified: trunk/openutils-testing-junit/pom.xml
===================================================================
--- trunk/openutils-testing-junit/pom.xml	2010-03-21 17:37:34 UTC (rev 2203)
+++ trunk/openutils-testing-junit/pom.xml	2010-03-21 17:51:05 UTC (rev 2204)
@@ -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">
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <groupId>net.sourceforge.openutils</groupId>
@@ -21,6 +22,11 @@
     <system>jira</system>
     <url>http://jira.openmindlab.com/browse/TEST</url>
   </issueManagement>
+  <scm>
+    <connection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/trunk/openutils-testing-junit</connection>
+    <developerConnection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/trunk/openutils-testing-junit</developerConnection>
+    <url>http://openutils.svn.sourceforge.net/viewcvs.cgi/openutils/trunk/openutils-testing-junit</url>
+  </scm>
   <build>
     <plugins>
       <plugin>

Modified: trunk/openutils-testing-testng/pom.xml
===================================================================
--- trunk/openutils-testing-testng/pom.xml	2010-03-21 17:37:34 UTC (rev 2203)
+++ trunk/openutils-testing-testng/pom.xml	2010-03-21 17:51:05 UTC (rev 2204)
@@ -21,6 +21,11 @@
     <system>jira</system>
     <url>http://jira.openmindlab.com/browse/TEST</url>
   </issueManagement>
+  <scm>
+    <connection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/trunk/openutils-testing-testng</connection>
+    <developerConnection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/trunk/openutils-testing-testng</developerConnection>
+    <url>http://openutils.svn.sourceforge.net/viewcvs.cgi/openutils/trunk/openutils-testing-testng</url>
+  </scm>
   <build>
     <plugins>
       <plugin>

Modified: trunk/openutils-testing4dwr/pom.xml
===================================================================
--- trunk/openutils-testing4dwr/pom.xml	2010-03-21 17:37:34 UTC (rev 2203)
+++ trunk/openutils-testing4dwr/pom.xml	2010-03-21 17:51:05 UTC (rev 2204)
@@ -10,6 +10,11 @@
   <name>openutils dwr test utils</name>
   <version>2.0-SNAPSHOT</version>
   <description>openutils test utils for dwr</description>
+  <scm>
+    <connection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/trunk/openutils-testing4dwr</connection>
+    <developerConnection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/trunk/openutils-testing4dwr</developerConnection>
+    <url>http://openutils.svn.sourceforge.net/viewcvs.cgi/openutils/trunk/openutils-testing4dwr</url>
+  </scm>
   <dependencies>
     <dependency>
       <groupId>org.springframework</groupId>

Modified: trunk/openutils-testing4dwr-junit/pom.xml
===================================================================
--- trunk/openutils-testing4dwr-junit/pom.xml	2010-03-21 17:37:34 UTC (rev 2203)
+++ trunk/openutils-testing4dwr-junit/pom.xml	2010-03-21 17:51:05 UTC (rev 2204)
@@ -10,6 +10,11 @@
   <name>openutils testing4dwr (junit)</name>
   <version>2.0-SNAPSHOT</version>
   <description>openutils testing4dwr (junit)</description>
+  <scm>
+    <connection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/trunk/openutils-testing4dwr-junit</connection>
+    <developerConnection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/trunk/openutils-testing4dwr-junit</developerConnection>
+    <url>http://openutils.svn.sourceforge.net/viewcvs.cgi/openutils/trunk/openutils-testing4dwr-junit</url>
+  </scm>
   <dependencies>
     <dependency>
       <groupId>net.sourceforge.openutils</groupId>

Modified: trunk/openutils-testing4dwr-testng/pom.xml
===================================================================
--- trunk/openutils-testing4dwr-testng/pom.xml	2010-03-21 17:37:34 UTC (rev 2203)
+++ trunk/openutils-testing4dwr-testng/pom.xml	2010-03-21 17:51:05 UTC (rev 2204)
@@ -10,6 +10,11 @@
   <name>openutils testing4dwr (testng)</name>
   <version>2.0-SNAPSHOT</version>
   <description>openutils testing4dwr (testng)</description>
+  <scm>
+    <connection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/trunk/openutils-testing4dwr-testng</connection>
+    <developerConnection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/trunk/openutils-testing4dwr-testng</developerConnection>
+    <url>http://openutils.svn.sourceforge.net/viewcvs.cgi/openutils/trunk/openutils-testing4dwr-testng</url>
+  </scm>
   <dependencies>
     <dependency>
       <groupId>net.sourceforge.openutils</groupId>

Modified: trunk/openutils-testing4web/pom.xml
===================================================================
--- trunk/openutils-testing4web/pom.xml	2010-03-21 17:37:34 UTC (rev 2203)
+++ trunk/openutils-testing4web/pom.xml	2010-03-21 17:51:05 UTC (rev 2204)
@@ -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">
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <groupId>net.sourceforge.openutils</groupId>
@@ -22,6 +23,11 @@
     <system>jira</system>
     <url>http://jira.openmindlab.com/browse/TESTINGWEB</url>
   </issueManagement>
+  <scm>
+    <connection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/trunk/openutils-testing4web</connection>
+    <developerConnection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/trunk/openutils-testing4web</developerConnection>
+    <url>http://openutils.svn.sourceforge.net/viewcvs.cgi/openutils/trunk/openutils-testing4web</url>
+  </scm>
   <build>
     <plugins>
       <plugin>

Modified: trunk/pom.xml
===================================================================
--- trunk/pom.xml	2010-03-21 17:37:34 UTC (rev 2203)
+++ trunk/pom.xml	2010-03-21 17:51:05 UTC (rev 2204)
@@ -8,6 +8,14 @@
   <version>12-SNAPSHOT</version>
   <name>openutils</name>
   <description>Reactor pom, only to do an eclipse:eclipse for all the projects. Not to be released</description>
+  <build>
+    <plugins>
+      <plugin>
+        <artifactId>maven-eclipse-plugin</artifactId>
+        <version>2.5.1</version>
+      </plugin>
+    </plugins>
+  </build>
   <modules>
     <module>openutils-maven-skin</module>
     <module>openutils-bshd5</module>
@@ -40,4 +48,4 @@
     <module>openutils-mgnltagcloud</module>
     <module>magnolia-test-webapp</module>
   </modules>
-</project>
+</project>
\ No newline at end of file


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

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

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

Revision: 2217
          http://openutils.svn.sourceforge.net/openutils/?rev=2217&view=rev
Author:   fgiust
Date:     2010-03-27 11:28:16 +0000 (Sat, 27 Mar 2010)

Log Message:
-----------
upgrade mgnltasks dependency

Modified Paths:
--------------
    trunk/magnolia-test-webapp/pom.xml
    trunk/openutils-mgnlcontrols/pom.xml
    trunk/openutils-mgnlgroovy/pom.xml
    trunk/openutils-mgnlmedia/pom.xml
    trunk/openutils-mgnlmessages/pom.xml
    trunk/openutils-mgnlstripes/pom.xml
    trunk/openutils-mgnlstruts11/pom.xml

Modified: trunk/magnolia-test-webapp/pom.xml
===================================================================
--- trunk/magnolia-test-webapp/pom.xml	2010-03-27 11:22:29 UTC (rev 2216)
+++ trunk/magnolia-test-webapp/pom.xml	2010-03-27 11:28:16 UTC (rev 2217)
@@ -161,7 +161,7 @@
     <dependency>
       <groupId>net.sourceforge.openutils</groupId>
       <artifactId>openutils-mgnltasks</artifactId>
-      <version>4.0.5-SNAPSHOT</version>
+      <version>4.0.6-SNAPSHOT</version>
     </dependency>
     <!--dependency> <groupId>info.magnolia</groupId> <artifactId>magnolia-module-modulestore</artifactId> <version>4.3-SNAPSHOT</version> 
       </dependency -->

Modified: trunk/openutils-mgnlcontrols/pom.xml
===================================================================
--- trunk/openutils-mgnlcontrols/pom.xml	2010-03-27 11:22:29 UTC (rev 2216)
+++ trunk/openutils-mgnlcontrols/pom.xml	2010-03-27 11:28:16 UTC (rev 2217)
@@ -90,7 +90,7 @@
     <dependency>
       <groupId>net.sourceforge.openutils</groupId>
       <artifactId>openutils-mgnltasks</artifactId>
-      <version>4.0.4</version>
+      <version>4.0.5</version>
     </dependency>
     <dependency>
       <groupId>net.sourceforge.openutils</groupId>

Modified: trunk/openutils-mgnlgroovy/pom.xml
===================================================================
--- trunk/openutils-mgnlgroovy/pom.xml	2010-03-27 11:22:29 UTC (rev 2216)
+++ trunk/openutils-mgnlgroovy/pom.xml	2010-03-27 11:28:16 UTC (rev 2217)
@@ -88,7 +88,7 @@
     <dependency>
       <groupId>net.sourceforge.openutils</groupId>
       <artifactId>openutils-mgnltasks</artifactId>
-      <version>4.0.4</version>
+      <version>4.0.5</version>
     </dependency>
   </dependencies>
   <repositories>

Modified: trunk/openutils-mgnlmedia/pom.xml
===================================================================
--- trunk/openutils-mgnlmedia/pom.xml	2010-03-27 11:22:29 UTC (rev 2216)
+++ trunk/openutils-mgnlmedia/pom.xml	2010-03-27 11:28:16 UTC (rev 2217)
@@ -101,7 +101,7 @@
     <dependency>
       <groupId>net.sourceforge.openutils</groupId>
       <artifactId>openutils-mgnltasks</artifactId>
-      <version>4.0.4</version>
+      <version>4.0.5</version>
     </dependency>
     <dependency>
       <groupId>net.sourceforge.openutils</groupId>

Modified: trunk/openutils-mgnlmessages/pom.xml
===================================================================
--- trunk/openutils-mgnlmessages/pom.xml	2010-03-27 11:22:29 UTC (rev 2216)
+++ trunk/openutils-mgnlmessages/pom.xml	2010-03-27 11:28:16 UTC (rev 2217)
@@ -78,7 +78,7 @@
     <dependency>
       <groupId>net.sourceforge.openutils</groupId>
       <artifactId>openutils-mgnltasks</artifactId>
-      <version>4.0.4</version>
+      <version>4.0.5</version>
     </dependency>
     <dependency>
       <groupId>net.sourceforge.openutils</groupId>

Modified: trunk/openutils-mgnlstripes/pom.xml
===================================================================
--- trunk/openutils-mgnlstripes/pom.xml	2010-03-27 11:22:29 UTC (rev 2216)
+++ trunk/openutils-mgnlstripes/pom.xml	2010-03-27 11:28:16 UTC (rev 2217)
@@ -72,7 +72,7 @@
     <dependency>
       <groupId>net.sourceforge.openutils</groupId>
       <artifactId>openutils-mgnltasks</artifactId>
-      <version>4.0.4</version>
+      <version>4.0.5</version>
     </dependency>
     <dependency>
       <groupId>javax.servlet</groupId>

Modified: trunk/openutils-mgnlstruts11/pom.xml
===================================================================
--- trunk/openutils-mgnlstruts11/pom.xml	2010-03-27 11:22:29 UTC (rev 2216)
+++ trunk/openutils-mgnlstruts11/pom.xml	2010-03-27 11:28:16 UTC (rev 2217)
@@ -90,7 +90,7 @@
     <dependency>
       <groupId>net.sourceforge.openutils</groupId>
       <artifactId>openutils-mgnltasks</artifactId>
-      <version>4.0.4</version>
+      <version>4.0.5</version>
     </dependency>
     <dependency>
       <groupId>struts</groupId>


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

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

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

Revision: 2247
          http://openutils.svn.sourceforge.net/openutils/?rev=2247&view=rev
Author:   fgiust
Date:     2010-04-03 13:06:23 +0000 (Sat, 03 Apr 2010)

Log Message:
-----------
new cache module

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

Added Paths:
-----------
    trunk/openutils-mgnlcache/
    trunk/openutils-mgnlcache/pom.xml
    trunk/openutils-mgnlcache/src/
    trunk/openutils-mgnlcache/src/main/
    trunk/openutils-mgnlcache/src/main/assembly/
    trunk/openutils-mgnlcache/src/main/assembly/assembly-bundle.xml
    trunk/openutils-mgnlcache/src/main/bundle/
    trunk/openutils-mgnlcache/src/main/bundle/LICENSE.txt
    trunk/openutils-mgnlcache/src/main/bundle/README.txt
    trunk/openutils-mgnlcache/src/main/etc/
    trunk/openutils-mgnlcache/src/main/etc/header.txt
    trunk/openutils-mgnlcache/src/main/java/
    trunk/openutils-mgnlcache/src/main/java/net/
    trunk/openutils-mgnlcache/src/main/java/net/sourceforge/
    trunk/openutils-mgnlcache/src/main/java/net/sourceforge/openutils/
    trunk/openutils-mgnlcache/src/main/java/net/sourceforge/openutils/mgnlsimplecache/
    trunk/openutils-mgnlcache/src/main/java/net/sourceforge/openutils/mgnlsimplecache/filesystem/
    trunk/openutils-mgnlcache/src/main/java/net/sourceforge/openutils/mgnlsimplecache/filesystem/FSCacheManager.java
    trunk/openutils-mgnlcache/src/main/java/net/sourceforge/openutils/mgnlsimplecache/filesystem/FSCacheManagerMBean.java
    trunk/openutils-mgnlcache/src/main/java/net/sourceforge/openutils/mgnlsimplecache/filesystem/FSCachedItem.java
    trunk/openutils-mgnlcache/src/main/java/net/sourceforge/openutils/mgnlsimplecache/filesystem/ResetableBufferedFileOutputStream.java
    trunk/openutils-mgnlcache/src/main/java/net/sourceforge/openutils/mgnlsimplecache/filesystem/SimpleCacheHeaders.java
    trunk/openutils-mgnlcache/src/main/java/net/sourceforge/openutils/mgnlsimplecache/filters/
    trunk/openutils-mgnlcache/src/main/java/net/sourceforge/openutils/mgnlsimplecache/filters/CacheFilter.java
    trunk/openutils-mgnlcache/src/main/java/net/sourceforge/openutils/mgnlsimplecache/filters/ClientHeadersFilter.java
    trunk/openutils-mgnlcache/src/main/java/net/sourceforge/openutils/mgnlsimplecache/lock/
    trunk/openutils-mgnlcache/src/main/java/net/sourceforge/openutils/mgnlsimplecache/lock/LockableCacheContent.java
    trunk/openutils-mgnlcache/src/main/java/net/sourceforge/openutils/mgnlsimplecache/lock/NoArgsSynchedOp.java
    trunk/openutils-mgnlcache/src/main/java/net/sourceforge/openutils/mgnlsimplecache/lock/SynchCacheContentOperations.java
    trunk/openutils-mgnlcache/src/main/java/net/sourceforge/openutils/mgnlsimplecache/lock/SynchedOp.java
    trunk/openutils-mgnlcache/src/main/java/net/sourceforge/openutils/mgnlsimplecache/managers/
    trunk/openutils-mgnlcache/src/main/java/net/sourceforge/openutils/mgnlsimplecache/managers/CacheHeaders.java
    trunk/openutils-mgnlcache/src/main/java/net/sourceforge/openutils/mgnlsimplecache/managers/CacheManager.java
    trunk/openutils-mgnlcache/src/main/java/net/sourceforge/openutils/mgnlsimplecache/managers/CacheResponseWrapper.java
    trunk/openutils-mgnlcache/src/main/java/net/sourceforge/openutils/mgnlsimplecache/managers/CachedItem.java
    trunk/openutils-mgnlcache/src/main/java/net/sourceforge/openutils/mgnlsimplecache/managers/ResetableBufferedOutputStream.java
    trunk/openutils-mgnlcache/src/main/java/net/sourceforge/openutils/mgnlsimplecache/voters/
    trunk/openutils-mgnlcache/src/main/java/net/sourceforge/openutils/mgnlsimplecache/voters/AllInOneCacheVoter.java
    trunk/openutils-mgnlcache/src/main/resources/
    trunk/openutils-mgnlcache/src/main/resources/META-INF/
    trunk/openutils-mgnlcache/src/main/resources/META-INF/magnolia/
    trunk/openutils-mgnlcache/src/main/resources/META-INF/magnolia/simplecache.xml
    trunk/openutils-mgnlcache/src/test/
    trunk/openutils-mgnlcache/src/test/java/
    trunk/openutils-mgnlcache/src/test/resources/

Added: trunk/openutils-mgnlcache/pom.xml
===================================================================
--- trunk/openutils-mgnlcache/pom.xml	                        (rev 0)
+++ trunk/openutils-mgnlcache/pom.xml	2010-04-03 13:06:23 UTC (rev 2247)
@@ -0,0 +1,78 @@
+<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>
+    <version>1.3</version>
+  </parent>
+  <modelVersion>4.0.0</modelVersion>
+  <packaging>jar</packaging>
+  <artifactId>openutils-mgnlcache</artifactId>
+  <name>Magnolia Simplecache module</name>
+  <description>An alternative "simple is beautiful" cache module for Magnolia</description>
+  <version>1.0.0-b1-SNAPSHOT</version>
+  <inceptionYear>2010</inceptionYear>
+  <licenses>
+    <license>
+      <name>GPLv3</name>
+      <url>http://www.gnu.org/licenses/gpl-3.0.txt</url>
+    </license>
+  </licenses>
+  <url>http://www.openmindlab.com/lab/products/simplecache.html</url>
+  <issueManagement>
+    <system>jira</system>
+    <url>http://jira.openmindlab.com/browse/CACHE</url>
+  </issueManagement>
+  <scm>
+    <connection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/trunk/openutils-mgnlcache</connection>
+    <developerConnection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/trunk/openutils-mgnlcache</developerConnection>
+    <url>http://openutils.svn.sourceforge.net/viewcvs.cgi/openutils/trunk/openutils-mgnlcache</url>
+  </scm>
+  <build>
+    <resources>
+      <resource>
+        <filtering>false</filtering>
+        <directory>src/main/resources</directory>
+        <includes>
+          <include>**/*</include>
+        </includes>
+      </resource>
+      <resource>
+        <filtering>true</filtering>
+        <directory>src/main/resources</directory>
+        <includes>
+          <include>META-INF/magnolia/*</include>
+        </includes>
+      </resource>
+    </resources>
+  </build>
+  <dependencies>
+    <dependency>
+      <groupId>info.magnolia</groupId>
+      <artifactId>magnolia-core</artifactId>
+      <version>${magnolia.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>com.google.collections</groupId>
+      <artifactId>google-collections</artifactId>
+      <version>1.0</version>
+    </dependency>
+    <dependency>
+      <groupId>org.testng</groupId>
+      <artifactId>testng</artifactId>
+      <version>5.10</version>
+      <classifier>jdk15</classifier>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>info.magnolia</groupId>
+      <artifactId>magnolia-core</artifactId>
+      <version>${magnolia.version}</version>
+      <classifier>tests</classifier>
+      <scope>test</scope>
+    </dependency>
+  </dependencies>
+  <properties>
+    <magnolia.version>4.3</magnolia.version>
+  </properties>
+</project>
\ No newline at end of file


Property changes on: trunk/openutils-mgnlcache/pom.xml
___________________________________________________________________
Added: svn:mime-type
   + text/xml
Added: svn:keywords
   + Author Date Id Revision
Added: svn:eol-style
   + native

Added: trunk/openutils-mgnlcache/src/main/assembly/assembly-bundle.xml
===================================================================
--- trunk/openutils-mgnlcache/src/main/assembly/assembly-bundle.xml	                        (rev 0)
+++ trunk/openutils-mgnlcache/src/main/assembly/assembly-bundle.xml	2010-04-03 13:06:23 UTC (rev 2247)
@@ -0,0 +1,35 @@
+<assembly>
+  <id>bundle</id>
+  <formats>
+    <format>zip</format>
+  </formats>
+  <includeBaseDirectory>false</includeBaseDirectory>
+  <fileSets>
+    <fileSet>
+      <filtered>true</filtered>
+      <outputDirectory>/</outputDirectory>
+      <lineEnding>crlf</lineEnding>
+      <directory>${basedir}/src/main/bundle</directory>
+      <includes>
+        <include>*</include>
+      </includes>
+    </fileSet>
+    <fileSet>
+      <directory>.</directory>
+      <outputDirectory>/sources/</outputDirectory>
+      <includes>
+        <include>src/**/*</include>
+        <include>pom.xml</include>
+      </includes>
+    </fileSet>
+  </fileSets>
+  <dependencySets>
+    <dependencySet>
+      <outputDirectory>bin</outputDirectory>
+      <includes>
+        <include>net.sourceforge.openutils:*</include>
+        <include>com.google.collections:*</include>
+      </includes>
+    </dependencySet>
+  </dependencySets>
+</assembly>
\ No newline at end of file


Property changes on: trunk/openutils-mgnlcache/src/main/assembly/assembly-bundle.xml
___________________________________________________________________
Added: svn:mime-type
   + text/xml
Added: svn:keywords
   + Author Date Id Revision
Added: svn:eol-style
   + native

Added: trunk/openutils-mgnlcache/src/main/bundle/LICENSE.txt
===================================================================
--- trunk/openutils-mgnlcache/src/main/bundle/LICENSE.txt	                        (rev 0)
+++ trunk/openutils-mgnlcache/src/main/bundle/LICENSE.txt	2010-04-03 13:06:23 UTC (rev 2247)
@@ -0,0 +1,674 @@
+                    GNU GENERAL PUBLIC LICENSE
+                       Version 3, 29 June 2007
+
+ Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+                            Preamble
+
+  The GNU General Public License is a free, copyleft license for
+software and other kinds of works.
+
+  The licenses for most software and other practical works are designed
+to take away your freedom to share and change the works.  By contrast,
+the GNU General Public License is intended to guarantee your freedom to
+share and change all versions of a program--to make sure it remains free
+software for all its users.  We, the Free Software Foundation, use the
+GNU General Public License for most of our software; it applies also to
+any other work released this way by its authors.  You can apply it to
+your programs, too.
+
+  When we speak of free software, we are referring to freedom, not
+price.  Our General Public Licenses are designed to make sure that you
+have the freedom to distribute copies of free software (and charge for
+them if you wish), that you receive source code or can get it if you
+want it, that you can change the software or use pieces of it in new
+free programs, and that you know you can do these things.
+
+  To protect your rights, we need to prevent others from denying you
+these rights or asking you to surrender the rights.  Therefore, you have
+certain responsibilities if you distribute copies of the software, or if
+you modify it: responsibilities to respect the freedom of others.
+
+  For example, if you distribute copies of such a program, whether
+gratis or for a fee, you must pass on to the recipients the same
+freedoms that you received.  You must make sure that they, too, receive
+or can get the source code.  And you must show them these terms so they
+know their rights.
+
+  Developers that use the GNU GPL protect your rights with two steps:
+(1) assert copyright on the software, and (2) offer you this License
+giving you legal permission to copy, distribute and/or modify it.
+
+  For the developers' and authors' protection, the GPL clearly explains
+that there is no warranty for this free software.  For both users' and
+authors' sake, the GPL requires that modified versions be marked as
+changed, so that their problems will not be attributed erroneously to
+authors of previous versions.
+
+  Some devices are designed to deny users access to install or run
+modified versions of the software inside them, although the manufacturer
+can do so.  This is fundamentally incompatible with the aim of
+protecting users' freedom to change the software.  The systematic
+pattern of such abuse occurs in the area of products for individuals to
+use, which is precisely where it is most unacceptable.  Therefore, we
+have designed this version of the GPL to prohibit the practice for those
+products.  If such problems arise substantially in other domains, we
+stand ready to extend this provision to those domains in future versions
+of the GPL, as needed to protect the freedom of users.
+
+  Finally, every program is threatened constantly by software patents.
+States should not allow patents to restrict development and use of
+software on general-purpose computers, but in those that do, we wish to
+avoid the special danger that patents applied to a free program could
+make it effectively proprietary.  To prevent this, the GPL assures that
+patents cannot be used to render the program non-free.
+
+  The precise terms and conditions for copying, distribution and
+modification follow.
+
+                       TERMS AND CONDITIONS
+
+  0. Definitions.
+
+  "This License" refers to version 3 of the GNU General Public License.
+
+  "Copyright" also means copyright-like laws that apply to other kinds of
+works, such as semiconductor masks.
+
+  "The Program" refers to any copyrightable work licensed under this
+License.  Each licensee is addressed as "you".  "Licensees" and
+"recipients" may be individuals or organizations.
+
+  To "modify" a work means to copy from or adapt all or part of the work
+in a fashion requiring copyright permission, other than the making of an
+exact copy.  The resulting work is called a "modified version" of the
+earlier work or a work "based on" the earlier work.
+
+  A "covered work" means either the unmodified Program or a work based
+on the Program.
+
+  To "propagate" a work means to do anything with it that, without
+permission, would make you directly or secondarily liable for
+infringement under applicable copyright law, except executing it on a
+computer or modifying a private copy.  Propagation includes copying,
+distribution (with or without modification), making available to the
+public, and in some countries other activities as well.
+
+  To "convey" a work means any kind of propagation that enables other
+parties to make or receive copies.  Mere interaction with a user through
+a computer network, with no transfer of a copy, is not conveying.
+
+  An interactive user interface displays "Appropriate Legal Notices"
+to the extent that it includes a convenient and prominently visible
+feature that (1) displays an appropriate copyright notice, and (2)
+tells the user that there is no warranty for the work (except to the
+extent that warranties are provided), that licensees may convey the
+work under this License, and how to view a copy of this License.  If
+the interface presents a list of user commands or options, such as a
+menu, a prominent item in the list meets this criterion.
+
+  1. Source Code.
+
+  The "source code" for a work means the preferred form of the work
+for making modifications to it.  "Object code" means any non-source
+form of a work.
+
+  A "Standard Interface" means an interface that either is an official
+standard defined by a recognized standards body, or, in the case of
+interfaces specified for a particular programming language, one that
+is widely used among developers working in that language.
+
+  The "System Libraries" of an executable work include anything, other
+than the work as a whole, that (a) is included in the normal form of
+packaging a Major Component, but which is not part of that Major
+Component, and (b) serves only to enable use of the work with that
+Major Component, or to implement a Standard Interface for which an
+implementation is available to the public in source code form.  A
+"Major Component", in this context, means a major essential component
+(kernel, window system, and so on) of the specific operating system
+(if any) on which the executable work runs, or a compiler used to
+produce the work, or an object code interpreter used to run it.
+
+  The "Corresponding Source" for a work in object code form means all
+the source code needed to generate, install, and (for an executable
+work) run the object code and to modify the work, including scripts to
+control those activities.  However, it does not include the work's
+System Libraries, or general-purpose tools or generally available free
+programs which are used unmodified in performing those activities but
+which are not part of the work.  For example, Corresponding Source
+includes interface definition files associated with source files for
+the work, and the source code for shared libraries and dynamically
+linked subprograms that the work is specifically designed to require,
+such as by intimate data communication or control flow between those
+subprograms and other parts of the work.
+
+  The Corresponding Source need not include anything that users
+can regenerate automatically from other parts of the Corresponding
+Source.
+
+  The Corresponding Source for a work in source code form is that
+same work.
+
+  2. Basic Permissions.
+
+  All rights granted under this License are granted for the term of
+copyright on the Program, and are irrevocable provided the stated
+conditions are met.  This License explicitly affirms your unlimited
+permission to run the unmodified Program.  The output from running a
+covered work is covered by this License only if the output, given its
+content, constitutes a covered work.  This License acknowledges your
+rights of fair use or other equivalent, as provided by copyright law.
+
+  You may make, run and propagate covered works that you do not
+convey, without conditions so long as your license otherwise remains
+in force.  You may convey covered works to others for the sole purpose
+of having them make modifications exclusively for you, or provide you
+with facilities for running those works, provided that you comply with
+the terms of this License in conveying all material for which you do
+not control copyright.  Those thus making or running the covered works
+for you must do so exclusively on your behalf, under your direction
+and control, on terms that prohibit them from making any copies of
+your copyrighted material outside their relationship with you.
+
+  Conveying under any other circumstances is permitted solely under
+the conditions stated below.  Sublicensing is not allowed; section 10
+makes it unnecessary.
+
+  3. Protecting Users' Legal Rights From Anti-Circumvention Law.
+
+  No covered work shall be deemed part of an effective technological
+measure under any applicable law fulfilling obligations under article
+11 of the WIPO copyright treaty adopted on 20 December 1996, or
+similar laws prohibiting or restricting circumvention of such
+measures.
+
+  When you convey a covered work, you waive any legal power to forbid
+circumvention of technological measures to the extent such circumvention
+is effected by exercising rights under this License with respect to
+the covered work, and you disclaim any intention to limit operation or
+modification of the work as a means of enforcing, against the work's
+users, your or third parties' legal rights to forbid circumvention of
+technological measures.
+
+  4. Conveying Verbatim Copies.
+
+  You may convey verbatim copies of the Program's source code as you
+receive it, in any medium, provided that you conspicuously and
+appropriately publish on each copy an appropriate copyright notice;
+keep intact all notices stating that this License and any
+non-permissive terms added in accord with section 7 apply to the code;
+keep intact all notices of the absence of any warranty; and give all
+recipients a copy of this License along with the Program.
+
+  You may charge any price or no price for each copy that you convey,
+and you may offer support or warranty protection for a fee.
+
+  5. Conveying Modified Source Versions.
+
+  You may convey a work based on the Program, or the modifications to
+produce it from the Program, in the form of source code under the
+terms of section 4, provided that you also meet all of these conditions:
+
+    a) The work must carry prominent notices stating that you modified
+    it, and giving a relevant date.
+
+    b) The work must carry prominent notices stating that it is
+    released under this License and any conditions added under section
+    7.  This requirement modifies the requirement in section 4 to
+    "keep intact all notices".
+
+    c) You must license the entire work, as a whole, under this
+    License to anyone who comes into possession of a copy.  This
+    License will therefore apply, along with any applicable section 7
+    additional terms, to the whole of the work, and all its parts,
+    regardless of how they are packaged.  This License gives no
+    permission to license the work in any other way, but it does not
+    invalidate such permission if you have separately received it.
+
+    d) If the work has interactive user interfaces, each must display
+    Appropriate Legal Notices; however, if the Program has interactive
+    interfaces that do not display Appropriate Legal Notices, your
+    work need not make them do so.
+
+  A compilation of a covered work with other separate and independent
+works, which are not by their nature extensions of the covered work,
+and which are not combined with it such as to form a larger program,
+in or on a volume of a storage or distribution medium, is called an
+"aggregate" if the compilation and its resulting copyright are not
+used to limit the access or legal rights of the compilation's users
+beyond what the individual works permit.  Inclusion of a covered work
+in an aggregate does not cause this License to apply to the other
+parts of the aggregate.
+
+  6. Conveying Non-Source Forms.
+
+  You may convey a covered work in object code form under the terms
+of sections 4 and 5, provided that you also convey the
+machine-readable Corresponding Source under the terms of this License,
+in one of these ways:
+
+    a) Convey the object code in, or embodied in, a physical product
+    (including a physical distribution medium), accompanied by the
+    Corresponding Source fixed on a durable physical medium
+    customarily used for software interchange.
+
+    b) Convey the object code in, or embodied in, a physical product
+    (including a physical distribution medium), accompanied by a
+    written offer, valid for at least three years and valid for as
+    long as you offer spare parts or customer support for that product
+    model, to give anyone who possesses the object code either (1) a
+    copy of the Corresponding Source for all the software in the
+    product that is covered by this License, on a durable physical
+    medium customarily used for software interchange, for a price no
+    more than your reasonable cost of physically performing this
+    conveying of source, or (2) access to copy the
+    Corresponding Source from a network server at no charge.
+
+    c) Convey individual copies of the object code with a copy of the
+    written offer to provide the Corresponding Source.  This
+    alternative is allowed only occasionally and noncommercially, and
+    only if you received the object code with such an offer, in accord
+    with subsection 6b.
+
+    d) Convey the object code by offering access from a designated
+    place (gratis or for a charge), and offer equivalent access to the
+    Corresponding Source in the same way through the same place at no
+    further charge.  You need not require recipients to copy the
+    Corresponding Source along with the object code.  If the place to
+    copy the object code is a network server, the Corresponding Source
+    may be on a different server (operated by you or a third party)
+    that supports equivalent copying facilities, provided you maintain
+    clear directions next to the object code saying where to find the
+    Corresponding Source.  Regardless of what server hosts the
+    Corresponding Source, you remain obligated to ensure that it is
+    available for as long as needed to satisfy these requirements.
+
+    e) Convey the object code using peer-to-peer transmission, provided
+    you inform other peers where the object code and Corresponding
+    Source of the work are being offered to the general public at no
+    charge under subsection 6d.
+
+  A separable portion of the object code, whose source code is excluded
+from the Corresponding Source as a System Library, need not be
+included in conveying the object code work.
+
+  A "User Product" is either (1) a "consumer product", which means any
+tangible personal property which is normally used for personal, family,
+or household purposes, or (2) anything designed or sold for incorporation
+into a dwelling.  In determining whether a product is a consumer product,
+doubtful cases shall be resolved in favor of coverage.  For a particular
+product received by a particular user, "normally used" refers to a
+typical or common use of that class of product, regardless of the status
+of the particular user or of the way in which the particular user
+actually uses, or expects or is expected to use, the product.  A product
+is a consumer product regardless of whether the product has substantial
+commercial, industrial or non-consumer uses, unless such uses represent
+the only significant mode of use of the product.
+
+  "Installation Information" for a User Product means any methods,
+procedures, authorization keys, or other information required to install
+and execute modified versions of a covered work in that User Product from
+a modified version of its Corresponding Source.  The information must
+suffice to ensure that the continued functioning of the modified object
+code is in no case prevented or interfered with solely because
+modification has been made.
+
+  If you convey an object code work under this section in, or with, or
+specifically for use in, a User Product, and the conveying occurs as
+part of a transaction in which the right of possession and use of the
+User Product is transferred to the recipient in perpetuity or for a
+fixed term (regardless of how the transaction is characterized), the
+Corresponding Source conveyed under this section must be accompanied
+by the Installation Information.  But this requirement does not apply
+if neither you nor any third party retains the ability to install
+modified object code on the User Product (for example, the work has
+been installed in ROM).
+
+  The requirement to provide Installation Information does not include a
+requirement to continue to provide support service, warranty, or updates
+for a work that has been modified or installed by the recipient, or for
+the User Product in which it has been modified or installed.  Access to a
+network may be denied when the modification itself materially and
+adversely affects the operation of the network or violates the rules and
+protocols for communication across the network.
+
+  Corresponding Source conveyed, and Installation Information provided,
+in accord with this section must be in a format that is publicly
+documented (and with an implementation available to the public in
+source code form), and must require no special password or key for
+unpacking, reading or copying.
+
+  7. Additional Terms.
+
+  "Additional permissions" are terms that supplement the terms of this
+License by making exceptions from one or more of its conditions.
+Additional permissions that are applicable to the entire Program shall
+be treated as though they were included in this License, to the extent
+that they are valid under applicable law.  If additional permissions
+apply only to part of the Program, that part may be used separately
+under those permissions, but the entire Program remains governed by
+this License without regard to the additional permissions.
+
+  When you convey a copy of a covered work, you may at your option
+remove any additional permissions from that copy, or from any part of
+it.  (Additional permissions may be written to require their own
+removal in certain cases when you modify the work.)  You may place
+additional permissions on material, added by you to a covered work,
+for which you have or can give appropriate copyright permission.
+
+  Notwithstanding any other provision of this License, for material you
+add to a covered work, you may (if authorized by the copyright holders of
+that material) supplement the terms of this License with terms:
+
+    a) Disclaiming warranty or limiting liability differently from the
+    terms of sections 15 and 16 of this License; or
+
+    b) Requiring preservation of specified reasonable legal notices or
+    author attributions in that material or in the Appropriate Legal
+    Notices displayed by works containing it; or
+
+    c) Prohibiting misrepresentation of the origin of that material, or
+    requiring that modified versions of such material be marked in
+    reasonable ways as different from the original version; or
+
+    d) Limiting the use for publicity purposes of names of licensors or
+    authors of the material; or
+
+    e) Declining to grant rights under trademark law for use of some
+    trade names, trademarks, or service marks; or
+
+    f) Requiring indemnification of licensors and authors of that
+    material by anyone who conveys the material (or modified versions of
+    it) with contractual assumptions of liability to the recipient, for
+    any liability that these contractual assumptions directly impose on
+    those licensors and authors.
+
+  All other non-permissive additional terms are considered "further
+restrictions" within the meaning of section 10.  If the Program as you
+received it, or any part of it, contains a notice stating that it is
+governed by this License along with a term that is a further
+restriction, you may remove that term.  If a license document contains
+a further restriction but permits relicensing or conveying under this
+License, you may add to a covered work material governed by the terms
+of that license document, provided that the further restriction does
+not survive such relicensing or conveying.
+
+  If you add terms to a covered work in accord with this section, you
+must place, in the relevant source files, a statement of the
+additional terms that apply to those files, or a notice indicating
+where to find the applicable terms.
+
+  Additional terms, permissive or non-permissive, may be stated in the
+form of a separately written license, or stated as exceptions;
+the above requirements apply either way.
+
+  8. Termination.
+
+  You may not propagate or modify a covered work except as expressly
+provided under this License.  Any attempt otherwise to propagate or
+modify it is void, and will automatically terminate your rights under
+this License (including any patent licenses granted under the third
+paragraph of section 11).
+
+  However, if you cease all violation of this License, then your
+license from a particular copyright holder is reinstated (a)
+provisionally, unless and until the copyright holder explicitly and
+finally terminates your license, and (b) permanently, if the copyright
+holder fails to notify you of the violation by some reasonable means
+prior to 60 days after the cessation.
+
+  Moreover, your license from a particular copyright holder is
+reinstated permanently if the copyright holder notifies you of the
+violation by some reasonable means, this is the first time you have
+received notice of violation of this License (for any work) from that
+copyright holder, and you cure the violation prior to 30 days after
+your receipt of the notice.
+
+  Termination of your rights under this section does not terminate the
+licenses of parties who have received copies or rights from you under
+this License.  If your rights have been terminated and not permanently
+reinstated, you do not qualify to receive new licenses for the same
+material under section 10.
+
+  9. Acceptance Not Required for Having Copies.
+
+  You are not required to accept this License in order to receive or
+run a copy of the Program.  Ancillary propagation of a covered work
+occurring solely as a consequence of using peer-to-peer transmission
+to receive a copy likewise does not require acceptance.  However,
+nothing other than this License grants you permission to propagate or
+modify any covered work.  These actions infringe copyright if you do
+not accept this License.  Therefore, by modifying or propagating a
+covered work, you indicate your acceptance of this License to do so.
+
+  10. Automatic Licensing of Downstream Recipients.
+
+  Each time you convey a covered work, the recipient automatically
+receives a license from the original licensors, to run, modify and
+propagate that work, subject to this License.  You are not responsible
+for enforcing compliance by third parties with this License.
+
+  An "entity transaction" is a transaction transferring control of an
+organization, or substantially all assets of one, or subdividing an
+organization, or merging organizations.  If propagation of a covered
+work results from an entity transaction, each party to that
+transaction who receives a copy of the work also receives whatever
+licenses to the work the party's predecessor in interest had or could
+give under the previous paragraph, plus a right to possession of the
+Corresponding Source of the work from the predecessor in interest, if
+the predecessor has it or can get it with reasonable efforts.
+
+  You may not impose any further restrictions on the exercise of the
+rights granted or affirmed under this License.  For example, you may
+not impose a license fee, royalty, or other charge for exercise of
+rights granted under this License, and you may not initiate litigation
+(including a cross-claim or counterclaim in a lawsuit) alleging that
+any patent claim is infringed by making, using, selling, offering for
+sale, or importing the Program or any portion of it.
+
+  11. Patents.
+
+  A "contributor" is a copyright holder who authorizes use under this
+License of the Program or a work on which the Program is based.  The
+work thus licensed is called the contributor's "contributor version".
+
+  A contributor's "essential patent claims" are all patent claims
+owned or controlled by the contributor, whether already acquired or
+hereafter acquired, that would be infringed by some manner, permitted
+by this License, of making, using, or selling its contributor version,
+but do not include claims that would be infringed only as a
+consequence of further modification of the contributor version.  For
+purposes of this definition, "control" includes the right to grant
+patent sublicenses in a manner consistent with the requirements of
+this License.
+
+  Each contributor grants you a non-exclusive, worldwide, royalty-free
+patent license under the contributor's essential patent claims, to
+make, use, sell, offer for sale, import and otherwise run, modify and
+propagate the contents of its contributor version.
+
+  In the following three paragraphs, a "patent license" is any express
+agreement or commitment, however denominated, not to enforce a patent
+(such as an express permission to practice a patent or covenant not to
+sue for patent infringement).  To "grant" such a patent license to a
+party means to make such an agreement or commitment not to enforce a
+patent against the party.
+
+  If you convey a covered work, knowingly relying on a patent license,
+and the Corresponding Source of the work is not available for anyone
+to copy, free of charge and under the terms of this License, through a
+publicly available network server or other readily accessible means,
+then you must either (1) cause the Corresponding Source to be so
+available, or (2) arrange to deprive yourself of the benefit of the
+patent license for this particular work, or (3) arrange, in a manner
+consistent with the requirements of this License, to extend the patent
+license to downstream recipients.  "Knowingly relying" means you have
+actual knowledge that, but for the patent license, your conveying the
+covered work in a country, or your recipient's use of the covered work
+in a country, would infringe one or more identifiable patents in that
+country that you have reason to believe are valid.
+
+  If, pursuant to or in connection with a single transaction or
+arrangement, you convey, or propagate by procuring conveyance of, a
+covered work, and grant a patent license to some of the parties
+receiving the covered work authorizing them to use, propagate, modify
+or convey a specific copy of the covered work, then the patent license
+you grant is automatically extended to all recipients of the covered
+work and works based on it.
+
+  A patent license is "discriminatory" if it does not include within
+the scope of its coverage, prohibits the exercise of, or is
+conditioned on the non-exercise of one or more of the rights that are
+specifically granted under this License.  You may not convey a covered
+work if you are a party to an arrangement with a third party that is
+in the business of distributing software, under which you make payment
+to the third party based on the extent of your activity of conveying
+the work, and under which the third party grants, to any of the
+parties who would receive the covered work from you, a discriminatory
+patent license (a) in connection with copies of the covered work
+conveyed by you (or copies made from those copies), or (b) primarily
+for and in connection with specific products or compilations that
+contain the covered work, unless you entered into that arrangement,
+or that patent license was granted, prior to 28 March 2007.
+
+  Nothing in this License shall be construed as excluding or limiting
+any implied license or other defenses to infringement that may
+otherwise be available to you under applicable patent law.
+
+  12. No Surrender of Others' Freedom.
+
+  If conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License.  If you cannot convey a
+covered work so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you may
+not convey it at all.  For example, if you agree to terms that obligate you
+to collect a royalty for further conveying from those to whom you convey
+the Program, the only way you could satisfy both those terms and this
+License would be to refrain entirely from conveying the Program.
+
+  13. Use with the GNU Affero General Public License.
+
+  Notwithstanding any other provision of this License, you have
+permission to link or combine any covered work with a work licensed
+under version 3 of the GNU Affero General Public License into a single
+combined work, and to convey the resulting work.  The terms of this
+License will continue to apply to the part which is the covered work,
+but the special requirements of the GNU Affero General Public License,
+section 13, concerning interaction through a network will apply to the
+combination as such.
+
+  14. Revised Versions of this License.
+
+  The Free Software Foundation may publish revised and/or new versions of
+the GNU General Public License from time to time.  Such new versions will
+be similar in spirit to the present version, but may differ in detail to
+address new problems or concerns.
+
+  Each version is given a distinguishing version number.  If the
+Program specifies that a certain numbered version of the GNU General
+Public License "or any later version" applies to it, you have the
+option of following the terms and conditions either of that numbered
+version or of any later version published by the Free Software
+Foundation.  If the Program does not specify a version number of the
+GNU General Public License, you may choose any version ever published
+by the Free Software Foundation.
+
+  If the Program specifies that a proxy can decide which future
+versions of the GNU General Public License can be used, that proxy's
+public statement of acceptance of a version permanently authorizes you
+to choose that version for the Program.
+
+  Later license versions may give you additional or different
+permissions.  However, no additional obligations are imposed on any
+author or copyright holder as a result of your choosing to follow a
+later version.
+
+  15. Disclaimer of Warranty.
+
+  THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
+APPLICABLE LAW.  EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
+HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY
+OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,
+THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM
+IS WITH YOU.  SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF
+ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
+
+  16. Limitation of Liability.
+
+  IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
+THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY
+GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE
+USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF
+DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD
+PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),
+EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF
+SUCH DAMAGES.
+
+  17. Interpretation of Sections 15 and 16.
+
+  If the disclaimer of warranty and limitation of liability provided
+above cannot be given local legal effect according to their terms,
+reviewing courts shall apply local law that most closely approximates
+an absolute waiver of all civil liability in connection with the
+Program, unless a warranty or assumption of liability accompanies a
+copy of the Program in return for a fee.
+
+                     END OF TERMS AND CONDITIONS
+
+            How to Apply These Terms to Your New Programs
+
+  If you develop a new program, and you want it to be of the greatest
+possible use to the public, the best way to achieve this is to make it
+free software which everyone can redistribute and change under these terms.
+
+  To do so, attach the following notices to the program.  It is safest
+to attach them to the start of each source file to most effectively
+state the exclusion of warranty; and each file should have at least
+the "copyright" line and a pointer to where the full notice is found.
+
+    <one line to give the program's name and a brief idea of what it does.>
+    Copyright (C) <year>  <name of author>
+
+    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/>.
+
+Also add information on how to contact you by electronic and paper mail.
+
+  If the program does terminal interaction, make it output a short
+notice like this when it starts in an interactive mode:
+
+    <program>  Copyright (C) <year>  <name of author>
+    This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
+    This is free software, and you are welcome to redistribute it
+    under certain conditions; type `show c' for details.
+
+The hypothetical commands `show w' and `show c' should show the appropriate
+parts of the General Public License.  Of course, your program's commands
+might be different; for a GUI interface, you would use an "about box".
+
+  You should also get your employer (if you work as a programmer) or school,
+if any, to sign a "copyright disclaimer" for the program, if necessary.
+For more information on this, and how to apply and follow the GNU GPL, see
+<http://www.gnu.org/licenses/>.
+
+  The GNU General Public License does not permit incorporating your program
+into proprietary programs.  If your program is a subroutine library, you
+may consider it more useful to permit linking proprietary applications with
+the library.  If this is what you want to do, use the GNU Lesser General
+Public License instead of this License.  But first, please read
+<http://www.gnu.org/philosophy/why-not-lgpl.html>.


Property changes on: trunk/openutils-mgnlcache/src/main/bundle/LICENSE.txt
___________________________________________________________________
Added: svn:mime-type
   + text/plain
Added: svn:keywords
   + Author Date Id Revision
Added: svn:eol-style
   + native

Added: trunk/openutils-mgnlcache/src/main/bundle/README.txt
===================================================================
--- trunk/openutils-mgnlcache/src/main/bundle/README.txt	                        (rev 0)
+++ trunk/openutils-mgnlcache/src/main/bundle/README.txt	2010-04-03 13:06:23 UTC (rev 2247)
@@ -0,0 +1,76 @@
+===========================================================
+
+${pom.name} ${pom.version}
+by ${pom.organization.name}
+
+===========================================================
+
+${pom.description}
+
+More information about this project can be found at:
+${pom.url}
+
+Change log and known issues can be found at:
+${pom.issueManagement.url}
+
+Source is available from the subversion repository at:
+${pom.scm.url}
+
+
+=========================================
+ INSTALLATION
+=========================================
+
+The bundle is provided as a zip file; the archive contains a number of .jar files
+(the module itself plus the required dependencies not already available in a
+standard Magnolia installation.
+
+Copy to your all the jar files in the bundle into your Magnolia instances'
+WEB-INF/lib folder, just like any other module.
+
+Please check the documentation website for information about required Magnolia
+versions.
+
+
+=========================================
+ USING MAVEN
+=========================================
+
+The preferred way to add ${pom.name} to your project is using maven.
+You can declare the following dependency in your pom.xml:
+
+    <dependency>
+      <groupId>${pom.groupId}</groupId>
+      <artifactId>${pom.artifactId}</artifactId>
+      <version>${pom.version}</version>
+    </dependency>
+
+
+
+=========================================
+ LICENSE
+=========================================
+
+Copyright Openmind 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/>.
+
+
+
+=========================================
+ GENERAL LEGAL NOTICES
+=========================================
+
+Magnolia is a registered trademark of Magnolia International Ltd.
+


Property changes on: trunk/openutils-mgnlcache/src/main/bundle/README.txt
___________________________________________________________________
Added: svn:mime-type
   + text/plain
Added: svn:keywords
   + Author Date Id Revision
Added: svn:eol-style
   + native

Added: trunk/openutils-mgnlcache/src/main/etc/header.txt
===================================================================
--- trunk/openutils-mgnlcache/src/main/etc/header.txt	                        (rev 0)
+++ trunk/openutils-mgnlcache/src/main/etc/header.txt	2010-04-03 13:06:23 UTC (rev 2247)
@@ -0,0 +1,16 @@
+
+${name} (${url})
+Copyright(C) ${year}, 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/>.
\ No newline at end of file


Property changes on: trunk/openutils-mgnlcache/src/main/etc/header.txt
___________________________________________________________________
Added: svn:mime-type
   + text/plain
Added: svn:keywords
   + Author Date Id Revision
Added: svn:eol-style
   + native

Added: trunk/openutils-mgnlcache/src/main/java/net/sourceforge/openutils/mgnlsimplecache/filesystem/FSCacheManager.java
===================================================================
--- trunk/openutils-mgnlcache/src/main/java/net/sourceforge/openutils/mgnlsimplecache/filesystem/FSCacheManager.java	                        (rev 0)
+++ trunk/openutils-mgnlcache/src/main/java/net/sourceforge/openutils/mgnlsimplecache/filesystem/FSCacheManager.java	2010-04-03 13:06:23 UTC (rev 2247)
@@ -0,0 +1,485 @@
+/**
+ *
+ * Magnolia Simplecache module (http://www.openmindlab.com/lab/products/simplecache.html)
+ * Copyright(C) 2010-2010, Openmind S.r.l. http://www.openmindonline.it
+ *
+ *  This program is free software: you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation, either version 3 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package net.sourceforge.openutils.mgnlsimplecache.filesystem;
+
+import info.magnolia.cms.beans.config.ContentRepository;
+import info.magnolia.cms.core.Path;
+import info.magnolia.cms.util.MBeanUtil;
+import info.magnolia.cms.util.ObservationUtil;
+import info.magnolia.voting.Voter;
+
+import java.io.File;
+import java.io.IOException;
+import java.io.UnsupportedEncodingException;
+import java.net.URLEncoder;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.List;
+import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
+
+import javax.jcr.observation.EventIterator;
+import javax.jcr.observation.EventListener;
+import javax.servlet.http.HttpServletRequest;
+
+import net.sourceforge.openutils.mgnlsimplecache.managers.CacheManager;
+import net.sourceforge.openutils.mgnlsimplecache.managers.CachedItem;
+
+import org.apache.commons.io.FileUtils;
+import org.apache.commons.io.filefilter.IOFileFilter;
+import org.apache.commons.io.filefilter.TrueFileFilter;
+import org.apache.commons.lang.StringUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+
+/**
+ * @author Manuel Molaschi
+ * @author Fabrizio Giustina
+ * @version $Id$
+ */
+public class FSCacheManager implements CacheManager, FSCacheManagerMBean, EventListener
+{
+
+    private List<String> repositoryUrls = new ArrayList<String>();
+
+    private final String cacheKeyInRequest;
+
+    private final String cacheDir;
+
+    private Map<String, FSCachedItem> contents = new ConcurrentHashMap<String, FSCachedItem>();
+
+    private String basePath = "fscache";
+
+    private Object lock = new Object();
+
+    private boolean flushOnStop = false;
+
+    private boolean reloadAtStartup;
+
+    private int cacheHits;
+
+    private int cacheMisses;
+
+    private int cachePuts;
+
+    private Voter gzipVoter;
+
+    /**
+     * Logger.
+     */
+    private Logger log = LoggerFactory.getLogger(FSCacheManager.class);
+
+    /**
+     * Constructor
+     */
+    public FSCacheManager()
+    {
+        super();
+        cacheKeyInRequest = "__" + this.getClass().getName() + "__" + this.hashCode() + "__key";
+        cacheDir = StringUtils.replace(Path.getCacheDirectoryPath(), "\\", "/")
+            + ((Path.getCacheDirectoryPath().endsWith("\\") || Path.getCacheDirectoryPath().endsWith("/")) ? "" : "/")
+            + this.getBasePath()
+            + "/";
+
+        new File(cacheDir).mkdirs();
+
+        try
+        {
+
+            MBeanUtil.registerMBean(this.getClass().getSimpleName(), this);
+        }
+        catch (Throwable e)
+        {
+            log.error("Error registering cache MBean: " + e.getClass().getName() + " " + e.getMessage());
+        }
+    }
+
+    /**
+     * Returns the gzip.
+     * @return the gzip
+     */
+    public Voter getGzipVoter()
+    {
+        return gzipVoter;
+    }
+
+    /**
+     * Sets the gzip.
+     * @param gzip the gzip to set
+     */
+    public void setGzipVoter(Voter gzip)
+    {
+        this.gzipVoter = gzip;
+    }
+
+    /**
+     * Returns the basePath.
+     * @return the basePath
+     */
+    public String getBasePath()
+    {
+        return basePath;
+    }
+
+    /**
+     * Sets the basePath.
+     * @param basePath the basePath to set
+     */
+    public void setBasePath(String basePath)
+    {
+        this.basePath = basePath;
+    }
+
+    /**
+     * Get cache directory
+     * @return cache dir
+     */
+    public String getCacheDir()
+    {
+        return this.cacheDir;
+    }
+
+    /**
+     * Sets the flushOnStop.
+     * @param flushOnStop the flushOnStop to set
+     */
+    public void setFlushOnStop(boolean flushOnStop)
+    {
+        this.flushOnStop = flushOnStop;
+    }
+
+    /**
+     * Returns the reloadAtStartup.
+     * @return the reloadAtStartup
+     */
+    public boolean isReloadAtStartup()
+    {
+        return reloadAtStartup;
+    }
+
+    /**
+     * Sets the reloadAtStartup.
+     * @param reloadAtStartup the reloadAtStartup to set
+     */
+    public void setReloadAtStartup(boolean reloadAtStartup)
+    {
+        this.reloadAtStartup = reloadAtStartup;
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public int getCacheCount()
+    {
+        return contents.size();
+    }
+
+    @Override
+    public int getCacheHits()
+    {
+        return this.cacheHits;
+    }
+
+    @Override
+    public int getCacheMisses()
+    {
+        return this.cacheMisses;
+    }
+
+    @Override
+    public int getCachePuts()
+    {
+        return this.cachePuts;
+    }
+
+    @Override
+    public void resetStatistics()
+    {
+        this.cacheHits = 0;
+        this.cacheMisses = 0;
+        this.cachePuts = 0;
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public void onEvent(EventIterator events)
+    {
+        flush();
+    }
+
+    /**
+     * Returns the repositoriesToWatch.
+     * @return the repositoriesToWatch
+     */
+    public List<String> getRepositoryUrls()
+    {
+        return repositoryUrls;
+    }
+
+    /**
+     * Sets the repositoriesToWatch.
+     * @param repositoriesToWatch the repositoriesToWatch to set
+     */
+    public void addRepositoryUrl(String repo)
+    {
+        this.repositoryUrls.add(repo);
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public long getSizeOnDisk()
+    {
+        long size = 0;
+        for (FSCachedItem content : contents.values())
+        {
+            size += content.getTotalSizeOnDiskInBytes();
+        }
+
+        // size in b
+        return size / 1024;
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public boolean isFlushOnStop()
+    {
+        return flushOnStop;
+    }
+
+    /**
+     * Get key
+     * @param request
+     * @return
+     */
+    protected String getKey(HttpServletRequest request)
+    {
+        String key = (String) request.getAttribute(cacheKeyInRequest);
+        if (key == null)
+        {
+            String uri = StringUtils.replaceOnce(request.getRequestURI(), request.getContextPath(), StringUtils.EMPTY);
+            if (StringUtils.isBlank(uri))
+            {
+                uri = "/";
+            }
+            if (uri.endsWith("/"))
+            {
+                uri += "root";
+            }
+            String uriTokens[] = StringUtils.split(uri, "/");
+            for (int i = 0; i < uriTokens.length; i++)
+            {
+                try
+                {
+                    uriTokens[i] = URLEncoder.encode(uriTokens[i], "UTF-8");
+                }
+                catch (UnsupportedEncodingException e)
+                {
+                    // never happens
+                }
+                if (i < uriTokens.length - 1)
+                {
+                    uriTokens[i] += ".cachedir";
+                }
+            }
+            key = StringUtils.join(uriTokens, "/");
+            key = (StringUtils.isNotBlank(request.getScheme()) ? request.getScheme() : "http")
+                + "-"
+                + request.getServerName()
+                + "/"
+                + key;
+            if (StringUtils.isNotBlank(request.getQueryString()))
+            {
+                key += "-qs-" + request.getQueryString().hashCode();
+            }
+        }
+        return key;
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public CachedItem get(HttpServletRequest request)
+    {
+
+        boolean gzipable = gzipVoter != null && gzipVoter.vote(request) > 0;
+
+        synchronized (lock)
+        {
+
+            boolean miss = !contents.containsKey(getKey(request));
+            if (miss)
+            {
+                cacheMisses++;
+            }
+            else
+            {
+                cacheHits++;
+            }
+
+            if (miss)
+            {
+                String fileName = getCacheDir() + getKey(request);
+                contents.put(getKey(request), FSCachedItem.createNew(fileName, gzipable));
+                cachePuts++;
+            }
+            return contents.get(getKey(request));
+        }
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public void reset(HttpServletRequest request) throws IOException
+    {
+        FSCachedItem content = (FSCachedItem) get(request);
+        content.lockToWrite();
+        content.flush();
+        contents.remove(getKey(request));
+        content.releaseLockToWrite();
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @SuppressWarnings("unchecked")
+    @Override
+    public void start()
+    {
+
+        // to be sure...
+        contents.clear();
+
+        if (reloadAtStartup)
+        {
+
+            // restore cache contents
+            String cacheDir = getCacheDir();
+            Collection<File> files = FileUtils.listFiles(new File(cacheDir), new IOFileFilter()
+            {
+
+                /**
+                 * {@inheritDoc}
+                 */
+                @Override
+                public boolean accept(File dir, String name)
+                {
+                    return accept(new File(dir, name));
+                }
+
+                /**
+                 * {@inheritDoc}
+                 */
+                @Override
+                public boolean accept(File file)
+                {
+                    return !file.isDirectory() && !file.getName().endsWith(".gz");
+                }
+
+            }, TrueFileFilter.INSTANCE);
+            for (File cached : files)
+            {
+                String absPath = StringUtils.replace(cached.getAbsolutePath(), "\\", "/");
+                String path = StringUtils.substringAfter(absPath, cacheDir);
+                contents.put(path, FSCachedItem.reload(absPath));
+            }
+        }
+
+   ...
 
[truncated message content]

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

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

Revision: 2340
          http://openutils.svn.sourceforge.net/openutils/?rev=2340&view=rev
Author:   fgiust
Date:     2010-05-03 10:04:17 +0000 (Mon, 03 May 2010)

Log Message:
-----------
new release for mgnlcontrols

Modified Paths:
--------------
    trunk/magnolia-test-webapp/pom.xml
    trunk/openutils-mgnlmedia/pom.xml

Added Paths:
-----------
    trunk/magnolia-test-webapp/src/main/resources/mgnl-resources/admin-css/

Modified: trunk/magnolia-test-webapp/pom.xml
===================================================================
--- trunk/magnolia-test-webapp/pom.xml	2010-05-03 09:46:07 UTC (rev 2339)
+++ trunk/magnolia-test-webapp/pom.xml	2010-05-03 10:04:17 UTC (rev 2340)
@@ -111,7 +111,7 @@
     <dependency>
       <groupId>net.sourceforge.openutils</groupId>
       <artifactId>openutils-mgnlcontrols</artifactId>
-      <version>4.0.7-SNAPSHOT</version>
+      <version>4.0.8-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>net.sourceforge.openutils</groupId>

Modified: trunk/openutils-mgnlmedia/pom.xml
===================================================================
--- trunk/openutils-mgnlmedia/pom.xml	2010-05-03 09:46:07 UTC (rev 2339)
+++ trunk/openutils-mgnlmedia/pom.xml	2010-05-03 10:04:17 UTC (rev 2340)
@@ -106,7 +106,7 @@
     <dependency>
       <groupId>net.sourceforge.openutils</groupId>
       <artifactId>openutils-mgnlcontrols</artifactId>
-      <version>4.0.7-SNAPSHOT</version>
+      <version>4.0.7</version>
     </dependency>
     <dependency>
       <groupId>net.sourceforge.openutils</groupId>


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

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

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

Revision: 2386
          http://openutils.svn.sourceforge.net/openutils/?rev=2386&view=rev
Author:   diego_schivo
Date:     2010-05-11 17:12:47 +0000 (Tue, 11 May 2010)

Log Message:
-----------
CONTROLS-20 sample controls template and grid paragraph

Modified Paths:
--------------
    trunk/openutils-mgnlcontrols/src/main/java/net/sourceforge/openutils/mgnlcontrols/setup/ControlsModuleVersionHandler.java

Added Paths:
-----------
    trunk/magnolia-test-webapp/src/main/resources/net/
    trunk/magnolia-test-webapp/src/main/resources/net/sourceforge/
    trunk/magnolia-test-webapp/src/main/resources/net/sourceforge/openutils/
    trunk/magnolia-test-webapp/src/main/resources/net/sourceforge/openutils/mgnltestwebapp/
    trunk/magnolia-test-webapp/src/main/resources/net/sourceforge/openutils/mgnltestwebapp/lang/
    trunk/magnolia-test-webapp/src/main/resources/net/sourceforge/openutils/mgnltestwebapp/lang/messages.properties
    trunk/openutils-mgnlcontrols/src/main/java/net/sourceforge/openutils/mgnlcontrols/setup/SamplesExtractionTask.java
    trunk/openutils-mgnlcontrols/src/main/resources/mgnl-bootstrap-samples/
    trunk/openutils-mgnlcontrols/src/main/resources/mgnl-bootstrap-samples/controls/
    trunk/openutils-mgnlcontrols/src/main/resources/mgnl-bootstrap-samples/controls/config.modules.controls.dialogs.samples-grid.xml
    trunk/openutils-mgnlcontrols/src/main/resources/mgnl-bootstrap-samples/controls/config.modules.controls.paragraphs.samples-grid.xml
    trunk/openutils-mgnlcontrols/src/main/resources/mgnl-bootstrap-samples/controls/config.modules.controls.templates.sampleControls.xml
    trunk/openutils-mgnlcontrols/src/main/resources/mgnl-bootstrap-samples/controls/website.sample-controls.xml
    trunk/openutils-mgnlcontrols/src/main/resources/mgnl-files/
    trunk/openutils-mgnlcontrols/src/main/resources/mgnl-files/templates/
    trunk/openutils-mgnlcontrols/src/main/resources/mgnl-files/templates/samples-controls/
    trunk/openutils-mgnlcontrols/src/main/resources/mgnl-files/templates/samples-controls/paragraph-grid.jsp
    trunk/openutils-mgnlcontrols/src/main/resources/mgnl-files/templates/samples-controls/template.jsp

Added: trunk/magnolia-test-webapp/src/main/resources/net/sourceforge/openutils/mgnltestwebapp/lang/messages.properties
===================================================================
--- trunk/magnolia-test-webapp/src/main/resources/net/sourceforge/openutils/mgnltestwebapp/lang/messages.properties	                        (rev 0)
+++ trunk/magnolia-test-webapp/src/main/resources/net/sourceforge/openutils/mgnltestwebapp/lang/messages.properties	2010-05-11 17:12:47 UTC (rev 2386)
@@ -0,0 +1,3 @@
+testwebapp.dialogs.samples-grid.columnA.header=Column A
+testwebapp.dialogs.samples-grid.columnB.header=Column B
+testwebapp.dialogs.samples-grid.columnC.header=Column C


Property changes on: trunk/magnolia-test-webapp/src/main/resources/net/sourceforge/openutils/mgnltestwebapp/lang/messages.properties
___________________________________________________________________
Added: svn:mime-type
   + text/plain
Added: svn:keywords
   + Author Date Id Revision
Added: svn:eol-style
   + native

Modified: trunk/openutils-mgnlcontrols/src/main/java/net/sourceforge/openutils/mgnlcontrols/setup/ControlsModuleVersionHandler.java
===================================================================
--- trunk/openutils-mgnlcontrols/src/main/java/net/sourceforge/openutils/mgnlcontrols/setup/ControlsModuleVersionHandler.java	2010-05-11 14:47:05 UTC (rev 2385)
+++ trunk/openutils-mgnlcontrols/src/main/java/net/sourceforge/openutils/mgnlcontrols/setup/ControlsModuleVersionHandler.java	2010-05-11 17:12:47 UTC (rev 2386)
@@ -19,9 +19,15 @@
 
 package net.sourceforge.openutils.mgnlcontrols.setup;
 
+import info.magnolia.cms.core.SystemProperty;
+import info.magnolia.module.InstallContext;
+import info.magnolia.module.delta.Task;
 import it.openutils.mgnltasks.SimpleModuleVersionHandler;
 
+import java.util.ArrayList;
+import java.util.List;
 
+
 /**
  * @author fgiust
  * @version $Id$
@@ -29,4 +35,20 @@
 public class ControlsModuleVersionHandler extends SimpleModuleVersionHandler
 {
 
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    protected List<Task> getStartupTasks(InstallContext installContext)
+    {
+        List<Task> tasks = new ArrayList<Task>();
+
+        if (SystemProperty.getBooleanProperty(SystemProperty.MAGNOLIA_BOOTSTRAP_SAMPLES))
+        {
+            tasks.add(new SamplesExtractionTask());
+        }
+
+        return tasks;
+    }
+
 }

Added: trunk/openutils-mgnlcontrols/src/main/java/net/sourceforge/openutils/mgnlcontrols/setup/SamplesExtractionTask.java
===================================================================
--- trunk/openutils-mgnlcontrols/src/main/java/net/sourceforge/openutils/mgnlcontrols/setup/SamplesExtractionTask.java	                        (rev 0)
+++ trunk/openutils-mgnlcontrols/src/main/java/net/sourceforge/openutils/mgnlcontrols/setup/SamplesExtractionTask.java	2010-05-11 17:12:47 UTC (rev 2386)
@@ -0,0 +1,91 @@
+/**
+ *
+ * Magnolia SimpleMedia Module (http://www.openmindlab.com/lab/products/media.html)
+ * Copyright (C)2008 - 2010, Openmind S.r.l. http://www.openmindonline.it
+ *
+ *  This program is free software: you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation, either version 3 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package net.sourceforge.openutils.mgnlcontrols.setup;
+
+import info.magnolia.cms.core.HierarchyManager;
+import info.magnolia.cms.core.Path;
+import info.magnolia.module.InstallContext;
+import info.magnolia.module.delta.AbstractTask;
+import info.magnolia.module.delta.TaskExecutionException;
+import info.magnolia.module.files.FileExtractionLogger;
+import info.magnolia.module.files.FileExtractor;
+import info.magnolia.module.files.MD5CheckingFileExtractor;
+
+import java.io.IOException;
+
+import org.apache.commons.lang.StringUtils;
+
+
+/**
+ * Extract samples files to webapp root.
+ * @author fgiust
+ * @version $Id$
+ */
+public class SamplesExtractionTask extends AbstractTask
+{
+
+    public SamplesExtractionTask()
+    {
+        super("Samples extraction", "Extracts jsp files for samples.");
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public void execute(final InstallContext ctx) throws TaskExecutionException
+    {
+        final HierarchyManager hm = ctx.getConfigHierarchyManager();
+        final MD5CheckingFileExtractor extractor = new MD5CheckingFileExtractor(new FileExtractionLogger()
+        {
+
+            public void error(String message)
+            {
+                ctx.warn(message);
+            }
+        }, hm);
+        try
+        {
+            extractor.extractFiles(new FileExtractor.Transformer()
+            {
+
+                public String accept(String resourcePath)
+                {
+                    final boolean thisIsAFileWeWant = resourcePath.startsWith("/mgnl-files/")
+                        && StringUtils.contains(resourcePath, "/samples-controls/");
+                    if (!thisIsAFileWeWant)
+                    {
+                        return null;
+                    }
+                    final String relTargetPath = StringUtils.removeStart(resourcePath, "/mgnl-files/");
+                    return Path.getAbsoluteFileSystemPath(relTargetPath);
+                }
+
+            });
+        }
+        catch (IOException e)
+        {
+            throw new TaskExecutionException("Could not extract files for module "
+                + ctx.getCurrentModuleDefinition()
+                + ": "
+                + e.getMessage(), e);
+        }
+    }
+
+}


Property changes on: trunk/openutils-mgnlcontrols/src/main/java/net/sourceforge/openutils/mgnlcontrols/setup/SamplesExtractionTask.java
___________________________________________________________________
Added: svn:mime-type
   + text/plain
Added: svn:keywords
   + Author Date Id Revision
Added: svn:eol-style
   + native

Added: trunk/openutils-mgnlcontrols/src/main/resources/mgnl-bootstrap-samples/controls/config.modules.controls.dialogs.samples-grid.xml
===================================================================
--- trunk/openutils-mgnlcontrols/src/main/resources/mgnl-bootstrap-samples/controls/config.modules.controls.dialogs.samples-grid.xml	                        (rev 0)
+++ trunk/openutils-mgnlcontrols/src/main/resources/mgnl-bootstrap-samples/controls/config.modules.controls.dialogs.samples-grid.xml	2010-05-11 17:12:47 UTC (rev 2386)
@@ -0,0 +1,242 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<sv:node sv:name="samples-grid" xmlns:sv="http://www.jcp.org/jcr/sv/1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <sv:property sv:name="jcr:primaryType" sv:type="Name">
+    <sv:value>mgnl:contentNode</sv:value>
+  </sv:property>
+  <sv:property sv:name="jcr:uuid" sv:type="String">
+    <sv:value>88d56a3b-9b0e-4a6c-b5da-8d48a5e41d4a</sv:value>
+  </sv:property>
+  <sv:property sv:name="i18nBasename" sv:type="String">
+    <sv:value>net.sourceforge.openutils.mgnltestwebapp.lang.messages</sv:value>
+  </sv:property>
+  <sv:node sv:name="MetaData">
+    <sv:property sv:name="jcr:primaryType" sv:type="Name">
+      <sv:value>mgnl:metaData</sv:value>
+    </sv:property>
+    <sv:property sv:name="mgnl:Data" sv:type="String">
+      <sv:value>MetaData</sv:value>
+    </sv:property>
+    <sv:property sv:name="mgnl:activated" sv:type="Boolean">
+      <sv:value>false</sv:value>
+    </sv:property>
+    <sv:property sv:name="mgnl:activatorid" sv:type="String">
+      <sv:value>superuser</sv:value>
+    </sv:property>
+    <sv:property sv:name="mgnl:authorid" sv:type="String">
+      <sv:value>superuser</sv:value>
+    </sv:property>
+    <sv:property sv:name="mgnl:creationdate" sv:type="String">
+      <sv:value>2004-11-02T15:34:43.213+01:00</sv:value>
+    </sv:property>
+    <sv:property sv:name="mgnl:lastaction" sv:type="Date">
+      <sv:value>2008-04-28T23:43:10.557+02:00</sv:value>
+    </sv:property>
+    <sv:property sv:name="mgnl:lastmodified" sv:type="Date">
+      <sv:value>2010-05-11T19:08:39.312+02:00</sv:value>
+    </sv:property>
+    <sv:property sv:name="mgnl:title" sv:type="String">
+      <sv:value/>
+    </sv:property>
+  </sv:node>
+  <sv:node sv:name="tabGrid">
+    <sv:property sv:name="jcr:primaryType" sv:type="Name">
+      <sv:value>mgnl:contentNode</sv:value>
+    </sv:property>
+    <sv:property sv:name="jcr:uuid" sv:type="String">
+      <sv:value>82526404-44cf-4af1-a352-b8b38426a6a9</sv:value>
+    </sv:property>
+    <sv:property sv:name="controlType" sv:type="String">
+      <sv:value>tab</sv:value>
+    </sv:property>
+    <sv:property sv:name="label" sv:type="String">
+      <sv:value>Grid</sv:value>
+    </sv:property>
+    <sv:node sv:name="MetaData">
+      <sv:property sv:name="jcr:primaryType" sv:type="Name">
+        <sv:value>mgnl:metaData</sv:value>
+      </sv:property>
+      <sv:property sv:name="mgnl:Data" sv:type="String">
+        <sv:value>MetaData</sv:value>
+      </sv:property>
+      <sv:property sv:name="mgnl:activated" sv:type="Boolean">
+        <sv:value>false</sv:value>
+      </sv:property>
+      <sv:property sv:name="mgnl:activatorid" sv:type="String">
+        <sv:value>superuser</sv:value>
+      </sv:property>
+      <sv:property sv:name="mgnl:authorid" sv:type="String">
+        <sv:value>superuser</sv:value>
+      </sv:property>
+      <sv:property sv:name="mgnl:creationdate" sv:type="String">
+        <sv:value>2004-11-02T15:34:29.217+01:00</sv:value>
+      </sv:property>
+      <sv:property sv:name="mgnl:lastaction" sv:type="Date">
+        <sv:value>2008-06-19T14:49:08.436+02:00</sv:value>
+      </sv:property>
+      <sv:property sv:name="mgnl:lastmodified" sv:type="Date">
+        <sv:value>2010-05-11T18:48:22.984+02:00</sv:value>
+      </sv:property>
+    </sv:node>
+    <sv:node sv:name="grid">
+      <sv:property sv:name="jcr:primaryType" sv:type="Name">
+        <sv:value>mgnl:contentNode</sv:value>
+      </sv:property>
+      <sv:property sv:name="jcr:uuid" sv:type="String">
+        <sv:value>cac41cbc-bff5-47a7-9951-aa470e42f7e8</sv:value>
+      </sv:property>
+      <sv:property sv:name="controlType" sv:type="String">
+        <sv:value>grid</sv:value>
+      </sv:property>
+      <sv:property sv:name="label" sv:type="String">
+        <sv:value>Grid</sv:value>
+      </sv:property>
+      <sv:property sv:name="rows" sv:type="Long">
+        <sv:value>10</sv:value>
+      </sv:property>
+      <sv:property sv:name="type" sv:type="String">
+        <sv:value>String</sv:value>
+      </sv:property>
+      <sv:node sv:name="MetaData">
+        <sv:property sv:name="jcr:primaryType" sv:type="Name">
+          <sv:value>mgnl:metaData</sv:value>
+        </sv:property>
+        <sv:property sv:name="mgnl:Data" sv:type="String">
+          <sv:value>MetaData</sv:value>
+        </sv:property>
+        <sv:property sv:name="mgnl:activated" sv:type="Boolean">
+          <sv:value>false</sv:value>
+        </sv:property>
+        <sv:property sv:name="mgnl:activatorid" sv:type="String">
+          <sv:value>superuser</sv:value>
+        </sv:property>
+        <sv:property sv:name="mgnl:authorid" sv:type="String">
+          <sv:value>superuser</sv:value>
+        </sv:property>
+        <sv:property sv:name="mgnl:creationdate" sv:type="String">
+          <sv:value>2004-11-02T15:34:29.357+01:00</sv:value>
+        </sv:property>
+        <sv:property sv:name="mgnl:lastaction" sv:type="Date">
+          <sv:value>2008-07-07T14:56:33.437+02:00</sv:value>
+        </sv:property>
+        <sv:property sv:name="mgnl:lastmodified" sv:type="Date">
+          <sv:value>2010-05-11T18:48:45.187+02:00</sv:value>
+        </sv:property>
+      </sv:node>
+      <sv:node sv:name="columns">
+        <sv:property sv:name="jcr:primaryType" sv:type="Name">
+          <sv:value>mgnl:contentNode</sv:value>
+        </sv:property>
+        <sv:property sv:name="jcr:mixinTypes" sv:type="Name">
+          <sv:value>mix:lockable</sv:value>
+        </sv:property>
+        <sv:property sv:name="jcr:uuid" sv:type="String">
+          <sv:value>a006c6db-150c-415e-a73a-7a71822e1bbc</sv:value>
+        </sv:property>
+        <sv:node sv:name="MetaData">
+          <sv:property sv:name="jcr:primaryType" sv:type="Name">
+            <sv:value>mgnl:metaData</sv:value>
+          </sv:property>
+          <sv:property sv:name="mgnl:authorid" sv:type="String">
+            <sv:value>superuser</sv:value>
+          </sv:property>
+          <sv:property sv:name="mgnl:creationdate" sv:type="Date">
+            <sv:value>2010-05-11T18:48:49.593+02:00</sv:value>
+          </sv:property>
+          <sv:property sv:name="mgnl:lastmodified" sv:type="Date">
+            <sv:value>2010-05-11T18:48:56.859+02:00</sv:value>
+          </sv:property>
+        </sv:node>
+        <sv:node sv:name="0">
+          <sv:property sv:name="jcr:primaryType" sv:type="Name">
+            <sv:value>mgnl:contentNode</sv:value>
+          </sv:property>
+          <sv:property sv:name="jcr:mixinTypes" sv:type="Name">
+            <sv:value>mix:lockable</sv:value>
+          </sv:property>
+          <sv:property sv:name="jcr:uuid" sv:type="String">
+            <sv:value>5574be51-7913-43d4-a5f6-f327c074b78f</sv:value>
+          </sv:property>
+          <sv:property sv:name="header" sv:type="String">
+            <sv:value>testwebapp.dialogs.samples-grid.columnA.header</sv:value>
+          </sv:property>
+          <sv:node sv:name="MetaData">
+            <sv:property sv:name="jcr:primaryType" sv:type="Name">
+              <sv:value>mgnl:metaData</sv:value>
+            </sv:property>
+            <sv:property sv:name="mgnl:authorid" sv:type="String">
+              <sv:value>superuser</sv:value>
+            </sv:property>
+            <sv:property sv:name="mgnl:creationdate" sv:type="Date">
+              <sv:value>2010-05-11T18:49:01.296+02:00</sv:value>
+            </sv:property>
+            <sv:property sv:name="mgnl:lastmodified" sv:type="Date">
+              <sv:value>2010-05-11T19:07:49.968+02:00</sv:value>
+            </sv:property>
+          </sv:node>
+        </sv:node>
+        <sv:node sv:name="00">
+          <sv:property sv:name="jcr:primaryType" sv:type="Name">
+            <sv:value>mgnl:contentNode</sv:value>
+          </sv:property>
+          <sv:property sv:name="jcr:mixinTypes" sv:type="Name">
+            <sv:value>mix:lockable</sv:value>
+          </sv:property>
+          <sv:property sv:name="jcr:uuid" sv:type="String">
+            <sv:value>2075cf83-e4ba-448f-a020-24398b0fac3e</sv:value>
+          </sv:property>
+          <sv:property sv:name="header" sv:type="String">
+            <sv:value>testwebapp.dialogs.samples-grid.columnB.header</sv:value>
+          </sv:property>
+          <sv:node sv:name="MetaData">
+            <sv:property sv:name="jcr:primaryType" sv:type="Name">
+              <sv:value>mgnl:metaData</sv:value>
+            </sv:property>
+            <sv:property sv:name="mgnl:activated" sv:type="Boolean">
+              <sv:value>false</sv:value>
+            </sv:property>
+            <sv:property sv:name="mgnl:authorid" sv:type="String">
+              <sv:value>superuser</sv:value>
+            </sv:property>
+            <sv:property sv:name="mgnl:creationdate" sv:type="Date">
+              <sv:value>2010-05-11T18:49:01.296+02:00</sv:value>
+            </sv:property>
+            <sv:property sv:name="mgnl:lastmodified" sv:type="Date">
+              <sv:value>2010-05-11T19:07:56.343+02:00</sv:value>
+            </sv:property>
+          </sv:node>
+        </sv:node>
+        <sv:node sv:name="01">
+          <sv:property sv:name="jcr:primaryType" sv:type="Name">
+            <sv:value>mgnl:contentNode</sv:value>
+          </sv:property>
+          <sv:property sv:name="jcr:mixinTypes" sv:type="Name">
+            <sv:value>mix:lockable</sv:value>
+          </sv:property>
+          <sv:property sv:name="jcr:uuid" sv:type="String">
+            <sv:value>1b0dea2d-fab3-46d3-9d95-22f2afce5504</sv:value>
+          </sv:property>
+          <sv:property sv:name="header" sv:type="String">
+            <sv:value>testwebapp.dialogs.samples-grid.columnC.header</sv:value>
+          </sv:property>
+          <sv:node sv:name="MetaData">
+            <sv:property sv:name="jcr:primaryType" sv:type="Name">
+              <sv:value>mgnl:metaData</sv:value>
+            </sv:property>
+            <sv:property sv:name="mgnl:activated" sv:type="Boolean">
+              <sv:value>false</sv:value>
+            </sv:property>
+            <sv:property sv:name="mgnl:authorid" sv:type="String">
+              <sv:value>superuser</sv:value>
+            </sv:property>
+            <sv:property sv:name="mgnl:creationdate" sv:type="Date">
+              <sv:value>2010-05-11T18:49:01.296+02:00</sv:value>
+            </sv:property>
+            <sv:property sv:name="mgnl:lastmodified" sv:type="Date">
+              <sv:value>2010-05-11T19:08:01.890+02:00</sv:value>
+            </sv:property>
+          </sv:node>
+        </sv:node>
+      </sv:node>
+    </sv:node>
+  </sv:node>
+</sv:node>


Property changes on: trunk/openutils-mgnlcontrols/src/main/resources/mgnl-bootstrap-samples/controls/config.modules.controls.dialogs.samples-grid.xml
___________________________________________________________________
Added: svn:mime-type
   + text/plain
Added: svn:keywords
   + Author Date Id Revision
Added: svn:eol-style
   + native

Added: trunk/openutils-mgnlcontrols/src/main/resources/mgnl-bootstrap-samples/controls/config.modules.controls.paragraphs.samples-grid.xml
===================================================================
--- trunk/openutils-mgnlcontrols/src/main/resources/mgnl-bootstrap-samples/controls/config.modules.controls.paragraphs.samples-grid.xml	                        (rev 0)
+++ trunk/openutils-mgnlcontrols/src/main/resources/mgnl-bootstrap-samples/controls/config.modules.controls.paragraphs.samples-grid.xml	2010-05-11 17:12:47 UTC (rev 2386)
@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<sv:node sv:name="samples-grid" xmlns:sv="http://www.jcp.org/jcr/sv/1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <sv:property sv:name="jcr:primaryType" sv:type="Name">
+    <sv:value>mgnl:contentNode</sv:value>
+  </sv:property>
+  <sv:property sv:name="jcr:mixinTypes" sv:type="Name">
+    <sv:value>mix:lockable</sv:value>
+  </sv:property>
+  <sv:property sv:name="jcr:uuid" sv:type="String">
+    <sv:value>717bfdf5-2ba3-402c-9654-8c2e98d50810</sv:value>
+  </sv:property>
+  <sv:property sv:name="description" sv:type="String">
+    <sv:value>Sample grid paragraph</sv:value>
+  </sv:property>
+  <sv:property sv:name="templatePath" sv:type="String">
+    <sv:value>/templates/samples-controls/paragraph-grid.jsp</sv:value>
+  </sv:property>
+  <sv:property sv:name="title" sv:type="String">
+    <sv:value>Grid sample</sv:value>
+  </sv:property>
+  <sv:property sv:name="type" sv:type="String">
+    <sv:value>jsp</sv:value>
+  </sv:property>
+  <sv:node sv:name="MetaData">
+    <sv:property sv:name="jcr:primaryType" sv:type="Name">
+      <sv:value>mgnl:metaData</sv:value>
+    </sv:property>
+    <sv:property sv:name="mgnl:activated" sv:type="Boolean">
+      <sv:value>false</sv:value>
+    </sv:property>
+    <sv:property sv:name="mgnl:authorid" sv:type="String">
+      <sv:value>superuser</sv:value>
+    </sv:property>
+    <sv:property sv:name="mgnl:creationdate" sv:type="Date">
+      <sv:value>2008-09-25T12:45:26.721+02:00</sv:value>
+    </sv:property>
+    <sv:property sv:name="mgnl:lastmodified" sv:type="Date">
+      <sv:value>2010-05-11T18:56:13.890+02:00</sv:value>
+    </sv:property>
+  </sv:node>
+</sv:node>


Property changes on: trunk/openutils-mgnlcontrols/src/main/resources/mgnl-bootstrap-samples/controls/config.modules.controls.paragraphs.samples-grid.xml
___________________________________________________________________
Added: svn:mime-type
   + text/plain
Added: svn:keywords
   + Author Date Id Revision
Added: svn:eol-style
   + native

Added: trunk/openutils-mgnlcontrols/src/main/resources/mgnl-bootstrap-samples/controls/config.modules.controls.templates.sampleControls.xml
===================================================================
--- trunk/openutils-mgnlcontrols/src/main/resources/mgnl-bootstrap-samples/controls/config.modules.controls.templates.sampleControls.xml	                        (rev 0)
+++ trunk/openutils-mgnlcontrols/src/main/resources/mgnl-bootstrap-samples/controls/config.modules.controls.templates.sampleControls.xml	2010-05-11 17:12:47 UTC (rev 2386)
@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<sv:node sv:name="sampleControls" xmlns:sv="http://www.jcp.org/jcr/sv/1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <sv:property sv:name="jcr:primaryType" sv:type="Name">
+    <sv:value>mgnl:contentNode</sv:value>
+  </sv:property>
+  <sv:property sv:name="jcr:mixinTypes" sv:type="Name">
+    <sv:value>mix:lockable</sv:value>
+  </sv:property>
+  <sv:property sv:name="jcr:uuid" sv:type="String">
+    <sv:value>3bf33407-77fc-48cc-9c52-268f0bd64473</sv:value>
+  </sv:property>
+  <sv:property sv:name="templatePath" sv:type="String">
+    <sv:value>/templates/samples-controls/template.jsp</sv:value>
+  </sv:property>
+  <sv:property sv:name="title" sv:type="String">
+    <sv:value>Controls sample template</sv:value>
+  </sv:property>
+  <sv:property sv:name="type" sv:type="String">
+    <sv:value>jsp</sv:value>
+  </sv:property>
+  <sv:property sv:name="visible" sv:type="String">
+    <sv:value>true</sv:value>
+  </sv:property>
+  <sv:node sv:name="MetaData">
+    <sv:property sv:name="jcr:primaryType" sv:type="Name">
+      <sv:value>mgnl:metaData</sv:value>
+    </sv:property>
+    <sv:property sv:name="mgnl:activated" sv:type="Boolean">
+      <sv:value>false</sv:value>
+    </sv:property>
+    <sv:property sv:name="mgnl:authorid" sv:type="String">
+      <sv:value>superuser</sv:value>
+    </sv:property>
+    <sv:property sv:name="mgnl:creationdate" sv:type="Date">
+      <sv:value>2008-09-23T16:56:46.344+02:00</sv:value>
+    </sv:property>
+    <sv:property sv:name="mgnl:lastmodified" sv:type="Date">
+      <sv:value>2010-05-11T18:17:25.531+02:00</sv:value>
+    </sv:property>
+  </sv:node>
+</sv:node>


Property changes on: trunk/openutils-mgnlcontrols/src/main/resources/mgnl-bootstrap-samples/controls/config.modules.controls.templates.sampleControls.xml
___________________________________________________________________
Added: svn:mime-type
   + text/plain
Added: svn:keywords
   + Author Date Id Revision
Added: svn:eol-style
   + native

Added: trunk/openutils-mgnlcontrols/src/main/resources/mgnl-bootstrap-samples/controls/website.sample-controls.xml
===================================================================
--- trunk/openutils-mgnlcontrols/src/main/resources/mgnl-bootstrap-samples/controls/website.sample-controls.xml	                        (rev 0)
+++ trunk/openutils-mgnlcontrols/src/main/resources/mgnl-bootstrap-samples/controls/website.sample-controls.xml	2010-05-11 17:12:47 UTC (rev 2386)
@@ -0,0 +1,117 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<sv:node sv:name="sample-controls" xmlns:sv="http://www.jcp.org/jcr/sv/1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <sv:property sv:name="jcr:primaryType" sv:type="Name">
+    <sv:value>mgnl:content</sv:value>
+  </sv:property>
+  <sv:property sv:name="jcr:mixinTypes" sv:type="Name">
+    <sv:value>mix:lockable</sv:value>
+  </sv:property>
+  <sv:property sv:name="jcr:uuid" sv:type="String">
+    <sv:value>1e1df947-3a2b-437c-8e38-d0a03d4c41c0</sv:value>
+  </sv:property>
+  <sv:property sv:name="title" sv:type="String">
+    <sv:value>Controls sample</sv:value>
+  </sv:property>
+  <sv:node sv:name="MetaData">
+    <sv:property sv:name="jcr:primaryType" sv:type="Name">
+      <sv:value>mgnl:metaData</sv:value>
+    </sv:property>
+    <sv:property sv:name="mgnl:authorid" sv:type="String">
+      <sv:value>superuser</sv:value>
+    </sv:property>
+    <sv:property sv:name="mgnl:creationdate" sv:type="Date">
+      <sv:value>2010-05-11T18:45:03.281+02:00</sv:value>
+    </sv:property>
+    <sv:property sv:name="mgnl:lastmodified" sv:type="Date">
+      <sv:value>2010-05-11T18:58:15.703+02:00</sv:value>
+    </sv:property>
+    <sv:property sv:name="mgnl:template" sv:type="String">
+      <sv:value>sampleControls</sv:value>
+    </sv:property>
+  </sv:node>
+  <sv:node sv:name="main">
+    <sv:property sv:name="jcr:primaryType" sv:type="Name">
+      <sv:value>mgnl:contentNode</sv:value>
+    </sv:property>
+    <sv:property sv:name="jcr:mixinTypes" sv:type="Name">
+      <sv:value>mix:lockable</sv:value>
+    </sv:property>
+    <sv:property sv:name="jcr:uuid" sv:type="String">
+      <sv:value>04bed0be-23ab-4b18-b581-04f1670b59ad</sv:value>
+    </sv:property>
+    <sv:node sv:name="MetaData">
+      <sv:property sv:name="jcr:primaryType" sv:type="Name">
+        <sv:value>mgnl:metaData</sv:value>
+      </sv:property>
+      <sv:property sv:name="mgnl:authorid" sv:type="String">
+        <sv:value>superuser</sv:value>
+      </sv:property>
+      <sv:property sv:name="mgnl:creationdate" sv:type="Date">
+        <sv:value>2010-05-11T18:55:40.453+02:00</sv:value>
+      </sv:property>
+      <sv:property sv:name="mgnl:lastmodified" sv:type="Date">
+        <sv:value>2010-05-11T18:58:15.703+02:00</sv:value>
+      </sv:property>
+    </sv:node>
+    <sv:node sv:name="0">
+      <sv:property sv:name="jcr:primaryType" sv:type="Name">
+        <sv:value>mgnl:contentNode</sv:value>
+      </sv:property>
+      <sv:property sv:name="jcr:mixinTypes" sv:type="Name">
+        <sv:value>mix:lockable</sv:value>
+      </sv:property>
+      <sv:property sv:name="jcr:uuid" sv:type="String">
+        <sv:value>0aea2f91-916f-43c9-8778-6498d2764c17</sv:value>
+      </sv:property>
+      <sv:property sv:name="grid" sv:type="String">
+        <sv:value>Lorem	ipsum	dolor
+sit	amet	consectetur
+adipisici	elit	sed
+eiusmod	tempor	incidunt
+ut	labore	et
+dolore	magna	aliqua
+		
+		
+		
+		
+</sv:value>
+      </sv:property>
+      <sv:node sv:name="MetaData">
+        <sv:property sv:name="jcr:primaryType" sv:type="Name">
+          <sv:value>mgnl:metaData</sv:value>
+        </sv:property>
+        <sv:property sv:name="mgnl:authorid" sv:type="String">
+          <sv:value>superuser</sv:value>
+        </sv:property>
+        <sv:property sv:name="mgnl:creationdate" sv:type="Date">
+          <sv:value>2010-05-11T18:55:40.468+02:00</sv:value>
+        </sv:property>
+        <sv:property sv:name="mgnl:lastmodified" sv:type="Date">
+          <sv:value>2010-05-11T18:58:15.703+02:00</sv:value>
+        </sv:property>
+        <sv:property sv:name="mgnl:template" sv:type="String">
+          <sv:value>samples-grid</sv:value>
+        </sv:property>
+      </sv:node>
+      <sv:node sv:name="grid_files">
+        <sv:property sv:name="jcr:primaryType" sv:type="Name">
+          <sv:value>mgnl:contentNode</sv:value>
+        </sv:property>
+        <sv:property sv:name="jcr:mixinTypes" sv:type="Name">
+          <sv:value>mix:lockable</sv:value>
+        </sv:property>
+        <sv:property sv:name="jcr:uuid" sv:type="String">
+          <sv:value>d71bd42f-e207-4f67-bd9b-bab73a5e83f3</sv:value>
+        </sv:property>
+        <sv:node sv:name="MetaData">
+          <sv:property sv:name="jcr:primaryType" sv:type="Name">
+            <sv:value>mgnl:metaData</sv:value>
+          </sv:property>
+          <sv:property sv:name="mgnl:creationdate" sv:type="Date">
+            <sv:value>2010-05-11T18:55:40.515+02:00</sv:value>
+          </sv:property>
+        </sv:node>
+      </sv:node>
+    </sv:node>
+  </sv:node>
+</sv:node>


Property changes on: trunk/openutils-mgnlcontrols/src/main/resources/mgnl-bootstrap-samples/controls/website.sample-controls.xml
___________________________________________________________________
Added: svn:mime-type
   + text/plain
Added: svn:keywords
   + Author Date Id Revision
Added: svn:eol-style
   + native

Added: trunk/openutils-mgnlcontrols/src/main/resources/mgnl-files/templates/samples-controls/paragraph-grid.jsp
===================================================================
--- trunk/openutils-mgnlcontrols/src/main/resources/mgnl-files/templates/samples-controls/paragraph-grid.jsp	                        (rev 0)
+++ trunk/openutils-mgnlcontrols/src/main/resources/mgnl-files/templates/samples-controls/paragraph-grid.jsp	2010-05-11 17:12:47 UTC (rev 2386)
@@ -0,0 +1,8 @@
+<jsp:root version="2.0" 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:fn="urn:jsptld:http://java.sun.com/jsp/jstl/functions"
+  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:mu="mgnlutils">
+  <jsp:directive.page contentType="text/html; charset=UTF-8" session="false" />
+  <cms:setNode var="node" />
+  <div>${node.grid}</div>
+</jsp:root>
\ No newline at end of file


Property changes on: trunk/openutils-mgnlcontrols/src/main/resources/mgnl-files/templates/samples-controls/paragraph-grid.jsp
___________________________________________________________________
Added: svn:mime-type
   + text/xml
Added: svn:keywords
   + Author Date Id Revision
Added: svn:eol-style
   + native

Added: trunk/openutils-mgnlcontrols/src/main/resources/mgnl-files/templates/samples-controls/template.jsp
===================================================================
--- trunk/openutils-mgnlcontrols/src/main/resources/mgnl-files/templates/samples-controls/template.jsp	                        (rev 0)
+++ trunk/openutils-mgnlcontrols/src/main/resources/mgnl-files/templates/samples-controls/template.jsp	2010-05-11 17:12:47 UTC (rev 2386)
@@ -0,0 +1,25 @@
+<jsp:root version="2.0" 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">
+  <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">
+    <head>
+      <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
+      <title>${actpage.title}</title>
+      <cms:links />
+    </head>
+    <body>
+      <h1>${actpage.title}</h1>
+
+      <cms:contentNodeIterator contentNodeCollectionName="main">
+        <cms:editBar />
+        <cms:includeTemplate />
+      </cms:contentNodeIterator>
+      <cms:newBar contentNodeCollectionName="main" paragraph="samples-grid" />
+    </body>
+  </html>
+</jsp:root>
\ No newline at end of file


Property changes on: trunk/openutils-mgnlcontrols/src/main/resources/mgnl-files/templates/samples-controls/template.jsp
___________________________________________________________________
Added: svn:mime-type
   + text/xml
Added: svn:keywords
   + Author Date Id Revision
Added: svn:eol-style
   + native


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

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

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

Revision: 2388
          http://openutils.svn.sourceforge.net/openutils/?rev=2388&view=rev
Author:   fgiust
Date:     2010-05-11 19:07:59 +0000 (Tue, 11 May 2010)

Log Message:
-----------
media module version in trunk is now 4.3-b1, 4.2.x will be released from branch

Modified Paths:
--------------
    trunk/magnolia-test-webapp/pom.xml
    trunk/openutils-mgnlmedia/pom.xml

Modified: trunk/magnolia-test-webapp/pom.xml
===================================================================
--- trunk/magnolia-test-webapp/pom.xml	2010-05-11 19:03:43 UTC (rev 2387)
+++ trunk/magnolia-test-webapp/pom.xml	2010-05-11 19:07:59 UTC (rev 2388)
@@ -131,7 +131,7 @@
     <dependency>
       <groupId>net.sourceforge.openutils</groupId>
       <artifactId>openutils-mgnlmedia</artifactId>
-      <version>4.2.1-SNAPSHOT</version>
+      <version>4.3-b1-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>net.sourceforge.openutils</groupId>

Modified: trunk/openutils-mgnlmedia/pom.xml
===================================================================
--- trunk/openutils-mgnlmedia/pom.xml	2010-05-11 19:03:43 UTC (rev 2387)
+++ trunk/openutils-mgnlmedia/pom.xml	2010-05-11 19:07:59 UTC (rev 2388)
@@ -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>
@@ -9,7 +10,7 @@
   <artifactId>openutils-mgnlmedia</artifactId>
   <name>Magnolia SimpleMedia Module</name>
   <description>Magnolia SimpleMedia Module: a module for Magnolia CMS for easier management multimedia assets.</description>
-  <version>4.2.1-SNAPSHOT</version>
+  <version>4.3-b1-SNAPSHOT</version>
   <inceptionYear>2008</inceptionYear>
   <licenses>
     <license>
@@ -134,7 +135,19 @@
       <artifactId>metadata-extractor</artifactId>
       <version>2.4.0-beta-1</version>
     </dependency>
+    <!-- to be released before the final 4.3 version -->
     <dependency>
+      <groupId>net.sourceforge.openutils</groupId>
+      <artifactId>openutils-mgnlcriteria</artifactId>
+      <version>2.0-b8</version>
+    </dependency>
+    <dependency>
+      <groupId>net.sourceforge.openutils</groupId>
+      <artifactId>openutils-mgnltagcloud</artifactId>
+      <version>1.0-b5</version>
+    </dependency>
+    <!-- to be released before the final 4.3 version -->
+    <dependency>
       <groupId>javax.servlet</groupId>
       <artifactId>jsp-api</artifactId>
       <version>2.0</version>


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

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

[<cs...@us...>]

Revision: 2402
          http://openutils.svn.sourceforge.net/openutils/?rev=2402&view=rev
Author:   cstrap
Date:     2010-05-12 08:26:53 +0000 (Wed, 12 May 2010)

Log Message:
-----------
TAGCLOUD-7 Sample template and website pages

Modified Paths:
--------------
    trunk/magnolia-test-webapp/src/main/webapp/templates/samples-tagcloud/template.jsp
    trunk/openutils-mgnltagcloud/src/main/resources/mgnl-files/templates/samples-tagcloud/template.jsp

Added Paths:
-----------
    trunk/openutils-mgnltagcloud/src/main/resources/mgnl-bootstrap-samples/tagcloud/website.sample-tagcloud.xml

Removed Paths:
-------------
    trunk/magnolia-test-webapp/src/main/webapp/templates/samples-tagcloud/p-tagclouds.jsp

Deleted: trunk/magnolia-test-webapp/src/main/webapp/templates/samples-tagcloud/p-tagclouds.jsp
===================================================================
--- trunk/magnolia-test-webapp/src/main/webapp/templates/samples-tagcloud/p-tagclouds.jsp	2010-05-12 07:03:00 UTC (rev 2401)
+++ trunk/magnolia-test-webapp/src/main/webapp/templates/samples-tagcloud/p-tagclouds.jsp	2010-05-12 08:26:53 UTC (rev 2402)
@@ -1 +0,0 @@
-${content.tags}
\ No newline at end of file

Modified: trunk/magnolia-test-webapp/src/main/webapp/templates/samples-tagcloud/template.jsp
===================================================================
--- trunk/magnolia-test-webapp/src/main/webapp/templates/samples-tagcloud/template.jsp	2010-05-12 07:03:00 UTC (rev 2401)
+++ trunk/magnolia-test-webapp/src/main/webapp/templates/samples-tagcloud/template.jsp	2010-05-12 08:26:53 UTC (rev 2402)
@@ -1,39 +1,50 @@
 <jsp:root version="2.0" 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="urn:jsptld:cms-taglib"
   xmlns:cmsfn="http://www.magnolia.info/tlds/cmsfn-taglib.tld" xmlns:cmsu="urn:jsptld:cms-util-taglib"
-  xmlns:tagcloud="http://net.sourceforge.openutils/mgnlTagCloud" xmlns:su="http://openutils.sf.net/openutils-stringutils"
-  xmlns:bc="barilla-corporate" xmlns:pm="pirellimedia" xmlns:bctags="urn:jsptagdir:/WEB-INF/tags/barilla-corporate-tags">
+  xmlns:tagcloud="http://net.sourceforge.openutils/mgnlTagCloud" xmlns:su="http://openutils.sf.net/openutils-stringutils">
   <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>
     <head>
-      <title>TEST</title>
+      <title>${actpage.title}</title>
     </head>
     <cms:mainBar paragraph="sample-tagcloud" />
     <body>
-      <br />
-      0 tag:
-      <br />
+      <h1>${actpage.title}</h1>
+      <h2>Samples:</h2>
+      <p>Tagcloud created from scratch, retrieve tags from actpage.handle:</p>
+      <code>
+          <![CDATA[
+          &lt;tagcloud:tagcloud id="cloud1" url="${actpage.handle}/" showFreq="true" /&gt;
+          ]]>
+      </code>
+      <p>Produce:</p>
       <tagcloud:tagcloud id="cloud1" url="${actpage.handle}/" showFreq="true" />
-      1 tag:
-      <br />
-      <tagcloud:tagcloud id="cloud2" orderby="count asc" path="/test/untitled1" />
-      2 tag:
-      <br />
+      <p>Tagcloud created from scratch, retrieve tags from your configured path (in this sample are /sample-tagcloud/)
+      </p>
+      <code>
+          <![CDATA[
+          &lt;tagcloud:tagcloud id="cloud2" orderby="count asc" path="/path/to/my/pages" /&gt;
+          ]]>
+      </code>
+      <p>Produce:</p>
+      <tagcloud:tagcloud id="cloud2" orderby="count asc" path="/sample-tagcloud/" />
+      <p>Retrieve tagcloud where 'tags' is the name</p>
+      <code>
+          <![CDATA[
+          &lt;tagcloud:tagcloud id="cloud3" name="tags" orderby="name asc" showFreq="true" /&gt;
+          ]]>
+      </code>
+      <p>Produce:</p>
       <tagcloud:tagcloud id="cloud3" name="tags" orderby="name asc" showFreq="true" />
-      3 tag:
-      <br />
-      <tagcloud:tagcloud id="cloud3" orderby="count asc" path="/test/untitled" />
-      4 tag:
-      <br />
-      <tagcloud:tagcloud id="cloudMedia" name="tagsMedia" orderby="name asc" showFreq="true" />
-      <cms:contentNodeIterator contentNodeCollectionName="main">
-        <cms:editBar adminOnly="true" />
-        <cms:includeTemplate />
-      </cms:contentNodeIterator>
-      <cms:newBar contentNodeCollectionName="main" paragraph="localeaware" adminOnly="true" />
+      <p>A sample where you can add tagcloud control on media dialog and retrieve a media tagcloud</p>
+      <code>
+          <![CDATA[
+          &lt;tagcloud:tagcloud id="cloudMedia" name="tagsMedia" orderby="name asc" showFreq="true"&gt;
+          ]]>
+      </code>
     </body>
   </html>
 </jsp:root>
\ No newline at end of file

Added: trunk/openutils-mgnltagcloud/src/main/resources/mgnl-bootstrap-samples/tagcloud/website.sample-tagcloud.xml
===================================================================
--- trunk/openutils-mgnltagcloud/src/main/resources/mgnl-bootstrap-samples/tagcloud/website.sample-tagcloud.xml	                        (rev 0)
+++ trunk/openutils-mgnltagcloud/src/main/resources/mgnl-bootstrap-samples/tagcloud/website.sample-tagcloud.xml	2010-05-12 08:26:53 UTC (rev 2402)
@@ -0,0 +1,114 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<sv:node sv:name="sample-tagcloud" xmlns:sv="http://www.jcp.org/jcr/sv/1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <sv:property sv:name="jcr:primaryType" sv:type="Name">
+    <sv:value>mgnl:content</sv:value>
+  </sv:property>
+  <sv:property sv:name="jcr:mixinTypes" sv:type="Name">
+    <sv:value>mix:lockable</sv:value>
+  </sv:property>
+  <sv:property sv:name="jcr:uuid" sv:type="String">
+    <sv:value>6d1acc6b-3237-414f-ba94-dea511486724</sv:value>
+  </sv:property>
+  <sv:property sv:name="tags" sv:type="String">
+    <sv:value>hello</sv:value>
+    <sv:value>hello world</sv:value>
+    <sv:value>openmind</sv:value>
+  </sv:property>
+  <sv:property sv:name="title" sv:type="String">
+    <sv:value>Tagcloud module sample</sv:value>
+  </sv:property>
+  <sv:node sv:name="MetaData">
+    <sv:property sv:name="jcr:primaryType" sv:type="Name">
+      <sv:value>mgnl:metaData</sv:value>
+    </sv:property>
+    <sv:property sv:name="mgnl:authorid" sv:type="String">
+      <sv:value>superuser</sv:value>
+    </sv:property>
+    <sv:property sv:name="mgnl:creationdate" sv:type="Date">
+      <sv:value>2010-05-11T16:02:40.052+02:00</sv:value>
+    </sv:property>
+    <sv:property sv:name="mgnl:lastmodified" sv:type="Date">
+      <sv:value>2010-05-11T17:25:11.508+02:00</sv:value>
+    </sv:property>
+    <sv:property sv:name="mgnl:template" sv:type="String">
+      <sv:value>sampleTagcloud</sv:value>
+    </sv:property>
+  </sv:node>
+  <sv:node sv:name="sample-inner-tagcloud-page">
+    <sv:property sv:name="jcr:primaryType" sv:type="Name">
+      <sv:value>mgnl:content</sv:value>
+    </sv:property>
+    <sv:property sv:name="jcr:mixinTypes" sv:type="Name">
+      <sv:value>mix:lockable</sv:value>
+    </sv:property>
+    <sv:property sv:name="jcr:uuid" sv:type="String">
+      <sv:value>e0959050-a409-403c-9f52-1ffa13eca39f</sv:value>
+    </sv:property>
+    <sv:property sv:name="tags" sv:type="String">
+      <sv:value>hello</sv:value>
+      <sv:value>openmind</sv:value>
+    </sv:property>
+    <sv:property sv:name="title" sv:type="String">
+      <sv:value>Tagcloud module sample</sv:value>
+    </sv:property>
+    <sv:node sv:name="MetaData">
+      <sv:property sv:name="jcr:primaryType" sv:type="Name">
+        <sv:value>mgnl:metaData</sv:value>
+      </sv:property>
+      <sv:property sv:name="mgnl:activated" sv:type="Boolean">
+        <sv:value>false</sv:value>
+      </sv:property>
+      <sv:property sv:name="mgnl:authorid" sv:type="String">
+        <sv:value>superuser</sv:value>
+      </sv:property>
+      <sv:property sv:name="mgnl:creationdate" sv:type="Date">
+        <sv:value>2010-05-11T16:02:40.052+02:00</sv:value>
+      </sv:property>
+      <sv:property sv:name="mgnl:lastmodified" sv:type="Date">
+        <sv:value>2010-05-11T17:36:17.548+02:00</sv:value>
+      </sv:property>
+      <sv:property sv:name="mgnl:template" sv:type="String">
+        <sv:value>sampleTagcloud</sv:value>
+      </sv:property>
+    </sv:node>
+  </sv:node>
+  <sv:node sv:name="sample-another-inner-tagcloud-page">
+    <sv:property sv:name="jcr:primaryType" sv:type="Name">
+      <sv:value>mgnl:content</sv:value>
+    </sv:property>
+    <sv:property sv:name="jcr:mixinTypes" sv:type="Name">
+      <sv:value>mix:lockable</sv:value>
+    </sv:property>
+    <sv:property sv:name="jcr:uuid" sv:type="String">
+      <sv:value>2e15bdca-0e3c-4168-a47a-81d99ad5ec79</sv:value>
+    </sv:property>
+    <sv:property sv:name="tags" sv:type="String">
+      <sv:value>openmind</sv:value>
+      <sv:value>page0</sv:value>
+      <sv:value>custom</sv:value>
+    </sv:property>
+    <sv:property sv:name="title" sv:type="String">
+      <sv:value>Tagcloud module sample</sv:value>
+    </sv:property>
+    <sv:node sv:name="MetaData">
+      <sv:property sv:name="jcr:primaryType" sv:type="Name">
+        <sv:value>mgnl:metaData</sv:value>
+      </sv:property>
+      <sv:property sv:name="mgnl:activated" sv:type="Boolean">
+        <sv:value>false</sv:value>
+      </sv:property>
+      <sv:property sv:name="mgnl:authorid" sv:type="String">
+        <sv:value>superuser</sv:value>
+      </sv:property>
+      <sv:property sv:name="mgnl:creationdate" sv:type="Date">
+        <sv:value>2010-05-11T16:02:40.052+02:00</sv:value>
+      </sv:property>
+      <sv:property sv:name="mgnl:lastmodified" sv:type="Date">
+        <sv:value>2010-05-11T17:36:35.895+02:00</sv:value>
+      </sv:property>
+      <sv:property sv:name="mgnl:template" sv:type="String">
+        <sv:value>sampleTagcloud</sv:value>
+      </sv:property>
+    </sv:node>
+  </sv:node>
+</sv:node>


Property changes on: trunk/openutils-mgnltagcloud/src/main/resources/mgnl-bootstrap-samples/tagcloud/website.sample-tagcloud.xml
___________________________________________________________________
Added: svn:mime-type
   + text/xml
Added: svn:keywords
   + Author Date Id Revision
Added: svn:eol-style
   + native

Modified: trunk/openutils-mgnltagcloud/src/main/resources/mgnl-files/templates/samples-tagcloud/template.jsp
===================================================================
--- trunk/openutils-mgnltagcloud/src/main/resources/mgnl-files/templates/samples-tagcloud/template.jsp	2010-05-12 07:03:00 UTC (rev 2401)
+++ trunk/openutils-mgnltagcloud/src/main/resources/mgnl-files/templates/samples-tagcloud/template.jsp	2010-05-12 08:26:53 UTC (rev 2402)
@@ -1,39 +1,50 @@
 <jsp:root version="2.0" 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="urn:jsptld:cms-taglib"
   xmlns:cmsfn="http://www.magnolia.info/tlds/cmsfn-taglib.tld" xmlns:cmsu="urn:jsptld:cms-util-taglib"
-  xmlns:tagcloud="http://net.sourceforge.openutils/mgnlTagCloud" xmlns:su="http://openutils.sf.net/openutils-stringutils"
-  xmlns:bc="barilla-corporate" xmlns:pm="pirellimedia" xmlns:bctags="urn:jsptagdir:/WEB-INF/tags/barilla-corporate-tags">
+  xmlns:tagcloud="http://net.sourceforge.openutils/mgnlTagCloud" xmlns:su="http://openutils.sf.net/openutils-stringutils">
   <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>
     <head>
-      <title>TEST</title>
+      <title>${actpage.title}</title>
     </head>
     <cms:mainBar paragraph="sample-tagcloud" />
     <body>
-      <br />
-      0 tag:
-      <br />
+      <h1>${actpage.title}</h1>
+      <h2>Samples:</h2>
+      <p>Tagcloud created from scratch, retrieve tags from actpage.handle:</p>
+      <code>
+          <![CDATA[
+          &lt;tagcloud:tagcloud id="cloud1" url="${actpage.handle}/" showFreq="true" /&gt;
+          ]]>
+      </code>
+      <p>Produce:</p>
       <tagcloud:tagcloud id="cloud1" url="${actpage.handle}/" showFreq="true" />
-      1 tag:
-      <br />
-      <tagcloud:tagcloud id="cloud2" orderby="count asc" path="/test/untitled1" />
-      2 tag:
-      <br />
+      <p>Tagcloud created from scratch, retrieve tags from your configured path (in this sample are /sample-tagcloud/)
+      </p>
+      <code>
+          <![CDATA[
+          &lt;tagcloud:tagcloud id="cloud2" orderby="count asc" path="/path/to/my/pages" /&gt;
+          ]]>
+      </code>
+      <p>Produce:</p>
+      <tagcloud:tagcloud id="cloud2" orderby="count asc" path="/sample-tagcloud/" />
+      <p>Retrieve tagcloud where 'tags' is the name</p>
+      <code>
+          <![CDATA[
+          &lt;tagcloud:tagcloud id="cloud3" name="tags" orderby="name asc" showFreq="true" /&gt;
+          ]]>
+      </code>
+      <p>Produce:</p>
       <tagcloud:tagcloud id="cloud3" name="tags" orderby="name asc" showFreq="true" />
-      3 tag:
-      <br />
-      <tagcloud:tagcloud id="cloud3" orderby="count asc" path="/test/untitled" />
-      4 tag:
-      <br />
-      <tagcloud:tagcloud id="cloudMedia" name="tagsMedia" orderby="name asc" showFreq="true" />
-      <cms:contentNodeIterator contentNodeCollectionName="main">
-        <cms:editBar adminOnly="true" />
-        <cms:includeTemplate />
-      </cms:contentNodeIterator>
-      <cms:newBar contentNodeCollectionName="main" paragraph="localeaware" adminOnly="true" />
+      <p>A sample where you can add tagcloud control on media dialog and retrieve a media tagcloud</p>
+      <code>
+          <![CDATA[
+          &lt;tagcloud:tagcloud id="cloudMedia" name="tagsMedia" orderby="name asc" showFreq="true"&gt;
+          ]]>
+      </code>
     </body>
   </html>
 </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:[2409] trunk

[<cs...@us...>]

Revision: 2409
          http://openutils.svn.sourceforge.net/openutils/?rev=2409&view=rev
Author:   cstrap
Date:     2010-05-12 11:04:27 +0000 (Wed, 12 May 2010)

Log Message:
-----------
TAGCLOUD-7 
- Template samples
- Update webapp test to magnolia 4.3.1
- Adding dependencies to jackrabbit 2.1.0
- Tagcloud indexing configuration xml

Modified Paths:
--------------
    trunk/magnolia-test-webapp/pom.xml
    trunk/magnolia-test-webapp/src/main/webapp/WEB-INF/config/repo-conf/jackrabbit-memory-search.xml
    trunk/magnolia-test-webapp/src/main/webapp/templates/samples-tagcloud/template.jsp
    trunk/openutils-mgnltagcloud/src/main/resources/mgnl-files/templates/samples-tagcloud/template.jsp

Added Paths:
-----------
    trunk/openutils-mgnltagcloud/src/main/resources/tagcloud_indexing_configuration.xml

Modified: trunk/magnolia-test-webapp/pom.xml
===================================================================
--- trunk/magnolia-test-webapp/pom.xml	2010-05-12 11:03:16 UTC (rev 2408)
+++ trunk/magnolia-test-webapp/pom.xml	2010-05-12 11:04:27 UTC (rev 2409)
@@ -163,8 +163,10 @@
       <artifactId>openutils-mgnltasks</artifactId>
       <version>4.1.1-SNAPSHOT</version>
     </dependency>
-    <!--dependency> <groupId>info.magnolia</groupId> <artifactId>magnolia-module-modulestore</artifactId> <version>4.3-SNAPSHOT</version> 
-      </dependency -->
+    <!--
+      dependency> <groupId>info.magnolia</groupId> <artifactId>magnolia-module-modulestore</artifactId>
+      <version>4.3-SNAPSHOT</version> </dependency
+    -->
     <dependency>
       <groupId>net.sourceforge.openutils</groupId>
       <artifactId>openutils-mgnlutils</artifactId>
@@ -199,12 +201,30 @@
         <groupId>pdfbox</groupId>
         <artifactId>pdfbox</artifactId>
         <version>0.7.3</version>
-        <scope>provided</scope><!-- exclude from webapp, org.apache.pdfbox:pdfbox 1.0.0 is needed for thumbnail generation -->
+        <scope>provided</scope>
+        <!--
+          exclude from webapp, org.apache.pdfbox:pdfbox 1.0.0 is needed for thumbnail generation
+        -->
       </dependency>
+      <dependency>
+        <groupId>org.apache.jackrabbit</groupId>
+        <artifactId>jackrabbit-core</artifactId>
+        <version>2.1.0</version>
+      </dependency>
+      <dependency>
+        <groupId>org.apache.jackrabbit</groupId>
+        <artifactId>jackrabbit-api</artifactId>
+        <version>2.1.0</version>
+      </dependency>
+      <dependency>
+        <groupId>javax.jcr</groupId>
+        <artifactId>jcr</artifactId>
+        <version>2.0</version>
+      </dependency>
     </dependencies>
   </dependencyManagement>
   <properties>
-    <magnolia.version>4.3-m2</magnolia.version>
+    <magnolia.version>4.3.1</magnolia.version>
     <stk.version>1.2</stk.version>
   </properties>
   <build>

Modified: trunk/magnolia-test-webapp/src/main/webapp/WEB-INF/config/repo-conf/jackrabbit-memory-search.xml
===================================================================
--- trunk/magnolia-test-webapp/src/main/webapp/WEB-INF/config/repo-conf/jackrabbit-memory-search.xml	2010-05-12 11:03:16 UTC (rev 2408)
+++ trunk/magnolia-test-webapp/src/main/webapp/WEB-INF/config/repo-conf/jackrabbit-memory-search.xml	2010-05-12 11:04:27 UTC (rev 2409)
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE Repository PUBLIC "-//The Apache Software Foundation//DTD Jackrabbit 1.6//EN" "http://jackrabbit.apache.org/dtd/repository-1.6.dtd">
-  <!--
-  TESTING-ONLY configuration!
-  repositories are in memory only and any change is lost upon restart
--->
+<!-- TESTING-ONLY configuration! repositories are in memory only and any change is lost upon restart -->
 <Repository>
   <FileSystem class="org.apache.jackrabbit.core.fs.mem.MemoryFileSystem">
   </FileSystem>
@@ -23,6 +20,7 @@
       <param name="persistent" value="false" />
     </PersistenceManager>
     <SearchIndex class="org.apache.jackrabbit.core.query.lucene.SearchIndex">
+      <param name="indexingConfiguration" value="/tagcloud_indexing_configuration.xml" />
       <param name="path" value="${wsp.home}/index" />
       <param name="useCompoundFile" value="true" />
       <param name="minMergeDocs" value="100" />
@@ -57,6 +55,7 @@
   </Versioning>
   <SearchIndex class="org.apache.jackrabbit.core.query.lucene.SearchIndex">
     <param name="path" value="${rep.home}/index" />
+    <param name="indexingConfiguration" value="/tagcloud_indexing_configuration.xml" />
     <param name="useCompoundFile" value="true" />
     <param name="minMergeDocs" value="100" />
     <param name="volatileIdleTime" value="3" />

Modified: trunk/magnolia-test-webapp/src/main/webapp/templates/samples-tagcloud/template.jsp
===================================================================
--- trunk/magnolia-test-webapp/src/main/webapp/templates/samples-tagcloud/template.jsp	2010-05-12 11:03:16 UTC (rev 2408)
+++ trunk/magnolia-test-webapp/src/main/webapp/templates/samples-tagcloud/template.jsp	2010-05-12 11:04:27 UTC (rev 2409)
@@ -14,7 +14,7 @@
     <body>
       <h1>${actpage.title}</h1>
       <h2>Samples:</h2>
-      <p>Tagcloud created from scratch, retrieve tags from actpage.handle:</p>
+      <p>Tagcloud created from scratch, retrieve tags from configured node and set tag url to current page:</p>
       <code>
           <![CDATA[
           &lt;tagcloud:tagcloud id="cloud1" url="${actpage.handle}/" showFreq="true" /&gt;

Modified: trunk/openutils-mgnltagcloud/src/main/resources/mgnl-files/templates/samples-tagcloud/template.jsp
===================================================================
--- trunk/openutils-mgnltagcloud/src/main/resources/mgnl-files/templates/samples-tagcloud/template.jsp	2010-05-12 11:03:16 UTC (rev 2408)
+++ trunk/openutils-mgnltagcloud/src/main/resources/mgnl-files/templates/samples-tagcloud/template.jsp	2010-05-12 11:04:27 UTC (rev 2409)
@@ -14,7 +14,7 @@
     <body>
       <h1>${actpage.title}</h1>
       <h2>Samples:</h2>
-      <p>Tagcloud created from scratch, retrieve tags from actpage.handle:</p>
+      <p>Tagcloud created from scratch, retrieve tags from configured node and set tag url to current page:</p>
       <code>
           <![CDATA[
           &lt;tagcloud:tagcloud id="cloud1" url="${actpage.handle}/" showFreq="true" /&gt;

Added: trunk/openutils-mgnltagcloud/src/main/resources/tagcloud_indexing_configuration.xml
===================================================================
--- trunk/openutils-mgnltagcloud/src/main/resources/tagcloud_indexing_configuration.xml	                        (rev 0)
+++ trunk/openutils-mgnltagcloud/src/main/resources/tagcloud_indexing_configuration.xml	2010-05-12 11:04:27 UTC (rev 2409)
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE configuration SYSTEM "http://jackrabbit.apache.org/dtd/indexing-configuration-1.0.dtd">
+<configuration xmlns:nt="http://www.jcp.org/jcr/nt/1.0">
+  <analyzers>
+    <analyzer class="org.apache.lucene.analysis.KeywordAnalyzer">
+      <property>tags</property>
+    </analyzer>
+  </analyzers>
+</configuration>
\ No newline at end of file


Property changes on: trunk/openutils-mgnltagcloud/src/main/resources/tagcloud_indexing_configuration.xml
___________________________________________________________________
Added: svn:mime-type
   + text/xml
Added: svn:keywords
   + Author Date Id Revision
Added: svn:eol-style
   + native


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