openutils-svn Mailing List for openutils (Page 16)

Brought to you by: fcarone, fgiust, molaschi

openutils-svn — developer list with svn commits

You can subscribe to this list here.

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

Flat | Threaded

<< < 1 .. 14 15 16 17 18 .. 227 > >> (Page 16 of 227)

[Openutils-svn] SF.net SVN: openutils:[4265] magnoliamodules/trunk/openutils-mgnlcriteria/ src/test/resources/crit-bootstrap/website.n?\194?\176-21.xml

From: <die...@us...> - 2013-06-25 15:05:23

Revision: 4265
          http://openutils.svn.sourceforge.net/openutils/?rev=4265&view=rev
Author:   diego_schivo
Date:     2013-06-25 15:05:20 +0000 (Tue, 25 Jun 2013)
Log Message:
-----------
CRIT-53 DegreeSignTest.java

Added Paths:
-----------
    magnoliamodules/trunk/openutils-mgnlcriteria/src/test/resources/crit-bootstrap/website.n?\194?\176-21.xml

Added: magnoliamodules/trunk/openutils-mgnlcriteria/src/test/resources/crit-bootstrap/website.n?\194?\176-21.xml
===================================================================
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Openutils-svn] SF.net SVN: openutils:[4264] magnoliamodules/trunk/openutils-mgnlcriteria/ src/test/java/net/sourceforge/openutils/mgnlcriteria/jcr/query/ DegreeSignTest.java

From: <die...@us...> - 2013-06-25 15:05:06

Revision: 4264
          http://openutils.svn.sourceforge.net/openutils/?rev=4264&view=rev
Author:   diego_schivo
Date:     2013-06-25 15:05:03 +0000 (Tue, 25 Jun 2013)
Log Message:
-----------
CRIT-53 DegreeSignTest.java

Added Paths:
-----------
    magnoliamodules/trunk/openutils-mgnlcriteria/src/test/java/net/sourceforge/openutils/mgnlcriteria/jcr/query/DegreeSignTest.java

Added: magnoliamodules/trunk/openutils-mgnlcriteria/src/test/java/net/sourceforge/openutils/mgnlcriteria/jcr/query/DegreeSignTest.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlcriteria/src/test/java/net/sourceforge/openutils/mgnlcriteria/jcr/query/DegreeSignTest.java	                        (rev 0)
+++ magnoliamodules/trunk/openutils-mgnlcriteria/src/test/java/net/sourceforge/openutils/mgnlcriteria/jcr/query/DegreeSignTest.java	2013-06-25 15:05:03 UTC (rev 4264)
@@ -0,0 +1,98 @@
+/**
+ *
+ * Criteria API for Magnolia CMS (http://www.openmindlab.com/lab/products/mgnlcriteria.html)
+ * Copyright(C) 2009-2013, Openmind S.r.l. http://www.openmindonline.it
+ *
+ *  This program is free software: you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation, either version 3 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package net.sourceforge.openutils.mgnlcriteria.jcr.query;
+
+import info.magnolia.cms.core.MgnlNodeType;
+import info.magnolia.cms.i18n.DefaultI18nContentSupport;
+import info.magnolia.cms.i18n.I18nContentSupport;
+import info.magnolia.cms.security.MgnlRoleManager;
+import info.magnolia.cms.security.Realm;
+import info.magnolia.cms.security.SecuritySupport;
+import info.magnolia.cms.security.SecuritySupportImpl;
+import info.magnolia.cms.security.SystemUserManager;
+import info.magnolia.context.MgnlContext;
+import info.magnolia.repository.RepositoryConstants;
+import info.magnolia.test.ComponentsTestUtil;
+import it.openutils.mgnlutils.test.RepositoryTestConfiguration;
+import it.openutils.mgnlutils.test.TestNgRepositoryTestcase;
+
+import javax.jcr.Node;
+
+import net.sourceforge.openutils.mgnlcriteria.jcr.query.criterion.Restrictions;
+import net.sourceforge.openutils.mgnlcriteria.tests.CriteriaTestUtils;
+
+import org.testng.Assert;
+import org.testng.annotations.BeforeClass;
+import org.testng.annotations.Test;
+
+
+/**
+ * CRIT-53
+ * @author dschivo
+ */
+@RepositoryTestConfiguration(jackrabbitRepositoryConfig = "/crit-repository/jackrabbit-test-configuration.xml", repositoryConfig = "/crit-repository/test-repositories.xml", bootstrapFiles = {
+    "/crit-bootstrap/website.n°-21.xml",
+    "/crit-bootstrap/userroles.anonymous.xml",
+    "/crit-bootstrap/users.system.anonymous.xml" })
+public class DegreeSignTest extends TestNgRepositoryTestcase
+{
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    @BeforeClass
+    public void setUp() throws Exception
+    {
+        super.setUp();
+
+        // Nodes in this workspace:
+        // - n°-21 (title=n°-21)
+        // --- foo (title=foo)
+        MgnlContext.getJCRSession(RepositoryConstants.WEBSITE).save();
+
+        ComponentsTestUtil.setInstance(I18nContentSupport.class, new DefaultI18nContentSupport());
+
+        // info.magnolia.cms.security.SecurityTest.setUp()
+        final SecuritySupportImpl sec = new SecuritySupportImpl();
+        sec.addUserManager(Realm.REALM_SYSTEM.getName(), new SystemUserManager());
+        sec.setRoleManager(new MgnlRoleManager());
+        ComponentsTestUtil.setInstance(SecuritySupport.class, sec);
+    }
+
+    /**
+     * @throws Exception
+     */
+    @Test
+    public void testEscape() throws Exception
+    {
+        Criteria criteria = JCRCriteriaFactory
+            .createCriteria()
+            .setWorkspace(RepositoryConstants.WEBSITE)
+            .setBasePath("/jcr:root/n°-21/*")
+            .add(Restrictions.eq("@jcr:primaryType", MgnlNodeType.NT_CONTENT));
+        AdvancedResult result = criteria.execute();
+        ResultIterator< ? extends Node> iterator = result.getItems();
+        Assert.assertTrue(iterator.hasNext());
+        Node resultNode = iterator.next();
+        Assert.assertEquals(CriteriaTestUtils.title(resultNode), "foo");
+    }
+
+}


Property changes on: magnoliamodules/trunk/openutils-mgnlcriteria/src/test/java/net/sourceforge/openutils/mgnlcriteria/jcr/query/DegreeSignTest.java
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

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

From: <die...@us...> - 2013-06-14 16:09:08

Revision: 4263
          http://openutils.svn.sourceforge.net/openutils/?rev=4263&view=rev
Author:   diego_schivo
Date:     2013-06-14 16:09:03 +0000 (Fri, 14 Jun 2013)
Log Message:
-----------
CONTROLS-54 dependentSelectListAndRadioGroup.ftl

Modified Paths:
--------------
    magnoliamodules/trunk/openutils-mgnlcontrols/src/main/java/net/sourceforge/openutils/mgnlcontrols/samples/SampleRadioOptionsProvider.java
    magnoliamodules/trunk/openutils-mgnlcontrols/src/main/resources/dialogs/dependentSelectListAndRadioGroup.ftl
    magnoliamodules/trunk/openutils-mgnlcontrols/src/main/resources/mgnl-bootstrap-samples/controls/config.modules.controls.dialogs.samples-dependentSelectList.xml

Modified: magnoliamodules/trunk/openutils-mgnlcontrols/src/main/java/net/sourceforge/openutils/mgnlcontrols/samples/SampleRadioOptionsProvider.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlcontrols/src/main/java/net/sourceforge/openutils/mgnlcontrols/samples/SampleRadioOptionsProvider.java	2013-06-14 15:45:04 UTC (rev 4262)
+++ magnoliamodules/trunk/openutils-mgnlcontrols/src/main/java/net/sourceforge/openutils/mgnlcontrols/samples/SampleRadioOptionsProvider.java	2013-06-14 16:09:03 UTC (rev 4263)
@@ -39,8 +39,8 @@
         options.setMore(false);
         try
         {
-            Node parent = MgnlContext.getJCRSession("website").getRootNode();
-            Iterator<Node> iter = NodeUtil.getNodes(parent, "mgnl:page").iterator();
+            Node parent = MgnlContext.getJCRSession("config").getNode("/modules/controls/gridColumnTypes");
+            Iterator<Node> iter = NodeUtil.getNodes(parent, "mgnl:contentNode").iterator();
             int start = itemsPerPage > 0 ? Math.max(pageNumberStartingFromOne - 1, 0) * itemsPerPage : 0;
             int i = 0;
             while (i < start && iter.hasNext())

Modified: magnoliamodules/trunk/openutils-mgnlcontrols/src/main/resources/dialogs/dependentSelectListAndRadioGroup.ftl
===================================================================
--- magnoliamodules/trunk/openutils-mgnlcontrols/src/main/resources/dialogs/dependentSelectListAndRadioGroup.ftl	2013-06-14 15:45:04 UTC (rev 4262)
+++ magnoliamodules/trunk/openutils-mgnlcontrols/src/main/resources/dialogs/dependentSelectListAndRadioGroup.ftl	2013-06-14 16:09:03 UTC (rev 4263)
@@ -1,3 +1,4 @@
+[#assign refresh = request.getParameter("dependentSelectListCK")?has_content]
 [#list selectOptionsList as options]
 [#assign paramSelect]${name}Select${options_index}[/#assign]
 <select style="width:100%;" class="mgnlDialogControlSelect" id="${paramSelect}" name="${paramSelect}">
@@ -7,35 +8,57 @@
   [/#list]
 </select>
 [/#list]
-[#assign refresh = request.getParameter("dependentSelectListCK")?has_content]
+<div class="radioGroup">
 [#assign found = false]
 [#list radioOptions.items?keys as key]
   [#assign checked = (!refresh && key = value!) || (refresh && key = request.getParameter(name)!)]
   [#assign found = found || checked]
-<input type="radio" id="${name}_${key?html!}" name="${name}" value="${key?html!}"[#if checked] checked="checked"[/#if] />${radioOptions.items[key]!}<br />
+  <input type="radio" id="${name}_${key?html!}" name="${name}" value="${key?html!}"[#if checked] checked="checked"[/#if] />${radioOptions.items[key]!}<br />
 [/#list]
 [#if radioOptions.more]
-<a href="#" id="${name}More">More</a>
+  <a href="#" id="${name}More">More</a>
 [/#if]
 [#if !refresh]
   [#if !found]
-<input type="hidden" name="${name}" value="${value?html}" />
+  <input type="hidden" name="${name}" value="${value?html}" />
   [/#if]
+[/#if]
+</div>
+[#if !refresh]
 <script type="text/javascript">
 (function($){
+  var dialogBoxInput;
+  var selects;
+  var page = 1;
+  
   function init(){
-    var dialogBoxInput = $('label[for="${name}"]').closest("tr").find("td.mgnlDialogBoxInput");
-    var selects = dialogBoxInput.find('select[name!="${name}"]');
+    dialogBoxInput = $('label[for="${name}"]').closest("tr").find("td.mgnlDialogBoxInput");
+    selects = dialogBoxInput.find('select[name!="${name}"]');
     selects.change(function(){
       var $this = $(this);
       var data = $("#mgnlPath,#mgnlParagraph,#mgnlRepository,#mgnlLocale,#mgnlRichE,#mgnlRichEPaste").add(selects);
       $.get($("#mgnlFormMain").attr("action"), data.serialize() + "&dependentSelectListCK=" + new Date().getTime(), function(data){
         $(data).find('label[for="${name}"]').closest("tr").find("td.mgnlDialogBoxInput").replaceAll(dialogBoxInput);
+        page = 1;
         init();
       });
     });
+    initRadio();
   }
   
+  function initRadio(){
+    var link = $("a#${name}More");
+    link.click(function(e){
+      e.preventDefault();
+      var $this = $(this);
+      var data = $("#mgnlPath,#mgnlParagraph,#mgnlRepository,#mgnlLocale,#mgnlRichE,#mgnlRichEPaste").add(selects);
+      $.get($("#mgnlFormMain").attr("action"), data.serialize() + "&radioGroupPage=" + (++page) + "&dependentSelectListCK=" + new Date().getTime(), function(data){
+        $(data).find('label[for="${name}"]').closest("tr").find("td.mgnlDialogBoxInput .radioGroup").replaceAll(link);
+        initRadio();
+      });
+    });
+  }
+  
   $(function(){
     init();
   });

Modified: magnoliamodules/trunk/openutils-mgnlcontrols/src/main/resources/mgnl-bootstrap-samples/controls/config.modules.controls.dialogs.samples-dependentSelectList.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnlcontrols/src/main/resources/mgnl-bootstrap-samples/controls/config.modules.controls.dialogs.samples-dependentSelectList.xml	2013-06-14 15:45:04 UTC (rev 4262)
+++ magnoliamodules/trunk/openutils-mgnlcontrols/src/main/resources/mgnl-bootstrap-samples/controls/config.modules.controls.dialogs.samples-dependentSelectList.xml	2013-06-14 16:09:03 UTC (rev 4263)
@@ -143,7 +143,7 @@
         <sv:value>radioGroup</sv:value>
       </sv:property>
       <sv:property sv:name="itemsPerPage" sv:type="String">
-        <sv:value>5</sv:value>
+        <sv:value>4</sv:value>
       </sv:property>
       <sv:property sv:name="jcr:createdBy" sv:type="String">
         <sv:value>admin</sv:value>
@@ -171,7 +171,7 @@
           <sv:value>2013-06-14T15:54:03.927+02:00</sv:value>
         </sv:property>
         <sv:property sv:name="mgnl:lastmodified" sv:type="Date">
-          <sv:value>2013-06-14T17:40:38.218+02:00</sv:value>
+          <sv:value>2013-06-14T17:48:28.855+02:00</sv:value>
         </sv:property>
       </sv:node>
     </sv:node>
@@ -189,7 +189,7 @@
         <sv:value>dependentSelectListAndRadioGroup</sv:value>
       </sv:property>
       <sv:property sv:name="itemsPerPage" sv:type="String">
-        <sv:value>5</sv:value>
+        <sv:value>4</sv:value>
       </sv:property>
       <sv:property sv:name="jcr:createdBy" sv:type="String">
         <sv:value>admin</sv:value>
@@ -220,7 +220,7 @@
           <sv:value>2013-06-14T15:54:03.927+02:00</sv:value>
         </sv:property>
         <sv:property sv:name="mgnl:lastmodified" sv:type="Date">
-          <sv:value>2013-06-14T17:40:48.550+02:00</sv:value>
+          <sv:value>2013-06-14T17:48:32.429+02:00</sv:value>
         </sv:property>
       </sv:node>
     </sv:node>

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

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

From: <die...@us...> - 2013-06-14 15:45:07

Revision: 4262
          http://openutils.svn.sourceforge.net/openutils/?rev=4262&view=rev
Author:   diego_schivo
Date:     2013-06-14 15:45:04 +0000 (Fri, 14 Jun 2013)
Log Message:
-----------
CONTROLS-54 itemsPerPage

Modified Paths:
--------------
    magnoliamodules/trunk/openutils-mgnlcontrols/src/main/resources/dialogs/dependentSelectListAndRadioGroup.ftl
    magnoliamodules/trunk/openutils-mgnlcontrols/src/main/resources/mgnl-bootstrap-samples/controls/config.modules.controls.dialogs.samples-dependentSelectList.xml
    magnoliamodules/trunk/openutils-mgnlcontrols/src/main/resources/mgnl-bootstrap-samples/controls/website.sample-controls.xml

Modified: magnoliamodules/trunk/openutils-mgnlcontrols/src/main/resources/dialogs/dependentSelectListAndRadioGroup.ftl
===================================================================
--- magnoliamodules/trunk/openutils-mgnlcontrols/src/main/resources/dialogs/dependentSelectListAndRadioGroup.ftl	2013-06-14 15:39:57 UTC (rev 4261)
+++ magnoliamodules/trunk/openutils-mgnlcontrols/src/main/resources/dialogs/dependentSelectListAndRadioGroup.ftl	2013-06-14 15:45:04 UTC (rev 4262)
@@ -9,11 +9,14 @@
 [/#list]
 [#assign refresh = request.getParameter("dependentSelectListCK")?has_content]
 [#assign found = false]
-[#list radioOptions?keys as key]
+[#list radioOptions.items?keys as key]
   [#assign checked = (!refresh && key = value!) || (refresh && key = request.getParameter(name)!)]
   [#assign found = found || checked]
-<input type="radio" id="${name}_${key?html!}" name="${name}" value="${key?html!}"[#if checked] checked="checked"[/#if] />${radioOptions[key]!}<br />
+<input type="radio" id="${name}_${key?html!}" name="${name}" value="${key?html!}"[#if checked] checked="checked"[/#if] />${radioOptions.items[key]!}<br />
 [/#list]
+[#if radioOptions.more]
+<a href="#" id="${name}More">More</a>
+[/#if]
 [#if !refresh]
   [#if !found]
 <input type="hidden" name="${name}" value="${value?html}" />

Modified: magnoliamodules/trunk/openutils-mgnlcontrols/src/main/resources/mgnl-bootstrap-samples/controls/config.modules.controls.dialogs.samples-dependentSelectList.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnlcontrols/src/main/resources/mgnl-bootstrap-samples/controls/config.modules.controls.dialogs.samples-dependentSelectList.xml	2013-06-14 15:39:57 UTC (rev 4261)
+++ magnoliamodules/trunk/openutils-mgnlcontrols/src/main/resources/mgnl-bootstrap-samples/controls/config.modules.controls.dialogs.samples-dependentSelectList.xml	2013-06-14 15:45:04 UTC (rev 4262)
@@ -103,7 +103,7 @@
         <sv:value>dependentSelectList</sv:value>
       </sv:property>
       <sv:property sv:name="jcr:createdBy" sv:type="String">
-        <sv:value>superuser</sv:value>
+        <sv:value>admin</sv:value>
       </sv:property>
       <sv:property sv:name="label" sv:type="String">
         <sv:value>Foo</sv:value>
@@ -116,7 +116,7 @@
           <sv:value>mgnl:metaData</sv:value>
         </sv:property>
         <sv:property sv:name="jcr:createdBy" sv:type="String">
-          <sv:value>superuser</sv:value>
+          <sv:value>admin</sv:value>
         </sv:property>
         <sv:property sv:name="mgnl:authorid" sv:type="String">
           <sv:value>superuser</sv:value>
@@ -142,8 +142,11 @@
       <sv:property sv:name="controlType" sv:type="String">
         <sv:value>radioGroup</sv:value>
       </sv:property>
+      <sv:property sv:name="itemsPerPage" sv:type="String">
+        <sv:value>5</sv:value>
+      </sv:property>
       <sv:property sv:name="jcr:createdBy" sv:type="String">
-        <sv:value>superuser</sv:value>
+        <sv:value>admin</sv:value>
       </sv:property>
       <sv:property sv:name="label" sv:type="String">
         <sv:value>Bar</sv:value>
@@ -156,7 +159,7 @@
           <sv:value>mgnl:metaData</sv:value>
         </sv:property>
         <sv:property sv:name="jcr:createdBy" sv:type="String">
-          <sv:value>superuser</sv:value>
+          <sv:value>admin</sv:value>
         </sv:property>
         <sv:property sv:name="mgnl:activated" sv:type="Boolean">
           <sv:value>false</sv:value>
@@ -168,7 +171,7 @@
           <sv:value>2013-06-14T15:54:03.927+02:00</sv:value>
         </sv:property>
         <sv:property sv:name="mgnl:lastmodified" sv:type="Date">
-          <sv:value>2013-06-14T16:35:32.392+02:00</sv:value>
+          <sv:value>2013-06-14T17:40:38.218+02:00</sv:value>
         </sv:property>
       </sv:node>
     </sv:node>
@@ -185,8 +188,11 @@
       <sv:property sv:name="controlType" sv:type="String">
         <sv:value>dependentSelectListAndRadioGroup</sv:value>
       </sv:property>
+      <sv:property sv:name="itemsPerPage" sv:type="String">
+        <sv:value>5</sv:value>
+      </sv:property>
       <sv:property sv:name="jcr:createdBy" sv:type="String">
-        <sv:value>superuser</sv:value>
+        <sv:value>admin</sv:value>
       </sv:property>
       <sv:property sv:name="label" sv:type="String">
         <sv:value>Baz</sv:value>
@@ -202,7 +208,7 @@
           <sv:value>mgnl:metaData</sv:value>
         </sv:property>
         <sv:property sv:name="jcr:createdBy" sv:type="String">
-          <sv:value>superuser</sv:value>
+          <sv:value>admin</sv:value>
         </sv:property>
         <sv:property sv:name="mgnl:activated" sv:type="Boolean">
           <sv:value>false</sv:value>
@@ -214,7 +220,7 @@
           <sv:value>2013-06-14T15:54:03.927+02:00</sv:value>
         </sv:property>
         <sv:property sv:name="mgnl:lastmodified" sv:type="Date">
-          <sv:value>2013-06-14T16:43:16.185+02:00</sv:value>
+          <sv:value>2013-06-14T17:40:48.550+02:00</sv:value>
         </sv:property>
       </sv:node>
     </sv:node>

Modified: magnoliamodules/trunk/openutils-mgnlcontrols/src/main/resources/mgnl-bootstrap-samples/controls/website.sample-controls.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnlcontrols/src/main/resources/mgnl-bootstrap-samples/controls/website.sample-controls.xml	2013-06-14 15:39:57 UTC (rev 4261)
+++ magnoliamodules/trunk/openutils-mgnlcontrols/src/main/resources/mgnl-bootstrap-samples/controls/website.sample-controls.xml	2013-06-14 15:45:04 UTC (rev 4262)
@@ -10,7 +10,7 @@
     <sv:value>1e1df947-3a2b-437c-8e38-d0a03d4c41c0</sv:value>
   </sv:property>
   <sv:property sv:name="jcr:createdBy" sv:type="String">
-    <sv:value>superuser</sv:value>
+    <sv:value>admin</sv:value>
   </sv:property>
   <sv:property sv:name="title" sv:type="String">
     <sv:value>Controls sample</sv:value>
@@ -20,7 +20,7 @@
       <sv:value>mgnl:metaData</sv:value>
     </sv:property>
     <sv:property sv:name="jcr:createdBy" sv:type="String">
-      <sv:value>superuser</sv:value>
+      <sv:value>admin</sv:value>
     </sv:property>
     <sv:property sv:name="mgnl:authorid" sv:type="String">
       <sv:value>superuser</sv:value>
@@ -29,7 +29,7 @@
       <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>2013-06-14T16:45:39.733+02:00</sv:value>
+      <sv:value>2013-06-14T17:42:42.408+02:00</sv:value>
     </sv:property>
     <sv:property sv:name="mgnl:template" sv:type="String">
       <sv:value>controls:pages/sampleControls</sv:value>
@@ -46,14 +46,14 @@
       <sv:value>04bed0be-23ab-4b18-b581-04f1670b59ad</sv:value>
     </sv:property>
     <sv:property sv:name="jcr:createdBy" sv:type="String">
-      <sv:value>superuser</sv:value>
+      <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>superuser</sv:value>
+        <sv:value>admin</sv:value>
       </sv:property>
       <sv:property sv:name="mgnl:authorid" sv:type="String">
         <sv:value>superuser</sv:value>
@@ -62,7 +62,7 @@
         <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>2013-06-14T16:45:39.732+02:00</sv:value>
+        <sv:value>2013-06-14T17:42:42.408+02:00</sv:value>
       </sv:property>
     </sv:node>
     <sv:node sv:name="0">
@@ -97,14 +97,14 @@
 								</sv:value>
       </sv:property>
       <sv:property sv:name="jcr:createdBy" sv:type="String">
-        <sv:value>superuser</sv:value>
+        <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>superuser</sv:value>
+          <sv:value>admin</sv:value>
         </sv:property>
         <sv:property sv:name="mgnl:authorid" sv:type="String">
           <sv:value>superuser</sv:value>
@@ -130,14 +130,14 @@
           <sv:value>d71bd42f-e207-4f67-bd9b-bab73a5e83f3</sv:value>
         </sv:property>
         <sv:property sv:name="jcr:createdBy" sv:type="String">
-          <sv:value>superuser</sv:value>
+          <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>superuser</sv:value>
+            <sv:value>admin</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>
@@ -229,35 +229,14 @@
         <sv:value>mix:lockable</sv:value>
       </sv:property>
       <sv:property sv:name="jcr:uuid" sv:type="String">
-        <sv:value>2f0eb337-36c7-4dc6-bdd8-4a904834d038</sv:value>
+        <sv:value>496abe2c-4008-4d1b-9bf5-5c6272620c30</sv:value>
       </sv:property>
-      <sv:property sv:name="bar" sv:type="String">
-        <sv:value>1e1df947-3a2b-437c-8e38-d0a03d4c41c0</sv:value>
-      </sv:property>
       <sv:property sv:name="baz" sv:type="String">
-        <sv:value>9c9b6148-f018-49f9-b674-102b1f4318eb</sv:value>
+        <sv:value/>
       </sv:property>
-      <sv:property sv:name="bazSelect0" sv:type="String">
-        <sv:value>2f363acf-792e-4e2f-9fdb-6a52853b44f0</sv:value>
-      </sv:property>
-      <sv:property sv:name="bazSelect1" sv:type="String">
-        <sv:value>ea1cf7df-1bcf-4b47-b7bc-f4403daa50e6</sv:value>
-      </sv:property>
-      <sv:property sv:name="bazSelect2" sv:type="String">
-        <sv:value>9d29a284-9502-43a8-beba-c57fac3b462f</sv:value>
-      </sv:property>
       <sv:property sv:name="foo" sv:type="String">
-        <sv:value>46b21a36-f8c2-4193-b23e-17f06de93932</sv:value>
+        <sv:value/>
       </sv:property>
-      <sv:property sv:name="fooSelect0" sv:type="String">
-        <sv:value>2f363acf-792e-4e2f-9fdb-6a52853b44f0</sv:value>
-      </sv:property>
-      <sv:property sv:name="fooSelect1" sv:type="String">
-        <sv:value>ea1cf7df-1bcf-4b47-b7bc-f4403daa50e6</sv:value>
-      </sv:property>
-      <sv:property sv:name="fooSelect2" sv:type="String">
-        <sv:value>9d29a284-9502-43a8-beba-c57fac3b462f</sv:value>
-      </sv:property>
       <sv:property sv:name="jcr:createdBy" sv:type="String">
         <sv:value>superuser</sv:value>
       </sv:property>
@@ -272,10 +251,10 @@
           <sv:value>superuser</sv:value>
         </sv:property>
         <sv:property sv:name="mgnl:creationdate" sv:type="Date">
-          <sv:value>2013-06-14T16:00:43.989+02:00</sv:value>
+          <sv:value>2013-06-14T17:42:42.404+02:00</sv:value>
         </sv:property>
         <sv:property sv:name="mgnl:lastmodified" sv:type="Date">
-          <sv:value>2013-06-14T16:45:39.732+02:00</sv:value>
+          <sv:value>2013-06-14T17:42:42.408+02:00</sv:value>
         </sv:property>
         <sv:property sv:name="mgnl:template" sv:type="String">
           <sv:value>controls:components/samples-dependentSelectList</sv:value>

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

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

From: <die...@us...> - 2013-06-14 15:40:00

Revision: 4261
          http://openutils.svn.sourceforge.net/openutils/?rev=4261&view=rev
Author:   diego_schivo
Date:     2013-06-14 15:39:57 +0000 (Fri, 14 Jun 2013)
Log Message:
-----------
CONTROLS-54 radioGroup.ftl

Modified Paths:
--------------
    magnoliamodules/trunk/openutils-mgnlcontrols/src/main/java/net/sourceforge/openutils/mgnlcontrols/samples/SampleRadioOptionsProvider.java
    magnoliamodules/trunk/openutils-mgnlcontrols/src/main/java/net/sourceforge/openutils/mgnlcontrols/samples/SampleRadioOptionsProvider2.java
    magnoliamodules/trunk/openutils-mgnlcontrols/src/main/resources/dialogs/radioGroup.ftl

Modified: magnoliamodules/trunk/openutils-mgnlcontrols/src/main/java/net/sourceforge/openutils/mgnlcontrols/samples/SampleRadioOptionsProvider.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlcontrols/src/main/java/net/sourceforge/openutils/mgnlcontrols/samples/SampleRadioOptionsProvider.java	2013-06-14 15:14:06 UTC (rev 4260)
+++ magnoliamodules/trunk/openutils-mgnlcontrols/src/main/java/net/sourceforge/openutils/mgnlcontrols/samples/SampleRadioOptionsProvider.java	2013-06-14 15:39:57 UTC (rev 4261)
@@ -53,6 +53,7 @@
             {
                 Node node = iter.next();
                 options.getItems().put(node.getIdentifier(), node.getName());
+                i++;
             }
             options.setMore(iter.hasNext());
         }

Modified: magnoliamodules/trunk/openutils-mgnlcontrols/src/main/java/net/sourceforge/openutils/mgnlcontrols/samples/SampleRadioOptionsProvider2.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlcontrols/src/main/java/net/sourceforge/openutils/mgnlcontrols/samples/SampleRadioOptionsProvider2.java	2013-06-14 15:14:06 UTC (rev 4260)
+++ magnoliamodules/trunk/openutils-mgnlcontrols/src/main/java/net/sourceforge/openutils/mgnlcontrols/samples/SampleRadioOptionsProvider2.java	2013-06-14 15:39:57 UTC (rev 4261)
@@ -59,6 +59,7 @@
                 {
                     Node node = iter.next();
                     options.getItems().put(node.getIdentifier(), node.getName());
+                    i++;
                 }
                 options.setMore(iter.hasNext());
             }

Modified: magnoliamodules/trunk/openutils-mgnlcontrols/src/main/resources/dialogs/radioGroup.ftl
===================================================================
--- magnoliamodules/trunk/openutils-mgnlcontrols/src/main/resources/dialogs/radioGroup.ftl	2013-06-14 15:14:06 UTC (rev 4260)
+++ magnoliamodules/trunk/openutils-mgnlcontrols/src/main/resources/dialogs/radioGroup.ftl	2013-06-14 15:39:57 UTC (rev 4261)
@@ -1,3 +1,32 @@
-[#list radioOptions?keys as key]
-<input type="radio" id="${name}_${key?html!}" name="${name}" value="${key?html!}"[#if key = value!] checked="checked"[/#if] />${radioOptions[key]!}<br />
+[#list radioOptions.items?keys as key]
+<input type="radio" id="${name}_${key?html!}" name="${name}" value="${key?html!}"[#if key = value!] checked="checked"[/#if] />${radioOptions.items[key]!}<br />
 [/#list]
+[#if radioOptions.more]
+<a href="#" id="${name}More">More</a>
+[/#if]
+[#assign refresh = request.getParameter("radioGroupCK")?has_content]
+[#if !refresh]
+<script type="text/javascript">
+(function($){
+  var page = 1;
+  
+  function init(){
+    var dialogBoxInput = $('label[for="${name}"]').closest("tr").find("td.mgnlDialogBoxInput");
+    var link = $("a#${name}More");
+    link.click(function(e){
+      e.preventDefault();
+      var $this = $(this);
+      var data = $("#mgnlPath,#mgnlParagraph,#mgnlRepository,#mgnlLocale,#mgnlRichE,#mgnlRichEPaste");
+      $.get($("#mgnlFormMain").attr("action"), data.serialize() + "&radioGroupPage=" + (++page) + "&radioGroupCK=" + new Date().getTime(), function(data){
+        $(data).find('label[for="${name}"]').closest("tr").find("td.mgnlDialogBoxInput").replaceAll(link);
+        init();
+      });
+    });
+  }
+  
+  $(function(){
+    init();
+  });
+})(jQuery);
+</script>
+[/#if]

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

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

From: <die...@us...> - 2013-06-14 15:14:09

Revision: 4260
          http://openutils.svn.sourceforge.net/openutils/?rev=4260&view=rev
Author:   diego_schivo
Date:     2013-06-14 15:14:06 +0000 (Fri, 14 Jun 2013)
Log Message:
-----------
CONTROLS-54 RadioOptions

Modified Paths:
--------------
    magnoliamodules/trunk/openutils-mgnlcontrols/src/main/java/net/sourceforge/openutils/mgnlcontrols/dialog/DialogRadioGroup.java
    magnoliamodules/trunk/openutils-mgnlcontrols/src/main/java/net/sourceforge/openutils/mgnlcontrols/samples/SampleRadioOptionsProvider.java
    magnoliamodules/trunk/openutils-mgnlcontrols/src/main/java/net/sourceforge/openutils/mgnlcontrols/samples/SampleRadioOptionsProvider2.java
    magnoliamodules/trunk/openutils-mgnlcontrols/src/main/resources/mgnl-files/templates/samples-controls/paragraph-dependentSelectList.jsp

Modified: magnoliamodules/trunk/openutils-mgnlcontrols/src/main/java/net/sourceforge/openutils/mgnlcontrols/dialog/DialogRadioGroup.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlcontrols/src/main/java/net/sourceforge/openutils/mgnlcontrols/dialog/DialogRadioGroup.java	2013-06-14 14:47:15 UTC (rev 4259)
+++ magnoliamodules/trunk/openutils-mgnlcontrols/src/main/java/net/sourceforge/openutils/mgnlcontrols/dialog/DialogRadioGroup.java	2013-06-14 15:14:06 UTC (rev 4260)
@@ -30,9 +30,8 @@
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
-import net.sourceforge.openutils.mgnlcontrols.dialog.ConfigurableFreemarkerDialog;
-
 import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang.math.NumberUtils;
 
 
 /**
@@ -43,7 +42,7 @@
 
     private RadioOptionsProvider radioOptionsProvider;
 
-    private Map<String, String> radioOptions;
+    private RadioOptions radioOptions;
 
     /**
      * Returns the radioOptionsProvider.
@@ -77,11 +76,14 @@
      * Returns the radioOptions.
      * @return the radioOptions
      */
-    public Map<String, String> getRadioOptions()
+    public RadioOptions getRadioOptions()
     {
         if (radioOptions == null)
         {
-            radioOptions = getRadioOptionsProvider().getRadioOptions(getThisDialogControl());
+            radioOptions = getRadioOptionsProvider().getRadioOptions(
+                NumberUtils.toInt(getConfigValue("itemsPerPage")),
+                NumberUtils.toInt(getRequest().getParameter("radioGroupPage"), 1),
+                getThisDialogControl());
         }
         return radioOptions;
     }
@@ -123,6 +125,51 @@
     public interface RadioOptionsProvider
     {
 
-        public Map<String, String> getRadioOptions(DialogControl dialogControl);
+        public RadioOptions getRadioOptions(int itemsPerPage, int pageNumberStartingFromOne, DialogControl dialogControl);
     }
+
+    public static class RadioOptions
+    {
+
+        Map<String, String> items;
+
+        boolean more;
+
+        /**
+         * Returns the items.
+         * @return the items
+         */
+        public Map<String, String> getItems()
+        {
+            return items;
+        }
+
+        /**
+         * Sets the items.
+         * @param items the items to set
+         */
+        public void setItems(Map<String, String> items)
+        {
+            this.items = items;
+        }
+
+        /**
+         * Returns the more.
+         * @return the more
+         */
+        public boolean isMore()
+        {
+            return more;
+        }
+
+        /**
+         * Sets the more.
+         * @param more the more to set
+         */
+        public void setMore(boolean more)
+        {
+            this.more = more;
+        }
+
+    }
 }

Modified: magnoliamodules/trunk/openutils-mgnlcontrols/src/main/java/net/sourceforge/openutils/mgnlcontrols/samples/SampleRadioOptionsProvider.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlcontrols/src/main/java/net/sourceforge/openutils/mgnlcontrols/samples/SampleRadioOptionsProvider.java	2013-06-14 14:47:15 UTC (rev 4259)
+++ magnoliamodules/trunk/openutils-mgnlcontrols/src/main/java/net/sourceforge/openutils/mgnlcontrols/samples/SampleRadioOptionsProvider.java	2013-06-14 15:14:06 UTC (rev 4260)
@@ -6,9 +6,7 @@
 
 import java.util.Iterator;
 import java.util.LinkedHashMap;
-import java.util.Map;
 
-import javax.jcr.LoginException;
 import javax.jcr.Node;
 import javax.jcr.RepositoryException;
 
@@ -33,23 +31,31 @@
     /**
      * {@inheritDoc}
      */
-    public Map<String, String> getRadioOptions(DialogControl dialogControl)
+    public DialogRadioGroup.RadioOptions getRadioOptions(int itemsPerPage, int pageNumberStartingFromOne,
+        DialogControl dialogControl)
     {
-        Map<String, String> options = new LinkedHashMap<String, String>();
+        DialogRadioGroup.RadioOptions options = new DialogRadioGroup.RadioOptions();
+        options.setItems(new LinkedHashMap<String, String>());
+        options.setMore(false);
         try
         {
             Node parent = MgnlContext.getJCRSession("website").getRootNode();
-            for (Iterator<Node> iter = NodeUtil.getNodes(parent, "mgnl:page").iterator(); iter.hasNext();)
+            Iterator<Node> iter = NodeUtil.getNodes(parent, "mgnl:page").iterator();
+            int start = itemsPerPage > 0 ? Math.max(pageNumberStartingFromOne - 1, 0) * itemsPerPage : 0;
+            int i = 0;
+            while (i < start && iter.hasNext())
             {
+                iter.next();
+                i++;
+            }
+            int end = itemsPerPage > 0 ? start + itemsPerPage : 0;
+            while ((end == 0 || i < end) && iter.hasNext())
+            {
                 Node node = iter.next();
-                options.put(node.getIdentifier(), node.getName());
+                options.getItems().put(node.getIdentifier(), node.getName());
             }
+            options.setMore(iter.hasNext());
         }
-        catch (LoginException e)
-        {
-            // TODO Auto-generated catch block
-            log.error(e.getMessage(), e);
-        }
         catch (RepositoryException e)
         {
             // TODO Auto-generated catch block

Modified: magnoliamodules/trunk/openutils-mgnlcontrols/src/main/java/net/sourceforge/openutils/mgnlcontrols/samples/SampleRadioOptionsProvider2.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlcontrols/src/main/java/net/sourceforge/openutils/mgnlcontrols/samples/SampleRadioOptionsProvider2.java	2013-06-14 14:47:15 UTC (rev 4259)
+++ magnoliamodules/trunk/openutils-mgnlcontrols/src/main/java/net/sourceforge/openutils/mgnlcontrols/samples/SampleRadioOptionsProvider2.java	2013-06-14 15:14:06 UTC (rev 4260)
@@ -6,7 +6,6 @@
 import java.util.Iterator;
 import java.util.LinkedHashMap;
 import java.util.List;
-import java.util.Map;
 
 import javax.jcr.Node;
 import javax.jcr.RepositoryException;
@@ -33,9 +32,12 @@
     /**
      * {@inheritDoc}
      */
-    public Map<String, String> getRadioOptions(DialogControl dialogControl)
+    public DialogRadioGroup.RadioOptions getRadioOptions(int itemsPerPage, int pageNumberStartingFromOne,
+        DialogControl dialogControl)
     {
-        Map<String, String> options = new LinkedHashMap<String, String>();
+        DialogRadioGroup.RadioOptions options = new DialogRadioGroup.RadioOptions();
+        options.setItems(new LinkedHashMap<String, String>());
+        options.setMore(false);
         List<String> treePathValues = ((DialogDependentSelectListAndRadioGroup) dialogControl)
             .getDependentSelectList()
             .getTreePathValues();
@@ -44,11 +46,21 @@
             try
             {
                 Node parent = NodeUtil.getNodeByIdentifier("config", treePathValues.get(treePathValues.size() - 1));
-                for (Iterator<Node> iter = NodeUtil.getNodes(parent, "mgnl:contentNode").iterator(); iter.hasNext();)
+                Iterator<Node> iter = NodeUtil.getNodes(parent, "mgnl:contentNode").iterator();
+                int start = itemsPerPage > 0 ? Math.max(pageNumberStartingFromOne - 1, 0) * itemsPerPage : 0;
+                int i = 0;
+                while (i < start && iter.hasNext())
                 {
+                    iter.next();
+                    i++;
+                }
+                int end = itemsPerPage > 0 ? start + itemsPerPage : 0;
+                while ((end == 0 || i < end) && iter.hasNext())
+                {
                     Node node = iter.next();
-                    options.put(node.getIdentifier(), node.getName());
+                    options.getItems().put(node.getIdentifier(), node.getName());
                 }
+                options.setMore(iter.hasNext());
             }
             catch (RepositoryException e)
             {

Modified: magnoliamodules/trunk/openutils-mgnlcontrols/src/main/resources/mgnl-files/templates/samples-controls/paragraph-dependentSelectList.jsp
===================================================================
--- magnoliamodules/trunk/openutils-mgnlcontrols/src/main/resources/mgnl-files/templates/samples-controls/paragraph-dependentSelectList.jsp	2013-06-14 14:47:15 UTC (rev 4259)
+++ magnoliamodules/trunk/openutils-mgnlcontrols/src/main/resources/mgnl-files/templates/samples-controls/paragraph-dependentSelectList.jsp	2013-06-14 15:14:06 UTC (rev 4260)
@@ -3,5 +3,7 @@
   xmlns:cmsfn="http://magnolia-cms.com/taglib/templating-components/cmsfn" xmlns:media="http://net.sourceforge.openutils/mgnlMedia"
   xmlns:mu="mgnlutils">
   <jsp:directive.page contentType="text/html; charset=UTF-8" session="false" />
-  ${cmsfn:contentByIdentifier(content.foo, "config")}
+  ${cmsfn:contentByIdentifier(content.foo, "config")}<br />
+  ${cmsfn:contentByIdentifier(content.bar, "website")}<br />
+  ${cmsfn:contentByIdentifier(content.baz, "config")}<br />
 </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:[4259] magnoliamodules/trunk/openutils-mgnlcontrols/ src/main

From: <die...@us...> - 2013-06-14 14:47:19

Revision: 4259
          http://openutils.svn.sourceforge.net/openutils/?rev=4259&view=rev
Author:   diego_schivo
Date:     2013-06-14 14:47:15 +0000 (Fri, 14 Jun 2013)
Log Message:
-----------
CONTROLS-54 SampleRadioOptionsProvider.java

Modified Paths:
--------------
    magnoliamodules/trunk/openutils-mgnlcontrols/src/main/java/net/sourceforge/openutils/mgnlcontrols/dialog/DialogDependentSelectListAndRadioGroup.java
    magnoliamodules/trunk/openutils-mgnlcontrols/src/main/java/net/sourceforge/openutils/mgnlcontrols/samples/SampleSelectOptionsProvider.java
    magnoliamodules/trunk/openutils-mgnlcontrols/src/main/resources/mgnl-bootstrap-samples/controls/config.modules.controls.dialogs.samples-dependentSelectList.xml
    magnoliamodules/trunk/openutils-mgnlcontrols/src/main/resources/mgnl-bootstrap-samples/controls/website.sample-controls.xml

Added Paths:
-----------
    magnoliamodules/trunk/openutils-mgnlcontrols/src/main/java/net/sourceforge/openutils/mgnlcontrols/samples/SampleRadioOptionsProvider.java
    magnoliamodules/trunk/openutils-mgnlcontrols/src/main/java/net/sourceforge/openutils/mgnlcontrols/samples/SampleRadioOptionsProvider2.java
    magnoliamodules/trunk/openutils-mgnlcontrols/src/main/resources/mgnl-bootstrap/controls/config.modules.controls.controls.dependentSelectListAndRadioGroup.xml
    magnoliamodules/trunk/openutils-mgnlcontrols/src/main/resources/mgnl-bootstrap/controls/config.modules.controls.controls.radioGroup.xml

Removed Paths:
-------------
    magnoliamodules/trunk/openutils-mgnlcontrols/src/main/resources/mgnl-bootstrap/controls/config.modules.controls.controls.dialogDependentSelectListAndRadioGroup.xml
    magnoliamodules/trunk/openutils-mgnlcontrols/src/main/resources/mgnl-bootstrap/controls/config.modules.controls.controls.dialogRadioGroup.xml

Modified: magnoliamodules/trunk/openutils-mgnlcontrols/src/main/java/net/sourceforge/openutils/mgnlcontrols/dialog/DialogDependentSelectListAndRadioGroup.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlcontrols/src/main/java/net/sourceforge/openutils/mgnlcontrols/dialog/DialogDependentSelectListAndRadioGroup.java	2013-06-14 14:10:18 UTC (rev 4258)
+++ magnoliamodules/trunk/openutils-mgnlcontrols/src/main/java/net/sourceforge/openutils/mgnlcontrols/dialog/DialogDependentSelectListAndRadioGroup.java	2013-06-14 14:47:15 UTC (rev 4259)
@@ -28,7 +28,7 @@
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
-import net.sourceforge.openutils.mgnlcontrols.dialog.ConfigurableFreemarkerDialog;
+import org.apache.commons.lang.StringUtils;
 
 
 /**
@@ -116,6 +116,12 @@
         super.init(request, response, websiteNode, configNode);
         getDependentSelectList().init(request, response, websiteNode, configNode);
         getRadioGroup().init(request, response, websiteNode, configNode);
+        if (StringUtils.isEmpty(getConfigValue("saveHandler")))
+        {
+            setConfig(
+                "saveHandler",
+                "net.sourceforge.openutils.mgnlcontrols.dialog.DialogDependentSelectListSaveHandler");
+        }
     }
 
     /**

Added: magnoliamodules/trunk/openutils-mgnlcontrols/src/main/java/net/sourceforge/openutils/mgnlcontrols/samples/SampleRadioOptionsProvider.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlcontrols/src/main/java/net/sourceforge/openutils/mgnlcontrols/samples/SampleRadioOptionsProvider.java	                        (rev 0)
+++ magnoliamodules/trunk/openutils-mgnlcontrols/src/main/java/net/sourceforge/openutils/mgnlcontrols/samples/SampleRadioOptionsProvider.java	2013-06-14 14:47:15 UTC (rev 4259)
@@ -0,0 +1,61 @@
+package net.sourceforge.openutils.mgnlcontrols.samples;
+
+import info.magnolia.cms.gui.dialog.DialogControl;
+import info.magnolia.context.MgnlContext;
+import info.magnolia.jcr.util.NodeUtil;
+
+import java.util.Iterator;
+import java.util.LinkedHashMap;
+import java.util.Map;
+
+import javax.jcr.LoginException;
+import javax.jcr.Node;
+import javax.jcr.RepositoryException;
+
+import net.sourceforge.openutils.mgnlcontrols.dialog.DialogRadioGroup;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+
+/**
+ * @author diego
+ * @version $Id: $
+ */
+public class SampleRadioOptionsProvider implements DialogRadioGroup.RadioOptionsProvider
+{
+
+    /**
+     * Logger.
+     */
+    private static final Logger log = LoggerFactory.getLogger(SampleRadioOptionsProvider.class);
+
+    /**
+     * {@inheritDoc}
+     */
+    public Map<String, String> getRadioOptions(DialogControl dialogControl)
+    {
+        Map<String, String> options = new LinkedHashMap<String, String>();
+        try
+        {
+            Node parent = MgnlContext.getJCRSession("website").getRootNode();
+            for (Iterator<Node> iter = NodeUtil.getNodes(parent, "mgnl:page").iterator(); iter.hasNext();)
+            {
+                Node node = iter.next();
+                options.put(node.getIdentifier(), node.getName());
+            }
+        }
+        catch (LoginException e)
+        {
+            // TODO Auto-generated catch block
+            log.error(e.getMessage(), e);
+        }
+        catch (RepositoryException e)
+        {
+            // TODO Auto-generated catch block
+            log.error(e.getMessage(), e);
+        }
+        return options;
+    }
+
+}


Property changes on: magnoliamodules/trunk/openutils-mgnlcontrols/src/main/java/net/sourceforge/openutils/mgnlcontrols/samples/SampleRadioOptionsProvider.java
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: magnoliamodules/trunk/openutils-mgnlcontrols/src/main/java/net/sourceforge/openutils/mgnlcontrols/samples/SampleRadioOptionsProvider2.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlcontrols/src/main/java/net/sourceforge/openutils/mgnlcontrols/samples/SampleRadioOptionsProvider2.java	                        (rev 0)
+++ magnoliamodules/trunk/openutils-mgnlcontrols/src/main/java/net/sourceforge/openutils/mgnlcontrols/samples/SampleRadioOptionsProvider2.java	2013-06-14 14:47:15 UTC (rev 4259)
@@ -0,0 +1,62 @@
+package net.sourceforge.openutils.mgnlcontrols.samples;
+
+import info.magnolia.cms.gui.dialog.DialogControl;
+import info.magnolia.jcr.util.NodeUtil;
+
+import java.util.Iterator;
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Map;
+
+import javax.jcr.Node;
+import javax.jcr.RepositoryException;
+
+import net.sourceforge.openutils.mgnlcontrols.dialog.DialogDependentSelectListAndRadioGroup;
+import net.sourceforge.openutils.mgnlcontrols.dialog.DialogRadioGroup;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+
+/**
+ * @author diego
+ * @version $Id: $
+ */
+public class SampleRadioOptionsProvider2 implements DialogRadioGroup.RadioOptionsProvider
+{
+
+    /**
+     * Logger.
+     */
+    private static final Logger log = LoggerFactory.getLogger(SampleRadioOptionsProvider2.class);
+
+    /**
+     * {@inheritDoc}
+     */
+    public Map<String, String> getRadioOptions(DialogControl dialogControl)
+    {
+        Map<String, String> options = new LinkedHashMap<String, String>();
+        List<String> treePathValues = ((DialogDependentSelectListAndRadioGroup) dialogControl)
+            .getDependentSelectList()
+            .getTreePathValues();
+        if (!treePathValues.isEmpty())
+        {
+            try
+            {
+                Node parent = NodeUtil.getNodeByIdentifier("config", treePathValues.get(treePathValues.size() - 1));
+                for (Iterator<Node> iter = NodeUtil.getNodes(parent, "mgnl:contentNode").iterator(); iter.hasNext();)
+                {
+                    Node node = iter.next();
+                    options.put(node.getIdentifier(), node.getName());
+                }
+            }
+            catch (RepositoryException e)
+            {
+                // TODO Auto-generated catch block
+                log.error(e.getMessage(), e);
+            }
+        }
+        return options;
+    }
+
+}


Property changes on: magnoliamodules/trunk/openutils-mgnlcontrols/src/main/java/net/sourceforge/openutils/mgnlcontrols/samples/SampleRadioOptionsProvider2.java
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Modified: magnoliamodules/trunk/openutils-mgnlcontrols/src/main/java/net/sourceforge/openutils/mgnlcontrols/samples/SampleSelectOptionsProvider.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlcontrols/src/main/java/net/sourceforge/openutils/mgnlcontrols/samples/SampleSelectOptionsProvider.java	2013-06-14 14:10:18 UTC (rev 4258)
+++ magnoliamodules/trunk/openutils-mgnlcontrols/src/main/java/net/sourceforge/openutils/mgnlcontrols/samples/SampleSelectOptionsProvider.java	2013-06-14 14:47:15 UTC (rev 4259)
@@ -41,7 +41,7 @@
             Node parent = treePathValues.length > 0 ? NodeUtil.getNodeByIdentifier(
                 "config",
                 treePathValues[treePathValues.length - 1]) : MgnlContext.getJCRSession("config").getRootNode();
-            for (Iterator<Node> iter = NodeUtil.getNodes(parent).iterator(); iter.hasNext();)
+            for (Iterator<Node> iter = NodeUtil.getNodes(parent, "mgnl:content").iterator(); iter.hasNext();)
             {
                 Node node = iter.next();
                 options.put(node.getIdentifier(), node.getName());

Added: magnoliamodules/trunk/openutils-mgnlcontrols/src/main/resources/mgnl-bootstrap/controls/config.modules.controls.controls.dependentSelectListAndRadioGroup.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnlcontrols/src/main/resources/mgnl-bootstrap/controls/config.modules.controls.controls.dependentSelectListAndRadioGroup.xml	                        (rev 0)
+++ magnoliamodules/trunk/openutils-mgnlcontrols/src/main/resources/mgnl-bootstrap/controls/config.modules.controls.controls.dependentSelectListAndRadioGroup.xml	2013-06-14 14:47:15 UTC (rev 4259)
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<sv:node sv:name="dependentSelectListAndRadioGroup" xmlns:sv="http://www.jcp.org/jcr/sv/1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <sv:property sv:name="jcr:primaryType" sv:type="Name">
+    <sv:value>mgnl:contentNode</sv:value>
+  </sv:property>
+  <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
+    <sv:value>mix:lockable</sv:value>
+  </sv:property>
+  <sv:property sv:name="jcr:uuid" sv:type="String">
+    <sv:value>9c9b6148-f018-49f9-b674-102b1f4318eb</sv:value>
+  </sv:property>
+  <sv:property sv:name="class" sv:type="String">
+    <sv:value>net.sourceforge.openutils.mgnlcontrols.dialog.DialogDependentSelectListAndRadioGroup</sv:value>
+  </sv:property>
+  <sv:property sv:name="jcr:createdBy" sv:type="String">
+    <sv:value>admin</sv:value>
+  </sv:property>
+  <sv:node sv:name="MetaData">
+    <sv:property sv:name="jcr:primaryType" sv:type="Name">
+      <sv:value>mgnl:metaData</sv:value>
+    </sv:property>
+    <sv:property sv:name="jcr:createdBy" sv:type="String">
+      <sv:value>admin</sv:value>
+    </sv:property>
+    <sv:property sv:name="mgnl:activated" sv:type="Boolean">
+      <sv:value>false</sv:value>
+    </sv:property>
+    <sv:property sv:name="mgnl:authorid" sv:type="String">
+      <sv:value>superuser</sv:value>
+    </sv:property>
+    <sv:property sv:name="mgnl:creationdate" sv:type="Date">
+      <sv:value>2008-06-07T18:15:12.496+02:00</sv:value>
+    </sv:property>
+    <sv:property sv:name="mgnl:lastmodified" sv:type="Date">
+      <sv:value>2013-06-14T16:31:38.578+02:00</sv:value>
+    </sv:property>
+  </sv:node>
+</sv:node>


Property changes on: magnoliamodules/trunk/openutils-mgnlcontrols/src/main/resources/mgnl-bootstrap/controls/config.modules.controls.controls.dependentSelectListAndRadioGroup.xml
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+text/xml
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Deleted: magnoliamodules/trunk/openutils-mgnlcontrols/src/main/resources/mgnl-bootstrap/controls/config.modules.controls.controls.dialogDependentSelectListAndRadioGroup.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnlcontrols/src/main/resources/mgnl-bootstrap/controls/config.modules.controls.controls.dialogDependentSelectListAndRadioGroup.xml	2013-06-14 14:10:18 UTC (rev 4258)
+++ magnoliamodules/trunk/openutils-mgnlcontrols/src/main/resources/mgnl-bootstrap/controls/config.modules.controls.controls.dialogDependentSelectListAndRadioGroup.xml	2013-06-14 14:47:15 UTC (rev 4259)
@@ -1,38 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<sv:node sv:name="dialogDependentSelectListAndRadioGroup" xmlns:sv="http://www.jcp.org/jcr/sv/1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-  <sv:property sv:name="jcr:primaryType" sv:type="Name">
-    <sv:value>mgnl:contentNode</sv:value>
-  </sv:property>
-  <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
-    <sv:value>mix:lockable</sv:value>
-  </sv:property>
-  <sv:property sv:name="jcr:uuid" sv:type="String">
-    <sv:value>9c9b6148-f018-49f9-b674-102b1f4318eb</sv:value>
-  </sv:property>
-  <sv:property sv:name="class" sv:type="String">
-    <sv:value>net.sourceforge.openutils.mgnlcontrols.dialog.DialogDependentSelectListAndRadioGroup</sv:value>
-  </sv:property>
-  <sv:property sv:name="jcr:createdBy" sv:type="String">
-    <sv:value>admin</sv:value>
-  </sv:property>
-  <sv:node sv:name="MetaData">
-    <sv:property sv:name="jcr:primaryType" sv:type="Name">
-      <sv:value>mgnl:metaData</sv:value>
-    </sv:property>
-    <sv:property sv:name="jcr:createdBy" sv:type="String">
-      <sv:value>admin</sv:value>
-    </sv:property>
-    <sv:property sv:name="mgnl:activated" sv:type="Boolean">
-      <sv:value>false</sv:value>
-    </sv:property>
-    <sv:property sv:name="mgnl:authorid" sv:type="String">
-      <sv:value>superuser</sv:value>
-    </sv:property>
-    <sv:property sv:name="mgnl:creationdate" sv:type="Date">
-      <sv:value>2008-06-07T18:15:12.496+02:00</sv:value>
-    </sv:property>
-    <sv:property sv:name="mgnl:lastmodified" sv:type="Date">
-      <sv:value>2013-06-14T15:33:36.393+02:00</sv:value>
-    </sv:property>
-  </sv:node>
-</sv:node>

Deleted: magnoliamodules/trunk/openutils-mgnlcontrols/src/main/resources/mgnl-bootstrap/controls/config.modules.controls.controls.dialogRadioGroup.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnlcontrols/src/main/resources/mgnl-bootstrap/controls/config.modules.controls.controls.dialogRadioGroup.xml	2013-06-14 14:10:18 UTC (rev 4258)
+++ magnoliamodules/trunk/openutils-mgnlcontrols/src/main/resources/mgnl-bootstrap/controls/config.modules.controls.controls.dialogRadioGroup.xml	2013-06-14 14:47:15 UTC (rev 4259)
@@ -1,38 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<sv:node sv:name="dialogRadioGroup" xmlns:sv="http://www.jcp.org/jcr/sv/1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-  <sv:property sv:name="jcr:primaryType" sv:type="Name">
-    <sv:value>mgnl:contentNode</sv:value>
-  </sv:property>
-  <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
-    <sv:value>mix:lockable</sv:value>
-  </sv:property>
-  <sv:property sv:name="jcr:uuid" sv:type="String">
-    <sv:value>6c13516f-7746-4c0f-8bee-a2a463816e4e</sv:value>
-  </sv:property>
-  <sv:property sv:name="class" sv:type="String">
-    <sv:value>net.sourceforge.openutils.mgnlcontrols.dialog.DialogRadioGroup</sv:value>
-  </sv:property>
-  <sv:property sv:name="jcr:createdBy" sv:type="String">
-    <sv:value>admin</sv:value>
-  </sv:property>
-  <sv:node sv:name="MetaData">
-    <sv:property sv:name="jcr:primaryType" sv:type="Name">
-      <sv:value>mgnl:metaData</sv:value>
-    </sv:property>
-    <sv:property sv:name="jcr:createdBy" sv:type="String">
-      <sv:value>admin</sv:value>
-    </sv:property>
-    <sv:property sv:name="mgnl:activated" sv:type="Boolean">
-      <sv:value>false</sv:value>
-    </sv:property>
-    <sv:property sv:name="mgnl:authorid" sv:type="String">
-      <sv:value>superuser</sv:value>
-    </sv:property>
-    <sv:property sv:name="mgnl:creationdate" sv:type="Date">
-      <sv:value>2008-06-07T18:15:12.496+02:00</sv:value>
-    </sv:property>
-    <sv:property sv:name="mgnl:lastmodified" sv:type="Date">
-      <sv:value>2013-06-14T15:33:15.234+02:00</sv:value>
-    </sv:property>
-  </sv:node>
-</sv:node>

Added: magnoliamodules/trunk/openutils-mgnlcontrols/src/main/resources/mgnl-bootstrap/controls/config.modules.controls.controls.radioGroup.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnlcontrols/src/main/resources/mgnl-bootstrap/controls/config.modules.controls.controls.radioGroup.xml	                        (rev 0)
+++ magnoliamodules/trunk/openutils-mgnlcontrols/src/main/resources/mgnl-bootstrap/controls/config.modules.controls.controls.radioGroup.xml	2013-06-14 14:47:15 UTC (rev 4259)
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<sv:node sv:name="radioGroup" xmlns:sv="http://www.jcp.org/jcr/sv/1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <sv:property sv:name="jcr:primaryType" sv:type="Name">
+    <sv:value>mgnl:contentNode</sv:value>
+  </sv:property>
+  <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
+    <sv:value>mix:lockable</sv:value>
+  </sv:property>
+  <sv:property sv:name="jcr:uuid" sv:type="String">
+    <sv:value>6c13516f-7746-4c0f-8bee-a2a463816e4e</sv:value>
+  </sv:property>
+  <sv:property sv:name="class" sv:type="String">
+    <sv:value>net.sourceforge.openutils.mgnlcontrols.dialog.DialogRadioGroup</sv:value>
+  </sv:property>
+  <sv:property sv:name="jcr:createdBy" sv:type="String">
+    <sv:value>admin</sv:value>
+  </sv:property>
+  <sv:node sv:name="MetaData">
+    <sv:property sv:name="jcr:primaryType" sv:type="Name">
+      <sv:value>mgnl:metaData</sv:value>
+    </sv:property>
+    <sv:property sv:name="jcr:createdBy" sv:type="String">
+      <sv:value>admin</sv:value>
+    </sv:property>
+    <sv:property sv:name="mgnl:activated" sv:type="Boolean">
+      <sv:value>false</sv:value>
+    </sv:property>
+    <sv:property sv:name="mgnl:authorid" sv:type="String">
+      <sv:value>superuser</sv:value>
+    </sv:property>
+    <sv:property sv:name="mgnl:creationdate" sv:type="Date">
+      <sv:value>2008-06-07T18:15:12.496+02:00</sv:value>
+    </sv:property>
+    <sv:property sv:name="mgnl:lastmodified" sv:type="Date">
+      <sv:value>2013-06-14T16:31:31.801+02:00</sv:value>
+    </sv:property>
+  </sv:node>
+</sv:node>


Property changes on: magnoliamodules/trunk/openutils-mgnlcontrols/src/main/resources/mgnl-bootstrap/controls/config.modules.controls.controls.radioGroup.xml
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+text/xml
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Modified: magnoliamodules/trunk/openutils-mgnlcontrols/src/main/resources/mgnl-bootstrap-samples/controls/config.modules.controls.dialogs.samples-dependentSelectList.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnlcontrols/src/main/resources/mgnl-bootstrap-samples/controls/config.modules.controls.dialogs.samples-dependentSelectList.xml	2013-06-14 14:10:18 UTC (rev 4258)
+++ magnoliamodules/trunk/openutils-mgnlcontrols/src/main/resources/mgnl-bootstrap-samples/controls/config.modules.controls.dialogs.samples-dependentSelectList.xml	2013-06-14 14:47:15 UTC (rev 4259)
@@ -129,5 +129,94 @@
         </sv:property>
       </sv:node>
     </sv:node>
+    <sv:node sv:name="bar">
+      <sv:property sv:name="jcr:primaryType" sv:type="Name">
+        <sv:value>mgnl:contentNode</sv:value>
+      </sv:property>
+      <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
+        <sv:value>mix:lockable</sv:value>
+      </sv:property>
+      <sv:property sv:name="jcr:uuid" sv:type="String">
+        <sv:value>e70af52a-4bab-4192-94a4-4e54116ac97c</sv:value>
+      </sv:property>
+      <sv:property sv:name="controlType" sv:type="String">
+        <sv:value>radioGroup</sv:value>
+      </sv:property>
+      <sv:property sv:name="jcr:createdBy" sv:type="String">
+        <sv:value>superuser</sv:value>
+      </sv:property>
+      <sv:property sv:name="label" sv:type="String">
+        <sv:value>Bar</sv:value>
+      </sv:property>
+      <sv:property sv:name="radioOptionsProvider" sv:type="String">
+        <sv:value>net.sourceforge.openutils.mgnlcontrols.samples.SampleRadioOptionsProvider</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>superuser</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>2013-06-14T15:54:03.927+02:00</sv:value>
+        </sv:property>
+        <sv:property sv:name="mgnl:lastmodified" sv:type="Date">
+          <sv:value>2013-06-14T16:35:32.392+02:00</sv:value>
+        </sv:property>
+      </sv:node>
+    </sv:node>
+    <sv:node sv:name="baz">
+      <sv:property sv:name="jcr:primaryType" sv:type="Name">
+        <sv:value>mgnl:contentNode</sv:value>
+      </sv:property>
+      <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
+        <sv:value>mix:lockable</sv:value>
+      </sv:property>
+      <sv:property sv:name="jcr:uuid" sv:type="String">
+        <sv:value>59976845-c52e-487b-9a6d-c3c0a75692f4</sv:value>
+      </sv:property>
+      <sv:property sv:name="controlType" sv:type="String">
+        <sv:value>dependentSelectListAndRadioGroup</sv:value>
+      </sv:property>
+      <sv:property sv:name="jcr:createdBy" sv:type="String">
+        <sv:value>superuser</sv:value>
+      </sv:property>
+      <sv:property sv:name="label" sv:type="String">
+        <sv:value>Baz</sv:value>
+      </sv:property>
+      <sv:property sv:name="radioOptionsProvider" sv:type="String">
+        <sv:value>net.sourceforge.openutils.mgnlcontrols.samples.SampleRadioOptionsProvider2</sv:value>
+      </sv:property>
+      <sv:property sv:name="selectOptionsProvider" sv:type="String">
+        <sv:value>net.sourceforge.openutils.mgnlcontrols.samples.SampleSelectOptionsProvider</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>superuser</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>2013-06-14T15:54:03.927+02:00</sv:value>
+        </sv:property>
+        <sv:property sv:name="mgnl:lastmodified" sv:type="Date">
+          <sv:value>2013-06-14T16:43:16.185+02:00</sv:value>
+        </sv:property>
+      </sv:node>
+    </sv:node>
   </sv:node>
 </sv:node>

Modified: magnoliamodules/trunk/openutils-mgnlcontrols/src/main/resources/mgnl-bootstrap-samples/controls/website.sample-controls.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnlcontrols/src/main/resources/mgnl-bootstrap-samples/controls/website.sample-controls.xml	2013-06-14 14:10:18 UTC (rev 4258)
+++ magnoliamodules/trunk/openutils-mgnlcontrols/src/main/resources/mgnl-bootstrap-samples/controls/website.sample-controls.xml	2013-06-14 14:47:15 UTC (rev 4259)
@@ -29,7 +29,7 @@
       <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>2013-06-14T16:02:47.597+02:00</sv:value>
+      <sv:value>2013-06-14T16:45:39.733+02:00</sv:value>
     </sv:property>
     <sv:property sv:name="mgnl:template" sv:type="String">
       <sv:value>controls:pages/sampleControls</sv:value>
@@ -62,7 +62,7 @@
         <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>2013-06-14T16:02:47.597+02:00</sv:value>
+        <sv:value>2013-06-14T16:45:39.732+02:00</sv:value>
       </sv:property>
     </sv:node>
     <sv:node sv:name="0">
@@ -231,6 +231,21 @@
       <sv:property sv:name="jcr:uuid" sv:type="String">
         <sv:value>2f0eb337-36c7-4dc6-bdd8-4a904834d038</sv:value>
       </sv:property>
+      <sv:property sv:name="bar" sv:type="String">
+        <sv:value>1e1df947-3a2b-437c-8e38-d0a03d4c41c0</sv:value>
+      </sv:property>
+      <sv:property sv:name="baz" sv:type="String">
+        <sv:value>9c9b6148-f018-49f9-b674-102b1f4318eb</sv:value>
+      </sv:property>
+      <sv:property sv:name="bazSelect0" sv:type="String">
+        <sv:value>2f363acf-792e-4e2f-9fdb-6a52853b44f0</sv:value>
+      </sv:property>
+      <sv:property sv:name="bazSelect1" sv:type="String">
+        <sv:value>ea1cf7df-1bcf-4b47-b7bc-f4403daa50e6</sv:value>
+      </sv:property>
+      <sv:property sv:name="bazSelect2" sv:type="String">
+        <sv:value>9d29a284-9502-43a8-beba-c57fac3b462f</sv:value>
+      </sv:property>
       <sv:property sv:name="foo" sv:type="String">
         <sv:value>46b21a36-f8c2-4193-b23e-17f06de93932</sv:value>
       </sv:property>
@@ -243,9 +258,6 @@
       <sv:property sv:name="fooSelect2" sv:type="String">
         <sv:value>9d29a284-9502-43a8-beba-c57fac3b462f</sv:value>
       </sv:property>
-      <sv:property sv:name="fooSelect3" sv:type="String">
-        <sv:value>46b21a36-f8c2-4193-b23e-17f06de93932</sv:value>
-      </sv:property>
       <sv:property sv:name="jcr:createdBy" sv:type="String">
         <sv:value>superuser</sv:value>
       </sv:property>
@@ -263,7 +275,7 @@
           <sv:value>2013-06-14T16:00:43.989+02:00</sv:value>
         </sv:property>
         <sv:property sv:name="mgnl:lastmodified" sv:type="Date">
-          <sv:value>2013-06-14T16:02:47.596+02:00</sv:value>
+          <sv:value>2013-06-14T16:45:39.732+02:00</sv:value>
         </sv:property>
         <sv:property sv:name="mgnl:template" sv:type="String">
           <sv:value>controls:components/samples-dependentSelectList</sv:value>

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

[Openutils-svn] SF.net SVN: openutils:[4258] magnoliamodules/trunk/openutils-mgnlcontrols/ src/main/resources/mgnl-files/templates/samples-controls/ paragraph-dependentSelectList.jsp

From: <die...@us...> - 2013-06-14 14:10:21

Revision: 4258
          http://openutils.svn.sourceforge.net/openutils/?rev=4258&view=rev
Author:   diego_schivo
Date:     2013-06-14 14:10:18 +0000 (Fri, 14 Jun 2013)
Log Message:
-----------
CONTROLS-54 paragraph-dependentSelectList.jsp

Added Paths:
-----------
    magnoliamodules/trunk/openutils-mgnlcontrols/src/main/resources/mgnl-files/templates/samples-controls/paragraph-dependentSelectList.jsp

Added: magnoliamodules/trunk/openutils-mgnlcontrols/src/main/resources/mgnl-files/templates/samples-controls/paragraph-dependentSelectList.jsp
===================================================================
--- magnoliamodules/trunk/openutils-mgnlcontrols/src/main/resources/mgnl-files/templates/samples-controls/paragraph-dependentSelectList.jsp	                        (rev 0)
+++ magnoliamodules/trunk/openutils-mgnlcontrols/src/main/resources/mgnl-files/templates/samples-controls/paragraph-dependentSelectList.jsp	2013-06-14 14:10:18 UTC (rev 4258)
@@ -0,0 +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="http://magnolia-cms.com/taglib/templating-components/cms"
+  xmlns:cmsfn="http://magnolia-cms.com/taglib/templating-components/cmsfn" xmlns:media="http://net.sourceforge.openutils/mgnlMedia"
+  xmlns:mu="mgnlutils">
+  <jsp:directive.page contentType="text/html; charset=UTF-8" session="false" />
+  ${cmsfn:contentByIdentifier(content.foo, "config")}
+</jsp:root>
\ No newline at end of file


Property changes on: magnoliamodules/trunk/openutils-mgnlcontrols/src/main/resources/mgnl-files/templates/samples-controls/paragraph-dependentSelectList.jsp
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+text/xml
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

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

From: <die...@us...> - 2013-06-14 14:05:31

Revision: 4257
          http://openutils.svn.sourceforge.net/openutils/?rev=4257&view=rev
Author:   diego_schivo
Date:     2013-06-14 14:05:21 +0000 (Fri, 14 Jun 2013)
Log Message:
-----------
CONTROLS-54 website.sample-controls.xml

Modified Paths:
--------------
    magnoliamodules/trunk/openutils-mgnlcontrols/src/main/java/net/sourceforge/openutils/mgnlcontrols/dialog/DialogDependentSelectList.java
    magnoliamodules/trunk/openutils-mgnlcontrols/src/main/resources/dialogs/dependentSelectList.ftl
    magnoliamodules/trunk/openutils-mgnlcontrols/src/main/resources/mgnl-bootstrap-samples/controls/website.sample-controls.xml

Modified: magnoliamodules/trunk/openutils-mgnlcontrols/src/main/java/net/sourceforge/openutils/mgnlcontrols/dialog/DialogDependentSelectList.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlcontrols/src/main/java/net/sourceforge/openutils/mgnlcontrols/dialog/DialogDependentSelectList.java	2013-06-14 14:00:34 UTC (rev 4256)
+++ magnoliamodules/trunk/openutils-mgnlcontrols/src/main/java/net/sourceforge/openutils/mgnlcontrols/dialog/DialogDependentSelectList.java	2013-06-14 14:05:21 UTC (rev 4257)
@@ -33,8 +33,6 @@
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
-import net.sourceforge.openutils.mgnlcontrols.dialog.ConfigurableFreemarkerDialog;
-
 import org.apache.commons.lang.StringUtils;
 
 
@@ -172,6 +170,12 @@
         throws RepositoryException
     {
         super.init(request, response, websiteNode, configNode);
+        if (StringUtils.isEmpty(getConfigValue("saveHandler")))
+        {
+            setConfig(
+                "saveHandler",
+                "net.sourceforge.openutils.mgnlcontrols.dialog.DialogDependentSelectListSaveHandler");
+        }
     }
 
     /**

Modified: magnoliamodules/trunk/openutils-mgnlcontrols/src/main/resources/dialogs/dependentSelectList.ftl
===================================================================
--- magnoliamodules/trunk/openutils-mgnlcontrols/src/main/resources/dialogs/dependentSelectList.ftl	2013-06-14 14:00:34 UTC (rev 4256)
+++ magnoliamodules/trunk/openutils-mgnlcontrols/src/main/resources/dialogs/dependentSelectList.ftl	2013-06-14 14:05:21 UTC (rev 4257)
@@ -3,7 +3,7 @@
 <select style="width:100%;" class="mgnlDialogControlSelect" id="${paramSelect}" name="${paramSelect}">
   <option value="">- select -</option>
   [#list options?keys as key]
-  <option value="${key?html!}"[#if key = request.getParameter(paramSelect)!] selected="selected"[/#if]>${options[key]!}</option>
+  <option value="${key?html!}"[#if key = treePathValues[options_index]!] selected="selected"[/#if]>${options[key]!}</option>
   [/#list]
 </select>
 [/#list]

Modified: magnoliamodules/trunk/openutils-mgnlcontrols/src/main/resources/mgnl-bootstrap-samples/controls/website.sample-controls.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnlcontrols/src/main/resources/mgnl-bootstrap-samples/controls/website.sample-controls.xml	2013-06-14 14:00:34 UTC (rev 4256)
+++ magnoliamodules/trunk/openutils-mgnlcontrols/src/main/resources/mgnl-bootstrap-samples/controls/website.sample-controls.xml	2013-06-14 14:05:21 UTC (rev 4257)
@@ -29,7 +29,7 @@
       <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>2013-06-14T15:14:54.258+02:00</sv:value>
+      <sv:value>2013-06-14T16:02:47.597+02:00</sv:value>
     </sv:property>
     <sv:property sv:name="mgnl:template" sv:type="String">
       <sv:value>controls:pages/sampleControls</sv:value>
@@ -62,7 +62,7 @@
         <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>2013-06-14T14:55:50.194+02:00</sv:value>
+        <sv:value>2013-06-14T16:02:47.597+02:00</sv:value>
       </sv:property>
     </sv:node>
     <sv:node sv:name="0">
@@ -221,5 +221,54 @@
         </sv:node>
       </sv:node>
     </sv:node>
+    <sv:node sv:name="00">
+      <sv:property sv:name="jcr:primaryType" sv:type="Name">
+        <sv:value>mgnl:component</sv:value>
+      </sv:property>
+      <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
+        <sv:value>mix:lockable</sv:value>
+      </sv:property>
+      <sv:property sv:name="jcr:uuid" sv:type="String">
+        <sv:value>2f0eb337-36c7-4dc6-bdd8-4a904834d038</sv:value>
+      </sv:property>
+      <sv:property sv:name="foo" sv:type="String">
+        <sv:value>46b21a36-f8c2-4193-b23e-17f06de93932</sv:value>
+      </sv:property>
+      <sv:property sv:name="fooSelect0" sv:type="String">
+        <sv:value>2f363acf-792e-4e2f-9fdb-6a52853b44f0</sv:value>
+      </sv:property>
+      <sv:property sv:name="fooSelect1" sv:type="String">
+        <sv:value>ea1cf7df-1bcf-4b47-b7bc-f4403daa50e6</sv:value>
+      </sv:property>
+      <sv:property sv:name="fooSelect2" sv:type="String">
+        <sv:value>9d29a284-9502-43a8-beba-c57fac3b462f</sv:value>
+      </sv:property>
+      <sv:property sv:name="fooSelect3" sv:type="String">
+        <sv:value>46b21a36-f8c2-4193-b23e-17f06de93932</sv:value>
+      </sv:property>
+      <sv:property sv:name="jcr:createdBy" sv:type="String">
+        <sv:value>superuser</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>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>2013-06-14T16:00:43.989+02:00</sv:value>
+        </sv:property>
+        <sv:property sv:name="mgnl:lastmodified" sv:type="Date">
+          <sv:value>2013-06-14T16:02:47.596+02:00</sv:value>
+        </sv:property>
+        <sv:property sv:name="mgnl:template" sv:type="String">
+          <sv:value>controls:components/samples-dependentSelectList</sv:value>
+        </sv:property>
+      </sv:node>
+    </sv:node>
   </sv:node>
 </sv:node>

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

[Openutils-svn] SF.net SVN: openutils:[4256] magnoliamodules/trunk/openutils-mgnlcontrols/ src/main/resources/mgnl-bootstrap-samples/controls

From: <die...@us...> - 2013-06-14 14:00:38

Revision: 4256
          http://openutils.svn.sourceforge.net/openutils/?rev=4256&view=rev
Author:   diego_schivo
Date:     2013-06-14 14:00:34 +0000 (Fri, 14 Jun 2013)
Log Message:
-----------
CONTROLS-54 config.modules.controls.templates.components.samples-dependentSelectList.xml

Modified Paths:
--------------
    magnoliamodules/trunk/openutils-mgnlcontrols/src/main/resources/mgnl-bootstrap-samples/controls/config.modules.controls.templates.pages.sampleControls.xml

Added Paths:
-----------
    magnoliamodules/trunk/openutils-mgnlcontrols/src/main/resources/mgnl-bootstrap-samples/controls/config.modules.controls.dialogs.samples-dependentSelectList.xml
    magnoliamodules/trunk/openutils-mgnlcontrols/src/main/resources/mgnl-bootstrap-samples/controls/config.modules.controls.templates.components.samples-dependentSelectList.xml

Added: magnoliamodules/trunk/openutils-mgnlcontrols/src/main/resources/mgnl-bootstrap-samples/controls/config.modules.controls.dialogs.samples-dependentSelectList.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnlcontrols/src/main/resources/mgnl-bootstrap-samples/controls/config.modules.controls.dialogs.samples-dependentSelectList.xml	                        (rev 0)
+++ magnoliamodules/trunk/openutils-mgnlcontrols/src/main/resources/mgnl-bootstrap-samples/controls/config.modules.controls.dialogs.samples-dependentSelectList.xml	2013-06-14 14:00:34 UTC (rev 4256)
@@ -0,0 +1,133 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<sv:node sv:name="samples-dependentSelectList" 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>2fda1daf-371c-4c92-bb49-b3611fe5c4c8</sv:value>
+  </sv:property>
+  <sv:property sv:name="i18nBasename" sv:type="String">
+    <sv:value>net.sourceforge.openutils.mgnltestwebapp.lang.messages</sv:value>
+  </sv:property>
+  <sv:property sv:name="jcr:createdBy" sv:type="String">
+    <sv:value>admin</sv:value>
+  </sv:property>
+  <sv:node sv:name="MetaData">
+    <sv:property sv:name="jcr:primaryType" sv:type="Name">
+      <sv:value>mgnl:metaData</sv:value>
+    </sv:property>
+    <sv:property sv:name="jcr:createdBy" sv:type="String">
+      <sv:value>admin</sv:value>
+    </sv:property>
+    <sv:property sv:name="mgnl:Data" sv:type="String">
+      <sv:value>MetaData</sv:value>
+    </sv:property>
+    <sv:property sv:name="mgnl:activated" sv:type="Boolean">
+      <sv:value>false</sv:value>
+    </sv:property>
+    <sv:property sv:name="mgnl:activatorid" sv:type="String">
+      <sv:value>superuser</sv:value>
+    </sv:property>
+    <sv:property sv:name="mgnl:authorid" sv:type="String">
+      <sv:value>superuser</sv:value>
+    </sv:property>
+    <sv:property sv:name="mgnl:creationdate" sv:type="String">
+      <sv:value>2004-11-02T15:34:43.213+01:00</sv:value>
+    </sv:property>
+    <sv:property sv:name="mgnl:lastaction" sv:type="Date">
+      <sv:value>2008-04-28T23:43:10.557+02:00</sv:value>
+    </sv:property>
+    <sv:property sv:name="mgnl:lastmodified" sv:type="Date">
+      <sv:value>2013-06-14T15:53:34.342+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="tabGeneral">
+    <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>92626469-86c3-477b-8264-241c54135bf9</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>Dependent select list</sv:value>
+    </sv:property>
+    <sv:node sv:name="MetaData">
+      <sv:property sv:name="jcr:primaryType" sv:type="Name">
+        <sv:value>mgnl:metaData</sv:value>
+      </sv:property>
+      <sv:property sv:name="jcr:createdBy" sv:type="String">
+        <sv:value>admin</sv:value>
+      </sv:property>
+      <sv:property sv:name="mgnl: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>2013-06-14T15:55:11.010+02:00</sv:value>
+      </sv:property>
+    </sv:node>
+    <sv:node sv:name="foo">
+      <sv:property sv:name="jcr:primaryType" sv:type="Name">
+        <sv:value>mgnl:contentNode</sv:value>
+      </sv:property>
+      <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
+        <sv:value>mix:lockable</sv:value>
+      </sv:property>
+      <sv:property sv:name="jcr:uuid" sv:type="String">
+        <sv:value>09b554c8-c736-4656-93e4-afa74c208a82</sv:value>
+      </sv:property>
+      <sv:property sv:name="controlType" sv:type="String">
+        <sv:value>dependentSelectList</sv:value>
+      </sv:property>
+      <sv:property sv:name="jcr:createdBy" sv:type="String">
+        <sv:value>superuser</sv:value>
+      </sv:property>
+      <sv:property sv:name="label" sv:type="String">
+        <sv:value>Foo</sv:value>
+      </sv:property>
+      <sv:property sv:name="selectOptionsProvider" sv:type="String">
+        <sv:value>net.sourceforge.openutils.mgnlcontrols.samples.SampleSelectOptionsProvider</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>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>2013-06-14T15:54:03.927+02:00</sv:value>
+        </sv:property>
+        <sv:property sv:name="mgnl:lastmodified" sv:type="Date">
+          <sv:value>2013-06-14T15:54:58.678+02:00</sv:value>
+        </sv:property>
+      </sv:node>
+    </sv:node>
+  </sv:node>
+</sv:node>


Property changes on: magnoliamodules/trunk/openutils-mgnlcontrols/src/main/resources/mgnl-bootstrap-samples/controls/config.modules.controls.dialogs.samples-dependentSelectList.xml
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+text/xml
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: magnoliamodules/trunk/openutils-mgnlcontrols/src/main/resources/mgnl-bootstrap-samples/controls/config.modules.controls.templates.components.samples-dependentSelectList.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnlcontrols/src/main/resources/mgnl-bootstrap-samples/controls/config.modules.controls.templates.components.samples-dependentSelectList.xml	                        (rev 0)
+++ magnoliamodules/trunk/openutils-mgnlcontrols/src/main/resources/mgnl-bootstrap-samples/controls/config.modules.controls.templates.components.samples-dependentSelectList.xml	2013-06-14 14:00:34 UTC (rev 4256)
@@ -0,0 +1,50 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<sv:node sv:name="samples-dependentSelectList" xmlns:sv="http://www.jcp.org/jcr/sv/1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <sv:property sv:name="jcr:primaryType" sv:type="Name">
+    <sv:value>mgnl:contentNode</sv:value>
+  </sv:property>
+  <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
+    <sv:value>mix:lockable</sv:value>
+  </sv:property>
+  <sv:property sv:name="jcr:uuid" sv:type="String">
+    <sv:value>67b54851-2db9-44ee-be53-65acaf7ece19</sv:value>
+  </sv:property>
+  <sv:property sv:name="description" sv:type="String">
+    <sv:value>Sample dependent select list paragraph</sv:value>
+  </sv:property>
+  <sv:property sv:name="dialog" sv:type="String">
+    <sv:value>controls:samples-dependentSelectList</sv:value>
+  </sv:property>
+  <sv:property sv:name="jcr:createdBy" sv:type="String">
+    <sv:value>admin</sv:value>
+  </sv:property>
+  <sv:property sv:name="renderType" sv:type="String">
+    <sv:value>jsp</sv:value>
+  </sv:property>
+  <sv:property sv:name="templateScript" sv:type="String">
+    <sv:value>/templates/samples-controls/paragraph-dependentSelectList.jsp</sv:value>
+  </sv:property>
+  <sv:property sv:name="title" sv:type="String">
+    <sv:value>Dependent select list 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="jcr:createdBy" sv:type="String">
+      <sv:value>admin</sv:value>
+    </sv:property>
+    <sv:property sv:name="mgnl:activated" sv:type="Boolean">
+      <sv:value>false</sv:value>
+    </sv:property>
+    <sv:property sv:name="mgnl:authorid" sv:type="String">
+      <sv:value>superuser</sv:value>
+    </sv:property>
+    <sv:property sv:name="mgnl:creationdate" sv:type="Date">
+      <sv:value>2008-09-25T12:45:26.721+02:00</sv:value>
+    </sv:property>
+    <sv:property sv:name="mgnl:lastmodified" sv:type="Date">
+      <sv:value>2013-06-14T15:56:31.245+02:00</sv:value>
+    </sv:property>
+  </sv:node>
+</sv:node>


Property changes on: magnoliamodules/trunk/openutils-mgnlcontrols/src/main/resources/mgnl-bootstrap-samples/controls/config.modules.controls.templates.components.samples-dependentSelectList.xml
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+text/xml
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Modified: magnoliamodules/trunk/openutils-mgnlcontrols/src/main/resources/mgnl-bootstrap-samples/controls/config.modules.controls.templates.pages.sampleControls.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnlcontrols/src/main/resources/mgnl-bootstrap-samples/controls/config.modules.controls.templates.pages.sampleControls.xml	2013-06-14 13:52:47 UTC (rev 4255)
+++ magnoliamodules/trunk/openutils-mgnlcontrols/src/main/resources/mgnl-bootstrap-samples/controls/config.modules.controls.templates.pages.sampleControls.xml	2013-06-14 14:00:34 UTC (rev 4256)
@@ -186,6 +186,43 @@
             </sv:property>
           </sv:node>
         </sv:node>
+        <sv:node sv:name="samples-dependentSelectList">
+          <sv:property sv:name="jcr:primaryType" sv:type="Name">
+            <sv:value>mgnl:contentNode</sv:value>
+          </sv:property>
+          <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
+            <sv:value>mix:lockable</sv:value>
+          </sv:property>
+          <sv:property sv:name="jcr:uuid" sv:type="String">
+            <sv:value>5f07b523-0f18-4125-885a-3076cd68c340</sv:value>
+          </sv:property>
+          <sv:property sv:name="id" sv:type="String">
+            <sv:value>controls:components/samples-dependentSelectList</sv:value>
+          </sv:property>
+          <sv:property sv:name="jcr:createdBy" sv:type="String">
+            <sv:value>admin</sv:value>
+          </sv:property>
+          <sv:node sv:name="MetaData">
+            <sv:property sv:name="jcr:primaryType" sv:type="Name">
+              <sv:value>mgnl:metaData</sv:value>
+            </sv:property>
+            <sv:property sv:name="jcr:createdBy" sv:type="String">
+              <sv:value>admin</sv:value>
+            </sv:property>
+            <sv:property sv:name="mgnl:activated" sv:type="Boolean">
+              <sv:value>false</sv:value>
+            </sv:property>
+            <sv:property sv:name="mgnl:authorid" sv:type="String">
+              <sv:value>superuser</sv:value>
+            </sv:property>
+            <sv:property sv:name="mgnl:creationdate" sv:type="Date">
+              <sv:value>2012-03-21T07:32:14.200+01:00</sv:value>
+            </sv:property>
+            <sv:property sv:name="mgnl:lastmodified" sv:type="Date">
+              <sv:value>2013-06-14T15:57:52.773+02:00</sv:value>
+            </sv:property>
+          </sv:node>
+        </sv:node>
       </sv:node>
     </sv:node>
   </sv:node>

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

[Openutils-svn] SF.net SVN: openutils:[4255] magnoliamodules/trunk/openutils-mgnlcontrols/ src/main/java/net/sourceforge/openutils/mgnlcontrols

From: <die...@us...> - 2013-06-14 13:52:50

Revision: 4255
          http://openutils.svn.sourceforge.net/openutils/?rev=4255&view=rev
Author:   diego_schivo
Date:     2013-06-14 13:52:47 +0000 (Fri, 14 Jun 2013)
Log Message:
-----------
CONTROLS-54 SampleSelectOptionsProvider

Added Paths:
-----------
    magnoliamodules/trunk/openutils-mgnlcontrols/src/main/java/net/sourceforge/openutils/mgnlcontrols/samples/
    magnoliamodules/trunk/openutils-mgnlcontrols/src/main/java/net/sourceforge/openutils/mgnlcontrols/samples/SampleSelectOptionsProvider.java

Added: magnoliamodules/trunk/openutils-mgnlcontrols/src/main/java/net/sourceforge/openutils/mgnlcontrols/samples/SampleSelectOptionsProvider.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlcontrols/src/main/java/net/sourceforge/openutils/mgnlcontrols/samples/SampleSelectOptionsProvider.java	                        (rev 0)
+++ magnoliamodules/trunk/openutils-mgnlcontrols/src/main/java/net/sourceforge/openutils/mgnlcontrols/samples/SampleSelectOptionsProvider.java	2013-06-14 13:52:47 UTC (rev 4255)
@@ -0,0 +1,63 @@
+package net.sourceforge.openutils.mgnlcontrols.samples;
+
+import info.magnolia.cms.gui.dialog.DialogControl;
+import info.magnolia.context.MgnlContext;
+import info.magnolia.jcr.util.NodeUtil;
+
+import java.util.Iterator;
+import java.util.LinkedHashMap;
+import java.util.Map;
+
+import javax.jcr.LoginException;
+import javax.jcr.Node;
+import javax.jcr.RepositoryException;
+
+import net.sourceforge.openutils.mgnlcontrols.dialog.DialogDependentSelectList;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+
+/**
+ * @author diego
+ * @version $Id: $
+ */
+public class SampleSelectOptionsProvider implements DialogDependentSelectList.SelectOptionsProvider
+{
+
+    /**
+     * Logger.
+     */
+    private static final Logger log = LoggerFactory.getLogger(SampleSelectOptionsProvider.class);
+
+    /**
+     * {@inheritDoc}
+     */
+    public Map<String, String> getSelectOptions(String[] treePathValues, DialogControl dialogControl)
+    {
+        Map<String, String> options = new LinkedHashMap<String, String>();
+        try
+        {
+            Node parent = treePathValues.length > 0 ? NodeUtil.getNodeByIdentifier(
+                "config",
+                treePathValues[treePathValues.length - 1]) : MgnlContext.getJCRSession("config").getRootNode();
+            for (Iterator<Node> iter = NodeUtil.getNodes(parent).iterator(); iter.hasNext();)
+            {
+                Node node = iter.next();
+                options.put(node.getIdentifier(), node.getName());
+            }
+        }
+        catch (LoginException e)
+        {
+            // TODO Auto-generated catch block
+            log.error(e.getMessage(), e);
+        }
+        catch (RepositoryException e)
+        {
+            // TODO Auto-generated catch block
+            log.error(e.getMessage(), e);
+        }
+        return options;
+    }
+
+}


Property changes on: magnoliamodules/trunk/openutils-mgnlcontrols/src/main/java/net/sourceforge/openutils/mgnlcontrols/samples/SampleSelectOptionsProvider.java
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

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

From: <die...@us...> - 2013-06-14 13:38:09

Revision: 4254
          http://openutils.svn.sourceforge.net/openutils/?rev=4254&view=rev
Author:   diego_schivo
Date:     2013-06-14 13:38:05 +0000 (Fri, 14 Jun 2013)
Log Message:
-----------
CONTROLS-54 config.modules.controls.controls.dependentSelectList.xml

Added Paths:
-----------
    magnoliamodules/trunk/openutils-mgnlcontrols/src/main/java/net/sourceforge/openutils/mgnlcontrols/dialog/DialogDependentSelectList.java
    magnoliamodules/trunk/openutils-mgnlcontrols/src/main/java/net/sourceforge/openutils/mgnlcontrols/dialog/DialogDependentSelectListAndRadioGroup.java
    magnoliamodules/trunk/openutils-mgnlcontrols/src/main/java/net/sourceforge/openutils/mgnlcontrols/dialog/DialogDependentSelectListSaveHandler.java
    magnoliamodules/trunk/openutils-mgnlcontrols/src/main/java/net/sourceforge/openutils/mgnlcontrols/dialog/DialogRadioGroup.java
    magnoliamodules/trunk/openutils-mgnlcontrols/src/main/resources/dialogs/dependentSelectList.ftl
    magnoliamodules/trunk/openutils-mgnlcontrols/src/main/resources/dialogs/dependentSelectListAndRadioGroup.ftl
    magnoliamodules/trunk/openutils-mgnlcontrols/src/main/resources/dialogs/radioGroup.ftl
    magnoliamodules/trunk/openutils-mgnlcontrols/src/main/resources/mgnl-bootstrap/controls/config.modules.controls.controls.dependentSelectList.xml
    magnoliamodules/trunk/openutils-mgnlcontrols/src/main/resources/mgnl-bootstrap/controls/config.modules.controls.controls.dialogDependentSelectListAndRadioGroup.xml
    magnoliamodules/trunk/openutils-mgnlcontrols/src/main/resources/mgnl-bootstrap/controls/config.modules.controls.controls.dialogRadioGroup.xml

Added: magnoliamodules/trunk/openutils-mgnlcontrols/src/main/java/net/sourceforge/openutils/mgnlcontrols/dialog/DialogDependentSelectList.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlcontrols/src/main/java/net/sourceforge/openutils/mgnlcontrols/dialog/DialogDependentSelectList.java	                        (rev 0)
+++ magnoliamodules/trunk/openutils-mgnlcontrols/src/main/java/net/sourceforge/openutils/mgnlcontrols/dialog/DialogDependentSelectList.java	2013-06-14 13:38:05 UTC (rev 4254)
@@ -0,0 +1,194 @@
+/**
+ *
+ * Controls module for Magnolia CMS (http://www.openmindlab.com/lab/products/controls.html)
+ * Copyright(C) 2008-2012, Openmind S.r.l. http://www.openmindonline.it
+ *
+ *  This program is free software: you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation, either version 3 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package net.sourceforge.openutils.mgnlcontrols.dialog;
+
+import info.magnolia.cms.core.Content;
+import info.magnolia.cms.gui.dialog.DialogControl;
+import info.magnolia.cms.util.NodeDataUtil;
+import info.magnolia.objectfactory.Classes;
+import info.magnolia.objectfactory.MgnlInstantiationException;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+
+import javax.jcr.RepositoryException;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+import net.sourceforge.openutils.mgnlcontrols.dialog.ConfigurableFreemarkerDialog;
+
+import org.apache.commons.lang.StringUtils;
+
+
+/**
+ * @author diego
+ */
+public class DialogDependentSelectList extends ConfigurableFreemarkerDialog
+{
+
+    private SelectOptionsProvider selectOptionsProvider;
+
+    private List<String> treePathValues;
+
+    private List<Map<String, String>> selectOptionsList;
+
+    private Boolean leaf;
+
+    /**
+     * Returns the selectOptionsProvider.
+     * @return the selectOptionsProvider
+     */
+    public SelectOptionsProvider getSelectOptionsProvider()
+    {
+        if (selectOptionsProvider == null)
+        {
+            String className = getConfigValue("selectOptionsProvider");
+            if (StringUtils.isNotEmpty(className))
+            {
+                try
+                {
+                    selectOptionsProvider = Classes.newInstance(className);
+                }
+                catch (MgnlInstantiationException e)
+                {
+                    log.error("can't create select options provider", e);
+                }
+                catch (ClassNotFoundException e)
+                {
+                    log.error("can't create select options provider", e);
+                }
+            }
+        }
+        return selectOptionsProvider;
+    }
+
+    /**
+     * Returns the treePathValues.
+     * @return the treePathValues
+     */
+    public List<String> getTreePathValues()
+    {
+        if (treePathValues == null)
+        {
+            treePathValues = new ArrayList<String>();
+            if (StringUtils.isEmpty(getRequest().getParameter("dependentSelectListCK")))
+            {
+                if (getStorageNode() != null)
+                {
+                    String treePathValue;
+                    while (!StringUtils.isEmpty(treePathValue = NodeDataUtil.getString(getStorageNode(), getName()
+                        + "Select"
+                        + treePathValues.size())))
+                    {
+                        treePathValues.add(treePathValue);
+                    }
+                }
+            }
+            else
+            {
+                String treePathValue;
+                while (!StringUtils.isEmpty(treePathValue = getRequest().getParameter(
+                    getName() + "Select" + treePathValues.size())))
+                {
+                    treePathValues.add(treePathValue);
+                }
+            }
+        }
+        return treePathValues;
+    }
+
+    /**
+     * Returns the selectOptionsList.
+     * @return the selectOptionsList
+     */
+    public List<Map<String, String>> getSelectOptionsList()
+    {
+        if (selectOptionsList == null)
+        {
+            selectOptionsList = new ArrayList<Map<String, String>>();
+            leaf = Boolean.FALSE;
+            int length = getTreePathValues().size();
+            for (int i = 0; i <= length; i++)
+            {
+                Map<String, String> options = getSelectOptionsProvider().getSelectOptions(
+                    getTreePathValues().subList(0, i).toArray(new String[i]),
+                    this);
+                if (options.isEmpty())
+                {
+                    leaf = Boolean.TRUE;
+                    break;
+                }
+                selectOptionsList.add(options);
+            }
+        }
+        return selectOptionsList;
+    }
+
+    /**
+     * Returns the leaf.
+     * @return the leaf
+     */
+    public Boolean getLeaf()
+    {
+        if (leaf == null)
+        {
+            getSelectOptionsList();
+        }
+        return leaf;
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    protected String getPath()
+    {
+        return "dialogs/dependentSelectList.ftl";
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public void init(HttpServletRequest request, HttpServletResponse response, Content websiteNode, Content configNode)
+        throws RepositoryException
+    {
+        super.init(request, response, websiteNode, configNode);
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    protected void addToParameters(Map<String, Object> parameters)
+    {
+        super.addToParameters(parameters);
+        parameters.put("treePathValues", getTreePathValues());
+        parameters.put("selectOptionsList", getSelectOptionsList());
+        parameters.put("leaf", getLeaf());
+    }
+
+    public interface SelectOptionsProvider
+    {
+
+        public Map<String, String> getSelectOptions(String[] treePathValues, DialogControl dialogControl);
+    }
+}


Property changes on: magnoliamodules/trunk/openutils-mgnlcontrols/src/main/java/net/sourceforge/openutils/mgnlcontrols/dialog/DialogDependentSelectList.java
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: magnoliamodules/trunk/openutils-mgnlcontrols/src/main/java/net/sourceforge/openutils/mgnlcontrols/dialog/DialogDependentSelectListAndRadioGroup.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlcontrols/src/main/java/net/sourceforge/openutils/mgnlcontrols/dialog/DialogDependentSelectListAndRadioGroup.java	                        (rev 0)
+++ magnoliamodules/trunk/openutils-mgnlcontrols/src/main/java/net/sourceforge/openutils/mgnlcontrols/dialog/DialogDependentSelectListAndRadioGroup.java	2013-06-14 13:38:05 UTC (rev 4254)
@@ -0,0 +1,132 @@
+/**
+ *
+ * Controls module for Magnolia CMS (http://www.openmindlab.com/lab/products/controls.html)
+ * Copyright(C) 2008-2012, Openmind S.r.l. http://www.openmindonline.it
+ *
+ *  This program is free software: you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation, either version 3 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package net.sourceforge.openutils.mgnlcontrols.dialog;
+
+import info.magnolia.cms.core.Content;
+import info.magnolia.cms.gui.dialog.DialogControl;
+
+import java.util.Map;
+
+import javax.jcr.RepositoryException;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+import net.sourceforge.openutils.mgnlcontrols.dialog.ConfigurableFreemarkerDialog;
+
+
+/**
+ * @author diego
+ */
+public class DialogDependentSelectListAndRadioGroup extends ConfigurableFreemarkerDialog
+{
+
+    private DialogDependentSelectList dependentSelectList;
+
+    private DialogRadioGroup radioGroup;
+
+    /**
+	 * 
+	 */
+    public DialogDependentSelectListAndRadioGroup()
+    {
+    }
+
+    /**
+     * Returns the dependentSelectList.
+     * @return the dependentSelectList
+     */
+    public DialogDependentSelectList getDependentSelectList()
+    {
+        if (dependentSelectList == null)
+        {
+            dependentSelectList = new DialogDependentSelectList();
+        }
+        return dependentSelectList;
+    }
+
+    /**
+     * Returns the radioGroup.
+     * @return the radioGroup
+     */
+    public DialogRadioGroup getRadioGroup()
+    {
+        if (radioGroup == null)
+        {
+            radioGroup = new DialogRadioGroup()
+            {
+
+                /**
+                 * {@inheritDoc}
+                 */
+                @Override
+                protected DialogControl getThisDialogControl()
+                {
+                    return DialogDependentSelectListAndRadioGroup.this;
+                }
+
+            };
+        }
+        return radioGroup;
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public void setName(String s)
+    {
+        super.setName(s);
+        getDependentSelectList().setName(s);
+        getRadioGroup().setName(s);
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    protected String getPath()
+    {
+        return "dialogs/dependentSelectListAndRadioGroup.ftl";
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public void init(HttpServletRequest request, HttpServletResponse response, Content websiteNode, Content configNode)
+        throws RepositoryException
+    {
+        super.init(request, response, websiteNode, configNode);
+        getDependentSelectList().init(request, response, websiteNode, configNode);
+        getRadioGroup().init(request, response, websiteNode, configNode);
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    protected void addToParameters(Map<String, Object> parameters)
+    {
+        super.addToParameters(parameters);
+        getDependentSelectList().addToParameters(parameters);
+        getRadioGroup().addToParameters(parameters);
+    }
+
+}


Property changes on: magnoliamodules/trunk/openutils-mgnlcontrols/src/main/java/net/sourceforge/openutils/mgnlcontrols/dialog/DialogDependentSelectListAndRadioGroup.java
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: magnoliamodules/trunk/openutils-mgnlcontrols/src/main/java/net/sourceforge/openutils/mgnlcontrols/dialog/DialogDependentSelectListSaveHandler.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlcontrols/src/main/java/net/sourceforge/openutils/mgnlcontrols/dialog/DialogDependentSelectListSaveHandler.java	                        (rev 0)
+++ magnoliamodules/trunk/openutils-mgnlcontrols/src/main/java/net/sourceforge/openutils/mgnlcontrols/dialog/DialogDependentSelectListSaveHandler.java	2013-06-14 13:38:05 UTC (rev 4254)
@@ -0,0 +1,59 @@
+/**
+ *
+ * Controls module for Magnolia CMS (http://www.openmindlab.com/lab/products/controls.html)
+ * Copyright(C) 2008-2012, Openmind S.r.l. http://www.openmindonline.it
+ *
+ *  This program is free software: you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation, either version 3 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package net.sourceforge.openutils.mgnlcontrols.dialog;
+
+import info.magnolia.cms.beans.runtime.MultipartForm;
+import info.magnolia.cms.core.Content;
+import info.magnolia.cms.security.AccessDeniedException;
+import info.magnolia.cms.util.NodeDataUtil;
+import info.magnolia.module.admininterface.FieldSaveHandler;
+
+import javax.jcr.RepositoryException;
+
+import org.apache.commons.lang.StringUtils;
+
+
+/**
+ * @author diego
+ */
+public class DialogDependentSelectListSaveHandler implements FieldSaveHandler
+{
+
+    /**
+     * {@inheritDoc}
+     */
+    public void save(Content parentNode, Content configNode, String name, MultipartForm form, int type, int valueType,
+        int isRichEditValue, int encoding) throws RepositoryException, AccessDeniedException
+    {
+        String selectName, selectValue;
+        int i = 0;
+        while (!StringUtils.isEmpty(selectValue = form.getParameter(selectName = name + "Select" + i++)))
+        {
+            NodeDataUtil.getOrCreateAndSet(parentNode, selectName, selectValue);
+        }
+        while (parentNode.hasNodeData(selectName))
+        {
+            parentNode.deleteNodeData(selectName);
+            selectName = name + "Select" + i++;
+        }
+        NodeDataUtil.getOrCreateAndSet(parentNode, name, form.getParameter(name));
+    }
+
+}


Property changes on: magnoliamodules/trunk/openutils-mgnlcontrols/src/main/java/net/sourceforge/openutils/mgnlcontrols/dialog/DialogDependentSelectListSaveHandler.java
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: magnoliamodules/trunk/openutils-mgnlcontrols/src/main/java/net/sourceforge/openutils/mgnlcontrols/dialog/DialogRadioGroup.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlcontrols/src/main/java/net/sourceforge/openutils/mgnlcontrols/dialog/DialogRadioGroup.java	                        (rev 0)
+++ magnoliamodules/trunk/openutils-mgnlcontrols/src/main/java/net/sourceforge/openutils/mgnlcontrols/dialog/DialogRadioGroup.java	2013-06-14 13:38:05 UTC (rev 4254)
@@ -0,0 +1,128 @@
+/**
+ *
+ * Controls module for Magnolia CMS (http://www.openmindlab.com/lab/products/controls.html)
+ * Copyright(C) 2008-2012, Openmind S.r.l. http://www.openmindonline.it
+ *
+ *  This program is free software: you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation, either version 3 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package net.sourceforge.openutils.mgnlcontrols.dialog;
+
+import info.magnolia.cms.core.Content;
+import info.magnolia.cms.gui.dialog.DialogControl;
+import info.magnolia.objectfactory.Classes;
+import info.magnolia.objectfactory.MgnlInstantiationException;
+
+import java.util.Map;
+
+import javax.jcr.RepositoryException;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+import net.sourceforge.openutils.mgnlcontrols.dialog.ConfigurableFreemarkerDialog;
+
+import org.apache.commons.lang.StringUtils;
+
+
+/**
+ * @author diego
+ */
+public class DialogRadioGroup extends ConfigurableFreemarkerDialog
+{
+
+    private RadioOptionsProvider radioOptionsProvider;
+
+    private Map<String, String> radioOptions;
+
+    /**
+     * Returns the radioOptionsProvider.
+     * @return the radioOptionsProvider
+     */
+    public RadioOptionsProvider getRadioOptionsProvider()
+    {
+        if (radioOptionsProvider == null)
+        {
+            String className = getConfigValue("radioOptionsProvider");
+            if (StringUtils.isNotEmpty(className))
+            {
+                try
+                {
+                    radioOptionsProvider = Classes.newInstance(className);
+                }
+                catch (MgnlInstantiationException e)
+                {
+                    log.error("can't create radio options provider", e);
+                }
+                catch (ClassNotFoundException e)
+                {
+                    log.error("can't create radio options provider", e);
+                }
+            }
+        }
+        return radioOptionsProvider;
+    }
+
+    /**
+     * Returns the radioOptions.
+     * @return the radioOptions
+     */
+    public Map<String, String> getRadioOptions()
+    {
+        if (radioOptions == null)
+        {
+            radioOptions = getRadioOptionsProvider().getRadioOptions(getThisDialogControl());
+        }
+        return radioOptions;
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    protected String getPath()
+    {
+        return "dialogs/radioGroup.ftl";
+    }
+
+    protected DialogControl getThisDialogControl()
+    {
+        return this;
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public void init(HttpServletRequest request, HttpServletResponse response, Content websiteNode, Content configNode)
+        throws RepositoryException
+    {
+        super.init(request, response, websiteNode, configNode);
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    protected void addToParameters(Map<String, Object> parameters)
+    {
+        super.addToParameters(parameters);
+        parameters.put("radioOptions", getRadioOptions());
+    }
+
+    public interface RadioOptionsProvider
+    {
+
+        public Map<String, String> getRadioOptions(DialogControl dialogControl);
+    }
+}


Property changes on: magnoliamodules/trunk/openutils-mgnlcontrols/src/main/java/net/sourceforge/openutils/mgnlcontrols/dialog/DialogRadioGroup.java
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: magnoliamodules/trunk/openutils-mgnlcontrols/src/main/resources/dialogs/dependentSelectList.ftl
===================================================================
--- magnoliamodules/trunk/openutils-mgnlcontrols/src/main/resources/dialogs/dependentSelectList.ftl	                        (rev 0)
+++ magnoliamodules/trunk/openutils-mgnlcontrols/src/main/resources/dialogs/dependentSelectList.ftl	2013-06-14 13:38:05 UTC (rev 4254)
@@ -0,0 +1,35 @@
+[#list selectOptionsList as options]
+[#assign paramSelect]${name}Select${options_index}[/#assign]
+<select style="width:100%;" class="mgnlDialogControlSelect" id="${paramSelect}" name="${paramSelect}">
+  <option value="">- select -</option>
+  [#list options?keys as key]
+  <option value="${key?html!}"[#if key = request.getParameter(paramSelect)!] selected="selected"[/#if]>${options[key]!}</option>
+  [/#list]
+</select>
+[/#list]
+[#assign refresh = request.getParameter("dependentSelectListCK")?has_content]
+[#if !refresh]
+<input type="hidden" name="${name}" value="${value?html}" />
+<script type="text/javascript">
+(function($){
+  function init(){
+    var dialogBoxInput = $('label[for="${name}"]').closest("tr").find("td.mgnlDialogBoxInput");
+    var selects = dialogBoxInput.find('select[name!="${name}"]');
+    selects.change(function(){
+      var $this = $(this);
+      var data = $("#mgnlPath,#mgnlParagraph,#mgnlRepository,#mgnlLocale,#mgnlRichE,#mgnlRichEPaste").add(selects);
+      $.get($("#mgnlFormMain").attr("action"), data.serialize() + "&dependentSelectListCK=" + new Date().getTime(), function(data){
+        $(data).find('label[for="${name}"]').closest("tr").find("td.mgnlDialogBoxInput").replaceAll(dialogBoxInput);
+        init();
+      });
+    });
+  }
+  
+  $(function(){
+    init();
+  });
+})(jQuery);
+</script>
+[#else]
+<input type="hidden" name="${name}" value="[#if leaf]${request.getParameter(paramSelect)?html!}[/#if]" />
+[/#if]

Added: magnoliamodules/trunk/openutils-mgnlcontrols/src/main/resources/dialogs/dependentSelectListAndRadioGroup.ftl
===================================================================
--- magnoliamodules/trunk/openutils-mgnlcontrols/src/main/resources/dialogs/dependentSelectListAndRadioGroup.ftl	                        (rev 0)
+++ magnoliamodules/trunk/openutils-mgnlcontrols/src/main/resources/dialogs/dependentSelectListAndRadioGroup.ftl	2013-06-14 13:38:05 UTC (rev 4254)
@@ -0,0 +1,41 @@
+[#list selectOptionsList as options]
+[#assign paramSelect]${name}Select${options_index}[/#assign]
+<select style="width:100%;" class="mgnlDialogControlSelect" id="${paramSelect}" name="${paramSelect}">
+  <option value="">- select -</option>
+  [#list options?keys as key]
+  <option value="${key?html!}"[#if key = treePathValues[options_index]!] selected="selected"[/#if]>${options[key]!}</option>
+  [/#list]
+</select>
+[/#list]
+[#assign refresh = request.getParameter("dependentSelectListCK")?has_content]
+[#assign found = false]
+[#list radioOptions?keys as key]
+  [#assign checked = (!refresh && key = value!) || (refresh && key = request.getParameter(name)!)]
+  [#assign found = found || checked]
+<input type="radio" id="${name}_${key?html!}" name="${name}" value="${key?html!}"[#if checked] checked="checked"[/#if] />${radioOptions[key]!}<br />
+[/#list]
+[#if !refresh]
+  [#if !found]
+<input type="hidden" name="${name}" value="${value?html}" />
+  [/#if]
+<script type="text/javascript">
+(function($){
+  function init(){
+    var dialogBoxInput = $('label[for="${name}"]').closest("tr").find("td.mgnlDialogBoxInput");
+    var selects = dialogBoxInput.find('select[name!="${name}"]');
+    selects.change(function(){
+      var $this = $(this);
+      var data = $("#mgnlPath,#mgnlParagraph,#mgnlRepository,#mgnlLocale,#mgnlRichE,#mgnlRichEPaste").add(selects);
+      $.get($("#mgnlFormMain").attr("action"), data.serialize() + "&dependentSelectListCK=" + new Date().getTime(), function(data){
+        $(data).find('label[for="${name}"]').closest("tr").find("td.mgnlDialogBoxInput").replaceAll(dialogBoxInput);
+        init();
+      });
+    });
+  }
+  
+  $(function(){
+    init();
+  });
+})(jQuery);
+</script>
+[/#if]

Added: magnoliamodules/trunk/openutils-mgnlcontrols/src/main/resources/dialogs/radioGroup.ftl
===================================================================
--- magnoliamodules/trunk/openutils-mgnlcontrols/src/main/resources/dialogs/radioGroup.ftl	                        (rev 0)
+++ magnoliamodules/trunk/openutils-mgnlcontrols/src/main/resources/dialogs/radioGroup.ftl	2013-06-14 13:38:05 UTC (rev 4254)
@@ -0,0 +1,3 @@
+[#list radioOptions?keys as key]
+<input type="radio" id="${name}_${key?html!}" name="${name}" value="${key?html!}"[#if key = value!] checked="checked"[/#if] />${radioOptions[key]!}<br />
+[/#list]

Added: magnoliamodules/trunk/openutils-mgnlcontrols/src/main/resources/mgnl-bootstrap/controls/config.modules.controls.controls.dependentSelectList.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnlcontrols/src/main/resources/mgnl-bootstrap/controls/config.modules.controls.controls.dependentSelectList.xml	                        (rev 0)
+++ magnoliamodules/trunk/openutils-mgnlcontrols/src/main/resources/mgnl-bootstrap/controls/config.modules.controls.controls.dependentSelectList.xml	2013-06-14 13:38:05 UTC (rev 4254)
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<sv:node sv:name="dependentSelectList" xmlns:sv="http://www.jcp.org/jcr/sv/1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <sv:property sv:name="jcr:primaryType" sv:type="Name">
+    <sv:value>mgnl:contentNode</sv:value>
+  </sv:property>
+  <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
+    <sv:value>mix:lockable</sv:value>
+  </sv:property>
+  <sv:property sv:name="jcr:uuid" sv:type="String">
+    <sv:value>46b21a36-f8c2-4193-b23e-17f06de93932</sv:value>
+  </sv:property>
+  <sv:property sv:name="class" sv:type="String">
+    <sv:value>net.sourceforge.openutils.mgnlcontrols.dialog.DialogDependentSelectList</sv:value>
+  </sv:property>
+  <sv:property sv:name="jcr:createdBy" sv:type="String">
+    <sv:value>admin</sv:value>
+  </sv:property>
+  <sv:node sv:name="MetaData">
+    <sv:property sv:name="jcr:primaryType" sv:type="Name">
+      <sv:value>mgnl:metaData</sv:value>
+    </sv:property>
+    <sv:property sv:name="jcr:createdBy" sv:type="String">
+      <sv:value>admin</sv:value>
+    </sv:property>
+    <sv:property sv:name="mgnl:activated" sv:type="Boolean">
+      <sv:value>false</sv:value>
+    </sv:property>
+    <sv:property sv:name="mgnl:authorid" sv:type="String">
+      <sv:value>superuser</sv:value>
+    </sv:property>
+    <sv:property sv:name="mgnl:creationdate" sv:type="Date">
+      <sv:value>2008-06-07T18:15:12.496+02:00</sv:value>
+    </sv:property>
+    <sv:property sv:name="mgnl:lastmodified" sv:type="Date">
+      <sv:value>2013-06-14T15:32:49.701+02:00</sv:value>
+    </sv:property>
+  </sv:node>
+</sv:node>


Property changes on: magnoliamodules/trunk/openutils-mgnlcontrols/src/main/resources/mgnl-bootstrap/controls/config.modules.controls.controls.dependentSelectList.xml
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+text/xml
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: magnoliamodules/trunk/openutils-mgnlcontrols/src/main/resources/mgnl-bootstrap/controls/config.modules.controls.controls.dialogDependentSelectListAndRadioGroup.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnlcontrols/src/main/resources/mgnl-bootstrap/controls/config.modules.controls.controls.dialogDependentSelectListAndRadioGroup.xml	                        (rev 0)
+++ magnoliamodules/trunk/openutils-mgnlcontrols/src/main/resources/mgnl-bootstrap/controls/config.modules.controls.controls.dialogDependentSelectListAndRadioGroup.xml	2013-06-14 13:38:05 UTC (rev 4254)
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<sv:node sv:name="dialogDependentSelectListAndRadioGroup" xmlns:sv="http://www.jcp.org/jcr/sv/1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <sv:property sv:name="jcr:primaryType" sv:type="Name">
+    <sv:value>mgnl:contentNode</sv:value>
+  </sv:property>
+  <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
+    <sv:value>mix:lockable</sv:value>
+  </sv:property>
+  <sv:property sv:name="jcr:uuid" sv:type="String">
+    <sv:value>9c9b6148-f018-49f9-b674-102b1f4318eb</sv:value>
+  </sv:property>
+  <sv:property sv:name="class" sv:type="String">
+    <sv:value>net.sourceforge.openutils.mgnlcontrols.dialog.DialogDependentSelectListAndRadioGroup</sv:value>
+  </sv:property>
+  <sv:property sv:name="jcr:createdBy" sv:type="String">
+    <sv:value>admin</sv:value>
+  </sv:property>
+  <sv:node sv:name="MetaData">
+    <sv:property sv:name="jcr:primaryType" sv:type="Name">
+      <sv:value>mgnl:metaData</sv:value>
+    </sv:property>
+    <sv:property sv:name="jcr:createdBy" sv:type="String">
+      <sv:value>admin</sv:value>
+    </sv:property>
+    <sv:property sv:name="mgnl:activated" sv:type="Boolean">
+      <sv:value>false</sv:value>
+    </sv:property>
+    <sv:property sv:name="mgnl:authorid" sv:type="String">
+      <sv:value>superuser</sv:value>
+    </sv:property>
+    <sv:property sv:name="mgnl:creationdate" sv:type="Date">
+      <sv:value>2008-06-07T18:15:12.496+02:00</sv:value>
+    </sv:property>
+    <sv:property sv:name="mgnl:lastmodified" sv:type="Date">
+      <sv:value>2013-06-14T15:33:36.393+02:00</sv:value>
+    </sv:property>
+  </sv:node>
+</sv:node>


Property changes on: magnoliamodules/trunk/openutils-mgnlcontrols/src/main/resources/mgnl-bootstrap/controls/config.modules.controls.controls.dialogDependentSelectListAndRadioGroup.xml
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+text/xml
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: magnoliamodules/trunk/openutils-mgnlcontrols/src/main/resources/mgnl-bootstrap/controls/config.modules.controls.controls.dialogRadioGroup.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnlcontrols/src/main/resources/mgnl-bootstrap/controls/config.modules.controls.controls.dialogRadioGroup.xml	                        (rev 0)
+++ magnoliamodules/trunk/openutils-mgnlcontrols/src/main/resources/mgnl-bootstrap/controls/config.modules.controls.controls.dialogRadioGroup.xml	2013-06-14 13:38:05 UTC (rev 4254)
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<sv:node sv:name="dialogRadioGroup" xmlns:sv="http://www.jcp.org/jcr/sv/1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <sv:property sv:name="jcr:primaryType" sv:type="Name">
+    <sv:value>mgnl:contentNode</sv:value>
+  </sv:property>
+  <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
+    <sv:value>mix:lockable</sv:value>
+  </sv:property>
+  <sv:property sv:name="jcr:uuid" sv:type="String">
+    <sv:value>6c13516f-7746-4c0f-8bee-a2a463816e4e</sv:value>
+  </sv:property>
+  <sv:property sv:name="class" sv:type="String">
+    <sv:value>net.sourceforge.openutils.mgnlcontrols.dialog.DialogRadioGroup</sv:value>
+  </sv:property>
+  <sv:property sv:name="jcr:createdBy" sv:type="String">
+    <sv:value>admin</sv:value>
+  </sv:property>
+  <sv:node sv:name="MetaData">
+    <sv:property sv:name="jcr:primaryType" sv:type="Name">
+      <sv:value>mgnl:metaData</sv:value>
+    </sv:property>
+    <sv:property sv:name="jcr:createdBy" sv:type="String">
+      <sv:value>admin</sv:value>
+    </sv:property>
+    <sv:property sv:name="mgnl:activated" sv:type="Boolean">
+      <sv:value>false</sv:value>
+    </sv:property>
+    <sv:property sv:name="mgnl:authorid" sv:type="String">
+      <sv:value>superuser</sv:value>
+    </sv:property>
+    <sv:property sv:name="mgnl:creationdate" sv:type="Date">
+      <sv:value>2008-06-07T18:15:12.496+02:00</sv:value>
+    </sv:property>
+    <sv:property sv:name="mgnl:lastmodified" sv:type="Date">
+      <sv:value>2013-06-14T15:33:15.234+02:00</sv:value>
+    </sv:property>
+  </sv:node>
+</sv:node>


Property changes on: magnoliamodules/trunk/openutils-mgnlcontrols/src/main/resources/mgnl-bootstrap/controls/config.modules.controls.controls.dialogRadioGroup.xml
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+text/xml
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

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

From: <die...@us...> - 2013-06-14 13:31:12

Revision: 4253
          http://openutils.svn.sourceforge.net/openutils/?rev=4253&view=rev
Author:   diego_schivo
Date:     2013-06-14 13:31:09 +0000 (Fri, 14 Jun 2013)
Log Message:
-----------
paragraph-grid.jsp

Modified Paths:
--------------
    magnoliamodules/trunk/openutils-mgnlcontrols/src/main/resources/mgnl-bootstrap-samples/controls/config.modules.controls.templates.components.samples-grid.xml
    magnoliamodules/trunk/openutils-mgnlcontrols/src/main/resources/mgnl-bootstrap-samples/controls/website.sample-controls.xml
    magnoliamodules/trunk/openutils-mgnlcontrols/src/main/resources/mgnl-files/templates/samples-controls/paragraph-grid.jsp
    magnoliamodules/trunk/openutils-mgnlcontrols/src/main/resources/mgnl-files/templates/samples-controls/template.jsp

Added Paths:
-----------
    magnoliamodules/trunk/openutils-mgnlcontrols/src/main/resources/mgnl-files/templates/samples-controls/area.jsp

Modified: magnoliamodules/trunk/openutils-mgnlcontrols/src/main/resources/mgnl-bootstrap-samples/controls/config.modules.controls.templates.components.samples-grid.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnlcontrols/src/main/resources/mgnl-bootstrap-samples/controls/config.modules.controls.templates.components.samples-grid.xml	2013-06-14 12:26:17 UTC (rev 4252)
+++ magnoliamodules/trunk/openutils-mgnlcontrols/src/main/resources/mgnl-bootstrap-samples/controls/config.modules.controls.templates.components.samples-grid.xml	2013-06-14 13:31:09 UTC (rev 4253)
@@ -12,6 +12,9 @@
   <sv:property sv:name="description" sv:type="String">
     <sv:value>Sample grid paragraph</sv:value>
   </sv:property>
+  <sv:property sv:name="dialog" sv:type="String">
+    <sv:value>controls:samples-grid</sv:value>
+  </sv:property>
   <sv:property sv:name="jcr:createdBy" sv:type="String">
     <sv:value>admin</sv:value>
   </sv:property>
@@ -41,7 +44,7 @@
       <sv:value>2008-09-25T12:45:26.721+02:00</sv:value>
     </sv:property>
     <sv:property sv:name="mgnl:lastmodified" sv:type="Date">
-      <sv:value>2013-06-14T14:25:39.926+02:00</sv:value>
+      <sv:value>2013-06-14T15:09:22.878+02:00</sv:value>
     </sv:property>
   </sv:node>
 </sv:node>

Modified: magnoliamodules/trunk/openutils-mgnlcontrols/src/main/resources/mgnl-bootstrap-samples/controls/website.sample-controls.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnlcontrols/src/main/resources/mgnl-bootstrap-samples/controls/website.sample-controls.xml	2013-06-14 12:26:17 UTC (rev 4252)
+++ magnoliamodules/trunk/openutils-mgnlcontrols/src/main/resources/mgnl-bootstrap-samples/controls/website.sample-controls.xml	2013-06-14 13:31:09 UTC (rev 4253)
@@ -1,7 +1,7 @@
 <?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:value>mgnl:page</sv:value>
   </sv:property>
   <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
     <sv:value>mix:lockable</sv:value>
@@ -10,7 +10,7 @@
     <sv:value>1e1df947-3a2b-437c-8e38-d0a03d4c41c0</sv:value>
   </sv:property>
   <sv:property sv:name="jcr:createdBy" sv:type="String">
-    <sv:value>admin</sv:value>
+    <sv:value>superuser</sv:value>
   </sv:property>
   <sv:property sv:name="title" sv:type="String">
     <sv:value>Controls sample</sv:value>
@@ -20,7 +20,7 @@
       <sv:value>mgnl:metaData</sv:value>
     </sv:property>
     <sv:property sv:name="jcr:createdBy" sv:type="String">
-      <sv:value>admin</sv:value>
+      <sv:value>superuser</sv:value>
     </sv:property>
     <sv:property sv:name="mgnl:authorid" sv:type="String">
       <sv:value>superuser</sv:value>
@@ -29,7 +29,7 @@
       <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>2013-06-14T11:08:44.343+02:00</sv:value>
+      <sv:value>2013-06-14T15:14:54.258+02:00</sv:value>
     </sv:property>
     <sv:property sv:name="mgnl:template" sv:type="String">
       <sv:value>controls:pages/sampleControls</sv:value>
@@ -37,7 +37,7 @@
   </sv:node>
   <sv:node sv:name="main">
     <sv:property sv:name="jcr:primaryType" sv:type="Name">
-      <sv:value>mgnl:contentNode</sv:value>
+      <sv:value>mgnl:area</sv:value>
     </sv:property>
     <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
       <sv:value>mix:lockable</sv:value>
@@ -46,14 +46,14 @@
       <sv:value>04bed0be-23ab-4b18-b581-04f1670b59ad</sv:value>
     </sv:property>
     <sv:property sv:name="jcr:createdBy" sv:type="String">
-      <sv:value>admin</sv:value>
+      <sv:value>superuser</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:value>superuser</sv:value>
       </sv:property>
       <sv:property sv:name="mgnl:authorid" sv:type="String">
         <sv:value>superuser</sv:value>
@@ -62,12 +62,12 @@
         <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-06-21T17:46:04.175+02:00</sv:value>
+        <sv:value>2013-06-14T14:55:50.194+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:value>mgnl:component</sv:value>
       </sv:property>
       <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
         <sv:value>mix:lockable</sv:value>
@@ -97,14 +97,14 @@
 								</sv:value>
       </sv:property>
       <sv:property sv:name="jcr:createdBy" sv:type="String">
-        <sv:value>admin</sv:value>
+        <sv:value>superuser</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:value>superuser</sv:value>
         </sv:property>
         <sv:property sv:name="mgnl:authorid" sv:type="String">
           <sv:value>superuser</sv:value>
@@ -116,7 +116,7 @@
           <sv:value>2010-06-21T17:46:04.175+02:00</sv:value>
         </sv:property>
         <sv:property sv:name="mgnl:template" sv:type="String">
-          <sv:value>samples-grid</sv:value>
+          <sv:value>controls:components/samples-grid</sv:value>
         </sv:property>
       </sv:node>
       <sv:node sv:name="grid_files">
@@ -130,14 +130,14 @@
           <sv:value>d71bd42f-e207-4f67-bd9b-bab73a5e83f3</sv:value>
         </sv:property>
         <sv:property sv:name="jcr:createdBy" sv:type="String">
-          <sv:value>admin</sv:value>
+          <sv:value>superuser</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:value>superuser</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>

Added: magnoliamodules/trunk/openutils-mgnlcontrols/src/main/resources/mgnl-files/templates/samples-controls/area.jsp
===================================================================
--- magnoliamodules/trunk/openutils-mgnlcontrols/src/main/resources/mgnl-files/templates/samples-controls/area.jsp	                        (rev 0)
+++ magnoliamodules/trunk/openutils-mgnlcontrols/src/main/resources/mgnl-files/templates/samples-controls/area.jsp	2013-06-14 13:31:09 UTC (rev 4253)
@@ -0,0 +1,9 @@
+<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="http://magnolia-cms.com/taglib/templating-components/cms"
+  xmlns:cmsfn="http://magnolia-cms.com/taglib/templating-components/cmsfn" xmlns:media="http://net.sourceforge.openutils/mgnlMedia"
+  xmlns:mu="mgnlutils">
+  <jsp:directive.page contentType="text/html; charset=UTF-8" session="false" />
+  <c:forEach var="component" items="${components}">
+    <cms:component content="${component}" />
+  </c:forEach>
+</jsp:root>
\ No newline at end of file


Property changes on: magnoliamodules/trunk/openutils-mgnlcontrols/src/main/resources/mgnl-files/templates/samples-controls/area.jsp
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+text/xml
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Modified: magnoliamodules/trunk/openutils-mgnlcontrols/src/main/resources/mgnl-files/templates/samples-controls/paragraph-grid.jsp
===================================================================
--- magnoliamodules/trunk/openutils-mgnlcontrols/src/main/resources/mgnl-files/templates/samples-controls/paragraph-grid.jsp	2013-06-14 12:26:17 UTC (rev 4252)
+++ magnoliamodules/trunk/openutils-mgnlcontrols/src/main/resources/mgnl-files/templates/samples-controls/paragraph-grid.jsp	2013-06-14 13:31:09 UTC (rev 4253)
@@ -1,9 +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:mu="mgnlutils">
+<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="http://magnolia-cms.com/taglib/templating-components/cms"
+  xmlns:cmsfn="http://magnolia-cms.com/taglib/templating-components/cmsfn" xmlns:media="http://net.sourceforge.openutils/mgnlMedia"
+  xmlns:mu="mgnlutils">
   <jsp:directive.page contentType="text/html; charset=UTF-8" session="false" />
-  <cms:setNode var="node" />
   <table cellspacing="0" border="1">
     <thead>
       <tr>
@@ -19,7 +18,7 @@
       </tr>
     </thead>
     <tbody>
-      <c:forEach var="row" items="${mu:splitAndTokenize(node.grid)}">
+      <c:forEach var="row" items="${mu:splitAndTokenize(content.grid)}">
         <tr>
 
           <!-- text -->
@@ -45,10 +44,12 @@
           <!-- file -->
           <td>
             <c:if test="${!empty row[4]}">
-              <cms:setNode var="filesNode" path="${fn:substringBefore(row[4], '/grid_files/')}/grid_files" />
+              <c:set var="path" value="${fn:substringBefore(row[4], '/grid_files/')}/grid_files" />
+              <c:set var="filesNode" value="${cmsfn:content(path, 'website')}" />
               <c:set var="property" value="${fn:substringBefore(fn:substringAfter(row[4], '/grid_files/'), '/')}" />
               <a href="${pageContext.request.contextPath}${row[4]}">
-                <cms:out contentNode="${filesNode}" nodeDataName="${property}" fileProperty="name" />
+                <!--cms:out contentNode="${filesNode}" nodeDataName="${property}" fileProperty="name" /-->
+                ${filesNode[property].fileName}
               </a>
             </c:if>
           </td>

Modified: magnoliamodules/trunk/openutils-mgnlcontrols/src/main/resources/mgnl-files/templates/samples-controls/template.jsp
===================================================================
--- magnoliamodules/trunk/openutils-mgnlcontrols/src/main/resources/mgnl-files/templates/samples-controls/template.jsp	2013-06-14 12:26:17 UTC (rev 4252)
+++ magnoliamodules/trunk/openutils-mgnlcontrols/src/main/resources/mgnl-files/templates/samples-controls/template.jsp	2013-06-14 13:31:09 UTC (rev 4253)
@@ -1,6 +1,6 @@
-<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: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="http://magnolia-cms.com/taglib/templating-components/cms"
   xmlns:media="http://net.sourceforge.openutils/mgnlMedia">
   <jsp:directive.page contentType="text/html; charset=UTF-8" session="false" />
   <jsp:text>
@@ -10,16 +10,12 @@
     <head>
       <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
       <title>${actpage.title}</title>
-      <cms:links />
+      <cms:init />
     </head>
     <body>
       <h1>${actpage.title}</h1>
 
-      <cms:contentNodeIterator contentNodeCollectionName="main">
-        <cms:editBar />
-        <cms:includeTemplate />
-      </cms:contentNodeIterator>
-      <cms:newBar contentNodeCollectionName="main" paragraph="samples-grid" />
+      <cms:area name="main" />
     </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:[4252] magnoliamodules/trunk/openutils-mgnlcontrols/ src/main/resources/mgnl-bootstrap-samples/controls

From: <die...@us...> - 2013-06-14 12:26:20

Revision: 4252
          http://openutils.svn.sourceforge.net/openutils/?rev=4252&view=rev
Author:   diego_schivo
Date:     2013-06-14 12:26:17 +0000 (Fri, 14 Jun 2013)
Log Message:
-----------
config.modules.controls.templates.components.samples-grid.xml

Modified Paths:
--------------
    magnoliamodules/trunk/openutils-mgnlcontrols/src/main/resources/mgnl-bootstrap-samples/controls/config.modules.controls.templates.pages.sampleControls.xml

Added Paths:
-----------
    magnoliamodules/trunk/openutils-mgnlcontrols/src/main/resources/mgnl-bootstrap-samples/controls/config.modules.controls.templates.components.samples-grid.xml

Removed Paths:
-------------
    magnoliamodules/trunk/openutils-mgnlcontrols/src/main/resources/mgnl-bootstrap-samples/controls/config.modules.controls.paragraphs.samples-grid.xml

Deleted: magnoliamodules/trunk/openutils-mgnlcontrols/src/main/resources/mgnl-bootstrap-samples/controls/config.modules.controls.paragraphs.samples-grid.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnlcontrols/src/main/resources/mgnl-bootstrap-samples/controls/config.modules.controls.paragraphs.samples-grid.xml	2013-06-14 12:08:16 UTC (rev 4251)
+++ magnoliamodules/trunk/openutils-mgnlcontrols/src/main/resources/mgnl-bootstrap-samples/controls/config.modules.controls.paragraphs.samples-grid.xml	2013-06-14 12:26:17 UTC (rev 4252)
@@ -1,41 +0,0 @@
-<?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>

Added: magnoliamodules/trunk/openutils-mgnlcontrols/src/main/resources/mgnl-bootstrap-samples/controls/config.modules.controls.templates.components.samples-grid.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnlcontrols/src/main/resources/mgnl-bootstrap-samples/controls/config.modules.controls.templates.components.samples-grid.xml	                        (rev 0)
+++ magnoliamodules/trunk/openutils-mgnlcontrols/src/main/resources/mgnl-bootstrap-samples/controls/config.modules.controls.templates.components.samples-grid.xml	2013-06-14 12:26:17 UTC (rev 4252)
@@ -0,0 +1,47 @@
+<?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:multiple="true">
+    <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="jcr:createdBy" sv:type="String">
+    <sv:value>admin</sv:value>
+  </sv:property>
+  <sv:property sv:name="renderType" sv:type="String">
+    <sv:value>jsp</sv:value>
+  </sv:property>
+  <sv:property sv:name="templateScript" sv:type="String">
+    <sv:value>/templates/samples-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:node sv:name="MetaData">
+    <sv:property sv:name="jcr:primaryType" sv:type="Name">
+      <sv:value>mgnl:metaData</sv:value>
+    </sv:property>
+    <sv:property sv:name="jcr:createdBy" sv:type="String">
+      <sv:value>admin</sv:value>
+    </sv:property>
+    <sv:property sv:name="mgnl:activated" sv:type="Boolean">
+      <sv:value>false</sv:value>
+    </sv:property>
+    <sv:property sv:name="mgnl:authorid" sv:type="String">
+      <sv:value>superuser</sv:value>
+    </sv:property>
+    <sv:property sv:name="mgnl:creationdate" sv:type="Date">
+      <sv:value>2008-09-25T12:45:26.721+02:00</sv:value>
+    </sv:property>
+    <sv:property sv:name="mgnl:lastmodified" sv:type="Date">
+      <sv:value>2013-06-14T14:25:39.926+02:00</sv:value>
+    </sv:property>
+  </sv:node>
+</sv:node>


Property changes on: magnoliamodules/trunk/openutils-mgnlcontrols/src/main/resources/mgnl-bootstrap-samples/controls/config.modules.controls.templates.components.samples-grid.xml
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+text/xml
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Modified: magnoliamodules/trunk/openutils-mgnlcontrols/src/main/resources/mgnl-bootstrap-samples/controls/config.modules.controls.templates.pages.sampleControls.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnlcontrols/src/main/resources/mgnl-bootstrap-samples/controls/config.modules.controls.templates.pages.sampleControls.xml	2013-06-14 12:08:16 UTC (rev 4251)
+++ magnoliamodules/trunk/openutils-mgnlcontrols/src/main/resources/mgnl-bootstrap-samples/controls/config.modules.controls.templates.pages.sampleControls.xml	2013-06-14 12:26:17 UTC (rev 4252)
@@ -44,4 +44,149 @@
       <sv:value>2013-06-14T11:07:52.810+02:00</sv:value>
     </sv:property>
   </sv:node>
+  <sv:node sv:name="areas">
+    <sv:property sv:name="jcr:primaryType" sv:type="Name">
+      <sv:value>mgnl:contentNode</sv:value>
+    </sv:property>
+    <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
+      <sv:value>mix:lockable</sv:value>
+    </sv:property>
+    <sv:property sv:name="jcr:uuid" sv:type="String">
+      <sv:value>07f73d4f-4ba3-43bf-b738-2fd7696f2ba9</sv:value>
+    </sv:property>
+    <sv:property sv:name="jcr:createdBy" sv:type="String">
+      <sv:value>admin</sv:value>
+    </sv:property>
+    <sv:node sv:name="MetaData">
+      <sv:property sv:name="jcr:primaryType" sv:type="Name">
+        <sv:value>mgnl:metaData</sv:value>
+      </sv:property>
+      <sv:property sv:name="jcr:createdBy" sv:type="String">
+        <sv:value>admin</sv:value>
+      </sv:property>
+      <sv:property sv:name="mgnl:activated" sv:type="Boolean">
+        <sv:value>false</sv:value>
+      </sv:property>
+      <sv:property sv:name="mgnl:authorid" sv:type="String">
+        <sv:value>superuser</sv:value>
+      </sv:property>
+      <sv:property sv:name="mgnl:creationdate" sv:type="Date">
+        <sv:value>2012-03-21T07:30:29.457+01:00</sv:value>
+      </sv:property>
+      <sv:property sv:name="mgnl:lastmodified" sv:type="Date">
+        <sv:value>2013-06-14T14:22:36.943+02:00</sv:value>
+      </sv:property>
+    </sv:node>
+    <sv:node sv:name="main">
+      <sv:property sv:name="jcr:primaryType" sv:type="Name">
+        <sv:value>mgnl:contentNode</sv:value>
+      </sv:property>
+      <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
+        <sv:value>mix:lockable</sv:value>
+      </sv:property>
+      <sv:property sv:name="jcr:uuid" sv:type="String">
+        <sv:value>ddcc9d84-86e1-4555-b77a-d9e65f36080b</sv:value>
+      </sv:property>
+      <sv:property sv:name="jcr:createdBy" sv:type="String">
+        <sv:value>admin</sv:value>
+      </sv:property>
+      <sv:property sv:name="templateScript" sv:type="String">
+        <sv:value>/templates/samples-controls/area.jsp</sv:value>
+      </sv:property>
+      <sv:property sv:name="type" sv:type="String">
+        <sv:value>list</sv:value>
+      </sv:property>
+      <sv:node sv:name="MetaData">
+        <sv:property sv:name="jcr:primaryType" sv:type="Name">
+          <sv:value>mgnl:metaData</sv:value>
+        </sv:property>
+        <sv:property sv:name="jcr:createdBy" sv:type="String">
+          <sv:value>admin</sv:value>
+        </sv:property>
+        <sv:property sv:name="mgnl:activated" sv:type="Boolean">
+          <sv:value>false</sv:value>
+        </sv:property>
+        <sv:property sv:name="mgnl:authorid" sv:type="String">
+          <sv:value>superuser</sv:value>
+        </sv:property>
+        <sv:property sv:name="mgnl:creationdate" sv:type="Date">
+          <sv:value>2012-03-21T07:30:36.643+01:00</sv:value>
+        </sv:property>
+        <sv:property sv:name="mgnl:lastmodified" sv:type="Date">
+          <sv:value>2013-06-14T14:22:47.964+02:00</sv:value>
+        </sv:property>
+      </sv:node>
+      <sv:node sv:name="availableComponents">
+        <sv:property sv:name="jcr:primaryType" sv:type="Name">
+          <sv:value>mgnl:contentNode</sv:value>
+        </sv:property>
+        <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
+          <sv:value>mix:lockable</sv:value>
+        </sv:property>
+        <sv:property sv:name="jcr:uuid" sv:type="String">
+          <sv:value>ac77de15-6178-4865-9e03-6a984e04974c</sv:value>
+        </sv:property>
+        <sv:property sv:name="jcr:createdBy" sv:type="String">
+          <sv:value>admin</sv:value>
+        </sv:property>
+        <sv:node sv:name="MetaData">
+          <sv:property sv:name="jcr:primaryType" sv:type="Name">
+            <sv:value>mgnl:metaData</sv:value>
+          </sv:property>
+          <sv:property sv:name="jcr:createdBy" sv:type="String">
+            <sv:value>admin</sv:value>
+          </sv:property>
+          <sv:property sv:name="mgnl:activated" sv:type="Boolean">
+            <sv:value>false</sv:value>
+          </sv:property>
+          <sv:property sv:name="mgnl:authorid" sv:type="String">
+            <sv:value>superuser</sv:value>
+          </sv:property>
+          <sv:property sv:name="mgnl:creationdate" sv:type="Date">
+            <sv:value>2012-03-21T07:32:04.848+01:00</sv:value>
+          </sv:property>
+          <sv:property sv:name="mgnl:lastmodified" sv:type="Date">
+            <sv:value>2013-06-14T14:22:36.944+02:00</sv:value>
+          </sv:property>
+        </sv:node>
+        <sv:node sv:name="samples-grid">
+          <sv:property sv:name="jcr:primaryType" sv:type="Name">
+            <sv:value>mgnl:contentNode</sv:value>
+          </sv:property>
+          <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
+            <sv:value>mix:lockable</sv:value>
+          </sv:property>
+          <sv:property sv:name="jcr:uuid" sv:type="String">
+            <sv:value>d85fd9b0-b355-4f4e-90ca-e04da9bd5b93</sv:value>
+          </sv:property>
+          <sv:property sv:name="id" sv:type="String">
+            <sv:value>controls:components/samples-grid</sv:value>
+          </sv:property>
+          <sv:property sv:name="jcr:createdBy" sv:type="String">
+            <sv:value>admin</sv:value>
+          </sv:property>
+          <sv:node sv:name="MetaData">
+            <sv:property sv:name="jcr:primaryType" sv:type="Name">
+              <sv:value>mgnl:metaData</sv:value>
+            </sv:property>
+            <sv:property sv:name="jcr:createdBy" sv:type="String">
+              <sv:value>admin</sv:value>
+            </sv:property>
+            <sv:property sv:name="mgnl:activated" sv:type="Boolean">
+              <sv:value>false</sv:value>
+            </sv:property>
+            <sv:property sv:name="mgnl:authorid" sv:type="String">
+              <sv:value>superuser</sv:value>
+            </sv:property>
+            <sv:property sv:name="mgnl:creationdate" sv:type="Date">
+              <sv:value>2012-03-21T07:32:14.200+01:00</sv:value>
+            </sv:property>
+            <sv:property sv:name="mgnl:lastmodified" sv:type="Date">
+              <sv:value>2013-06-14T14:23:18.025+02:00</sv:value>
+            </sv:property>
+          </sv:node>
+        </sv:node>
+      </sv:node>
+    </sv:node>
+  </sv:node>
 </sv:node>

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

[Openutils-svn] SF.net SVN: openutils:[4251] magnoliamodules/trunk/openutils-mgnlcontrols/ src/main/resources/mgnl-bootstrap-samples/controls

From: <die...@us...> - 2013-06-14 12:08:21

Revision: 4251
          http://openutils.svn.sourceforge.net/openutils/?rev=4251&view=rev
Author:   diego_schivo
Date:     2013-06-14 12:08:16 +0000 (Fri, 14 Jun 2013)
Log Message:
-----------
config.modules.controls.templates.pages.sampleControls.xml

Modified Paths:
--------------
    magnoliamodules/trunk/openutils-mgnlcontrols/src/main/resources/mgnl-bootstrap-samples/controls/website.sample-controls.xml

Added Paths:
-----------
    magnoliamodules/trunk/openutils-mgnlcontrols/src/main/resources/mgnl-bootstrap-samples/controls/config.modules.controls.templates.pages.sampleControls.xml

Removed Paths:
-------------
    magnoliamodules/trunk/openutils-mgnlcontrols/src/main/resources/mgnl-bootstrap-samples/controls/config.modules.controls.templates.sampleControls.xml

Added: magnoliamodules/trunk/openutils-mgnlcontrols/src/main/resources/mgnl-bootstrap-samples/controls/config.modules.controls.templates.pages.sampleControls.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnlcontrols/src/main/resources/mgnl-bootstrap-samples/controls/config.modules.controls.templates.pages.sampleControls.xml	                        (rev 0)
+++ magnoliamodules/trunk/openutils-mgnlcontrols/src/main/resources/mgnl-bootstrap-samples/controls/config.modules.controls.templates.pages.sampleControls.xml	2013-06-14 12:08:16 UTC (rev 4251)
@@ -0,0 +1,47 @@
+<?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:multiple="true">
+    <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="jcr:createdBy" sv:type="String">
+    <sv:value>admin</sv:value>
+  </sv:property>
+  <sv:property sv:name="renderType" sv:type="String">
+    <sv:value>jsp</sv:value>
+  </sv:property>
+  <sv:property sv:name="templateScript" sv:type="String">
+    <sv:value>/templates/samples-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="visible" sv:type="String">
+    <sv:value>true</sv:value>
+  </sv:property>
+  <sv:node sv:name="MetaData">
+    <sv:property sv:name="jcr:primaryType" sv:type="Name">
+      <sv:value>mgnl:metaData</sv:value>
+    </sv:property>
+    <sv:property sv:name="jcr:createdBy" sv:type="String">
+      <sv:value>admin</sv:value>
+    </sv:property>
+    <sv:property sv:name="mgnl:activated" sv:type="Boolean">
+      <sv:value>false</sv:value>
+    </sv:property>
+    <sv:property sv:name="mgnl:authorid" sv:type="String">
+      <sv:value>superuser</sv:value>
+    </sv:property>
+    <sv:property sv:name="mgnl:creationdate" sv:type="Date">
+      <sv:value>2008-09-23T16:56:46.344+02:00</sv:value>
+    </sv:property>
+    <sv:property sv:name="mgnl:lastmodified" sv:type="Date">
+      <sv:value>2013-06-14T11:07:52.810+02:00</sv:value>
+    </sv:property>
+  </sv:node>
+</sv:node>


Property changes on: magnoliamodules/trunk/openutils-mgnlcontrols/src/main/resources/mgnl-bootstrap-samples/controls/config.modules.controls.templates.pages.sampleControls.xml
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+text/xml
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Deleted: magnoliamodules/trunk/openutils-mgnlcontrols/src/main/resources/mgnl-bootstrap-samples/controls/config.modules.controls.templates.sampleControls.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnlcontrols/src/main/resources/mgnl-bootstrap-samples/controls/config.modules.controls.templates.sampleControls.xml	2013-06-14 10:54:22 UTC (rev 4250)
+++ magnoliamodules/trunk/openutils-mgnlcontrols/src/main/resources/mgnl-bootstrap-samples/controls/config.modules.controls.templates.sampleControls.xml	2013-06-14 12:08:16 UTC (rev 4251)
@@ -1,41 +0,0 @@
-<?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>

Modified: magnoliamodules/trunk/openutils-mgnlcontrols/src/main/resources/mgnl-bootstrap-samples/controls/website.sample-controls.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnlcontrols/src/main/resources/mgnl-bootstrap-samples/controls/website.sample-controls.xml	2013-06-14 10:54:22 UTC (rev 4250)
+++ magnoliamodules/trunk/openutils-mgnlcontrols/src/main/resources/mgnl-bootstrap-samples/controls/website.sample-controls.xml	2013-06-14 12:08:16 UTC (rev 4251)
@@ -3,7 +3,7 @@
   <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:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
     <sv:value>mix:lockable</sv:value>
   </sv:property>
   <sv:property sv:name="jcr:uuid" sv:type="String">
@@ -29,17 +29,17 @@
       <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-06-21T17:46:04.175+02:00</sv:value>
+      <sv:value>2013-06-14T11:08:44.343+02:00</sv:value>
     </sv:property>
     <sv:property sv:name="mgnl:template" sv:type="String">
-      <sv:value>sampleControls</sv:value>
+      <sv:value>controls:pages/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:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
       <sv:value>mix:lockable</sv:value>
     </sv:property>
     <sv:property sv:name="jcr:uuid" sv:type="String">
@@ -69,7 +69,7 @@
       <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:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
         <sv:value>mix:lockable</sv:value>
       </sv:property>
       <sv:property sv:name="jcr:uuid" sv:type="String">
@@ -123,7 +123,7 @@
         <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:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
           <sv:value>mix:lockable</sv:value>
         </sv:property>
         <sv:property sv:name="jcr:uuid" sv:type="String">

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

[Openutils-svn] SF.net SVN: openutils:[4250] magnoliamodules/trunk/commit-test.txt

From: <die...@us...> - 2013-06-14 10:54:25

Revision: 4250
          http://openutils.svn.sourceforge.net/openutils/?rev=4250&view=rev
Author:   diego_schivo
Date:     2013-06-14 10:54:22 +0000 (Fri, 14 Jun 2013)
Log Message:
-----------
revert r4249

Revision Links:
--------------
    http://openutils.svn.sourceforge.net/openutils/?rev=4249&view=rev

Removed Paths:
-------------
    magnoliamodules/trunk/commit-test.txt

Deleted: magnoliamodules/trunk/commit-test.txt
===================================================================
--- magnoliamodules/trunk/commit-test.txt	2013-06-14 10:49:28 UTC (rev 4249)
+++ magnoliamodules/trunk/commit-test.txt	2013-06-14 10:54:22 UTC (rev 4250)
@@ -1 +0,0 @@
-foo
\ 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:[4249] magnoliamodules/trunk/commit-test.txt

From: <die...@us...> - 2013-06-14 10:49:30

Revision: 4249
          http://openutils.svn.sourceforge.net/openutils/?rev=4249&view=rev
Author:   diego_schivo
Date:     2013-06-14 10:49:28 +0000 (Fri, 14 Jun 2013)
Log Message:
-----------
commit-test.txt

Added Paths:
-----------
    magnoliamodules/trunk/commit-test.txt

Added: magnoliamodules/trunk/commit-test.txt
===================================================================
--- magnoliamodules/trunk/commit-test.txt	                        (rev 0)
+++ magnoliamodules/trunk/commit-test.txt	2013-06-14 10:49:28 UTC (rev 4249)
@@ -0,0 +1 @@
+foo
\ No newline at end of file


Property changes on: magnoliamodules/trunk/commit-test.txt
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

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

From: <fg...@us...> - 2013-05-20 09:43:20

Revision: 4248
          http://openutils.svn.sourceforge.net/openutils/?rev=4248&view=rev
Author:   fgiust
Date:     2013-05-20 09:43:15 +0000 (Mon, 20 May 2013)
Log Message:
-----------
templating magic, no more need for wrappers!

Modified Paths:
--------------
    magnoliamodules/trunk/magnolia-test-webapp/pom.xml
    magnoliamodules/trunk/magnolia-test-webapp/src/main/webapp/WEB-INF/bootstrap/website.Criteria.xml
    magnoliamodules/trunk/magnolia-test-webapp/src/main/webapp/WEB-INF/bootstrap/website.Magnolia-Utils.xml
    magnoliamodules/trunk/magnolia-test-webapp/src/main/webapp/WEB-INF/bootstrap/website.test-MEDIA-113.xml
    magnoliamodules/trunk/magnolia-test-webapp/src/main/webapp/WEB-INF/config/default/log4j.xml
    magnoliamodules/trunk/magnolia-test-webapp/src/main/webapp/WEB-INF/web.xml
    magnoliamodules/trunk/magnolia-test-webapp/src/main/webapp/template_magnoliautils/magnoliaUtils.jsp
    magnoliamodules/trunk/magnolia-test-webapp/src/main/webapp/templates/samples-tagcloud/template.jsp
    magnoliamodules/trunk/openutils-mgnlutils/src/main/java/it/openutils/mgnlutils/el/NodeElResolver.java
    magnoliamodules/trunk/openutils-mgnlutils/src/main/java/it/openutils/mgnlutils/el/NodeElResolverUtils.java
    magnoliamodules/trunk/openutils-mgnlutils/src/main/java/it/openutils/mgnlutils/setup/MgnlUtilsModule.java
    magnoliamodules/trunk/openutils-mgnlutils/src/main/java/it/openutils/mgnlutils/setup/MgnlUtilsModuleVersionHandler.java
    magnoliamodules/trunk/openutils-mgnlutils/src/main/resources/META-INF/magnolia/mgnlutils.xml

Added Paths:
-----------
    magnoliamodules/trunk/magnolia-test-webapp/src/main/resources/tagcloud_indexing_configuration.xml
    magnoliamodules/trunk/magnolia-test-webapp/src/main/webapp/WEB-INF/bootstrap/config.modules.samples.templates.pages.samplesCriteria.xml
    magnoliamodules/trunk/magnolia-test-webapp/src/main/webapp/WEB-INF/bootstrap/config.modules.samples.templates.pages.samplesMagnoliaUtils.xml
    magnoliamodules/trunk/magnolia-test-webapp/src/main/webapp/WEB-INF/tags/
    magnoliamodules/trunk/magnolia-test-webapp/src/main/webapp/WEB-INF/tags/openutils/
    magnoliamodules/trunk/magnolia-test-webapp/src/main/webapp/WEB-INF/tags/openutils/debug.tag

Removed Paths:
-------------
    magnoliamodules/trunk/magnolia-test-webapp/src/main/webapp/WEB-INF/bootstrap/config.modules.samples.templates.samplesCriteria.xml
    magnoliamodules/trunk/magnolia-test-webapp/src/main/webapp/WEB-INF/bootstrap/config.modules.samples.templates.samplesMagnoliaUtils.xml

Modified: magnoliamodules/trunk/magnolia-test-webapp/pom.xml
===================================================================
--- magnoliamodules/trunk/magnolia-test-webapp/pom.xml	2013-05-20 09:39:55 UTC (rev 4247)
+++ magnoliamodules/trunk/magnolia-test-webapp/pom.xml	2013-05-20 09:43:15 UTC (rev 4248)
@@ -186,12 +186,12 @@
     <dependency>
       <groupId>net.sourceforge.openutils</groupId>
       <artifactId>openutils-mgnlutils</artifactId>
-      <version>5.0.1-SNAPSHOT</version>
+      <version>5.0.2-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>net.sourceforge.openutils</groupId>
       <artifactId>openutils-mgnltagcloud</artifactId>
-      <version>5.0.0-SNAPSHOT</version>
+      <version>5.0.2-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>net.sourceforge.openutils</groupId>

Added: magnoliamodules/trunk/magnolia-test-webapp/src/main/resources/tagcloud_indexing_configuration.xml
===================================================================
--- magnoliamodules/trunk/magnolia-test-webapp/src/main/resources/tagcloud_indexing_configuration.xml	                        (rev 0)
+++ magnoliamodules/trunk/magnolia-test-webapp/src/main/resources/tagcloud_indexing_configuration.xml	2013-05-20 09:43:15 UTC (rev 4248)
@@ -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: magnoliamodules/trunk/magnolia-test-webapp/src/main/resources/tagcloud_indexing_configuration.xml
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+text/xml
\ No newline at end of property
Added: svn:keywords
## -0,0 +1 ##
+Author Date Id Revision
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: magnoliamodules/trunk/magnolia-test-webapp/src/main/webapp/WEB-INF/bootstrap/config.modules.samples.templates.pages.samplesCriteria.xml
===================================================================
--- magnoliamodules/trunk/magnolia-test-webapp/src/main/webapp/WEB-INF/bootstrap/config.modules.samples.templates.pages.samplesCriteria.xml	                        (rev 0)
+++ magnoliamodules/trunk/magnolia-test-webapp/src/main/webapp/WEB-INF/bootstrap/config.modules.samples.templates.pages.samplesCriteria.xml	2013-05-20 09:43:15 UTC (rev 4248)
@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<sv:node sv:name="samplesCriteria" xmlns:sv="http://www.jcp.org/jcr/sv/1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <sv:property sv:name="jcr:primaryType" sv:type="Name">
+    <sv:value>mgnl:contentNode</sv:value>
+  </sv:property>
+  <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
+    <sv:value>mix:lockable</sv:value>
+  </sv:property>
+  <sv:property sv:name="jcr:uuid" sv:type="String">
+    <sv:value>a09f5032-bc54-4f8b-b011-111f922119f6</sv:value>
+  </sv:property>
+  <sv:property sv:name="jcr:createdBy" sv:type="String">
+    <sv:value>admin</sv:value>
+  </sv:property>
+  <sv:property sv:name="renderType" sv:type="String">
+    <sv:value>jsp</sv:value>
+  </sv:property>
+  <sv:property sv:name="templateScript" sv:type="String">
+    <sv:value>/template_criteria/criteria.jsp</sv:value>
+  </sv:property>
+  <sv:property sv:name="title" sv:type="String">
+    <sv:value>Sample Criteria</sv:value>
+  </sv:property>
+  <sv:property sv:name="visible" sv:type="String">
+    <sv:value>true</sv:value>
+  </sv:property>
+  <sv:node sv:name="MetaData">
+    <sv:property sv:name="jcr:primaryType" sv:type="Name">
+      <sv:value>mgnl:metaData</sv:value>
+    </sv:property>
+    <sv:property sv:name="jcr:createdBy" sv:type="String">
+      <sv:value>admin</sv:value>
+    </sv:property>
+    <sv:property sv:name="mgnl:activated" sv:type="Boolean">
+      <sv:value>false</sv:value>
+    </sv:property>
+    <sv:property sv:name="mgnl:authorid" sv:type="String">
+      <sv:value>superuser</sv:value>
+    </sv:property>
+    <sv:property sv:name="mgnl:creationdate" sv:type="Date">
+      <sv:value>2008-09-23T16:56:46.344+02:00</sv:value>
+    </sv:property>
+    <sv:property sv:name="mgnl:lastmodified" sv:type="Date">
+      <sv:value>2013-05-19T19:46:43.497+02:00</sv:value>
+    </sv:property>
+  </sv:node>
+</sv:node>


Property changes on: magnoliamodules/trunk/magnolia-test-webapp/src/main/webapp/WEB-INF/bootstrap/config.modules.samples.templates.pages.samplesCriteria.xml
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+text/xml
\ No newline at end of property
Added: svn:keywords
## -0,0 +1 ##
+Author Date Id Revision
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: magnoliamodules/trunk/magnolia-test-webapp/src/main/webapp/WEB-INF/bootstrap/config.modules.samples.templates.pages.samplesMagnoliaUtils.xml
===================================================================
--- magnoliamodules/trunk/magnolia-test-webapp/src/main/webapp/WEB-INF/bootstrap/config.modules.samples.templates.pages.samplesMagnoliaUtils.xml	                        (rev 0)
+++ magnoliamodules/trunk/magnolia-test-webapp/src/main/webapp/WEB-INF/bootstrap/config.modules.samples.templates.pages.samplesMagnoliaUtils.xml	2013-05-20 09:43:15 UTC (rev 4248)
@@ -0,0 +1,93 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<sv:node sv:name="samplesMagnoliaUtils" xmlns:sv="http://www.jcp.org/jcr/sv/1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <sv:property sv:name="jcr:primaryType" sv:type="Name">
+    <sv:value>mgnl:contentNode</sv:value>
+  </sv:property>
+  <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
+    <sv:value>mix:lockable</sv:value>
+  </sv:property>
+  <sv:property sv:name="jcr:uuid" sv:type="String">
+    <sv:value>da5823f7-dac4-4a6f-a769-a09e95601f44</sv:value>
+  </sv:property>
+  <sv:property sv:name="class" sv:type="String">
+    <sv:value>info.magnolia.module.samples.templates.SampleTemplate</sv:value>
+  </sv:property>
+  <sv:property sv:name="i18nBasename" sv:type="String">
+    <sv:value>info.magnolia.module.samples.messages</sv:value>
+  </sv:property>
+  <sv:property sv:name="jcr:createdBy" sv:type="String">
+    <sv:value>admin</sv:value>
+  </sv:property>
+  <sv:property sv:name="renderType" sv:type="String">
+    <sv:value>jsp</sv:value>
+  </sv:property>
+  <sv:property sv:name="templateScript" sv:type="String">
+    <sv:value>/template_magnoliautils/magnoliaUtils.jsp</sv:value>
+  </sv:property>
+  <sv:property sv:name="title" sv:type="String">
+    <sv:value>Sample Magnoliautils</sv:value>
+  </sv:property>
+  <sv:property sv:name="titleSize" sv:type="String">
+    <sv:value>1</sv:value>
+  </sv:property>
+  <sv:property sv:name="visible" sv:type="String">
+    <sv:value>true</sv:value>
+  </sv:property>
+  <sv:node sv:name="MetaData">
+    <sv:property sv:name="jcr:primaryType" sv:type="Name">
+      <sv:value>mgnl:metaData</sv:value>
+    </sv:property>
+    <sv:property sv:name="jcr:createdBy" sv:type="String">
+      <sv:value>admin</sv:value>
+    </sv:property>
+    <sv:property sv:name="mgnl:activated" sv:type="Boolean">
+      <sv:value>false</sv:value>
+    </sv:property>
+    <sv:property sv:name="mgnl:authorid" sv:type="String">
+      <sv:value>superuser</sv:value>
+    </sv:property>
+    <sv:property sv:name="mgnl:creationdate" sv:type="Date">
+      <sv:value>2008-09-23T16:56:46.344+02:00</sv:value>
+    </sv:property>
+    <sv:property sv:name="mgnl:lastmodified" sv:type="Date">
+      <sv:value>2013-05-19T19:46:42.181+02:00</sv:value>
+    </sv:property>
+  </sv:node>
+  <sv:node sv:name="parameters">
+    <sv:property sv:name="jcr:primaryType" sv:type="Name">
+      <sv:value>mgnl:contentNode</sv:value>
+    </sv:property>
+    <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
+      <sv:value>mix:lockable</sv:value>
+    </sv:property>
+    <sv:property sv:name="jcr:uuid" sv:type="String">
+      <sv:value>6dba0719-7b5c-4991-9eeb-4193a0b8b6db</sv:value>
+    </sv:property>
+    <sv:property sv:name="dummy" sv:type="String">
+      <sv:value>This parameter has been set in the template definition</sv:value>
+    </sv:property>
+    <sv:property sv:name="jcr:createdBy" sv:type="String">
+      <sv:value>admin</sv:value>
+    </sv:property>
+    <sv:node sv:name="MetaData">
+      <sv:property sv:name="jcr:primaryType" sv:type="Name">
+        <sv:value>mgnl:metaData</sv:value>
+      </sv:property>
+      <sv:property sv:name="jcr:createdBy" sv:type="String">
+        <sv:value>admin</sv:value>
+      </sv:property>
+      <sv:property sv:name="mgnl:activated" sv:type="Boolean">
+        <sv:value>false</sv:value>
+      </sv:property>
+      <sv:property sv:name="mgnl:authorid" sv:type="String">
+        <sv:value>superuser</sv:value>
+      </sv:property>
+      <sv:property sv:name="mgnl:creationdate" sv:type="Date">
+        <sv:value>2009-01-15T12:21:10.608+01:00</sv:value>
+      </sv:property>
+      <sv:property sv:name="mgnl:lastmodified" sv:type="Date">
+        <sv:value>2013-05-19T19:46:04.237+02:00</sv:value>
+      </sv:property>
+    </sv:node>
+  </sv:node>
+</sv:node>


Property changes on: magnoliamodules/trunk/magnolia-test-webapp/src/main/webapp/WEB-INF/bootstrap/config.modules.samples.templates.pages.samplesMagnoliaUtils.xml
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+text/xml
\ No newline at end of property
Added: svn:keywords
## -0,0 +1 ##
+Author Date Id Revision
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Deleted: magnoliamodules/trunk/magnolia-test-webapp/src/main/webapp/WEB-INF/bootstrap/config.modules.samples.templates.samplesCriteria.xml
===================================================================
--- magnoliamodules/trunk/magnolia-test-webapp/src/main/webapp/WEB-INF/bootstrap/config.modules.samples.templates.samplesCriteria.xml	2013-05-20 09:39:55 UTC (rev 4247)
+++ magnoliamodules/trunk/magnolia-test-webapp/src/main/webapp/WEB-INF/bootstrap/config.modules.samples.templates.samplesCriteria.xml	2013-05-20 09:43:15 UTC (rev 4248)
@@ -1,47 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<sv:node sv:name="samplesCriteria" 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>aaf3511c-2084-4f54-9e5a-ba0fca2a58f0</sv:value>
-  </sv:property>
-  <sv:property sv:name="jcr:createdBy" sv:type="String">
-    <sv:value>admin</sv:value>
-  </sv:property>
-  <sv:property sv:name="templatePath" sv:type="String">
-    <sv:value>/template_criteria/criteria.jsp</sv:value>
-  </sv:property>
-  <sv:property sv:name="title" sv:type="String">
-    <sv:value>Sample Criteria</sv:value>
-  </sv:property>
-  <sv:property sv:name="type" sv:type="String">
-    <sv:value>jsp</sv:value>
-  </sv:property>
-  <sv:property sv:name="visible" sv:type="String">
-    <sv:value>true</sv:value>
-  </sv:property>
-  <sv:node sv:name="MetaData">
-    <sv:property sv:name="jcr:primaryType" sv:type="Name">
-      <sv:value>mgnl:metaData</sv:value>
-    </sv:property>
-    <sv:property sv:name="jcr:createdBy" sv:type="String">
-      <sv:value>admin</sv:value>
-    </sv:property>
-    <sv:property sv:name="mgnl:activated" sv:type="Boolean">
-      <sv:value>false</sv:value>
-    </sv:property>
-    <sv:property sv:name="mgnl:authorid" sv:type="String">
-      <sv:value>superuser</sv:value>
-    </sv:property>
-    <sv:property sv:name="mgnl:creationdate" sv:type="Date">
-      <sv:value>2008-09-23T16:56:46.344+02:00</sv:value>
-    </sv:property>
-    <sv:property sv:name="mgnl:lastmodified" sv:type="Date">
-      <sv:value>2010-08-25T16:46:38.062+02:00</sv:value>
-    </sv:property>
-  </sv:node>
-</sv:node>

Deleted: magnoliamodules/trunk/magnolia-test-webapp/src/main/webapp/WEB-INF/bootstrap/config.modules.samples.templates.samplesMagnoliaUtils.xml
===================================================================
--- magnoliamodules/trunk/magnolia-test-webapp/src/main/webapp/WEB-INF/bootstrap/config.modules.samples.templates.samplesMagnoliaUtils.xml	2013-05-20 09:39:55 UTC (rev 4247)
+++ magnoliamodules/trunk/magnolia-test-webapp/src/main/webapp/WEB-INF/bootstrap/config.modules.samples.templates.samplesMagnoliaUtils.xml	2013-05-20 09:43:15 UTC (rev 4248)
@@ -1,81 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<sv:node sv:name="samplesMagnoliaUtils" 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>1e213413-c125-4958-b8c5-350b88cbb39c</sv:value>
-  </sv:property>
-  <sv:property sv:name="class" sv:type="String">
-    <sv:value>info.magnolia.module.samples.templates.SampleTemplate</sv:value>
-  </sv:property>
-  <sv:property sv:name="i18nBasename" sv:type="String">
-    <sv:value>info.magnolia.module.samples.messages</sv:value>
-  </sv:property>
-  <sv:property sv:name="templatePath" sv:type="String">
-    <sv:value>/template_magnoliautils/magnoliaUtils.jsp</sv:value>
-  </sv:property>
-  <sv:property sv:name="title" sv:type="String">
-    <sv:value>Sample Magnoliautils</sv:value>
-  </sv:property>
-  <sv:property sv:name="titleSize" sv:type="String">
-    <sv:value>1</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-01-18T10:16:28.038+01:00</sv:value>
-    </sv:property>
-  </sv:node>
-  <sv:node sv:name="parameters">
-    <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>c971ec11-95dc-4547-9fad-ae0275ea3856</sv:value>
-    </sv:property>
-    <sv:property sv:name="dummy" sv:type="String">
-      <sv:value>This parameter has been set in the template definition</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>2009-01-15T12:21:10.608+01:00</sv:value>
-      </sv:property>
-      <sv:property sv:name="mgnl:lastmodified" sv:type="Date">
-        <sv:value>2010-01-15T12:12:06.690+01:00</sv:value>
-      </sv:property>
-    </sv:node>
-  </sv:node>
-</sv:node>

Modified: magnoliamodules/trunk/magnolia-test-webapp/src/main/webapp/WEB-INF/bootstrap/website.Criteria.xml
===================================================================
--- magnoliamodules/trunk/magnolia-test-webapp/src/main/webapp/WEB-INF/bootstrap/website.Criteria.xml	2013-05-20 09:39:55 UTC (rev 4247)
+++ magnoliamodules/trunk/magnolia-test-webapp/src/main/webapp/WEB-INF/bootstrap/website.Criteria.xml	2013-05-20 09:43:15 UTC (rev 4248)
@@ -3,7 +3,7 @@
   <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:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
     <sv:value>mix:lockable</sv:value>
   </sv:property>
   <sv:property sv:name="jcr:uuid" sv:type="String">
@@ -29,17 +29,17 @@
       <sv:value>2010-08-25T16:28:31.718+02:00</sv:value>
     </sv:property>
     <sv:property sv:name="mgnl:lastmodified" sv:type="Date">
-      <sv:value>2010-08-25T16:48:30.468+02:00</sv:value>
+      <sv:value>2013-05-19T19:48:26.588+02:00</sv:value>
     </sv:property>
     <sv:property sv:name="mgnl:template" sv:type="String">
-      <sv:value>samplesCriteria</sv:value>
+      <sv:value>samples:pages/samplesCriteria</sv:value>
     </sv:property>
   </sv:node>
   <sv:node sv:name="pets">
     <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:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
       <sv:value>mix:lockable</sv:value>
     </sv:property>
     <sv:property sv:name="jcr:uuid" sv:type="String">
@@ -65,17 +65,17 @@
         <sv:value>2010-05-13T11:04:10.640+02:00</sv:value>
       </sv:property>
       <sv:property sv:name="mgnl:lastmodified" sv:type="Date">
-        <sv:value>2010-05-13T11:04:22.468+02:00</sv:value>
+        <sv:value>2013-05-19T19:48:36.682+02:00</sv:value>
       </sv:property>
       <sv:property sv:name="mgnl:template" sv:type="String">
-        <sv:value>plaintext</sv:value>
+        <sv:value>standard-templating-kit:pages/stkArticle</sv:value>
       </sv:property>
     </sv:node>
     <sv:node sv:name="cats">
       <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:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
         <sv:value>mix:lockable</sv:value>
       </sv:property>
       <sv:property sv:name="jcr:uuid" sv:type="String">
@@ -111,7 +111,7 @@
         <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:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
           <sv:value>mix:lockable</sv:value>
         </sv:property>
         <sv:property sv:name="jcr:uuid" sv:type="String">
@@ -154,7 +154,7 @@
         <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:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
           <sv:value>mix:lockable</sv:value>
         </sv:property>
         <sv:property sv:name="jcr:uuid" sv:type="String">
@@ -197,7 +197,7 @@
         <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:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
           <sv:value>mix:lockable</sv:value>
         </sv:property>
         <sv:property sv:name="jcr:uuid" sv:type="String">
@@ -240,7 +240,7 @@
         <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:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
           <sv:value>mix:lockable</sv:value>
         </sv:property>
         <sv:property sv:name="jcr:uuid" sv:type="String">
@@ -284,7 +284,7 @@
       <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:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
         <sv:value>mix:lockable</sv:value>
       </sv:property>
       <sv:property sv:name="jcr:uuid" sv:type="String">
@@ -320,7 +320,7 @@
         <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:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
           <sv:value>mix:lockable</sv:value>
         </sv:property>
         <sv:property sv:name="jcr:uuid" sv:type="String">
@@ -363,7 +363,7 @@
         <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:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
           <sv:value>mix:lockable</sv:value>
         </sv:property>
         <sv:property sv:name="jcr:uuid" sv:type="String">
@@ -406,7 +406,7 @@
         <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:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
           <sv:value>mix:lockable</sv:value>
         </sv:property>
         <sv:property sv:name="jcr:uuid" sv:type="String">
@@ -449,7 +449,7 @@
         <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:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
           <sv:value>mix:lockable</sv:value>
         </sv:property>
         <sv:property sv:name="jcr:uuid" sv:type="String">
@@ -493,7 +493,7 @@
       <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:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
         <sv:value>mix:lockable</sv:value>
       </sv:property>
       <sv:property sv:name="jcr:uuid" sv:type="String">
@@ -529,7 +529,7 @@
         <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:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
           <sv:value>mix:lockable</sv:value>
         </sv:property>
         <sv:property sv:name="jcr:uuid" sv:type="String">
@@ -573,7 +573,7 @@
       <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:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
         <sv:value>mix:lockable</sv:value>
       </sv:property>
       <sv:property sv:name="jcr:uuid" sv:type="String">
@@ -609,7 +609,7 @@
         <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:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
           <sv:value>mix:lockable</sv:value>
         </sv:property>
         <sv:property sv:name="jcr:uuid" sv:type="String">
@@ -653,7 +653,7 @@
       <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:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
         <sv:value>mix:lockable</sv:value>
       </sv:property>
       <sv:property sv:name="jcr:uuid" sv:type="String">
@@ -689,7 +689,7 @@
         <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:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
           <sv:value>mix:lockable</sv:value>
         </sv:property>
         <sv:property sv:name="jcr:uuid" sv:type="String">
@@ -732,7 +732,7 @@
         <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:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
           <sv:value>mix:lockable</sv:value>
         </sv:property>
         <sv:property sv:name="jcr:uuid" sv:type="String">
@@ -776,7 +776,7 @@
       <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:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
         <sv:value>mix:lockable</sv:value>
       </sv:property>
       <sv:property sv:name="jcr:uuid" sv:type="String">
@@ -812,7 +812,7 @@
         <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:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
           <sv:value>mix:lockable</sv:value>
         </sv:property>
         <sv:property sv:name="jcr:uuid" sv:type="String">

Modified: magnoliamodules/trunk/magnolia-test-webapp/src/main/webapp/WEB-INF/bootstrap/website.Magnolia-Utils.xml
===================================================================
--- magnoliamodules/trunk/magnolia-test-webapp/src/main/webapp/WEB-INF/bootstrap/website.Magnolia-Utils.xml	2013-05-20 09:39:55 UTC (rev 4247)
+++ magnoliamodules/trunk/magnolia-test-webapp/src/main/webapp/WEB-INF/bootstrap/website.Magnolia-Utils.xml	2013-05-20 09:43:15 UTC (rev 4248)
@@ -3,12 +3,15 @@
   <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:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
     <sv:value>mix:lockable</sv:value>
   </sv:property>
   <sv:property sv:name="jcr:uuid" sv:type="String">
     <sv:value>9854e9ac-0cde-4a3a-b019-e95a8634207c</sv:value>
   </sv:property>
+  <sv:property sv:name="jcr:createdBy" sv:type="String">
+    <sv:value>admin</sv:value>
+  </sv:property>
   <sv:property sv:name="title" sv:type="String">
     <sv:value>Magnolia Utils</sv:value>
   </sv:property>
@@ -16,6 +19,9 @@
     <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>
@@ -23,22 +29,25 @@
       <sv:value>2010-01-18T14:10:07.718+01:00</sv:value>
     </sv:property>
     <sv:property sv:name="mgnl:lastmodified" sv:type="Date">
-      <sv:value>2010-01-18T14:10:28.435+01:00</sv:value>
+      <sv:value>2013-05-19T19:47:38.973+02:00</sv:value>
     </sv:property>
     <sv:property sv:name="mgnl:template" sv:type="String">
-      <sv:value>samplesMagnoliaUtils</sv:value>
+      <sv:value>samples:pages/samplesMagnoliaUtils</sv:value>
     </sv:property>
   </sv:node>
   <sv:node sv:name="Magnolia-Utils">
     <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:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
       <sv:value>mix:lockable</sv:value>
     </sv:property>
     <sv:property sv:name="jcr:uuid" sv:type="String">
       <sv:value>ce2e0ee4-97bc-4a28-ab36-9283dd39af2e</sv:value>
     </sv:property>
+    <sv:property sv:name="jcr:createdBy" sv:type="String">
+      <sv:value>admin</sv:value>
+    </sv:property>
     <sv:property sv:name="title" sv:type="String">
       <sv:value>Magnolia Utils Test page 1</sv:value>
     </sv:property>
@@ -46,6 +55,9 @@
       <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>
@@ -56,22 +68,25 @@
         <sv:value>2010-01-18T14:10:07.718+01:00</sv:value>
       </sv:property>
       <sv:property sv:name="mgnl:lastmodified" sv:type="Date">
-        <sv:value>2010-01-18T14:43:05.416+01:00</sv:value>
+        <sv:value>2013-05-19T19:47:41.964+02:00</sv:value>
       </sv:property>
       <sv:property sv:name="mgnl:template" sv:type="String">
-        <sv:value>samplesMagnoliaUtils</sv:value>
+        <sv:value>samples:pages/samplesMagnoliaUtils</sv:value>
       </sv:property>
     </sv:node>
     <sv:node sv:name="Magnolia-Utils0">
       <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:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
         <sv:value>mix:lockable</sv:value>
       </sv:property>
       <sv:property sv:name="jcr:uuid" sv:type="String">
         <sv:value>f064acbd-0eb1-44f8-b2a4-f561dd49c805</sv:value>
       </sv:property>
+      <sv:property sv:name="jcr:createdBy" sv:type="String">
+        <sv:value>admin</sv:value>
+      </sv:property>
       <sv:property sv:name="title" sv:type="String">
         <sv:value>Magnolia Utils Test page 1b</sv:value>
       </sv:property>
@@ -79,6 +94,9 @@
         <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>
@@ -89,10 +107,10 @@
           <sv:value>2010-01-18T14:10:07.718+01:00</sv:value>
         </sv:property>
         <sv:property sv:name="mgnl:lastmodified" sv:type="Date">
-          <sv:value>2010-01-18T14:43:10.650+01:00</sv:value>
+          <sv:value>2013-05-19T19:48:00.030+02:00</sv:value>
         </sv:property>
         <sv:property sv:name="mgnl:template" sv:type="String">
-          <sv:value>samplesMagnoliaUtils</sv:value>
+          <sv:value>samples:pages/samplesMagnoliaUtils</sv:value>
         </sv:property>
       </sv:node>
     </sv:node>
@@ -100,16 +118,22 @@
       <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:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
         <sv:value>mix:lockable</sv:value>
       </sv:property>
       <sv:property sv:name="jcr:uuid" sv:type="String">
         <sv:value>7766ee9e-bcbe-4f8f-951f-07a57823f03c</sv:value>
       </sv:property>
+      <sv:property sv:name="jcr:createdBy" sv:type="String">
+        <sv:value>admin</sv:value>
+      </sv:property>
       <sv:node sv:name="MetaData">
         <sv:property sv:name="jcr:primaryType" sv:type="Name">
           <sv:value>mgnl:metaData</sv:value>
         </sv:property>
+        <sv:property sv:name="jcr:createdBy" sv:type="String">
+          <sv:value>admin</sv:value>
+        </sv:property>
         <sv:property sv:name="mgnl:authorid" sv:type="String">
           <sv:value>superuser</sv:value>
         </sv:property>
@@ -124,12 +148,15 @@
         <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:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
           <sv:value>mix:lockable</sv:value>
         </sv:property>
         <sv:property sv:name="jcr:uuid" sv:type="String">
           <sv:value>ef4fe54e-a6f9-4ab6-980a-2395a4a6e194</sv:value>
         </sv:property>
+        <sv:property sv:name="jcr:createdBy" sv:type="String">
+          <sv:value>admin</sv:value>
+        </sv:property>
         <sv:property sv:name="text" sv:type="String">
           <sv:value>&lt;p&gt;&lt;strong&gt;Lorem Ipsum&lt;/strong&gt; is simply dummy text of the printing and typesetting industry. Lorem Ipsum has been the industry's standard dummy text ever si&lt;/p&gt;</sv:value>
         </sv:property>
@@ -140,6 +167,9 @@
           <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>
@@ -157,16 +187,22 @@
           <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:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
             <sv:value>mix:lockable</sv:value>
           </sv:property>
           <sv:property sv:name="jcr:uuid" sv:type="String">
             <sv:value>7c158483-8813-47b5-b176-643694dbc857</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:creationdate" sv:type="Date">
               <sv:value>2010-01-18T14:11:22.618+01:00</sv:value>
             </sv:property>
@@ -179,12 +215,15 @@
     <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:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
       <sv:value>mix:lockable</sv:value>
     </sv:property>
     <sv:property sv:name="jcr:uuid" sv:type="String">
       <sv:value>e1285f01-769e-4791-b9de-afcb8771fdc8</sv:value>
     </sv:property>
+    <sv:property sv:name="jcr:createdBy" sv:type="String">
+      <sv:value>admin</sv:value>
+    </sv:property>
     <sv:property sv:name="title" sv:type="String">
       <sv:value>Magnolia Utils Test page 2</sv:value>
     </sv:property>
@@ -192,6 +231,9 @@
       <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>
@@ -202,10 +244,10 @@
         <sv:value>2010-01-18T14:10:07.718+01:00</sv:value>
       </sv:property>
       <sv:property sv:name="mgnl:lastmodified" sv:type="Date">
-        <sv:value>2010-01-18T14:42:59.901+01:00</sv:value>
+        <sv:value>2013-05-19T19:47:48.730+02:00</sv:value>
       </sv:property>
       <sv:property sv:name="mgnl:template" sv:type="String">
-        <sv:value>samplesMagnoliaUtils</sv:value>
+        <sv:value>samples:pages/samplesMagnoliaUtils</sv:value>
       </sv:property>
     </sv:node>
   </sv:node>

Modified: magnoliamodules/trunk/magnolia-test-webapp/src/main/webapp/WEB-INF/bootstrap/website.test-MEDIA-113.xml
===================================================================
--- magnoliamodules/trunk/magnolia-test-webapp/src/main/webapp/WEB-INF/bootstrap/website.test-MEDIA-113.xml	2013-05-20 09:39:55 UTC (rev 4247)
+++ magnoliamodules/trunk/magnolia-test-webapp/src/main/webapp/WEB-INF/bootstrap/website.test-MEDIA-113.xml	2013-05-20 09:43:15 UTC (rev 4248)
@@ -3,12 +3,15 @@
   <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:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
     <sv:value>mix:lockable</sv:value>
   </sv:property>
   <sv:property sv:name="jcr:uuid" sv:type="String">
     <sv:value>4b1defa2-e1f0-4051-a444-e855aa39c058</sv:value>
   </sv:property>
+  <sv:property sv:name="jcr:createdBy" sv:type="String">
+    <sv:value>admin</sv:value>
+  </sv:property>
   <sv:property sv:name="text" sv:type="String">
     <sv:value>&lt;p&gt;This sample shows how to use jsp template, how you can extend the Template class and add your own variables and how to define parameters that you can then use as request parameters.&lt;/p&gt;</sv:value>
   </sv:property>
@@ -19,6 +22,9 @@
     <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>
@@ -29,26 +35,32 @@
       <sv:value>2009-01-16T09:26:04.050+01:00</sv:value>
     </sv:property>
     <sv:property sv:name="mgnl:lastmodified" sv:type="Date">
-      <sv:value>2010-05-02T19:50:56.540+02:00</sv:value>
+      <sv:value>2013-05-19T19:47:52.730+02:00</sv:value>
     </sv:property>
     <sv:property sv:name="mgnl:template" sv:type="String">
-      <sv:value>sampleSimpleMedia</sv:value>
+      <sv:value>media:pages/sampleSimpleMedia</sv:value>
     </sv:property>
   </sv:node>
   <sv:node sv:name="text_files">
     <sv:property sv:name="jcr:primaryType" sv:type="Name">
       <sv:value>mgnl:contentNode</sv:value>
     </sv:property>
-    <sv:property sv:name="jcr:mixinTypes" sv:type="Name">
+    <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
       <sv:value>mix:lockable</sv:value>
     </sv:property>
     <sv:property sv:name="jcr:uuid" sv:type="String">
       <sv:value>c7024555-35bc-40e4-b1cb-081462176b3f</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:creationdate" sv:type="Date">
         <sv:value>2009-01-16T09:56:40.411+01:00</sv:value>
       </sv:property>
@@ -58,16 +70,22 @@
     <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:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
       <sv:value>mix:lockable</sv:value>
     </sv:property>
     <sv:property sv:name="jcr:uuid" sv:type="String">
       <sv:value>f76ca2a8-67f4-4267-a57c-f7219e7b6d92</sv:value>
     </sv:property>
+    <sv:property sv:name="jcr:createdBy" sv:type="String">
+      <sv:value>admin</sv:value>
+    </sv:property>
     <sv:node sv:name="MetaData">
       <sv:property sv:name="jcr:primaryType" sv:type="Name">
         <sv:value>mgnl:metaData</sv:value>
       </sv:property>
+      <sv:property sv:name="jcr:createdBy" sv:type="String">
+        <sv:value>admin</sv:value>
+      </sv:property>
       <sv:property sv:name="mgnl:authorid" sv:type="String">
         <sv:value>superuser</sv:value>
       </sv:property>
@@ -82,16 +100,22 @@
       <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:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
         <sv:value>mix:lockable</sv:value>
       </sv:property>
       <sv:property sv:name="jcr:uuid" sv:type="String">
         <sv:value>a96e842c-3908-42ff-a854-c6f8bf31ecf7</sv:value>
       </sv:property>
+      <sv:property sv:name="jcr:createdBy" sv:type="String">
+        <sv:value>admin</sv:value>
+      </sv:property>
       <sv:node sv:name="MetaData">
         <sv:property sv:name="jcr:primaryType" sv:type="Name">
           <sv:value>mgnl:metaData</sv:value>
         </sv:property>
+        <sv:property sv:name="jcr:createdBy" sv:type="String">
+          <sv:value>admin</sv:value>
+        </sv:property>
         <sv:property sv:name="mgnl:authorid" sv:type="String">
           <sv:value>superuser</sv:value>
         </sv:property>
@@ -127,6 +151,9 @@
         <sv:property sv:name="jcr:lastModified" sv:type="Date">
           <sv:value>2010-05-02T19:50:56.539+02:00</sv:value>
         </sv:property>
+        <sv:property sv:name="jcr:lastModifiedBy" sv:type="String">
+          <sv:value>admin</sv:value>
+        </sv:property>
         <sv:property sv:name="jcr:mimeType" sv:type="String">
           <sv:value>image/png</sv:value>
         </sv:property>
@@ -145,16 +172,22 @@
       <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:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
         <sv:value>mix:lockable</sv:value>
       </sv:property>
       <sv:property sv:name="jcr:uuid" sv:type="String">
         <sv:value>294b766b-8a2c-4b75-bb6f-42f09ff753d5</sv:value>
       </sv:property>
+      <sv:property sv:name="jcr:createdBy" sv:type="String">
+        <sv:value>admin</sv:value>
+      </sv:property>
       <sv:node sv:name="MetaData">
         <sv:property sv:name="jcr:primaryType" sv:type="Name">
           <sv:value>mgnl:metaData</sv:value>
         </sv:property>
+        <sv:property sv:name="jcr:createdBy" sv:type="String">
+          <sv:value>admin</sv:value>
+        </sv:property>
         <sv:property sv:name="mgnl:authorid" sv:type="String">
           <sv:value>superuser</sv:value>
         </sv:property>
@@ -190,6 +223,9 @@
         <sv:property sv:name="jcr:lastModified" sv:type="Date">
           <sv:value>2010-05-02T11:22:26.102+02:00</sv:value>
         </sv:property>
+        <sv:property sv:name="jcr:lastModifiedBy" sv:type="String">
+          <sv:value>admin</sv:value>
+        </sv:property>
         <sv:property sv:name="jcr:mimeType" sv:type="String">
           <sv:value>image/jpeg</sv:value>
         </sv:property>
@@ -208,12 +244,15 @@
       <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:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
         <sv:value>mix:lockable</sv:value>
       </sv:property>
       <sv:property sv:name="jcr:uuid" sv:type="String">
         <sv:value>44b37952-a482-471b-9cbc-01df334a71e5</sv:value>
       </sv:property>
+      <sv:property sv:name="jcr:createdBy" sv:type="String">
+        <sv:value>admin</sv:value>
+      </sv:property>
       <sv:property sv:name="media" sv:type="String">
         <sv:value>ad7e0745-ba39-448b-99ae-71ef39f8d45e</sv:value>
       </sv:property>
@@ -227,6 +266,9 @@
         <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>

Modified: magnoliamodules/trunk/magnolia-test-webapp/src/main/webapp/WEB-INF/config/default/log4j.xml
===================================================================
--- magnoliamodules/trunk/magnolia-test-webapp/src/main/webapp/WEB-INF/config/default/log4j.xml	2013-05-20 09:39:55 UTC (rev 4247)
+++ magnoliamodules/trunk/magnolia-test-webapp/src/main/webapp/WEB-INF/config/default/log4j.xml	2013-05-20 09:43:15 UTC (rev 4248)
@@ -46,10 +46,10 @@
     <priority value="INFO" />
   </category>
   <category name="info.magnolia.module.admininterface.commands.ActivationCommand">
-    <priority value="DEBUG" />
+    <priority value="INFO" />
   </category>
   <category name="info.magnolia.cms.i18n.AbstractMessagesImpl">
-    <priority value="DEBUG" />
+    <priority value="INFO" />
   </category>
   <category name="it.openutils.mgnlutils.el">
     <priority value="DEBUG" />

Added: magnoliamodules/trunk/magnolia-test-webapp/src/main/webapp/WEB-INF/tags/openutils/debug.tag
===================================================================
--- magnoliamodules/trunk/magnolia-test-webapp/src/main/webapp/WEB-INF/tags/openutils/debug.tag	                        (rev 0)
+++ magnoliamodules/trunk/magnolia-test-webapp/src/main/webapp/WEB-INF/tags/openutils/debug.tag	2013-05-20 09:43:15 UTC (rev 4248)
@@ -0,0 +1,112 @@
+<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:mgnl="http://magnolia-cms.com/taglib/templating-components/cms"
+  xmlns:cmsfn="http://magnolia-cms.com/taglib/templating-components/cmsfn" xmlns:su="http://openutils.sf.net/openutils-stringutils"
+  xmlns:mu="mgnlutils" xmlns:du="dateutils" xmlns:el="project">
+  <c:if test="${mu:systemProperty('magnolia.develop') or param.debug eq '42'}">
+    <div id="debugpanel">
+      <table class="table table-striped table-bordered table-hover table-condensed">
+        <tr>
+          <td>request URI</td>
+          <td>${pageContext.request.requestURI}</td>
+        </tr>
+        <tr>
+          <td>state</td>
+          <td>${state}</td>
+        </tr>
+        <tr>
+          <td>state.handle</td>
+          <td>${state.handle}</td>
+        </tr>
+        <tr>
+          <td>state.repository</td>
+          <td>${state.repository}</td>
+        </tr>
+        <tr>
+          <td>state.templateName</td>
+          <td>${state.templateName}</td>
+        </tr>
+        <tr>
+          <td>state.locale</td>
+          <td>${state.locale}</td>
+        </tr>
+        <tr>
+          <td>state.channel.name</td>
+          <td>${state.channel.name}</td>
+        </tr>
+        <tr>
+          <td>state.currentURI</td>
+          <td>${state.currentURI}</td>
+        </tr>
+        <tr>
+          <td>state.originalURL</td>
+          <td>${state.originalURL}</td>
+        </tr>
+        <tr>
+          <td>state.originalURI</td>
+          <td>${state.originalURI}</td>
+        </tr>
+<!--        <tr>
+          <td>state.mainContent</td>
+          <td>${state.mainContent} ${state.mainContent.class}</td>
+        </tr>-->
+<!--        <tr>
+          <td>state.mainContent.JCRNode</td>
+          <td>${state.mainContent.JCRNode} ${state.mainContent.JCRNode.class}</td>
+        </tr>-->
+        <tr>
+          <td>state.mainContent.JCRNode.identifier</td>
+          <td>${state.mainContent.JCRNode.identifier}</td>
+        </tr>
+        <tr>
+          <td>state.currentContent</td>
+          <td>${state.currentContent}</td>
+        </tr>
+        <tr>
+          <td>content</td>
+          <td>${content} content.title: ${content.title} id: ${content['@id']} name: ${content['@name']} depth:
+            ${content['@depth']} path: ${content['@path']} nodeType: ${content['@nodeType'].name}
+          </td>
+        </tr>
+        <tr>
+          <td>def</td>
+          <td>${def}</td>
+        </tr>
+        <tr>
+          <td>model</td>
+          <td>${model}</td>
+        </tr>
+<!--        <tr>
+          <td>model.node</td>
+          <td>${model.node} ${model.node.class} ${model.node.name} ${model.node}</td>
+        </tr>-->
+        <tr>
+          <td>model.content</td>
+          <td>${model.content}</td>
+        </tr>
+        <tr>
+          <td>model.def</td>
+          <td>${model.def}</td>
+        </tr>
+        <tr>
+          <td>cmsfn</td>
+          <td>${cmsfn}</td>
+        </tr>
+        <tr>
+          <td>request attr</td>
+          <td>
+            <table>
+              <c:forEach items="${pageContext.request.attributeNames}" var="attr">
+                <c:if test="${attr ne 'org.springframework.core.convert.ConversionService'}">
+                  <tr>
+                    <td>${attr}</td>
+                    <td>${requestScope[attr]}</td>
+                  </tr>
+                </c:if>
+              </c:forEach>
+            </table>
+          </td>
+        </tr>
+      </table>
+    </div>
+  </c:if>
+</jsp:root>
\ No newline at end of file


Property changes on: magnoliamodules/trunk/magnolia-test-webapp/src/main/webapp/WEB-INF/tags/openutils/debug.tag
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+text/xml
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Modified: magnoliamodules/trunk/magnolia-test-webapp/src/main/webapp/WEB-INF/web.xml
===================================================================
--- magnoliamodules/trunk/magnolia-test-webapp/src/main/webapp/WEB-INF/web.xml	2013-05-20 09:39:55 UTC (rev 4247)
+++ magnoliamodules/trunk/magnolia-test-webapp/src/main/webapp/WEB-INF/web.xml	2013-05-20 09:43:15 UTC (rev 4248)
@@ -1,6 +1,6 @@
 <?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">
+  xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_5.xsd" version="2.5">
   <description>Magnolia</description>
   <display-name>magnolia</display-name>
   <distributable />
@@ -60,7 +60,7 @@
     <url-pattern>/do/*</url-pattern>
   </servlet-mapping>
   <listener>
-    <listener-class>info.magnolia.cms.servlets.MgnlServletContextListener</listener-class>
+    <listener-class>info.magnolia.init.MagnoliaServletContextListener</listener-class>
   </listener>
   <jsp-config>
     <jsp-property-group>

Modified: magnoliamodules/trunk/magnolia-test-webapp/src/main/webapp/template_magnoliautils/magnoliaUtils.jsp
===================================================================
--- magnoliamodules/trunk/magnolia-test-webapp/src/main/webapp/template_magnoliautils/magnoliaUtils.jsp	2013-05-20 09:39:55 UTC (rev 4247)
+++ magnoliamodules/trunk/magnolia-test-webapp/src/main/webapp/template_magnoliautils/magnoliaUtils.jsp	2013-05-20 09:43:15 UTC (rev 4248)
@@ -1,168 +1,356 @@
+<jsp:root version="2.1" xmlns:jsp="http://java.sun.com/JSP/Page" xmlns:c="http://java.sun.com/jsp/jstl/core"
+  xmlns:fmt="http://java.sun.com/jsp/jstl/fmt" xmlns:fn="http://java.sun.com/jsp/jstl/functions" xmlns:cms="http://magnolia-cms.com/taglib/templating-components/cms"
+  xmlns:cmsfn="http://magnolia-cms.com/taglib/templating-components/cmsfn" xmlns:mu="mgnlutils"
+  xmlns:tags="urn:jsptagdir:/WEB-INF/tags/openutils">
+  <jsp:directive.page contentType="text/html; charset=UTF-8" session="false" />
+<![CDATA[
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<%@ page contentType="text/html" pageEncoding="UTF-8" %> <%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core"
-%> <%@ taglib prefix="cms" uri="cms-taglib" %> <%@ taglib prefix="cmsu" uri="cms-util-taglib" %> <%@ taglib prefix="mu"
-uri="mgnlutils" %>
-<html>
-  <head>
-    <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
-    <title>
-      <cms:ifNotEmpty nodeDataName="title">${content.title}</cms:ifNotEmpty>
-      <cms:ifEmpty nodeDataName="title"><cms:out nodeDataName="name" /></cms:ifEmpty>
-    </title>
-    <link rel="stylesheet" type="text/css" href="${pageContext.request.contextPath}/docroot/samples/samples.css" />
-    <cms:links />
-    <style>
-      .function {
-      border: 1px solid #ccc;
-      padding: 20px;
-      }      
-      .sampleresult {
-        color: red;
-      }
-      * {
-        font-family: tahoma, verdana, arial;
-      }
-      p{
-        color: blue;
-      }
-    </style>
-  </head>
-  <body>
-
-    <!-- Page Dialog  -->
-    <cms:mainBar dialog="mainProperties" />
-    <div id="header">
-      <h1>Magnolia Utils Samples</h1>
-    </div>
-
-    <!-- Simple Navigation Tag  -->
-    <div id="navigation">
-      <cmsu:simpleNavigation />
-    </div>
-    <div id="main">
+]]>
+  <html>
+    <head>
+      <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
+      <title> ${content.title}
+      </title>
+      <link rel="stylesheet" type="text/css" href="${pageContext.request.contextPath}/.resources/bootstrap/css/bootstrap.min.css" />
+      <style>
+    <![CDATA[
+      code { display: block}
+      ]]>
+      </style>
+      <cms:init />
+    </head>
+    <body>
+      <div id="main" class="container">
+        <div id="header">
+          <h1>Magnolia Utils Samples</h1>
+        </div>
+        <c:set var="oldcontent" value="${state.currentContent}" />
+        <c:set var="contentMap" value="${content}" />
+        <c:set var="node" value="${oldcontent.JCRNode}" />
+        <table class="table table-striped table-bordered table-hover">
+          <thead>
+            <tr>
+              <th>Property</th>
+              <th>Node</th>
+              <th>ContentMap</th>
+              <th>Content</th>
+            </tr>
+          </thead>
+          <tbody>
+            <tr>
+              <th><!--  -->
+              </th>
+              <td>${node}
+              </td>
+              <td>${contentMap}
+              </td>
+              <td>${oldcontent}
+              </td>
+            </tr>
+            <tr>
+              <th>class
+              </th>
+              <td>${node.class.name}
+              </td>
+              <td>${contentMap.class.name }
+              </td>
+              <td>${oldcontent.class.name}
+              </td>
+            </tr>
+            <tr>
+              <th>UUID
+              </th>
+              <td>${node.UUID}
+              </td>
+              <td>${contentMap.UUID}
+              </td>
+              <td>${oldcontent.UUID}
+              </td>
+            </tr>
+            <tr>
+              <th>@uuid
+              </th>
+              <td>${node['@uuid']}
+              </td>
+              <td>${contentMap['@uuid']}
+              </td>
+              <td>${oldcontent['@uuid']}
+              </td>
+            </tr>
+            <tr>
+              <th>@UUID
+              </th>
+              <td>${node['@UUID']}
+              </td>
+              <td>${contentMap['@UUID']}
+              </td>
+              <td>${oldcontent['@UUID']}
+              </td>
+            </tr>
+            <tr>
+              <th>@id
+              </th>
+              <td>${node['@id']}
+              </td>
+              <td>${contentMap['@id']}
+              </td>
+              <td>${oldcontent['@id']}
+              </td>
+            </tr>
+            <tr>
+              <th>handle
+              </th>
+              <td>${node.handle}
+              </td>
+              <td>${contentMap.handle}
+              </td>
+              <td>${oldcontent.handle}
+              </td>
+            </tr>
+            <tr>
+              <th>path
+              </th>
+              <td>${node.path}
+              </td>
+              <td>${contentMap.path}
+              </td>
+              <td>${oldcontent.path}
+              </td>
+            </tr>
+            <tr>
+              <th>@handle
+              </th>
+              <td>${node['@handle']}
+              </td>
+              <td>${contentMap['@handle']}
+              </td>
+              <td>${oldcontent['@handle']}
+              </td>
+            </tr>
+            <tr>
+              <th>@path
+              </th>
...
 
[truncated message content]

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

From: <fg...@us...> - 2013-05-20 09:39:58

Revision: 4247
          http://openutils.svn.sourceforge.net/openutils/?rev=4247&view=rev
Author:   fgiust
Date:     2013-05-20 09:39:55 +0000 (Mon, 20 May 2013)
Log Message:
-----------
embed twitter bootstrap for demo and test pages

Added Paths:
-----------
    magnoliamodules/trunk/openutils-mgnlutils/src/main/resources/mgnl-resources/
    magnoliamodules/trunk/openutils-mgnlutils/src/main/resources/mgnl-resources/bootstrap/
    magnoliamodules/trunk/openutils-mgnlutils/src/main/resources/mgnl-resources/bootstrap/css/
    magnoliamodules/trunk/openutils-mgnlutils/src/main/resources/mgnl-resources/bootstrap/css/bootstrap-responsive.css
    magnoliamodules/trunk/openutils-mgnlutils/src/main/resources/mgnl-resources/bootstrap/css/bootstrap-responsive.min.css
    magnoliamodules/trunk/openutils-mgnlutils/src/main/resources/mgnl-resources/bootstrap/css/bootstrap.css
    magnoliamodules/trunk/openutils-mgnlutils/src/main/resources/mgnl-resources/bootstrap/css/bootstrap.min.css
    magnoliamodules/trunk/openutils-mgnlutils/src/main/resources/mgnl-resources/bootstrap/img/
    magnoliamodules/trunk/openutils-mgnlutils/src/main/resources/mgnl-resources/bootstrap/img/glyphicons-halflings-white.png
    magnoliamodules/trunk/openutils-mgnlutils/src/main/resources/mgnl-resources/bootstrap/img/glyphicons-halflings.png
    magnoliamodules/trunk/openutils-mgnlutils/src/main/resources/mgnl-resources/bootstrap/js/
    magnoliamodules/trunk/openutils-mgnlutils/src/main/resources/mgnl-resources/bootstrap/js/bootstrap.js
    magnoliamodules/trunk/openutils-mgnlutils/src/main/resources/mgnl-resources/bootstrap/js/bootstrap.min.js

Added: magnoliamodules/trunk/openutils-mgnlutils/src/main/resources/mgnl-resources/bootstrap/css/bootstrap-responsive.css
===================================================================
--- magnoliamodules/trunk/openutils-mgnlutils/src/main/resources/mgnl-resources/bootstrap/css/bootstrap-responsive.css	                        (rev 0)
+++ magnoliamodules/trunk/openutils-mgnlutils/src/main/resources/mgnl-resources/bootstrap/css/bootstrap-responsive.css	2013-05-20 09:39:55 UTC (rev 4247)
@@ -0,0 +1,1109 @@
+/*!
+ * Bootstrap Responsive v2.3.2
+ *
+ * Copyright 2012 Twitter, Inc
+ * Licensed under the Apache License v2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Designed and built with all the love in the world @twitter by @mdo and @fat.
+ */
+
+.clearfix {
+  *zoom: 1;
+}
+
+.clearfix:before,
+.clearfix:after {
+  display: table;
+  line-height: 0;
+  content: "";
+}
+
+.clearfix:after {
+  clear: both;
+}
+
+.hide-text {
+  font: 0/0 a;
+  color: transparent;
+  text-shadow: none;
+  background-color: transparent;
+  border: 0;
+}
+
+.input-block-level {
+  display: block;
+  width: 100%;
+  min-height: 30px;
+  -webkit-box-sizing: border-box;
+     -moz-box-sizing: border-box;
+          box-sizing: border-box;
+}
+
+@-ms-viewport {
+  width: device-width;
+}
+
+.hidden {
+  display: none;
+  visibility: hidden;
+}
+
+.visible-phone {
+  display: none !important;
+}
+
+.visible-tablet {
+  display: none !important;
+}
+
+.hidden-desktop {
+  display: none !important;
+}
+
+.visible-desktop {
+  display: inherit !important;
+}
+
+@media (min-width: 768px) and (max-width: 979px) {
+  .hidden-desktop {
+    display: inherit !important;
+  }
+  .visible-desktop {
+    display: none !important ;
+  }
+  .visible-tablet {
+    display: inherit !important;
+  }
+  .hidden-tablet {
+    display: none !important;
+  }
+}
+
+@media (max-width: 767px) {
+  .hidden-desktop {
+    display: inherit !important;
+  }
+  .visible-desktop {
+    display: none !important;
+  }
+  .visible-phone {
+    display: inherit !important;
+  }
+  .hidden-phone {
+    display: none !important;
+  }
+}
+
+.visible-print {
+  display: none !important;
+}
+
+@media print {
+  .visible-print {
+    display: inherit !important;
+  }
+  .hidden-print {
+    display: none !important;
+  }
+}
+
+@media (min-width: 1200px) {
+  .row {
+    margin-left: -30px;
+    *zoom: 1;
+  }
+  .row:before,
+  .row:after {
+    display: table;
+    line-height: 0;
+    content: "";
+  }
+  .row:after {
+    clear: both;
+  }
+  [class*="span"] {
+    float: left;
+    min-height: 1px;
+    margin-left: 30px;
+  }
+  .container,
+  .navbar-static-top .container,
+  .navbar-fixed-top .container,
+  .navbar-fixed-bottom .container {
+    width: 1170px;
+  }
+  .span12 {
+    width: 1170px;
+  }
+  .span11 {
+    width: 1070px;
+  }
+  .span10 {
+    width: 970px;
+  }
+  .span9 {
+    width: 870px;
+  }
+  .span8 {
+    width: 770px;
+  }
+  .span7 {
+    width: 670px;
+  }
+  .span6 {
+    width: 570px;
+  }
+  .span5 {
+    width: 470px;
+  }
+  .span4 {
+    width: 370px;
+  }
+  .span3 {
+    width: 270px;
+  }
+  .span2 {
+    width: 170px;
+  }
+  .span1 {
+    width: 70px;
+  }
+  .offset12 {
+    margin-left: 1230px;
+  }
+  .offset11 {
+    margin-left: 1130px;
+  }
+  .offset10 {
+    margin-left: 1030px;
+  }
+  .offset9 {
+    margin-left: 930px;
+  }
+  .offset8 {
+    margin-left: 830px;
+  }
+  .offset7 {
+    margin-left: 730px;
+  }
+  .offset6 {
+    margin-left: 630px;
+  }
+  .offset5 {
+    margin-left: 530px;
+  }
+  .offset4 {
+    margin-left: 430px;
+  }
+  .offset3 {
+    margin-left: 330px;
+  }
+  .offset2 {
+    margin-left: 230px;
+  }
+  .offset1 {
+    margin-left: 130px;
+  }
+  .row-fluid {
+    width: 100%;
+    *zoom: 1;
+  }
+  .row-fluid:before,
+  .row-fluid:after {
+    display: table;
+    line-height: 0;
+    content: "";
+  }
+  .row-fluid:after {
+    clear: both;
+  }
+  .row-fluid [class*="span"] {
+    display: block;
+    float: left;
+    width: 100%;
+    min-height: 30px;
+    margin-left: 2.564102564102564%;
+    *margin-left: 2.5109110747408616%;
+    -webkit-box-sizing: border-box;
+       -moz-box-sizing: border-box;
+            box-sizing: border-box;
+  }
+  .row-fluid [class*="span"]:first-child {
+    margin-left: 0;
+  }
+  .row-fluid .controls-row [class*="span"] + [class*="span"] {
+    margin-left: 2.564102564102564%;
+  }
+  .row-fluid .span12 {
+    width: 100%;
+    *width: 99.94680851063829%;
+  }
+  .row-fluid .span11 {
+    width: 91.45299145299145%;
+    *width: 91.39979996362975%;
+  }
+  .row-fluid .span10 {
+    width: 82.90598290598291%;
+    *width: 82.8527914166212%;
+  }
+  .row-fluid .span9 {
+    width: 74.35897435897436%;
+    *width: 74.30578286961266%;
+  }
+  .row-fluid .span8 {
+    width: 65.81196581196582%;
+    *width: 65.75877432260411%;
+  }
+  .row-fluid .span7 {
+    width: 57.26495726495726%;
+    *width: 57.21176577559556%;
+  }
+  .row-fluid .span6 {
+    width: 48.717948717948715%;
+    *width: 48.664757228587014%;
+  }
+  .row-fluid .span5 {
+    width: 40.17094017094017%;
+    *width: 40.11774868157847%;
+  }
+  .row-fluid .span4 {
+    width: 31.623931623931625%;
+    *width: 31.570740134569924%;
+  }
+  .row-fluid .span3 {
+    width: 23.076923076923077%;
+    *width: 23.023731587561375%;
+  }
+  .row-fluid .span2 {
+    width: 14.52991452991453%;
+    *width: 14.476723040552828%;
+  }
+  .row-fluid .span1 {
+    width: 5.982905982905983%;
+    *width: 5.929714493544281%;
+  }
+  .row-fluid .offset12 {
+    margin-left: 105.12820512820512%;
+    *margin-left: 105.02182214948171%;
+  }
+  .row-fluid .offset12:first-child {
+    margin-left: 102.56410256410257%;
+    *margin-left: 102.45771958537915%;
+  }
+  .row-fluid .offset11 {
+    margin-left: 96.58119658119658%;
+    *margin-left: 96.47481360247316%;
+  }
+  .row-fluid .offset11:first-child {
+    margin-left: 94.01709401709402%;
+    *margin-left: 93.91071103837061%;
+  }
+  .row-fluid .offset10 {
+    margin-left: 88.03418803418803%;
+    *margin-left: 87.92780505546462%;
+  }
+  .row-fluid .offset10:first-child {
+    margin-left: 85.47008547008548%;
+    *margin-left: 85.36370249136206%;
+  }
+  .row-fluid .offset9 {
+    margin-left: 79.48717948717949%;
+    *margin-left: 79.38079650845607%;
+  }
+  .row-fluid .offset9:first-child {
+    margin-left: 76.92307692307693%;
+    *margin-left: 76.81669394435352%;
+  }
+  .row-fluid .offset8 {
+    margin-left: 70.94017094017094%;
+    *margin-left: 70.83378796144753%;
+  }
+  .row-fluid .offset8:first-child {
+    margin-left: 68.37606837606839%;
+    *margin-left: 68.26968539734497%;
+  }
+  .row-fluid .offset7 {
+    margin-left: 62.393162393162385%;
+    *margin-left: 62.28677941443899%;
+  }
+  .row-fluid .offset7:first-child {
+    margin-left: 59.82905982905982%;
+    *margin-left: 59.72267685033642%;
+  }
+  .row-fluid .offset6 {
+    margin-left: 53.84615384615384%;
+    *margin-left: 53.739770867430444%;
+  }
+  .row-fluid .offset6:first-child {
+    margin-left: 51.28205128205128%;
+    *margin-left: 51.175668303327875%;
+  }
+  .row-fluid .offset5 {
+    margin-left: 45.299145299145295%;
+    *margin-left: 45.1927623204219%;
+  }
+  .row-fluid .offset5:first-child {
+    margin-left: 42.73504273504273%;
+    *margin-left: 42.62865975631933%;
+  }
+  .row-fluid .offset4 {
+    margin-left: 36.75213675213675%;
+    *margin-left: 36.645753773413354%;
+  }
+  .row-fluid .offset4:first-child {
+    margin-left: 34.18803418803419%;
+    *margin-left: 34.081651209310785%;
+  }
+  .row-fluid .offset3 {
+    margin-left: 28.205128205128204%;
+    *margin-left: 28.0987452264048%;
+  }
+  .row-fluid .offset3:first-child {
+    margin-left: 25.641025641025642%;
+    *margin-left: 25.53464266230224%;
+  }
+  .row-fluid .offset2 {
+    margin-left: 19.65811965811966%;
+    *margin-left: 19.551736679396257%;
+  }
+  .row-fluid .offset2:first-child {
+    margin-left: 17.094017094017094%;
+    *margin-left: 16.98763411529369%;
+  }
+  .row-fluid .offset1 {
+    margin-left: 11.11111111111111%;
+    *margin-left: 11.004728132387708%;
+  }
+  .row-fluid .offset1:first-child {
+    margin-left: 8.547008547008547%;
+    *margin-left: 8.440625568285142%;
+  }
+  input,
+  textarea,
+  .uneditable-input {
+    margin-left: 0;
+  }
+  .controls-row [class*="span"] + [class*="span"] {
+    margin-left: 30px;
+  }
+  input.span12,
+  textarea.span12,
+  .uneditable-input.span12 {
+    width: 1156px;
+  }
+  input.span11,
+  textarea.span11,
+  .uneditable-input.span11 {
+    width: 1056px;
+  }
+  input.span10,
+  textarea.span10,
+  .uneditable-input.span10 {
+    width: 956px;
+  }
+  input.span9,
+  textarea.span9,
+  .uneditable-input.span9 {
+    width: 856px;
+  }
+  input.span8,
+  textarea.span8,
+  .uneditable-input.span8 {
+    width: 756px;
+  }
+  input.span7,
+  textarea.span7,
+  .uneditable-input.span7 {
+    width: 656px;
+  }
+  input.span6,
+  textarea.span6,
+  .uneditable-input.span6 {
+    width: 556px;
+  }
+  input.span5,
+  textarea.span5,
+  .uneditable-input.span5 {
+    width: 456px;
+  }
+  input.span4,
+  textarea.span4,
+  .uneditable-input.span4 {
+    width: 356px;
+  }
+  input.span3,
+  textarea.span3,
+  .uneditable-input.span3 {
+    width: 256px;
+  }
+  input.span2,
+  textarea.span2,
+  .uneditable-input.span2 {
+    width: 156px;
+  }
+  input.span1,
+  textarea.span1,
+  .uneditable-input.span1 {
+    width: 56px;
+  }
+  .thumbnails {
+    margin-left: -30px;
+  }
+  .thumbnails > li {
+    margin-left: 30px;
+  }
+  .row-fluid .thumbnails {
+    margin-left: 0;
+  }
+}
+
+@media (min-width: 768px) and (max-width: 979px) {
+  .row {
+    margin-left: -20px;
+    *zoom: 1;
+  }
+  .row:before,
+  .row:after {
+    display: table;
+    line-height: 0;
+    content: "";
+  }
+  .row:after {
+    clear: both;
+  }
+  [class*="span"] {
+    float: left;
+    min-height: 1px;
+    margin-left: 20px;
+  }
+  .container,
+  .navbar-static-top .container,
+  .navbar-fixed-top .container,
+  .navbar-fixed-bottom .container {
+    width: 724px;
+  }
+  .span12 {
+    width: 724px;
+  }
+  .span11 {
+    width: 662px;
+  }
+  .span10 {
+    width: 600px;
+  }
+  .span9 {
+    width: 538px;
+  }
+  .span8 {
+    width: 476px;
+  }
+  .span7 {
+    width: 414px;
+  }
+  .span6 {
+    width: 352px;
+  }
+  .span5 {
+    width: 290px;
+  }
+  .span4 {
+    width: 228px;
+  }
+  .span3 {
+    width: 166px;
+  }
+  .span2 {
+    width: 104px;
+  }
+  .span1 {
+    width: 42px;
+  }
+  .offset12 {
+    margin-left: 764px;
+  }
+  .offset11 {
+    margin-left: 702px;
+  }
+  .offset10 {
+    margin-left: 640px;
+  }
+  .offset9 {
+    margin-left: 578px;
+  }
+  .offset8 {
+    margin-left: 516px;
+  }
+  .offset7 {
+    margin-left: 454px;
+  }
+  .offset6 {
+    margin-left: 392px;
+  }
+  .offset5 {
+    margin-left: 330px;
+  }
+  .offset4 {
+    margin-left: 268px;
+  }
+  .offset3 {
+    margin-left: 206px;
+  }
+  .offset2 {
+    margin-left: 144px;
+  }
+  .offset1 {
+    margin-left: 82px;
+  }
+  .row-fluid {
+    width: 100%;
+    *zoom: 1;
+  }
+  .row-fluid:before,
+  .row-fluid:after {
+    display: table;
+    line-height: 0;
+    content: "";
+  }
+  .row-fluid:after {
+    clear: both;
+  }
+  .row-fluid [class*="span"] {
+    display: block;
+    float: left;
+    width: 100%;
+    min-height: 30px;
+    margin-left: 2.7624309392265194%;
+    *margin-left: 2.709239449864817%;
+    -webkit-box-sizing: border-box;
+       -moz-box-sizing: border-box;
+            box-sizing: border-box;
+  }
+  .row-fluid [class*="span"]:first-child {
+    margin-left: 0;
+  }
+  .row-fluid .controls-row [class*="span"] + [class*="span"] {
+    margin-left: 2.7624309392265194%;
+  }
+  .row-fluid .span12 {
+    width: 100%;
+    *width: 99.94680851063829%;
+  }
+  .row-fluid .span11 {
+    width: 91.43646408839778%;
+    *width: 91.38327259903608%;
+  }
+  .row-fluid .span10 {
+    width: 82.87292817679558%;
+    *width: 82.81973668743387%;
+  }
+  .row-fluid .span9 {
+    width: 74.30939226519337%;
+    *width: 74.25620077583166%;
+  }
+  .row-fluid .span8 {
+    width: 65.74585635359117%;
+    *width: 65.69266486422946%;
+  }
+  .row-fluid .span7 {
+    width: 57.18232044198895%;
+    *width: 57.12912895262725%;
+  }
+  .row-fluid .span6 {
+    width: 48.61878453038674%;
+    *width: 48.56559304102504%;
+  }
+  .row-fluid .span5 {
+    width: 40.05524861878453%;
+    *width: 40.00205712942283%;
+  }
+  .row-fluid .span4 {
+    width: 31.491712707182323%;
+    *width: 31.43852121782062%;
+  }
+  .row-fluid .span3 {
+    width: 22.92817679558011%;
+    *width: 22.87498530621841%;
+  }
+  .row-fluid .span2 {
+    width: 14.3646408839779%;
+    *width: 14.311449394616199%;
+  }
+  .row-fluid .span1 {
+    width: 5.801104972375691%;
+    *width: 5.747913483013988%;
+  }
+  .row-fluid .offset12 {
+    margin-left: 105.52486187845304%;
+    *margin-left: 105.41847889972962%;
+  }
+  .row-fluid .offset12:first-child {
+    margin-left: 102.76243093922652%;
+    *margin-left: 102.6560479605031%;
+  }
+  .row-fluid .offset11 {
+    margin-left: 96.96132596685082%;
+    *margin-left: 96.8549429881274%;
+  }
+  .row-fluid .offset11:first-child {
+    margin-left: 94.1988950276243%;
+    *margin-left: 94.09251204890089%;
+  }
+  .row-fluid .offset10 {
+    margin-left: 88.39779005524862%;
+    *margin-left: 88.2914070765252%;
+  }
+  .row-fluid .offset10:first-child {
+    margin-left: 85.6353591160221%;
+    *margin-left: 85.52897613729868%;
+  }
+  .row-fluid .offset9 {
+    margin-left: 79.8342541436464%;
+    *margin-left: 79.72787116492299%;
+  }
+  .row-fluid .offset9:first-child {
+    margin-left: 77.07182320441989%;
+    *margin-left: 76.96544022569647%;
+  }
+  .row-fluid .offset8 {
+    margin-left: 71.2707182320442%;
+    *margin-left: 71.16433525332079%;
+  }
+  .row-fluid .offset8:first-child {
+    margin-left: 68.50828729281768%;
+    *margin-left: 68.40190431409427%;
+  }
+  .row-fluid .offset7 {
+    margin-left: 62.70718232044199%;
+    *margin-left: 62.600799341718584%;
+  }
+  .row-fluid .offset7:first-child {
+    margin-left: 59.94475138121547%;
+    *margin-left: 59.838368402492065%;
+  }
+  .row-fluid .offset6 {
+    margin-left: 54.14364640883978%;
+    *margin-left: 54.037263430116376%;
+  }
+  .row-fluid .offset6:first-child {
+    margin-left: 51.38121546961326%;
+    *margin-left: 51.27483249088986%;
+  }
+  .row-fluid .offset5 {
+    margin-left: 45.58011049723757%;
+    *margin-left: 45.47372751851417%;
+  }
+  .row-fluid .offset5:first-child {
+    margin-left: 42.81767955801105%;
+    *margin-left: 42.71129657928765%;
+  }
+  .row-fluid .offset4 {
+    margin-left: 37.01657458563536%;
+    *margin-left: 36.91019160691196%;
+  }
+  .row-fluid .offset4:first-child {
+    margin-left: 34.25414364640884%;
+    *margin-left: 34.14776066768544%;
+  }
+  .row-fluid .offset3 {
+    margin-left: 28.45303867403315%;
+    *margin-left: 28.346655695309746%;
+  }
+  .row-fluid .offset3:first-child {
+    margin-left: 25.69060773480663%;
+    *margin-left: 25.584224756083227%;
+  }
+  .row-fluid .offset2 {
+    margin-left: 19.88950276243094%;
+    *margin-left: 19.783119783707537%;
+  }
+  .row-fluid .offset2:first-child {
+    margin-left: 17.12707182320442%;
+    *margin-left: 17.02068884448102%;
+  }
+  .row-fluid .offset1 {
+    margin-left: 11.32596685082873%;
+    *margin-left: 11.219583872105325%;
+  }
+  .row-fluid .offset1:first-child {
+    margin-left: 8.56353591160221%;
+    *margin-left: 8.457152932878806%;
+  }
+  input,
+  textarea,
+  .uneditable-input {
+    margin-left: 0;
+  }
+  .controls-row [class*="span"] + [class*="span"] {
+    margin-left: 20px;
+  }
+  input.span12,
+  textarea.span12,
+  .uneditable-input.span12 {
+    width: 710px;
+  }
+  input.span11,
+  textarea.span11,
+  .uneditable-input.span11 {
+    width: 648px;
+  }
+  input.span10,
+  textarea.span10,
+  .uneditable-input.span10 {
+    width: 586px;
+  }
+  input.span9,
+  textarea.span9,
+  .uneditable-input.span9 {
+    width: 524px;
+  }
+  input.span8,
+  textarea.span8,
+  .uneditable-input.span8 {
+    width: 462px;
+  }
+  input.span7,
+  textarea.span7,
+  .uneditable-input.span7 {
+    width: 400px;
+  }
+  input.span6,
+  textarea.span6,
+  .uneditable-input.span6 {
+    width: 338px;
+  }
+  input.span5,
+  textarea.span5,
+  .uneditable-input.span5 {
+    width: 276px;
+  }
+  input.span4,
+  textarea.span4,
+  .uneditable-input.span4 {
+    width: 214px;
+  }
+  input.span3,
+  textarea.span3,
+  .uneditable-input.span3 {
+    width: 152px;
+  }
+  input.span2,
+  textarea.span2,
+  .uneditable-input.span2 {
+    width: 90px;
+  }
+  input.span1,
+  textarea.span1,
+  .uneditable-input.span1 {
+    width: 28px;
+  }
+}
+
+@media (max-width: 767px) {
+  body {
+    padding-right: 20px;
+    padding-left: 20px;
+  }
+  .navbar-fixed-top,
+  .navbar-fixed-bottom,
+  .navbar-static-top {
+    margin-right: -20px;
+    margin-left: -20px;
+  }
+  .container-fluid {
+    padding: 0;
+  }
+  .dl-horizontal dt {
+    float: none;
+    width: auto;
+    clear: none;
+    text-align: left;
+  }
+  .dl-horizontal dd {
+    margin-left: 0;
+  }
+  .container {
+    width: auto;
+  }
+  .row-fluid {
+    width: 100%;
+  }
+  .row,
+  .thumbnails {
+    margin-left: 0;
+  }
+  .thumbnails > li {
+    float: none;
+    margin-left: 0;
+  }
+  [class*="span"],
+  .uneditable-input[class*="span"],
+  .row-fluid [class*="span"] {
+    display: block;
+    float: none;
+    width: 100%;
+    margin-left: 0;
+    -webkit-box-sizing: border-box;
+       -moz-box-sizing: border-box;
+            box-sizing: border-box;
+  }
+  .span12,
+  .row-fluid .span12 {
+    width: 100%;
+    -webkit-box-sizing: border-box;
+       -moz-box-sizing: border-box;
+            box-sizing: border-box;
+  }
+  .row-fluid [class*="offset"]:first-child {
+    margin-left: 0;
+  }
+  .input-large,
+  .input-xlarge,
+  .input-xxlarge,
+  input[class*="span"],
+  select[class*="span"],
+  textarea[class*="span"],
+  .uneditable-input {
+    display: block;
+    width: 100%;
+    min-height: 30px;
+    -webkit-box-sizing: border-box;
+       -moz-box-sizing: border-box;
+            box-sizing: border-box;
+  }
+  .input-prepend input,
+  .input-append input,
+  .input-prepend input[class*="span"],
+  .input-append input[class*="span"] {
+    display: inline-block;
+    width: auto;
+  }
+  .controls-row [class*="span"] + [class*="span"] {
+    margin-left: 0;
+  }
+  .modal {
+    position: fixed;
+    top: 20px;
+    right: 20px;
+    left: 20px;
+    width: auto;
+    margin: 0;
+  }
+  .modal.fade {
+    top: -100px;
+  }
+  .modal.fade.in {
+    top: 20px;
+  }
+}
+
+@media (max-width: 480px) {
+  .nav-collapse {
+    -webkit-transform: translate3d(0, 0, 0);
+  }
+  .page-header h1 small {
+    display: block;
+    line-height: 20px;
+  }
+  input[type="checkbox"],
+  input[type="radio"] {
+    border: 1px solid #ccc;
+  }
+  .form-horizontal .control-label {
+    float: none;
+    width: auto;
+    padding-top: 0;
+    text-align: left;
+  }
+  .form-horizontal .controls {
+    margin-left: 0;
+  }
+  .form-horizontal .control-list {
+    padding-top: 0;
+  }
+  .form-horizontal .form-actions {
+    padding-right: 10px;
+    padding-left: 10px;
+  }
+  .media .pull-left,
+  .media .pull-right {
+    display: block;
+    float: none;
+    margin-bottom: 10px;
+  }
+  .media-object {
+    margin-right: 0;
+    margin-left: 0;
+  }
+  .modal {
+    top: 10px;
+    right: 10px;
+    left: 10px;
+  }
+  .modal-header .close {
+    padding: 10px;
+    margin: -10px;
+  }
+  .carousel-caption {
+    position: static;
+  }
+}
+
+@media (max-width: 979px) {
+  body {
+    padding-top: 0;
+  }
+  .navbar-fixed-top,
+  .navbar-fixed-bottom {
+    position: static;
+  }
+  .navbar-fixed-top {
+    margin-bottom: 20px;
+  }
+  .navbar-fixed-bottom {
+    margin-top: 20px;
+  }
+  .navbar-fixed-top .navbar-inner,
+  .navbar-fixed-bottom .navbar-inner {
+    padding: 5px;
+  }
+  .navbar .container {
+    width: auto;
+    padding: 0;
+  }
+  .navbar .brand {
+    padding-right: 10px;
+    padding-left: 10px;
+    margin: 0 0 0 -5px;
+  }
+  .nav-collapse {
+    clear: both;
+  }
+  .nav-collapse .nav {
+    float: none;
+    margin: 0 0 10px;
+  }
+  .nav-collapse .nav > li {
+    float: none;
+  }
+  .nav-collapse .nav > li > a {
+    margin-bottom: 2px;
+  }
+  .nav-collapse .nav > .divider-vertical {
+    display: none;
+  }
+  .nav-collapse .nav .nav-header {
+    color: #777777;
+    text-shadow: none;
+  }
+  .nav-collapse .nav > li > a,
+  .nav-collapse .dropdown-menu a {
+    padding: 9px 15px;
+    font-weight: bold;
+    color: #777777;
+    -webkit-border-radius: 3px;
+       -moz-border-radius: 3px;
+            border-radius: 3px;
+  }
+  .nav-collapse .btn {
+    padding: 4px 10px 4px;
+    font-weight: normal;
+    -webkit-border-radius: 4px;
+       -moz-border-radius: 4px;
+            border-radius: 4px;
+  }
+  .nav-collapse .dropdown-menu li + li a {
+    margin-bottom: 2px;
+  }
+  .nav-collapse .nav > li > a:hover,
+  .nav-collapse .nav > li > a:focus,
+  .nav-collapse .dropdown-menu a:hover,
+  .nav-collapse .dropdown-menu a:focus {
+    background-color: #f2f2f2;
+  }
+  .navbar-inverse .nav-collapse .nav > li > a,
+  .navbar-inverse .nav-collapse .dropdown-menu a {
+    color: #999999;
+  }
+  .navbar-inverse .nav-collapse .nav > li > a:hover,
+  .navbar-inverse .nav-collapse .nav > li > a:focus,
+  .navbar-inverse .nav-collapse .dropdown-menu a:hover,
+  .navbar-inverse .nav-collapse .dropdown-menu a:focus {
+    background-color: #111111;
+  }
+  .nav-collapse.in .btn-group {
+    padding: 0;
+    margin-top: 5px;
+  }
+  .nav-collapse .dropdown-menu {
+    position: static;
+    top: auto;
+    left: auto;
+    display: none;
+    float: none;
+    max-width: none;
+    padding: 0;
+    margin: 0 15px;
+    background-color: transparent;
+    border: none;
+    -webkit-border-radius: 0;
+       -moz-border-radius: 0;
+            border-radius: 0;
+    -webkit-box-shadow: none;
+       -moz-box-shadow: none;
+            box-shadow: none;
+  }
+  .nav-collapse .open > .dropdown-menu {
+    display: block;
+  }
+  .nav-collapse .dropdown-menu:before,
+  .nav-collapse .dropdown-menu:after {
+    display: none;
+  }
+  .nav-collapse .dropdown-menu .divider {
+    display: none;
+  }
+  .nav-collapse .nav > li > .dropdown-menu:before,
+  .nav-collapse .nav > li > .dropdown-menu:after {
+    display: none;
+  }
+  .nav-collapse .navbar-form,
+  .nav-collapse .navbar-search {
+    float: none;
+    padding: 10px 15px;
+    margin: 10px 0;
+    border-top: 1px solid #f2f2f2;
+    border-bottom: 1px solid #f2f2f2;
+    -webkit-box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.1), 0 1px 0 rgba(255, 255, 255, 0.1);
+       -moz-box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.1), 0 1px 0 rgba(255, 255, 255, 0.1);
+            box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.1), 0 1px 0 rgba(255, 255, 255, 0.1);
+  }
+  .navbar-inverse .nav-collapse .navbar-form,
+  .navbar-inverse .nav-collapse .navbar-search {
+    border-top-color: #111111;
+    border-bottom-color: #111111;
+  }
+  .navbar .nav-collapse .nav.pull-right {
+    float: none;
+    margin-left: 0;
+  }
+  .nav-collapse,
+  .nav-collapse.collapse {
+    height: 0;
+    overflow: hidden;
+  }
+  .navbar .btn-navbar {
+    display: block;
+  }
+  .navbar-static .navbar-inner {
+    padding-right: 10px;
+    padding-left: 10px;
+  }
+}
+
+@media (min-width: 980px) {
+  .nav-collapse.collapse {
+    height: auto !important;
+    overflow: visible !important;
+  }
+}


Property changes on: magnoliamodules/trunk/openutils-mgnlutils/src/main/resources/mgnl-resources/bootstrap/css/bootstrap-responsive.css
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: magnoliamodules/trunk/openutils-mgnlutils/src/main/resources/mgnl-resources/bootstrap/css/bootstrap-responsive.min.css
===================================================================
--- magnoliamodules/trunk/openutils-mgnlutils/src/main/resources/mgnl-resources/bootstrap/css/bootstrap-responsive.min.css	                        (rev 0)
+++ magnoliamodules/trunk/openutils-mgnlutils/src/main/resources/mgnl-resources/bootstrap/css/bootstrap-responsive.min.css	2013-05-20 09:39:55 UTC (rev 4247)
@@ -0,0 +1,9 @@
+/*!
+ * Bootstrap Responsive v2.3.2
+ *
+ * Copyright 2012 Twitter, Inc
+ * Licensed under the Apache License v2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Designed and built with all the love in the world @twitter by @mdo and @fat.
+ */.clearfix{*zoom:1}.clearfix:before,.clearfix:after{display:table;line-height:0;content:""}.clearfix:after{clear:both}.hide-text{font:0/0 a;color:transparent;text-shadow:none;background-color:transparent;border:0}.input-block-level{display:block;width:100%;min-height:30px;-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box}@-ms-viewport{width:device-width}.hidden{display:none;visibility:hidden}.visible-phone{display:none!important}.visible-tablet{display:none!important}.hidden-desktop{display:none!important}.visible-desktop{display:inherit!important}@media(min-width:768px) and (max-width:979px){.hidden-desktop{display:inherit!important}.visible-desktop{display:none!important}.visible-tablet{display:inherit!important}.hidden-tablet{display:none!important}}@media(max-width:767px){.hidden-desktop{display:inherit!important}.visible-desktop{display:none!important}.visible-phone{display:inherit!important}.hidden-phone{display:none!important}}.visible-print{display:none!important}@media print{.visible-print{display:inherit!important}.hidden-print{display:none!important}}@media(min-width:1200px){.row{margin-left:-30px;*zoom:1}.row:before,.row:after{display:table;line-height:0;content:""}.row:after{clear:both}[class*="span"]{float:left;min-height:1px;margin-left:30px}.container,.navbar-static-top .container,.navbar-fixed-top .container,.navbar-fixed-bottom .container{width:1170px}.span12{width:1170px}.span11{width:1070px}.span10{width:970px}.span9{width:870px}.span8{width:770px}.span7{width:670px}.span6{width:570px}.span5{width:470px}.span4{width:370px}.span3{width:270px}.span2{width:170px}.span1{width:70px}.offset12{margin-left:1230px}.offset11{margin-left:1130px}.offset10{margin-left:1030px}.offset9{margin-left:930px}.offset8{margin-left:830px}.offset7{margin-left:730px}.offset6{margin-left:630px}.offset5{margin-left:530px}.offset4{margin-left:430px}.offset3{margin-left:330px}.offset2{margin-left:230px}.offset1{margin-left:130px}.row-fluid{width:100%;*zoom:1}.row-fluid:before,.row-fluid:after{display:table;line-height:0;content:""}.row-fluid:after{clear:both}.row-fluid [class*="span"]{display:block;float:left;width:100%;min-height:30px;margin-left:2.564102564102564%;*margin-left:2.5109110747408616%;-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box}.row-fluid [class*="span"]:first-child{margin-left:0}.row-fluid .controls-row [class*="span"]+[class*="span"]{margin-left:2.564102564102564%}.row-fluid .span12{width:100%;*width:99.94680851063829%}.row-fluid .span11{width:91.45299145299145%;*width:91.39979996362975%}.row-fluid .span10{width:82.90598290598291%;*width:82.8527914166212%}.row-fluid .span9{width:74.35897435897436%;*width:74.30578286961266%}.row-fluid .span8{width:65.81196581196582%;*width:65.75877432260411%}.row-fluid .span7{width:57.26495726495726%;*width:57.21176577559556%}.row-fluid .span6{width:48.717948717948715%;*width:48.664757228587014%}.row-fluid .span5{width:40.17094017094017%;*width:40.11774868157847%}.row-fluid .span4{width:31.623931623931625%;*width:31.570740134569924%}.row-fluid .span3{width:23.076923076923077%;*width:23.023731587561375%}.row-fluid .span2{width:14.52991452991453%;*width:14.476723040552828%}.row-fluid .span1{width:5.982905982905983%;*width:5.929714493544281%}.row-fluid .offset12{margin-left:105.12820512820512%;*margin-left:105.02182214948171%}.row-fluid .offset12:first-child{margin-left:102.56410256410257%;*margin-left:102.45771958537915%}.row-fluid .offset11{margin-left:96.58119658119658%;*margin-left:96.47481360247316%}.row-fluid .offset11:first-child{margin-left:94.01709401709402%;*margin-left:93.91071103837061%}.row-fluid .offset10{margin-left:88.03418803418803%;*margin-left:87.92780505546462%}.row-fluid .offset10:first-child{margin-left:85.47008547008548%;*margin-left:85.36370249136206%}.row-fluid .offset9{margin-left:79.48717948717949%;*margin-left:79.38079650845607%}.row-fluid .offset9:first-child{margin-left:76.92307692307693%;*margin-left:76.81669394435352%}.row-fluid .offset8{margin-left:70.94017094017094%;*margin-left:70.83378796144753%}.row-fluid .offset8:first-child{margin-left:68.37606837606839%;*margin-left:68.26968539734497%}.row-fluid .offset7{margin-left:62.393162393162385%;*margin-left:62.28677941443899%}.row-fluid .offset7:first-child{margin-left:59.82905982905982%;*margin-left:59.72267685033642%}.row-fluid .offset6{margin-left:53.84615384615384%;*margin-left:53.739770867430444%}.row-fluid .offset6:first-child{margin-left:51.28205128205128%;*margin-left:51.175668303327875%}.row-fluid .offset5{margin-left:45.299145299145295%;*margin-left:45.1927623204219%}.row-fluid .offset5:first-child{margin-left:42.73504273504273%;*margin-left:42.62865975631933%}.row-fluid .offset4{margin-left:36.75213675213675%;*margin-left:36.645753773413354%}.row-fluid .offset4:first-child{margin-left:34.18803418803419%;*margin-left:34.081651209310785%}.row-fluid .offset3{margin-left:28.205128205128204%;*margin-left:28.0987452264048%}.row-fluid .offset3:first-child{margin-left:25.641025641025642%;*margin-left:25.53464266230224%}.row-fluid .offset2{margin-left:19.65811965811966%;*margin-left:19.551736679396257%}.row-fluid .offset2:first-child{margin-left:17.094017094017094%;*margin-left:16.98763411529369%}.row-fluid .offset1{margin-left:11.11111111111111%;*margin-left:11.004728132387708%}.row-fluid .offset1:first-child{margin-left:8.547008547008547%;*margin-left:8.440625568285142%}input,textarea,.uneditable-input{margin-left:0}.controls-row [class*="span"]+[class*="span"]{margin-left:30px}input.span12,textarea.span12,.uneditable-input.span12{width:1156px}input.span11,textarea.span11,.uneditable-input.span11{width:1056px}input.span10,textarea.span10,.uneditable-input.span10{width:956px}input.span9,textarea.span9,.uneditable-input.span9{width:856px}input.span8,textarea.span8,.uneditable-input.span8{width:756px}input.span7,textarea.span7,.uneditable-input.span7{width:656px}input.span6,textarea.span6,.uneditable-input.span6{width:556px}input.span5,textarea.span5,.uneditable-input.span5{width:456px}input.span4,textarea.span4,.uneditable-input.span4{width:356px}input.span3,textarea.span3,.uneditable-input.span3{width:256px}input.span2,textarea.span2,.uneditable-input.span2{width:156px}input.span1,textarea.span1,.uneditable-input.span1{width:56px}.thumbnails{margin-left:-30px}.thumbnails>li{margin-left:30px}.row-fluid .thumbnails{margin-left:0}}@media(min-width:768px) and (max-width:979px){.row{margin-left:-20px;*zoom:1}.row:before,.row:after{display:table;line-height:0;content:""}.row:after{clear:both}[class*="span"]{float:left;min-height:1px;margin-left:20px}.container,.navbar-static-top .container,.navbar-fixed-top .container,.navbar-fixed-bottom .container{width:724px}.span12{width:724px}.span11{width:662px}.span10{width:600px}.span9{width:538px}.span8{width:476px}.span7{width:414px}.span6{width:352px}.span5{width:290px}.span4{width:228px}.span3{width:166px}.span2{width:104px}.span1{width:42px}.offset12{margin-left:764px}.offset11{margin-left:702px}.offset10{margin-left:640px}.offset9{margin-left:578px}.offset8{margin-left:516px}.offset7{margin-left:454px}.offset6{margin-left:392px}.offset5{margin-left:330px}.offset4{margin-left:268px}.offset3{margin-left:206px}.offset2{margin-left:144px}.offset1{margin-left:82px}.row-fluid{width:100%;*zoom:1}.row-fluid:before,.row-fluid:after{display:table;line-height:0;content:""}.row-fluid:after{clear:both}.row-fluid [class*="span"]{display:block;float:left;width:100%;min-height:30px;margin-left:2.7624309392265194%;*margin-left:2.709239449864817%;-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box}.row-fluid [class*="span"]:first-child{margin-left:0}.row-fluid .controls-row [class*="span"]+[class*="span"]{margin-left:2.7624309392265194%}.row-fluid .span12{width:100%;*width:99.94680851063829%}.row-fluid .span11{width:91.43646408839778%;*width:91.38327259903608%}.row-fluid .span10{width:82.87292817679558%;*width:82.81973668743387%}.row-fluid .span9{width:74.30939226519337%;*width:74.25620077583166%}.row-fluid .span8{width:65.74585635359117%;*width:65.69266486422946%}.row-fluid .span7{width:57.18232044198895%;*width:57.12912895262725%}.row-fluid .span6{width:48.61878453038674%;*width:48.56559304102504%}.row-fluid .span5{width:40.05524861878453%;*width:40.00205712942283%}.row-fluid .span4{width:31.491712707182323%;*width:31.43852121782062%}.row-fluid .span3{width:22.92817679558011%;*width:22.87498530621841%}.row-fluid .span2{width:14.3646408839779%;*width:14.311449394616199%}.row-fluid .span1{width:5.801104972375691%;*width:5.747913483013988%}.row-fluid .offset12{margin-left:105.52486187845304%;*margin-left:105.41847889972962%}.row-fluid .offset12:first-child{margin-left:102.76243093922652%;*margin-left:102.6560479605031%}.row-fluid .offset11{margin-left:96.96132596685082%;*margin-left:96.8549429881274%}.row-fluid .offset11:first-child{margin-left:94.1988950276243%;*margin-left:94.09251204890089%}.row-fluid .offset10{margin-left:88.39779005524862%;*margin-left:88.2914070765252%}.row-fluid .offset10:first-child{margin-left:85.6353591160221%;*margin-left:85.52897613729868%}.row-fluid .offset9{margin-left:79.8342541436464%;*margin-left:79.72787116492299%}.row-fluid .offset9:first-child{margin-left:77.07182320441989%;*margin-left:76.96544022569647%}.row-fluid .offset8{margin-left:71.2707182320442%;*margin-left:71.16433525332079%}.row-fluid .offset8:first-child{margin-left:68.50828729281768%;*margin-left:68.40190431409427%}.row-fluid .offset7{margin-left:62.70718232044199%;*margin-left:62.600799341718584%}.row-fluid .offset7:first-child{margin-left:59.94475138121547%;*margin-left:59.838368402492065%}.row-fluid .offset6{margin-left:54.14364640883978%;*margin-left:54.037263430116376%}.row-fluid .offset6:first-child{margin-left:51.38121546961326%;*margin-left:51.27483249088986%}.row-fluid .offset5{margin-left:45.58011049723757%;*margin-left:45.47372751851417%}.row-fluid .offset5:first-child{margin-left:42.81767955801105%;*margin-left:42.71129657928765%}.row-fluid .offset4{margin-left:37.01657458563536%;*margin-left:36.91019160691196%}.row-fluid .offset4:first-child{margin-left:34.25414364640884%;*margin-left:34.14776066768544%}.row-fluid .offset3{margin-left:28.45303867403315%;*margin-left:28.346655695309746%}.row-fluid .offset3:first-child{margin-left:25.69060773480663%;*margin-left:25.584224756083227%}.row-fluid .offset2{margin-left:19.88950276243094%;*margin-left:19.783119783707537%}.row-fluid .offset2:first-child{margin-left:17.12707182320442%;*margin-left:17.02068884448102%}.row-fluid .offset1{margin-left:11.32596685082873%;*margin-left:11.219583872105325%}.row-fluid .offset1:first-child{margin-left:8.56353591160221%;*margin-left:8.457152932878806%}input,textarea,.uneditable-input{margin-left:0}.controls-row [class*="span"]+[class*="span"]{margin-left:20px}input.span12,textarea.span12,.uneditable-input.span12{width:710px}input.span11,textarea.span11,.uneditable-input.span11{width:648px}input.span10,textarea.span10,.uneditable-input.span10{width:586px}input.span9,textarea.span9,.uneditable-input.span9{width:524px}input.span8,textarea.span8,.uneditable-input.span8{width:462px}input.span7,textarea.span7,.uneditable-input.span7{width:400px}input.span6,textarea.span6,.uneditable-input.span6{width:338px}input.span5,textarea.span5,.uneditable-input.span5{width:276px}input.span4,textarea.span4,.uneditable-input.span4{width:214px}input.span3,textarea.span3,.uneditable-input.span3{width:152px}input.span2,textarea.span2,.uneditable-input.span2{width:90px}input.span1,textarea.span1,.uneditable-input.span1{width:28px}}@media(max-width:767px){body{padding-right:20px;padding-left:20px}.navbar-fixed-top,.navbar-fixed-bottom,.navbar-static-top{margin-right:-20px;margin-left:-20px}.container-fluid{padding:0}.dl-horizontal dt{float:none;width:auto;clear:none;text-align:left}.dl-horizontal dd{margin-left:0}.container{width:auto}.row-fluid{width:100%}.row,.thumbnails{margin-left:0}.thumbnails>li{float:none;margin-left:0}[class*="span"],.uneditable-input[class*="span"],.row-fluid [class*="span"]{display:block;float:none;width:100%;margin-left:0;-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box}.span12,.row-fluid .span12{width:100%;-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box}.row-fluid [class*="offset"]:first-child{margin-left:0}.input-large,.input-xlarge,.input-xxlarge,input[class*="span"],select[class*="span"],textarea[class*="span"],.uneditable-input{display:block;width:100%;min-height:30px;-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box}.input-prepend input,.input-append input,.input-prepend input[class*="span"],.input-append input[class*="span"]{display:inline-block;width:auto}.controls-row [class*="span"]+[class*="span"]{margin-left:0}.modal{position:fixed;top:20px;right:20px;left:20px;width:auto;margin:0}.modal.fade{top:-100px}.modal.fade.in{top:20px}}@media(max-width:480px){.nav-collapse{-webkit-transform:translate3d(0,0,0)}.page-header h1 small{display:block;line-height:20px}input[type="checkbox"],input[type="radio"]{border:1px solid #ccc}.form-horizontal .control-label{float:none;width:auto;padding-top:0;text-align:left}.form-horizontal .controls{margin-left:0}.form-horizontal .control-list{padding-top:0}.form-horizontal .form-actions{padding-right:10px;padding-left:10px}.media .pull-left,.media .pull-right{display:block;float:none;margin-bottom:10px}.media-object{margin-right:0;margin-left:0}.modal{top:10px;right:10px;left:10px}.modal-header .close{padding:10px;margin:-10px}.carousel-caption{position:static}}@media(max-width:979px){body{padding-top:0}.navbar-fixed-top,.navbar-fixed-bottom{position:static}.navbar-fixed-top{margin-bottom:20px}.navbar-fixed-bottom{margin-top:20px}.navbar-fixed-top .navbar-inner,.navbar-fixed-bottom .navbar-inner{padding:5px}.navbar .container{width:auto;padding:0}.navbar .brand{padding-right:10px;padding-left:10px;margin:0 0 0 -5px}.nav-collapse{clear:both}.nav-collapse .nav{float:none;margin:0 0 10px}.nav-collapse .nav>li{float:none}.nav-collapse .nav>li>a{margin-bottom:2px}.nav-collapse .nav>.divider-vertical{display:none}.nav-collapse .nav .nav-header{color:#777;text-shadow:none}.nav-collapse .nav>li>a,.nav-collapse .dropdown-menu a{padding:9px 15px;font-weight:bold;color:#777;-webkit-border-radius:3px;-moz-border-radius:3px;border-radius:3px}.nav-collapse .btn{padding:4px 10px 4px;font-weight:normal;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px}.nav-collapse .dropdown-menu li+li a{margin-bottom:2px}.nav-collapse .nav>li>a:hover,.nav-collapse .nav>li>a:focus,.nav-collapse .dropdown-menu a:hover,.nav-collapse .dropdown-menu a:focus{background-color:#f2f2f2}.navbar-inverse .nav-collapse .nav>li>a,.navbar-inverse .nav-collapse .dropdown-menu a{color:#999}.navbar-inverse .nav-collapse .nav>li>a:hover,.navbar-inverse .nav-collapse .nav>li>a:focus,.navbar-inverse .nav-collapse .dropdown-menu a:hover,.navbar-inverse .nav-collapse .dropdown-menu a:focus{background-color:#111}.nav-collapse.in .btn-group{padding:0;margin-top:5px}.nav-collapse .dropdown-menu{position:static;top:auto;left:auto;display:none;float:none;max-width:none;padding:0;margin:0 15px;background-color:transparent;border:0;-webkit-border-radius:0;-moz-border-radius:0;border-radius:0;-webkit-box-shadow:none;-moz-box-shadow:none;box-shadow:none}.nav-collapse .open>.dropdown-menu{display:block}.nav-collapse .dropdown-menu:before,.nav-collapse .dropdown-menu:after{display:none}.nav-collapse .dropdown-menu .divider{display:none}.nav-collapse .nav>li>.dropdown-menu:before,.nav-collapse .nav>li>.dropdown-menu:after{display:none}.nav-collapse .navbar-form,.nav-collapse .navbar-search{float:none;padding:10px 15px;margin:10px 0;border-top:1px solid #f2f2f2;border-bottom:1px solid #f2f2f2;-webkit-box-shadow:inset 0 1px 0 rgba(255,255,255,0.1),0 1px 0 rgba(255,255,255,0.1);-moz-box-shadow:inset 0 1px 0 rgba(255,255,255,0.1),0 1px 0 rgba(255,255,255,0.1);box-shadow:inset 0 1px 0 rgba(255,255,255,0.1),0 1px 0 rgba(255,255,255,0.1)}.navbar-inverse .nav-collapse .navbar-form,.navbar-inverse .nav-collapse .navbar-search{border-top-color:#111;border-bottom-color:#111}.navbar .nav-collapse .nav.pull-right{float:none;margin-left:0}.nav-collapse,.nav-collapse.collapse{height:0;overflow:hidden}.navbar .btn-navbar{display:block}.navbar-static .navbar-inner{padding-right:10px;padding-left:10px}}@media(min-width:980px){.nav-collapse.collapse{height:auto!important;overflow:visible!important}}


Property changes on: magnoliamodules/trunk/openutils-mgnlutils/src/main/resources/mgnl-resources/bootstrap/css/bootstrap-responsive.min.css
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: magnoliamodules/trunk/openutils-mgnlutils/src/main/resources/mgnl-resources/bootstrap/css/bootstrap.css
===================================================================
--- magnoliamodules/trunk/openutils-mgnlutils/src/main/resources/mgnl-resources/bootstrap/css/bootstrap.css	                        (rev 0)
+++ magnoliamodules/trunk/openutils-mgnlutils/src/main/resources/mgnl-resources/bootstrap/css/bootstrap.css	2013-05-20 09:39:55 UTC (rev 4247)
@@ -0,0 +1,6167 @@
+/*!
+ * Bootstrap v2.3.2
+ *
+ * Copyright 2012 Twitter, Inc
+ * Licensed under the Apache License v2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Designed and built with all the love in the world @twitter by @mdo and @fat.
+ */
+
+.clearfix {
+  *zoom: 1;
+}
+
+.clearfix:before,
+.clearfix:after {
+  display: table;
+  line-height: 0;
+  content: "";
+}
+
+.clearfix:after {
+  clear: both;
+}
+
+.hide-text {
+  font: 0/0 a;
+  color: transparent;
+  text-shadow: none;
+  background-color: transparent;
+  border: 0;
+}
+
+.input-block-level {
+  display: block;
+  width: 100%;
+  min-height: 30px;
+  -webkit-box-sizing: border-box;
+     -moz-box-sizing: border-box;
+          box-sizing: border-box;
+}
+
+article,
+aside,
+details,
+figcaption,
+figure,
+footer,
+header,
+hgroup,
+nav,
+section {
+  display: block;
+}
+
+audio,
+canvas,
+video {
+  display: inline-block;
+  *display: inline;
+  *zoom: 1;
+}
+
+audio:not([controls]) {
+  display: none;
+}
+
+html {
+  font-size: 100%;
+  -webkit-text-size-adjust: 100%;
+      -ms-text-size-adjust: 100%;
+}
+
+a:focus {
+  outline: thin dotted #333;
+  outline: 5px auto -webkit-focus-ring-color;
+  outline-offset: -2px;
+}
+
+a:hover,
+a:active {
+  outline: 0;
+}
+
+sub,
+sup {
+  position: relative;
+  font-size: 75%;
+  line-height: 0;
+  vertical-align: baseline;
+}
+
+sup {
+  top: -0.5em;
+}
+
+sub {
+  bottom: -0.25em;
+}
+
+img {
+  width: auto\9;
+  height: auto;
+  max-width: 100%;
+  vertical-align: middle;
+  border: 0;
+  -ms-interpolation-mode: bicubic;
+}
+
+#map_canvas img,
+.google-maps img {
+  max-width: none;
+}
+
+button,
+input,
+select,
+textarea {
+  margin: 0;
+  font-size: 100%;
+  vertical-align: middle;
+}
+
+button,
+input {
+  *overflow: visible;
+  line-height: normal;
+}
+
+button::-moz-focus-inner,
+input::-moz-focus-inner {
+  padding: 0;
+  border: 0;
+}
+
+button,
+html input[type="button"],
+input[type="reset"],
+input[type="submit"] {
+  cursor: pointer;
+  -webkit-appearance: button;
+}
+
+label,
+select,
+button,
+input[type="button"],
+input[type="reset"],
+input[type="submit"],
+input[type="radio"],
+input[type="checkbox"] {
+  cursor: pointer;
+}
+
+input[type="search"] {
+  -webkit-box-sizing: content-box;
+     -moz-box-sizing: content-box;
+          box-sizing: content-box;
+  -webkit-appearance: textfield;
+}
+
+input[type="search"]::-webkit-search-decoration,
+input[type="search"]::-webkit-search-cancel-button {
+  -webkit-appearance: none;
+}
+
+textarea {
+  overflow: auto;
+  vertical-align: top;
+}
+
+@media print {
+  * {
+    color: #000 !important;
+    text-shadow: none !important;
+    background: transparent !important;
+    box-shadow: none !important;
+  }
+  a,
+  a:visited {
+    text-decoration: underline;
+  }
+  a[href]:after {
+    content: " (" attr(href) ")";
+  }
+  abbr[title]:after {
+    content: " (" attr(title) ")";
+  }
+  .ir a:after,
+  a[href^="javascript:"]:after,
+  a[href^="#"]:after {
+    content: "";
+  }
+  pre,
+  blockquote {
+    border: 1px solid #999;
+    page-break-inside: avoid;
+  }
+  thead {
+    display: table-header-group;
+  }
+  tr,
+  img {
+    page-break-inside: avoid;
+  }
+  img {
+    max-width: 100% !important;
+  }
+  @page  {
+    margin: 0.5cm;
+  }
+  p,
+  h2,
+  h3 {
+    orphans: 3;
+    widows: 3;
+  }
+  h2,
+  h3 {
+    page-break-after: avoid;
+  }
+}
+
+body {
+  margin: 0;
+  font-family: "Helvetica Neue", Helvetica, Arial, sans-serif;
+  font-size: 14px;
+  line-height: 20px;
+  color: #333333;
+  background-color: #ffffff;
+}
+
+a {
+  color: #0088cc;
+  text-decoration: none;
+}
+
+a:hover,
+a:focus {
+  color: #005580;
+  text-decoration: underline;
+}
+
+.img-rounded {
+  -webkit-border-radius: 6px;
+     -moz-border-radius: 6px;
+          border-radius: 6px;
+}
+
+.img-polaroid {
+  padding: 4px;
+  background-color: #fff;
+  border: 1px solid #ccc;
+  border: 1px solid rgba(0, 0, 0, 0.2);
+  -webkit-box-shadow: 0 1px 3px rgba(0, 0, 0, 0.1);
+     -moz-box-shadow: 0 1px 3px rgba(0, 0, 0, 0.1);
+          box-shadow: 0 1px 3px rgba(0, 0, 0, 0.1);
+}
+
+.img-circle {
+  -webkit-border-radius: 500px;
+     -moz-border-radius: 500px;
+          border-radius: 500px;
+}
+
+.row {
+  margin-left: -20px;
+  *zoom: 1;
+}
+
+.row:before,
+.row:after {
+  display: table;
+  line-height: 0;
+  content: "";
+}
+
+.row:after {
+  clear: both;
+}
+
+[class*="span"] {
+  float: left;
+  min-height: 1px;
+  margin-left: 20px;
+}
+
+.container,
+.navbar-static-top .container,
+.navbar-fixed-top .container,
+.navbar-fixed-bottom .container {
+  width: 940px;
+}
+
+.span12 {
+  width: 940px;
+}
+
+.span11 {
+  width: 860px;
+}
+
+.span10 {
+  width: 780px;
+}
+
+.span9 {
+  width: 700px;
+}
+
+.span8 {
+  width: 620px;
+}
+
+.span7 {
+  width: 540px;
+}
+
+.span6 {
+  width: 460px;
+}
+
+.span5 {
+  width: 380px;
+}
+
+.span4 {
+  width: 300px;
+}
+
+.span3 {
+  width: 220px;
+}
+
+.span2 {
+  width: 140px;
+}
+
+.span1 {
+  width: 60px;
+}
+
+.offset12 {
+  margin-left: 980px;
+}
+
+.offset11 {
+  margin-left: 900px;
+}
+
+.offset10 {
+  margin-left: 820px;
+}
+
+.offset9 {
+  margin-left: 740px;
+}
+
+.offset8 {
+  margin-left: 660px;
+}
+
+.offset7 {
+  margin-left: 580px;
+}
+
+.offset6 {
+  margin-left: 500px;
+}
+
+.offset5 {
+  margin-left: 420px;
+}
+
+.offset4 {
+  margin-left: 340px;
+}
+
+.offset3 {
+  margin-left: 260px;
+}
+
+.offset2 {
+  margin-left: 180px;
+}
+
+.offset1 {
+  margin-left: 100px;
+}
+
+.row-fluid {
+  width: 100%;
+  *zoom: 1;
+}
+
+.row-fluid:before,
+.row-fluid:after {
+  display: table;
+  line-height: 0;
+  content: "";
+}
+
+.row-fluid:after {
+  clear: both;
+}
+
+.row-fluid [class*="span"] {
+  display: block;
+  float: left;
+  width: 100%;
+  min-height: 30px;
+  margin-left: 2.127659574468085%;
+  *margin-left: 2.074468085106383%;
+  -webkit-box-sizing: border-box;
+     -moz-box-sizing: border-box;
+          box-sizing: border-box;
+}
+
+.row-fluid [class*="span"]:first-child {
+  margin-left: 0;
+}
+
+.row-fluid .controls-row [class*="span"] + [class*="span"] {
+  margin-left: 2.127659574468085%;
+}
+
+.row-fluid .span12 {
+  width: 100%;
+  *width: 99.94680851063829%;
+}
+
+.row-fluid .span11 {
+  width: 91.48936170212765%;
+  *width: 91.43617021276594%;
+}
+
+.row-fluid .span10 {
+  width: 82.97872340425532%;
+  *width: 82.92553191489361%;
+}
+
+.row-fluid .span9 {
+  width: 74.46808510638297%;
+  *width: 74.41489361702126%;
+}
+
+.row-fluid .span8 {
+  width: 65.95744680851064%;
+  *width: 65.90425531914893%;
+}
+
+.row-fluid .span7 {
+  width: 57.44680851063829%;
+  *width: 57.39361702127659%;
+}
+
+.row-fluid .span6 {
+  width: 48.93617021276595%;
+  *width: 48.88297872340425%;
+}
+
+.row-fluid .span5 {
+  width: 40.42553191489362%;
+  *width: 40.37234042553192%;
+}
+
+.row-fluid .span4 {
+  width: 31.914893617021278%;
+  *width: 31.861702127659576%;
+}
+
+.row-fluid .span3 {
+  width: 23.404255319148934%;
+  *width: 23.351063829787233%;
+}
+
+.row-fluid .span2 {
+  width: 14.893617021276595%;
+  *width: 14.840425531914894%;
+}
+
+.row-fluid .span1 {
+  width: 6.382978723404255%;
+  *width: 6.329787234042553%;
+}
+
+.row-fluid .offset12 {
+  margin-left: 104.25531914893617%;
+  *margin-left: 104.14893617021275%;
+}
+
+.row-fluid .offset12:first-child {
+  margin-left: 102.12765957446808%;
+  *margin-left: 102.02127659574467%;
+}
+
+.row-fluid .offset11 {
+  margin-left: 95.74468085106382%;
+  *margin-left: 95.6382978723404%;
+}
+
+.row-fluid .offset11:first-child {
+  margin-left: 93.61702127659574%;
+  *margin-left: 93.51063829787232%;
+}
+
+.row-fluid .offset10 {
+  margin-left: 87.23404255319149%;
+  *margin-left: 87.12765957446807%;
+}
+
+.row-fluid .offset10:first-child {
+  margin-left: 85.1063829787234%;
+  *margin-left: 84.99999999999999%;
+}
+
+.row-fluid .offset9 {
+  margin-left: 78.72340425531914%;
+  *margin-left: 78.61702127659572%;
+}
+
+.row-fluid .offset9:first-child {
+  margin-left: 76.59574468085106%;
+  *margin-left: 76.48936170212764%;
+}
+
+.row-fluid .offset8 {
+  margin-left: 70.2127659574468%;
+  *margin-left: 70.10638297872339%;
+}
+
+.row-fluid .offset8:first-child {
+  margin-left: 68.08510638297872%;
+  *margin-left: 67.9787234042553%;
+}
+
+.row-fluid .offset7 {
+  margin-left: 61.70212765957446%;
+  *margin-left: 61.59574468085106%;
+}
+
+.row-fluid .offset7:first-child {
+  margin-left: 59.574468085106375%;
+  *margin-left: 59.46808510638297%;
+}
+
+.row-fluid .offset6 {
+  margin-left: 53.191489361702125%;
+  *margin-left: 53.085106382978715%;
+}
+
+.row-fluid .offset6:first-child {
+  margin-left: 51.063829787234035%;
+  *margin-left: 50.95744680851063%;
+}
+
+.row-fluid .offset5 {
+  margin-left: 44.68085106382979%;
+  *margin-left: 44.57446808510638%;
+}
+
+.row-fluid .offset5:first-child {
+  margin-left: 42.5531914893617%;
+  *margin-left: 42.4468085106383%;
+}
+
+.row-fluid .offset4 {
+  margin-left: 36.170212765957444%;
+  *margin-left: 36.06382978723405%;
+}
+
+.row-fluid .offset4:first-child {
+  margin-left: 34.04255319148936%;
+  *margin-left: 33.93617021276596%;
+}
+
+.row-fluid .offset3 {
+  margin-left: 27.659574468085104%;
+  *margin-left: 27.5531914893617%;
+}
+
+.row-fluid .offset3:first-child {
+  margin-left: 25.53191489361702%;
+  *margin-left: 25.425531914893618%;
+}
+
+.row-fluid .offset2 {
+  margin-left: 19.148936170212764%;
+  *margin-left: 19.04255319148936%;
+}
+
+.row-fluid .offset2:first-child {
+  margin-left: 17.02127659574468%;
+  *margin-left: 16.914893617021278%;
+}
+
+.row-fluid .offset1 {
+  margin-left: 10.638297872340425%;
+  *margin-left: 10.53191489361702%;
+}
+
+.row-fluid .offset1:first-child {
+  margin-left: 8.51063829787234%;
+  *margin-left: 8.404255319148938%;
+}
+
+[class*="span"].hide,
+.row-fluid [class*="span"].hide {
+  display: none;
+}
+
+[class*="span"].pull-right,
+.row-fluid [class*="span"].pull-right {
+  float: right;
+}
+
+.container {
+  margin-right: auto;
+  margin-left: auto;
+  *zoom: 1;
+}
+
+.container:before,
+.container:after {
+  display: table;
+  line-height: 0;
+  content: "";
+}
+
+.container:after {
+  clear: both;
+}
+
+.container-fluid {
+  padding-right: 20px;
+  padding-left: 20px;
+  *zoom: 1;
+}
+
+.container-fluid:before,
+.container-fluid:after {
+  display: table;
+  line-height: 0;
+  content: "";
+}
+
+.container-fluid:after {
+  clear: both;
+}
+
+p {
+  margin: 0 0 10px;
+}
+
+.lead {
+  margin-bottom: 20px;
+  font-size: 21px;
+  font-weight: 200;
+  line-height: 30px;
+}
+
+small {
+  font-size: 85%;
+}
+
+strong {
+  font-weight: bold;
+}
+
+em {
+  font-style: italic;
+}
+
+cite {
+  font-style: normal;
+}
+
+.muted {
+  color: #999999;
+}
+
+a.muted:hover,
+a.muted:focus {
+  color: #808080;
+}
+
+.text-warning {
+  color: #c09853;
+}
+
+a.text-warning:hover,
+a.text-warning:focus {
+  color: #a47e3c;
+}
+
+.text-error {
+  color: #b94a48;
+}
+
+a.text-error:hover,
+a.text-error:focus {
+  color: #953b39;
+}
+
+.text-info {
+  color: #3a87ad;
+}
+
+a.text-info:hover,
+a.text-info:focus {
+  color: #2d6987;
+}
+
+.text-success {
+  color: #468847;
+}
+
+a.text-success:hover,
+a.text-success:focus {
+  color: #356635;
+}
+
+.text-left {
+  text-align: left;
+}
+
+.text-right {
+  text-align: right;
+}
+
+.text-center {
+  text-align: center;
+}
+
+h1,
+h2,
+h3,
+h4,
+h5,
+h6 {
+  margin: 10px 0;
+  font-family: inherit;
+  font-weight: bold;
+  line-height: 20px;
+  color: inherit;
+  text-rendering: optimizelegibility;
+}
+
+h1 small,
+h2 small,
+h3 small,
+h4 small,
+h5 small,
+h6 small {
+  font-weight: normal;
+  line-height: 1;
+  color: #999999;
+}
+
+h1,
+h2,
+h3 {
+  line-height: 40px;
+}
+
+h1 {
+  font-size: 38.5px;
+}
+
+h2 {
+  font-size: 31.5px;
+}
+
+h3 {
+  font-size: 24.5px;
+}
+
+h4 {
+  font-size: 17.5px;
+}
+
+h5 {
+  font-size: 14px;
+}
+
+h6 {
+  font-size: 11.9px;
+}
+
+h1 small {
+  font-size: 24.5px;
+}
+
+h2 small {
+  font-size: 17.5px;
+}
+
+h3 small {
+  font-size: 14px;
+}
+
+h4 small {
+  font-size: 14px;
+}
+
+.page-header {
+  padding-bottom: 9px;
+  margin: 20px 0 30px;
+  border-bottom: 1px solid #eeeeee;
+}
+
+ul,
+ol {
+  padding: 0;
+  margin: 0 0 10px 25px;
+}
+
+ul ul,
+ul ol,
+ol ol,
+ol ul {
+  margin-bottom: 0;
+}
+
+li {
+  line-height: 20px;
+}
+
+ul.unstyled,
+ol.unstyled {
+  margin-left: 0;
+  list-style: none;
+}
+
+ul.inline,
+ol.inline {
+  margin-left: 0;
+  list-style: none;
+}
+
+ul.inline > li,
+ol.inline > li {
+  display: inline-block;
+  *display: inline;
+  padding-right: 5px;
+  padding-left: 5px;
+  *zoom: 1;
+}
+
+dl {
+  margin-bottom: 20px;
+}
+
+dt,
+dd {
+  line-height: 20px;
+}
+
+dt {
+  font-weight: bold;
+}
+
+dd {
+  margin-left: 10px;
+}
+
+.dl-horizontal {
+  *zoom: 1;
+}
+
+.dl-horizontal:before,
+.dl-horizontal:after {
+  display: table;
+  line-height: 0;
+  content: "";
+}
+
+.dl-horizontal:after {
+  clear: both;
+}
+
+.dl-horizontal dt {
+  float: left;
+  width: 160px;
+  overflow: hidden;
+  clear: left;
+  text-align: right;
+  text-overflow: ellipsis;
+  white-space: nowrap;
+}
+
+.dl-horizontal dd {
+  margin-left: 180px;
+}
+
+hr {
+  margin: 20px 0;
+  border: 0;
+  border-top: 1px solid #eeeeee;
+  border-bottom: 1px solid #ffffff;
+}
+
+abbr[title],
+abbr[data-original-title] {
+  cursor: help;
+  border-bottom: 1px dotted #999999;
+}
+
+abbr.initialism {
+  font-size: 90%;
+  text-transform: uppercase;
+}
+
+blockquote {
+  padding: 0 0 0 15px;
+  margin: 0 0 20px;
+  border-left: 5px solid #eeeeee;
+}
+
+blockquote p {
+  margin-bottom: 0;
+  font-size: 17.5px;
+  font-weight: 300;
+  line-height: 1.25;
+}
+
+blockquote small {
+  display: block;
+  line-height: 20px;
+  color: #999999;
+}
+
+blockquote small:before {
+  content: '\2014 \00A0';
+}
+
+blockquote.pull-right {
+  float: right;
+  padding-right: 15px;
+  padding-left: 0;
+  border-right: 5px solid #eeeeee;
+  border-left: 0;
+}
+
+blockquote.pull-right p,
+blockquote.pull-right small {
+  text-align: right;
+}
+
+blockquote.pull-right small:before {
+  content: '';
+}
+
+blockquote.pull-right small:after {
+  content: '\00A0 \2014';
+}
+
+q:before,
+q:after,
+blockquote:before,
+blockquote:after {
+  content: "";
+}
+
+address {
+  display: block;
+  margin-bottom: 20px;
+  font-style: normal;
+  line-height: 20px;
+}
+
+code,
+pre {
+  padding: 0 3px 2px;
+  font-family: Monaco, Menlo, Consolas, "Courier New", monospace;
+  font-size: 12px;
+  color: #333333;
+  -webkit-border-radius: 3px;
+     -moz-border-radius: 3px;
+          border-radius: 3px;
+}
+
+code {
+  padding: 2px 4px;
+  color: #d14;
+  white-space: nowrap;
+  background-color: #f7f7f9;
+  border: 1px solid #e1e1e8;
+}
+
+pre {
+  display: block;
+  padding: 9.5px;
+  margin: 0 0 10px;
+  font-size: 13px;
+  line-height: 20px;
+  word-break: break-all;
+  word-wrap: break-word;
+  white-space: pre;
+  white-space: pre-wrap;
+  background-color: #f5f5f5;
+  border: 1px solid #ccc;
+  border: 1px solid rgba(0, 0, 0, 0.15);
+  -webkit-border-radius: 4px;
+     -moz-border-radius: 4px;
+          border-radius: 4px;
+}
+
+pre.prettyprint {
+  margin-bottom: 20px;
+}
+
+pre code {
+  padding: 0;
+  color: inherit;
+  white-space: pre;
+  white-space: pre-wrap;
+  background-color: transparent;
+  border: 0;
+}
+
+.pre-scrollable {
+  max-height: 340px;
+  overflow-y: scroll;
+}
+
+form {
+  margin: 0 0 20px;
+}
+
+fieldset {
+  padding: 0;
+  margin: 0;
+  border: 0;
+}
+
+legend {
+  display: block;
+  width: 100%;
+  padding: 0;
+  margin-bottom: 20px;
+  font-size: 21px;
+  line-height: 40px;
+  color: #333333;
+  border: 0;
+  border-bottom: 1px solid #e5e5e5;
+}
+
+legend small {
+  font-size: 15px;
+  color: #999999;
+}
+
+label,
+input,
+button,
+select,
+textarea {
+  font-size: 14px;
+  font-weight: normal;
+  line-height: 20px;
+}
+
+input,
+button,
+select,
+textarea {
+  font-family: "Helvetica Neue", Helvetica, Arial, sans-serif;
+}
+
+label {
+  display: block;
+  margin-bottom: 5px;
+}
+
+select,
+textarea,
+input[type="text"],
+input[type="password"],
+input[type="datetime"],
+input[type="datetime-local"],
+input[type="date"],
+input[type="month"],
+input[type="time"],
+input[type="week"],
+input[type="number"],
+input[type="email"],
+input[type="url"],
+input[type="search"],
+input[type="tel"],
+input[type="color"],
+.uneditable-input {
+  display: inline-block;
+  height: 20px;
+  padding: 4px 6px;
+  margin-bottom: 10px;
+  font-size: 14px;
+  line-height: 20px;
+  color: #555555;
+  vertical-align: middle;
+  -webkit-border-radius: 4px;
+     -moz-border-radius: 4px;
+          border-radius: 4px;
+}
+
+input,
+textarea,
+.uneditable-input {
+  width: 206px;
+}
+
+textarea {
+  height: auto;
+}
+
+textarea,
+input[type="text"],
+input[type="password"],
+input[type...
 
[truncated message content]

[Openutils-svn] SF.net SVN: openutils:[4246] magnoliamodules/trunk/openutils-mgnllms/src/ main/resources/META-INF/magnolia/mgnllms.xml

From: <fg...@us...> - 2013-05-20 09:38:58

Revision: 4246
          http://openutils.svn.sourceforge.net/openutils/?rev=4246&view=rev
Author:   fgiust
Date:     2013-05-20 09:38:56 +0000 (Mon, 20 May 2013)
Log Message:
-----------
add missing component definitions

Modified Paths:
--------------
    magnoliamodules/trunk/openutils-mgnllms/src/main/resources/META-INF/magnolia/mgnllms.xml

Modified: magnoliamodules/trunk/openutils-mgnllms/src/main/resources/META-INF/magnolia/mgnllms.xml
===================================================================
(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:[4245] magnoliamodules/trunk/openutils-mgnlmedia/src/ main/java/net/sourceforge/openutils/mgnlmedia/playlist

From: <fg...@us...> - 2013-05-19 17:38:22

Revision: 4245
          http://openutils.svn.sourceforge.net/openutils/?rev=4245&view=rev
Author:   fgiust
Date:     2013-05-19 17:38:18 +0000 (Sun, 19 May 2013)
Log Message:
-----------
compiling

Modified Paths:
--------------
    magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/playlist/pages/PlaylistView.java
    magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/playlist/utils/PlaylistIterateUtils.java

Modified: magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/playlist/pages/PlaylistView.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/playlist/pages/PlaylistView.java	2013-05-19 17:34:46 UTC (rev 4244)
+++ magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/playlist/pages/PlaylistView.java	2013-05-19 17:38:18 UTC (rev 4245)
@@ -40,6 +40,7 @@
 import java.util.Map;
 import java.util.Map.Entry;
 
+import javax.jcr.Node;
 import javax.jcr.RepositoryException;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
@@ -194,7 +195,7 @@
                     .hasNext();)
                 {
                     MediaNodeAndEntryPath item = iterator.next();
-                    AdvancedResultItem media = item.getMediaNode();
+                    Node media = item.getMediaNode();
                     if (media == null)
                     {
                         continue;
@@ -203,7 +204,7 @@
                     PlaylistEntryBean entry = new PlaylistEntryBean();
                     entry.setHandle(item.getPlaylistEntryPath());
                     entry.setMedia(NodeUtil.getNodeIdentifierIfPossible(media));
-                    entry.setMediaHandle(media.getHandle());
+                    entry.setMediaHandle(NodeUtil.getPathIfPossible(media));
                     MediaTypeConfiguration typeConf = MediaConfigurationManager
                         .getInstance()
                         .getMediaTypeConfigurationFromMedia(media);

Modified: magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/playlist/utils/PlaylistIterateUtils.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/playlist/utils/PlaylistIterateUtils.java	2013-05-19 17:34:46 UTC (rev 4244)
+++ magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/playlist/utils/PlaylistIterateUtils.java	2013-05-19 17:38:18 UTC (rev 4245)
@@ -148,13 +148,13 @@
                 // playlistNode.getChildren(PlaylistConstants.PLAYLIST_ENTRY).iterator(),
                 Iterable<Node> nodes = NodeUtil.getNodes(playlistNode, PlaylistConstants.MGNL_PLAYLIST_ENTRY_TYPE);
 
-                return Iterators.transform(nodes.iterator(), new Function<AdvancedResultItem, MediaNodeAndEntryPath>()
+                return Iterators.transform(nodes.iterator(), new Function<Node, MediaNodeAndEntryPath>()
                 {
 
                     /**
                      * {@inheritDoc}
                      */
-                    public MediaNodeAndEntryPath apply(AdvancedResultItem playlistEntry)
+                    public MediaNodeAndEntryPath apply(Node playlistEntry)
                     {
                         String mediaUUID = PropertyUtil.getString(playlistEntry, "media");
                         Content mediaNode = MediaEl.node(mediaUUID);
@@ -162,10 +162,14 @@
                         {
                             log.warn(
                                 "Node {} referenced by entry {} of playlist {} does not exist in media repository",
-                                new Object[]{mediaUUID, playlistEntry.getName(), playlistNode.getPath() });
+                                new Object[]{
+                                    mediaUUID,
+                                    NodeUtil.getName(playlistEntry),
+                                    NodeUtil.getPathIfPossible(playlistNode) });
                         }
 
-                        return new MediaNodeAndEntryPath(mediaNode.getJCRNode(), playlistEntry.getPath());
+                        return new MediaNodeAndEntryPath(mediaNode.getJCRNode(), NodeUtil
+                            .getPathIfPossible(playlistEntry));
                     }
                 });
             }

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

[Openutils-svn] SF.net SVN: openutils:[4244] magnoliamodules/trunk/openutils-mgnlmedia/src/ main/java/net/sourceforge/openutils/mgnlmedia/playlist

From: <fg...@us...> - 2013-05-19 17:34:49

Revision: 4244
          http://openutils.svn.sourceforge.net/openutils/?rev=4244&view=rev
Author:   fgiust
Date:     2013-05-19 17:34:46 +0000 (Sun, 19 May 2013)
Log Message:
-----------
upgrade old code

Modified Paths:
--------------
    magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/playlist/PlaylistConstants.java
    magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/playlist/utils/PlaylistIterateUtils.java

Modified: magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/playlist/PlaylistConstants.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/playlist/PlaylistConstants.java	2013-05-19 17:13:29 UTC (rev 4243)
+++ magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/playlist/PlaylistConstants.java	2013-05-19 17:34:46 UTC (rev 4244)
@@ -33,9 +33,9 @@
      */
     public static final String REPO = "playlists";
 
-    private static final String MGNL_PLAYLIST_TYPE = "mgnl:playlist";
+    public static final String MGNL_PLAYLIST_TYPE = "mgnl:playlist";
 
-    private static final String MGNL_PLAYLIST_ENTRY_TYPE = "mgnl:playlistentry";
+    public static final String MGNL_PLAYLIST_ENTRY_TYPE = "mgnl:playlistentry";
 
     /**
      * Folder type

Modified: magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/playlist/utils/PlaylistIterateUtils.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/playlist/utils/PlaylistIterateUtils.java	2013-05-19 17:13:29 UTC (rev 4243)
+++ magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/playlist/utils/PlaylistIterateUtils.java	2013-05-19 17:34:46 UTC (rev 4244)
@@ -21,9 +21,12 @@
 
 import info.magnolia.cms.core.Content;
 import info.magnolia.cms.core.ItemType;
+import info.magnolia.cms.core.MgnlNodeType;
 import info.magnolia.cms.util.NodeDataUtil;
 import info.magnolia.context.MgnlContext;
+import info.magnolia.jcr.predicate.AbstractPredicate;
 import info.magnolia.jcr.util.ContentMap;
+import info.magnolia.jcr.util.NodeUtil;
 import info.magnolia.jcr.util.PropertyUtil;
 
 import java.lang.reflect.Array;
@@ -48,6 +51,7 @@
 import net.sourceforge.openutils.mgnlmedia.playlist.PlaylistConstants;
 
 import org.apache.commons.collections.IteratorUtils;
+import org.apache.commons.lang.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -67,9 +71,6 @@
      */
     private static Logger log = LoggerFactory.getLogger(PlaylistIterateUtils.class);
 
-    /**
-     * 
-     */
     private PlaylistIterateUtils()
     {
     }
@@ -91,12 +92,14 @@
             if (playlistNode.hasNode("search"))
             {
                 Node searchNode = playlistNode.getNode("search");
-                Collection<Content> paramNodes = searchNode.getChildren(ItemType.CONTENTNODE);
+
+                Iterable<Node> nodes = NodeUtil.getNodes(searchNode, MgnlNodeType.NT_CONTENTNODE);
+
                 final Map<String, Object> map = new HashMap<String, Object>();
-                for (Content paramNode : paramNodes)
+                for (Node node : nodes)
                 {
-                    String paramName = NodeDataUtil.getString(paramNode, "name");
-                    Value[] jcrValues = paramNode.getNodeData("value").getValues();
+                    String paramName = PropertyUtil.getString(node, "name");
+                    Value[] jcrValues = node.getProperty("value").getValues();
                     String[] paramValues = new String[jcrValues.length];
                     for (int i = 0; i < jcrValues.length; i++)
                     {
@@ -141,28 +144,30 @@
             }
             else
             {
-                return Iterators.transform(
-                    playlistNode.getChildren(PlaylistConstants.PLAYLIST_ENTRY).iterator(),
-                    new Function<AdvancedResultItem, MediaNodeAndEntryPath>()
+
+                // playlistNode.getChildren(PlaylistConstants.PLAYLIST_ENTRY).iterator(),
+                Iterable<Node> nodes = NodeUtil.getNodes(playlistNode, PlaylistConstants.MGNL_PLAYLIST_ENTRY_TYPE);
+
+                return Iterators.transform(nodes.iterator(), new Function<AdvancedResultItem, MediaNodeAndEntryPath>()
+                {
+
+                    /**
+                     * {@inheritDoc}
+                     */
+                    public MediaNodeAndEntryPath apply(AdvancedResultItem playlistEntry)
                     {
-
-                        /**
-                         * {@inheritDoc}
-                         */
-                        public MediaNodeAndEntryPath apply(AdvancedResultItem playlistEntry)
+                        String mediaUUID = PropertyUtil.getString(playlistEntry, "media");
+                        Content mediaNode = MediaEl.node(mediaUUID);
+                        if (mediaNode == null)
                         {
-                            String mediaUUID = PropertyUtil.getString(playlistEntry, "media");
-                            Content mediaNode = MediaEl.node(mediaUUID);
-                            if (mediaNode == null)
-                            {
-                                log.warn(
-                                    "Node {} referenced by entry {} of playlist {} does not exist in media repository",
-                                    new Object[]{mediaUUID, playlistEntry.getName(), playlistNode.getPath() });
-                            }
+                            log.warn(
+                                "Node {} referenced by entry {} of playlist {} does not exist in media repository",
+                                new Object[]{mediaUUID, playlistEntry.getName(), playlistNode.getPath() });
+                        }
 
-                            return new MediaNodeAndEntryPath(mediaNode, playlistEntry.getPath());
-                        }
-                    });
+                        return new MediaNodeAndEntryPath(mediaNode.getJCRNode(), playlistEntry.getPath());
+                    }
+                });
             }
         }
         catch (RepositoryException e)
@@ -175,14 +180,14 @@
     public static class MediaNodeAndEntryPath
     {
 
-        private final AdvancedResultItem mediaNode;
+        private final Node mediaNode;
 
         private final String playlistEntryPath;
 
         /**
          * 
          */
-        public MediaNodeAndEntryPath(AdvancedResultItem mediaNode, String playlistEntryPath)
+        public MediaNodeAndEntryPath(Node mediaNode, String playlistEntryPath)
         {
             this.mediaNode = mediaNode;
             this.playlistEntryPath = playlistEntryPath;
@@ -192,7 +197,7 @@
          * Returns the mediaNode.
          * @return the mediaNode
          */
-        public AdvancedResultItem getMediaNode()
+        public Node getMediaNode()
         {
             return mediaNode;
         }

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

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

From: <fg...@us...> - 2013-05-19 17:13:33

Revision: 4243
          http://openutils.svn.sourceforge.net/openutils/?rev=4243&view=rev
Author:   fgiust
Date:     2013-05-19 17:13:29 +0000 (Sun, 19 May 2013)
Log Message:
-----------
update servletapi dependency + work in progress refactoring

Modified Paths:
--------------
    magnoliamodules/trunk/magnolia-test-webapp/pom.xml
    magnoliamodules/trunk/magnolia-test-webapp/src/main/webapp/WEB-INF/config/default/log4j.xml
    magnoliamodules/trunk/openutils-mgnlcache/pom.xml
    magnoliamodules/trunk/openutils-mgnlcas/pom.xml
    magnoliamodules/trunk/openutils-mgnlcontextmenu/pom.xml
    magnoliamodules/trunk/openutils-mgnlcontrols/pom.xml
    magnoliamodules/trunk/openutils-mgnlcriteria/pom.xml
    magnoliamodules/trunk/openutils-mgnlgroovy/pom.xml
    magnoliamodules/trunk/openutils-mgnllms/pom.xml
    magnoliamodules/trunk/openutils-mgnlmail/pom.xml
    magnoliamodules/trunk/openutils-mgnlmedia/pom.xml
    magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/tags/el/MediaEl.java
    magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/playlist/pages/PlaylistView.java
    magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/playlist/utils/PlaylistIterateUtils.java
    magnoliamodules/trunk/openutils-mgnlmessages/pom.xml
    magnoliamodules/trunk/openutils-mgnlmessages/src/main/java/net/sourceforge/openutils/mgnlmessages/i18n/RepositoryMessagesImpl.java
    magnoliamodules/trunk/openutils-mgnlrepoutils/pom.xml
    magnoliamodules/trunk/openutils-mgnlrules/pom.xml
    magnoliamodules/trunk/openutils-mgnlstripes/pom.xml
    magnoliamodules/trunk/openutils-mgnlstruts11/pom.xml
    magnoliamodules/trunk/openutils-mgnltagcloud/pom.xml
    magnoliamodules/trunk/openutils-mgnltasks/pom.xml
    magnoliamodules/trunk/openutils-mgnltests/pom.xml
    magnoliamodules/trunk/openutils-mgnlutils/pom.xml
    trunk/openutils-deployment/pom.xml
    trunk/openutils-elfunctions/pom.xml
    trunk/openutils-log4j/pom.xml
    trunk/openutils-spring/pom.xml
    trunk/openutils-testing4dwr/pom.xml
    trunk/openutils-testing4web/pom.xml

Added Paths:
-----------
    magnoliamodules/trunk/openutils-mgnlmail/src/main/resources/mgnl-bootstrap/simplemail-nooverwrite/config.modules.simplemail.templates.components.simplemail-text.xml
    magnoliamodules/trunk/openutils-mgnlmail/src/main/resources/mgnl-bootstrap/simplemail-nooverwrite/config.modules.simplemail.templates.pages.simplemail-simple.xml
    magnoliamodules/trunk/openutils-mgnlmail/src/main/resources/mgnl-bootstrap-samples/
    magnoliamodules/trunk/openutils-mgnlutils/src/main/java/it/openutils/mgnlutils/el/NodeElResolver.java
    magnoliamodules/trunk/openutils-mgnlutils/src/main/java/it/openutils/mgnlutils/el/NodeElResolverUtils.java
    magnoliamodules/trunk/openutils-mgnlutils/src/main/java/it/openutils/mgnlutils/setup/MgnlUtilsModule.java

Modified: magnoliamodules/trunk/magnolia-test-webapp/pom.xml
===================================================================
--- magnoliamodules/trunk/magnolia-test-webapp/pom.xml	2013-05-19 14:48:28 UTC (rev 4242)
+++ magnoliamodules/trunk/magnolia-test-webapp/pom.xml	2013-05-19 17:13:29 UTC (rev 4243)
@@ -104,13 +104,13 @@
     <dependency>
       <groupId>javax.servlet</groupId>
       <artifactId>servlet-api</artifactId>
-      <version>2.4</version>
+      <version>2.5</version>
       <scope>provided</scope>
     </dependency>
     <dependency>
-      <groupId>javax.servlet</groupId>
+      <groupId>javax.servlet.jsp</groupId>
       <artifactId>jsp-api</artifactId>
-      <version>2.0</version>
+      <version>2.1</version>
       <scope>provided</scope>
     </dependency>
     <dependency>

Modified: magnoliamodules/trunk/magnolia-test-webapp/src/main/webapp/WEB-INF/config/default/log4j.xml
===================================================================
--- magnoliamodules/trunk/magnolia-test-webapp/src/main/webapp/WEB-INF/config/default/log4j.xml	2013-05-19 14:48:28 UTC (rev 4242)
+++ magnoliamodules/trunk/magnolia-test-webapp/src/main/webapp/WEB-INF/config/default/log4j.xml	2013-05-19 17:13:29 UTC (rev 4243)
@@ -51,6 +51,9 @@
   <category name="info.magnolia.cms.i18n.AbstractMessagesImpl">
     <priority value="DEBUG" />
   </category>
+  <category name="it.openutils.mgnlutils.el">
+    <priority value="DEBUG" />
+  </category>
   <root>
     <priority value="ALL" />
     <appender-ref ref="console" />

Modified: magnoliamodules/trunk/openutils-mgnlcache/pom.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnlcache/pom.xml	2013-05-19 14:48:28 UTC (rev 4242)
+++ magnoliamodules/trunk/openutils-mgnlcache/pom.xml	2013-05-19 17:13:29 UTC (rev 4243)
@@ -66,7 +66,7 @@
     <dependency>
       <groupId>javax.servlet</groupId>
       <artifactId>servlet-api</artifactId>
-      <version>2.4</version>
+      <version>2.5</version>
       <scope>provided</scope>
     </dependency>
     <dependency>

Modified: magnoliamodules/trunk/openutils-mgnlcas/pom.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnlcas/pom.xml	2013-05-19 14:48:28 UTC (rev 4242)
+++ magnoliamodules/trunk/openutils-mgnlcas/pom.xml	2013-05-19 17:13:29 UTC (rev 4243)
@@ -66,7 +66,7 @@
     <dependency>
       <groupId>javax.servlet</groupId>
       <artifactId>servlet-api</artifactId>
-      <version>2.4</version>
+      <version>2.5</version>
       <scope>provided</scope>
     </dependency>
   </dependencies>

Modified: magnoliamodules/trunk/openutils-mgnlcontextmenu/pom.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnlcontextmenu/pom.xml	2013-05-19 14:48:28 UTC (rev 4242)
+++ magnoliamodules/trunk/openutils-mgnlcontextmenu/pom.xml	2013-05-19 17:13:29 UTC (rev 4243)
@@ -140,13 +140,13 @@
     <dependency>
       <groupId>javax.servlet</groupId>
       <artifactId>servlet-api</artifactId>
-      <version>2.4</version>
+      <version>2.5</version>
       <scope>provided</scope>
     </dependency>
     <dependency>
-      <groupId>javax.servlet</groupId>
+      <groupId>javax.servlet.jsp</groupId>
       <artifactId>jsp-api</artifactId>
-      <version>2.0</version>
+      <version>2.1</version>
       <scope>provided</scope>
     </dependency>
     <dependency>

Modified: magnoliamodules/trunk/openutils-mgnlcontrols/pom.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnlcontrols/pom.xml	2013-05-19 14:48:28 UTC (rev 4242)
+++ magnoliamodules/trunk/openutils-mgnlcontrols/pom.xml	2013-05-19 17:13:29 UTC (rev 4243)
@@ -101,7 +101,7 @@
     <dependency>
       <groupId>javax.servlet</groupId>
       <artifactId>servlet-api</artifactId>
-      <version>2.4</version>
+      <version>2.5</version>
       <scope>provided</scope>
     </dependency>
     <dependency>

Modified: magnoliamodules/trunk/openutils-mgnlcriteria/pom.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnlcriteria/pom.xml	2013-05-19 14:48:28 UTC (rev 4242)
+++ magnoliamodules/trunk/openutils-mgnlcriteria/pom.xml	2013-05-19 17:13:29 UTC (rev 4243)
@@ -160,7 +160,7 @@
     <dependency>
       <groupId>javax.servlet</groupId>
       <artifactId>servlet-api</artifactId>
-      <version>2.4</version>
+      <version>2.5</version>
       <scope>provided</scope>
     </dependency>
     <dependency>

Modified: magnoliamodules/trunk/openutils-mgnlgroovy/pom.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnlgroovy/pom.xml	2013-05-19 14:48:28 UTC (rev 4242)
+++ magnoliamodules/trunk/openutils-mgnlgroovy/pom.xml	2013-05-19 17:13:29 UTC (rev 4243)
@@ -95,7 +95,7 @@
     <dependency>
       <groupId>javax.servlet</groupId>
       <artifactId>servlet-api</artifactId>
-      <version>2.4</version>
+      <version>2.5</version>
       <scope>provided</scope>
     </dependency>
   </dependencies>

Modified: magnoliamodules/trunk/openutils-mgnllms/pom.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnllms/pom.xml	2013-05-19 14:48:28 UTC (rev 4242)
+++ magnoliamodules/trunk/openutils-mgnllms/pom.xml	2013-05-19 17:13:29 UTC (rev 4243)
@@ -182,13 +182,13 @@
     <dependency>
       <groupId>javax.servlet</groupId>
       <artifactId>servlet-api</artifactId>
-      <version>2.4</version>
+      <version>2.5</version>
       <scope>provided</scope>
     </dependency>
     <dependency>
-      <groupId>javax.servlet</groupId>
+      <groupId>javax.servlet.jsp</groupId>
       <artifactId>jsp-api</artifactId>
-      <version>2.0</version>
+      <version>2.1</version>
       <scope>provided</scope>
     </dependency>
     <dependency>

Modified: magnoliamodules/trunk/openutils-mgnlmail/pom.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnlmail/pom.xml	2013-05-19 14:48:28 UTC (rev 4242)
+++ magnoliamodules/trunk/openutils-mgnlmail/pom.xml	2013-05-19 17:13:29 UTC (rev 4243)
@@ -103,7 +103,7 @@
     <dependency>
       <groupId>javax.servlet</groupId>
       <artifactId>servlet-api</artifactId>
-      <version>2.4</version>
+      <version>2.5</version>
       <scope>provided</scope>
     </dependency>
   </dependencies>

Added: magnoliamodules/trunk/openutils-mgnlmail/src/main/resources/mgnl-bootstrap/simplemail-nooverwrite/config.modules.simplemail.templates.components.simplemail-text.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnlmail/src/main/resources/mgnl-bootstrap/simplemail-nooverwrite/config.modules.simplemail.templates.components.simplemail-text.xml	                        (rev 0)
+++ magnoliamodules/trunk/openutils-mgnlmail/src/main/resources/mgnl-bootstrap/simplemail-nooverwrite/config.modules.simplemail.templates.components.simplemail-text.xml	2013-05-19 17:13:29 UTC (rev 4243)
@@ -0,0 +1,50 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<sv:node sv:name="simplemail-text" xmlns:sv="http://www.jcp.org/jcr/sv/1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <sv:property sv:name="jcr:primaryType" sv:type="Name">
+    <sv:value>mgnl:contentNode</sv:value>
+  </sv:property>
+  <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
+    <sv:value>mix:lockable</sv:value>
+  </sv:property>
+  <sv:property sv:name="jcr:uuid" sv:type="String">
+    <sv:value>2e8a76b0-60de-4396-8710-a471a20d86fd</sv:value>
+  </sv:property>
+  <sv:property sv:name="description" sv:type="String">
+    <sv:value>Test paragraph</sv:value>
+  </sv:property>
+  <sv:property sv:name="dialog" sv:type="String">
+    <sv:value>simplemail:simplemail-text</sv:value>
+  </sv:property>
+  <sv:property sv:name="jcr:createdBy" sv:type="String">
+    <sv:value>admin</sv:value>
+  </sv:property>
+  <sv:property sv:name="renderType" sv:type="String">
+    <sv:value>freemarker</sv:value>
+  </sv:property>
+  <sv:property sv:name="templateScript" sv:type="String">
+    <sv:value>/simplemail/simple-paragraph.ftl</sv:value>
+  </sv:property>
+  <sv:property sv:name="title" sv:type="String">
+    <sv:value>Simplemail paragraph</sv:value>
+  </sv:property>
+  <sv:node sv:name="MetaData">
+    <sv:property sv:name="jcr:primaryType" sv:type="Name">
+      <sv:value>mgnl:metaData</sv:value>
+    </sv:property>
+    <sv:property sv:name="jcr:createdBy" sv:type="String">
+      <sv:value>admin</sv:value>
+    </sv:property>
+    <sv:property sv:name="mgnl:activated" sv:type="Boolean">
+      <sv:value>false</sv:value>
+    </sv:property>
+    <sv:property sv:name="mgnl:authorid" sv:type="String">
+      <sv:value>superuser</sv:value>
+    </sv:property>
+    <sv:property sv:name="mgnl:creationdate" sv:type="Date">
+      <sv:value>2008-09-23T16:56:46.344+02:00</sv:value>
+    </sv:property>
+    <sv:property sv:name="mgnl:lastmodified" sv:type="Date">
+      <sv:value>2013-05-01T22:22:45.892+02:00</sv:value>
+    </sv:property>
+  </sv:node>
+</sv:node>


Property changes on: magnoliamodules/trunk/openutils-mgnlmail/src/main/resources/mgnl-bootstrap/simplemail-nooverwrite/config.modules.simplemail.templates.components.simplemail-text.xml
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+text/xml
\ No newline at end of property
Added: svn:keywords
## -0,0 +1 ##
+Author Date Id Revision
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: magnoliamodules/trunk/openutils-mgnlmail/src/main/resources/mgnl-bootstrap/simplemail-nooverwrite/config.modules.simplemail.templates.pages.simplemail-simple.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnlmail/src/main/resources/mgnl-bootstrap/simplemail-nooverwrite/config.modules.simplemail.templates.pages.simplemail-simple.xml	                        (rev 0)
+++ magnoliamodules/trunk/openutils-mgnlmail/src/main/resources/mgnl-bootstrap/simplemail-nooverwrite/config.modules.simplemail.templates.pages.simplemail-simple.xml	2013-05-19 17:13:29 UTC (rev 4243)
@@ -0,0 +1,201 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<sv:node sv:name="simplemail-simple" xmlns:sv="http://www.jcp.org/jcr/sv/1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <sv:property sv:name="jcr:primaryType" sv:type="Name">
+    <sv:value>mgnl:contentNode</sv:value>
+  </sv:property>
+  <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
+    <sv:value>mix:lockable</sv:value>
+  </sv:property>
+  <sv:property sv:name="jcr:uuid" sv:type="String">
+    <sv:value>4414d9ba-a45a-4f9f-bb33-800081d8ac61</sv:value>
+  </sv:property>
+  <sv:property sv:name="class" sv:type="String">
+    <sv:value>it.openutils.mgnlutils.templating.ExtendedTemplate</sv:value>
+  </sv:property>
+  <sv:property sv:name="dialog" sv:type="String">
+    <sv:value>simplemail:simplemail-simple</sv:value>
+  </sv:property>
+  <sv:property sv:name="jcr:createdBy" sv:type="String">
+    <sv:value>admin</sv:value>
+  </sv:property>
+  <sv:property sv:name="renderType" sv:type="String">
+    <sv:value>freemarker</sv:value>
+  </sv:property>
+  <sv:property sv:name="repositories" sv:type="String">
+    <sv:value>email</sv:value>
+  </sv:property>
+  <sv:property sv:name="templateScript" sv:type="String">
+    <sv:value>/simplemail/simple.ftl</sv:value>
+  </sv:property>
+  <sv:property sv:name="title" sv:type="String">
+    <sv:value>Simple mail template</sv:value>
+  </sv:property>
+  <sv:property sv:name="visible" sv:type="String">
+    <sv:value>true</sv:value>
+  </sv:property>
+  <sv:node sv:name="MetaData">
+    <sv:property sv:name="jcr:primaryType" sv:type="Name">
+      <sv:value>mgnl:metaData</sv:value>
+    </sv:property>
+    <sv:property sv:name="jcr:createdBy" sv:type="String">
+      <sv:value>admin</sv:value>
+    </sv:property>
+    <sv:property sv:name="mgnl:activated" sv:type="Boolean">
+      <sv:value>false</sv:value>
+    </sv:property>
+    <sv:property sv:name="mgnl:authorid" sv:type="String">
+      <sv:value>superuser</sv:value>
+    </sv:property>
+    <sv:property sv:name="mgnl:creationdate" sv:type="Date">
+      <sv:value>2008-09-23T16:56:46.344+02:00</sv:value>
+    </sv:property>
+    <sv:property sv:name="mgnl:lastmodified" sv:type="Date">
+      <sv:value>2013-05-01T22:21:20.698+02:00</sv:value>
+    </sv:property>
+  </sv:node>
+  <sv:node sv:name="areas">
+    <sv:property sv:name="jcr:primaryType" sv:type="Name">
+      <sv:value>mgnl:contentNode</sv:value>
+    </sv:property>
+    <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
+      <sv:value>mix:lockable</sv:value>
+    </sv:property>
+    <sv:property sv:name="jcr:uuid" sv:type="String">
+      <sv:value>2ab486ba-a3fe-4701-bc75-c34dbda50e4d</sv:value>
+    </sv:property>
+    <sv:property sv:name="jcr:createdBy" sv:type="String">
+      <sv:value>admin</sv:value>
+    </sv:property>
+    <sv:node sv:name="MetaData">
+      <sv:property sv:name="jcr:primaryType" sv:type="Name">
+        <sv:value>mgnl:metaData</sv:value>
+      </sv:property>
+      <sv:property sv:name="jcr:createdBy" sv:type="String">
+        <sv:value>admin</sv:value>
+      </sv:property>
+      <sv:property sv:name="mgnl:activated" sv:type="Boolean">
+        <sv:value>false</sv:value>
+      </sv:property>
+      <sv:property sv:name="mgnl:authorid" sv:type="String">
+        <sv:value>superuser</sv:value>
+      </sv:property>
+      <sv:property sv:name="mgnl:creationdate" sv:type="Date">
+        <sv:value>2013-01-18T16:25:45.770+01:00</sv:value>
+      </sv:property>
+      <sv:property sv:name="mgnl:lastmodified" sv:type="Date">
+        <sv:value>2013-05-01T22:20:37.397+02:00</sv:value>
+      </sv:property>
+    </sv:node>
+    <sv:node sv:name="main">
+      <sv:property sv:name="jcr:primaryType" sv:type="Name">
+        <sv:value>mgnl:contentNode</sv:value>
+      </sv:property>
+      <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
+        <sv:value>mix:lockable</sv:value>
+      </sv:property>
+      <sv:property sv:name="jcr:uuid" sv:type="String">
+        <sv:value>d74116ed-d6c7-4fa4-b8ae-86433f4d234d</sv:value>
+      </sv:property>
+      <sv:property sv:name="jcr:createdBy" sv:type="String">
+        <sv:value>admin</sv:value>
+      </sv:property>
+      <sv:property sv:name="title" sv:type="String">
+        <sv:value>Main</sv:value>
+      </sv:property>
+      <sv:property sv:name="type" sv:type="String">
+        <sv:value>list</sv:value>
+      </sv:property>
+      <sv:node sv:name="MetaData">
+        <sv:property sv:name="jcr:primaryType" sv:type="Name">
+          <sv:value>mgnl:metaData</sv:value>
+        </sv:property>
+        <sv:property sv:name="jcr:createdBy" sv:type="String">
+          <sv:value>admin</sv:value>
+        </sv:property>
+        <sv:property sv:name="mgnl:activated" sv:type="Boolean">
+          <sv:value>false</sv:value>
+        </sv:property>
+        <sv:property sv:name="mgnl:authorid" sv:type="String">
+          <sv:value>superuser</sv:value>
+        </sv:property>
+        <sv:property sv:name="mgnl:creationdate" sv:type="Date">
+          <sv:value>2013-01-18T10:24:25.458+01:00</sv:value>
+        </sv:property>
+        <sv:property sv:name="mgnl:lastmodified" sv:type="Date">
+          <sv:value>2013-05-01T22:21:38.288+02:00</sv:value>
+        </sv:property>
+      </sv:node>
+      <sv:node sv:name="availableComponents">
+        <sv:property sv:name="jcr:primaryType" sv:type="Name">
+          <sv:value>mgnl:contentNode</sv:value>
+        </sv:property>
+        <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
+          <sv:value>mix:lockable</sv:value>
+        </sv:property>
+        <sv:property sv:name="jcr:uuid" sv:type="String">
+          <sv:value>b2d23ad0-f1a1-4f31-a8fe-21706d7e282f</sv:value>
+        </sv:property>
+        <sv:property sv:name="jcr:createdBy" sv:type="String">
+          <sv:value>admin</sv:value>
+        </sv:property>
+        <sv:node sv:name="MetaData">
+          <sv:property sv:name="jcr:primaryType" sv:type="Name">
+            <sv:value>mgnl:metaData</sv:value>
+          </sv:property>
+          <sv:property sv:name="jcr:createdBy" sv:type="String">
+            <sv:value>admin</sv:value>
+          </sv:property>
+          <sv:property sv:name="mgnl:activated" sv:type="Boolean">
+            <sv:value>false</sv:value>
+          </sv:property>
+          <sv:property sv:name="mgnl:authorid" sv:type="String">
+            <sv:value>superuser</sv:value>
+          </sv:property>
+          <sv:property sv:name="mgnl:creationdate" sv:type="Date">
+            <sv:value>2013-01-08T10:49:28.554+01:00</sv:value>
+          </sv:property>
+          <sv:property sv:name="mgnl:lastmodified" sv:type="Date">
+            <sv:value>2013-05-01T22:20:37.400+02:00</sv:value>
+          </sv:property>
+        </sv:node>
+        <sv:node sv:name="simplemail-text">
+          <sv:property sv:name="jcr:primaryType" sv:type="Name">
+            <sv:value>mgnl:contentNode</sv:value>
+          </sv:property>
+          <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
+            <sv:value>mix:lockable</sv:value>
+          </sv:property>
+          <sv:property sv:name="jcr:uuid" sv:type="String">
+            <sv:value>653b9bd4-ef0e-4719-a371-9fa17d4f463c</sv:value>
+          </sv:property>
+          <sv:property sv:name="id" sv:type="String">
+            <sv:value>simplemail:simplemail-text</sv:value>
+          </sv:property>
+          <sv:property sv:name="jcr:createdBy" sv:type="String">
+            <sv:value>admin</sv:value>
+          </sv:property>
+          <sv:node sv:name="MetaData">
+            <sv:property sv:name="jcr:primaryType" sv:type="Name">
+              <sv:value>mgnl:metaData</sv:value>
+            </sv:property>
+            <sv:property sv:name="jcr:createdBy" sv:type="String">
+              <sv:value>admin</sv:value>
+            </sv:property>
+            <sv:property sv:name="mgnl:activated" sv:type="Boolean">
+              <sv:value>false</sv:value>
+            </sv:property>
+            <sv:property sv:name="mgnl:authorid" sv:type="String">
+              <sv:value>superuser</sv:value>
+            </sv:property>
+            <sv:property sv:name="mgnl:creationdate" sv:type="Date">
+              <sv:value>2013-01-18T10:15:47.782+01:00</sv:value>
+            </sv:property>
+            <sv:property sv:name="mgnl:lastmodified" sv:type="Date">
+              <sv:value>2013-05-01T22:22:04.710+02:00</sv:value>
+            </sv:property>
+          </sv:node>
+        </sv:node>
+      </sv:node>
+    </sv:node>
+  </sv:node>
+</sv:node>


Property changes on: magnoliamodules/trunk/openutils-mgnlmail/src/main/resources/mgnl-bootstrap/simplemail-nooverwrite/config.modules.simplemail.templates.pages.simplemail-simple.xml
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+text/xml
\ No newline at end of property
Added: svn:keywords
## -0,0 +1 ##
+Author Date Id Revision
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Modified: magnoliamodules/trunk/openutils-mgnlmedia/pom.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnlmedia/pom.xml	2013-05-19 14:48:28 UTC (rev 4242)
+++ magnoliamodules/trunk/openutils-mgnlmedia/pom.xml	2013-05-19 17:13:29 UTC (rev 4243)
@@ -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,9 @@
   <packaging>jar</packaging>
   <artifactId>openutils-mgnlmedia</artifactId>
   <name>SimpleMedia Module for Magnolia CMS</name>
-  <description>SimpleMedia Module for Magnolia CMS: a module for Magnolia CMS for easier management of multimedia assets.</description>
+  <description>SimpleMedia Module for Magnolia CMS: a module for Magnolia CMS for easier management of multimedia
+    assets.
+  </description>
   <version>5.0.3-SNAPSHOT</version>
   <inceptionYear>2008</inceptionYear>
   <licenses>
@@ -24,8 +27,10 @@
     <url>http://jira.openmindlab.com/browse/MEDIA</url>
   </issueManagement>
   <scm>
-    <connection>scm:svn:svn+ssh://svn.code.sf.net/p/openutils/code/magnoliamodules/trunk/openutils-mgnlmedia</connection>
-    <developerConnection>scm:svn:svn+ssh://svn.code.sf.net/p/openutils/code/magnoliamodules/trunk/openutils-mgnlmedia</developerConnection>
+    <connection>scm:svn:svn+ssh://svn.code.sf.net/p/openutils/code/magnoliamodules/trunk/openutils-mgnlmedia
+    </connection>
+    <developerConnection>scm:svn:svn+ssh://svn.code.sf.net/p/openutils/code/magnoliamodules/trunk/openutils-mgnlmedia
+    </developerConnection>
     <url>http://sourceforge.net/p/openutils/code/HEAD/tree/trunk/openutils-mgnlmedia</url>
   </scm>
   <build>
@@ -127,7 +132,7 @@
     <dependency>
       <groupId>net.sourceforge.openutils</groupId>
       <artifactId>openutils-mgnlutils</artifactId>
-      <version>5.0.0</version>
+      <version>5.0.2-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>net.sourceforge.openutils</groupId>
@@ -163,6 +168,12 @@
       <scope>test</scope>
     </dependency>
     <dependency>
+      <groupId>net.sourceforge.openutils</groupId>
+      <artifactId>openutils-mgnltests</artifactId>
+      <version>5.0.1-SNAPSHOT</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
       <groupId>com.drewnoakes</groupId>
       <artifactId>metadata-extractor</artifactId>
       <version>2.4.0-beta-1</version>
@@ -173,9 +184,9 @@
       <version>5.0.1</version>
     </dependency>
     <dependency>
-      <groupId>javax.servlet</groupId>
+      <groupId>javax.servlet.jsp</groupId>
       <artifactId>jsp-api</artifactId>
-      <version>2.0</version>
+      <version>2.1</version>
       <scope>provided</scope>
     </dependency>
     <dependency>
@@ -254,7 +265,7 @@
     <dependency>
       <groupId>javax.servlet</groupId>
       <artifactId>servlet-api</artifactId>
-      <version>2.4</version>
+      <version>2.5</version>
       <scope>provided</scope>
     </dependency>
   </dependencies>

Modified: magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/tags/el/MediaEl.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/tags/el/MediaEl.java	2013-05-19 14:48:28 UTC (rev 4242)
+++ magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/tags/el/MediaEl.java	2013-05-19 17:13:29 UTC (rev 4243)
@@ -21,6 +21,7 @@
 
 import info.magnolia.cms.beans.runtime.FileProperties;
 import info.magnolia.cms.core.Content;
+import info.magnolia.cms.core.DefaultContent;
 import info.magnolia.cms.core.NodeData;
 import info.magnolia.cms.i18n.I18nContentWrapper;
 import info.magnolia.cms.util.NodeDataUtil;
@@ -38,7 +39,6 @@
 import java.util.Locale;
 import java.util.Map;
 
-import javax.jcr.ItemNotFoundException;
 import javax.jcr.PropertyType;
 import javax.jcr.RepositoryException;
 import javax.jcr.Value;
@@ -104,17 +104,14 @@
      */
     public static Content node(Object obj)
     {
-        // TODO use openutils-mgnlutils 1.0.8:
-        // return
-
         if (obj == null)
         {
             return null;
         }
 
-        Content content = it.openutils.mgnlutils.el.MgnlUtilsElFunctions.node(obj, MediaModule.REPO);
+        ContentMap contentMap = it.openutils.mgnlutils.el.MgnlUtilsElFunctions.node(obj, MediaModule.REPO);
 
-        if (content != null && !(content instanceof NodeMapWrapper))
+        if (contentMap != null)
         {
             Content currentpage = null;
 
@@ -125,13 +122,16 @@
 
             if (currentpage == null)
             {
-                currentpage = content;
+                currentpage = new DefaultContent(contentMap.getJCRNode());
             }
 
-            content = new NodeMapWrapper(new I18nContentWrapper(content), currentpage.getHandle());
+            Content content = new NodeMapWrapper(
+                new I18nContentWrapper(new DefaultContent(contentMap.getJCRNode())),
+                currentpage.getHandle());
+            return content;
         }
 
-        return content;
+        return null;
     }
 
     /**
@@ -531,7 +531,7 @@
             return null;
         }
 
-        Content playlistNode = it.openutils.mgnlutils.el.MgnlUtilsElFunctions.node(obj, PlaylistConstants.REPO);
+        ContentMap playlistNode = it.openutils.mgnlutils.el.MgnlUtilsElFunctions.node(obj, PlaylistConstants.REPO);
 
         Iterator<ContentMap> iter = Iterators.transform(
             PlaylistIterateUtils.iterate(playlistNode.getJCRNode()),

Modified: magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/playlist/pages/PlaylistView.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/playlist/pages/PlaylistView.java	2013-05-19 14:48:28 UTC (rev 4242)
+++ magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/playlist/pages/PlaylistView.java	2013-05-19 17:13:29 UTC (rev 4243)
@@ -24,6 +24,7 @@
 import info.magnolia.cms.util.ContentUtil;
 import info.magnolia.cms.util.NodeDataUtil;
 import info.magnolia.context.MgnlContext;
+import info.magnolia.jcr.util.NodeUtil;
 import info.magnolia.jcr.util.PropertyUtil;
 import info.magnolia.module.ModuleRegistry;
 
@@ -181,27 +182,12 @@
             Content node = ContentUtil.getContent(PlaylistConstants.REPO, path);
             if (node != null)
             {
-                Map<String, String> propNames = new HashMap<String, String>();
-                propNames.put("title", "title");
-                propNames.put("description", "description");
-                propNames.put("tags", "tags");
-                if (!StringUtils.isEmpty(locale))
-                {
-                    Locale l = LocaleUtils.toLocale(locale);
-                    if (!I18nContentSupportFactory.getI18nSupport().getFallbackLocale().equals(l))
-                    {
-                        for (Entry<String, String> entry : propNames.entrySet())
-                        {
-                            entry.setValue(entry.getValue() + "_" + l);
-                        }
-                    }
-                }
 
                 playlist = new PlaylistBean();
                 playlist.setUuid(node.getUUID());
                 playlist.setHandle(node.getHandle());
-                playlist.setTitle(NodeDataUtil.getString(node, propNames.get("title")));
-                playlist.setDescription(NodeDataUtil.getString(node, propNames.get("description")));
+                playlist.setTitle(NodeDataUtil.getString(node, "title"));
+                playlist.setDescription(NodeDataUtil.getString(node, "description"));
                 List<PlaylistEntryBean> entries = new ArrayList<PlaylistEntryBean>();
 
                 for (Iterator<MediaNodeAndEntryPath> iterator = PlaylistIterateUtils.iterate(node.getJCRNode()); iterator
@@ -213,9 +199,10 @@
                     {
                         continue;
                     }
+
                     PlaylistEntryBean entry = new PlaylistEntryBean();
                     entry.setHandle(item.getPlaylistEntryPath());
-                    entry.setMedia(media.getUUID());
+                    entry.setMedia(NodeUtil.getNodeIdentifierIfPossible(media));
                     entry.setMediaHandle(media.getHandle());
                     MediaTypeConfiguration typeConf = MediaConfigurationManager
                         .getInstance()
@@ -226,18 +213,9 @@
                     }
                     entry.setThumbnail(MediaEl.thumbnail(media));
                     entry.setType(PropertyUtil.getString(media, "type"));
-                    entry.setTitle(I18nContentSupportFactory
-                        .getI18nSupport()
-                        .getProperty(media, propNames.get("title"))
-                        .getString());
-                    entry.setDescription(I18nContentSupportFactory
-                        .getI18nSupport()
-                        .getProperty(media, propNames.get("description"))
-                        .getString());
-                    entry.setTags(I18nContentSupportFactory
-                        .getI18nSupport()
-                        .getProperty(media, propNames.get("tags"))
-                        .getString());
+                    entry.setTitle(PropertyUtil.getString(media, "title"));
+                    entry.setDescription(PropertyUtil.getString(media, "description"));
+                    entry.setTags(PropertyUtil.getString(media, "tags"));
                     entries.add(entry);
                 }
                 playlist.setEntries(entries);

Modified: magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/playlist/utils/PlaylistIterateUtils.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/playlist/utils/PlaylistIterateUtils.java	2013-05-19 14:48:28 UTC (rev 4242)
+++ magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/playlist/utils/PlaylistIterateUtils.java	2013-05-19 17:13:29 UTC (rev 4243)
@@ -23,6 +23,8 @@
 import info.magnolia.cms.core.ItemType;
 import info.magnolia.cms.util.NodeDataUtil;
 import info.magnolia.context.MgnlContext;
+import info.magnolia.jcr.util.ContentMap;
+import info.magnolia.jcr.util.PropertyUtil;
 
 import java.lang.reflect.Array;
 import java.util.Collection;
@@ -33,6 +35,7 @@
 import java.util.Map;
 
 import javax.jcr.Node;
+import javax.jcr.Property;
 import javax.jcr.RepositoryException;
 import javax.jcr.Value;
 import javax.servlet.http.HttpServletRequest;
@@ -85,9 +88,9 @@
 
         try
         {
-            if (playlistNode.hasContent("search"))
+            if (playlistNode.hasNode("search"))
             {
-                Content searchNode = playlistNode.getContent("search");
+                Node searchNode = playlistNode.getNode("search");
                 Collection<Content> paramNodes = searchNode.getChildren(ItemType.CONTENTNODE);
                 final Map<String, Object> map = new HashMap<String, Object>();
                 for (Content paramNode : paramNodes)
@@ -108,6 +111,9 @@
                         map.put(paramName, paramValues);
                     }
                 }
+
+                Property maxresultProperty = PropertyUtil.getPropertyOrNull(playlistNode, "maxResults");
+                int maxresults = maxresultProperty != null ? (int) maxresultProperty.getLong() : 0;
                 AdvancedResult searchResult = MediaEl
                     .module()
                     .getSearch()
@@ -117,7 +123,7 @@
                         "/",
                         true,
                         SortMode.SCORE,
-                        (int) NodeDataUtil.getLong(playlistNode, "maxResults", 0),
+                        maxresults,
                         1);
                 return Iterators.transform(
                     searchResult.getItems(),
@@ -145,7 +151,7 @@
                          */
                         public MediaNodeAndEntryPath apply(AdvancedResultItem playlistEntry)
                         {
-                            String mediaUUID = NodeDataUtil.getString(playlistEntry, "media");
+                            String mediaUUID = PropertyUtil.getString(playlistEntry, "media");
                             Content mediaNode = MediaEl.node(mediaUUID);
                             if (mediaNode == null)
                             {

Modified: magnoliamodules/trunk/openutils-mgnlmessages/pom.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnlmessages/pom.xml	2013-05-19 14:48:28 UTC (rev 4242)
+++ magnoliamodules/trunk/openutils-mgnlmessages/pom.xml	2013-05-19 17:13:29 UTC (rev 4243)
@@ -122,7 +122,7 @@
     <dependency>
       <groupId>javax.servlet</groupId>
       <artifactId>servlet-api</artifactId>
-      <version>2.4</version>
+      <version>2.5</version>
       <scope>provided</scope>
     </dependency>
     <dependency>

Modified: magnoliamodules/trunk/openutils-mgnlmessages/src/main/java/net/sourceforge/openutils/mgnlmessages/i18n/RepositoryMessagesImpl.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlmessages/src/main/java/net/sourceforge/openutils/mgnlmessages/i18n/RepositoryMessagesImpl.java	2013-05-19 14:48:28 UTC (rev 4242)
+++ magnoliamodules/trunk/openutils-mgnlmessages/src/main/java/net/sourceforge/openutils/mgnlmessages/i18n/RepositoryMessagesImpl.java	2013-05-19 17:13:29 UTC (rev 4243)
@@ -32,11 +32,14 @@
 import java.util.Locale;
 import java.util.MissingResourceException;
 
+import javax.jcr.Property;
+import javax.jcr.PropertyIterator;
 import javax.jcr.RepositoryException;
 import javax.jcr.observation.EventIterator;
 import javax.jcr.observation.EventListener;
 
 import net.sourceforge.openutils.mgnlcriteria.jcr.query.AdvancedResult;
+import net.sourceforge.openutils.mgnlcriteria.jcr.query.AdvancedResultItem;
 import net.sourceforge.openutils.mgnlcriteria.jcr.query.Criteria;
 import net.sourceforge.openutils.mgnlcriteria.jcr.query.JCRCriteriaFactory;
 import net.sourceforge.openutils.mgnlcriteria.jcr.query.criterion.Order;
@@ -155,17 +158,37 @@
                 result.getTotalSize(),
                 criteria.toXpathExpression());
 
-            for (Content c : result.getItems())
+            for (AdvancedResultItem c : result.getItems())
             {
-                if (c.getNodeDataCollection().size() > 0)
+
+                PropertyIterator properties;
+                try
                 {
-                    // fix for NPE found in logs... not sure why, but it can happen
-                    String key = StringUtils.substring(StringUtils.replace(c.getHandle(), "/", "."), 1);
-                    if (StringUtils.isNotEmpty(key))
+                    properties = c.getProperties();
+
+                    while (properties.hasNext())
                     {
-                        keys.add(key);
+                        Property nextProperty = properties.nextProperty();
+
+                        try
+                        {
+                            String key = StringUtils
+                                .substring(StringUtils.replace(nextProperty.getPath(), "/", "."), 1);
+                            if (StringUtils.isNotEmpty(key))
+                            {
+                                keys.add(key);
+                            }
+                        }
+                        catch (RepositoryException e)
+                        {
+                            // ignore
+                        }
                     }
                 }
+                catch (RepositoryException e1)
+                {
+                    // properties can't be read, ignore
+                }
             }
         }
 

Modified: magnoliamodules/trunk/openutils-mgnlrepoutils/pom.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnlrepoutils/pom.xml	2013-05-19 14:48:28 UTC (rev 4242)
+++ magnoliamodules/trunk/openutils-mgnlrepoutils/pom.xml	2013-05-19 17:13:29 UTC (rev 4243)
@@ -81,7 +81,7 @@
     <dependency>
       <groupId>javax.servlet</groupId>
       <artifactId>servlet-api</artifactId>
-      <version>2.4</version>
+      <version>2.5</version>
       <scope>provided</scope>
     </dependency>
     <dependency>

Modified: magnoliamodules/trunk/openutils-mgnlrules/pom.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnlrules/pom.xml	2013-05-19 14:48:28 UTC (rev 4242)
+++ magnoliamodules/trunk/openutils-mgnlrules/pom.xml	2013-05-19 17:13:29 UTC (rev 4243)
@@ -117,13 +117,13 @@
     <dependency>
       <groupId>javax.servlet</groupId>
       <artifactId>servlet-api</artifactId>
-      <version>2.4</version>
+      <version>2.5</version>
       <scope>provided</scope>
     </dependency>
     <dependency>
-      <groupId>javax.servlet</groupId>
+      <groupId>javax.servlet.jsp</groupId>
       <artifactId>jsp-api</artifactId>
-      <version>2.0</version>
+      <version>2.1</version>
       <scope>provided</scope>
     </dependency>
     <dependency>

Modified: magnoliamodules/trunk/openutils-mgnlstripes/pom.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnlstripes/pom.xml	2013-05-19 14:48:28 UTC (rev 4242)
+++ magnoliamodules/trunk/openutils-mgnlstripes/pom.xml	2013-05-19 17:13:29 UTC (rev 4243)
@@ -86,9 +86,9 @@
       <scope>provided</scope>
     </dependency>
     <dependency>
-      <groupId>javax.servlet</groupId>
+      <groupId>javax.servlet.jsp</groupId>
       <artifactId>jsp-api</artifactId>
-      <version>2.0</version>
+      <version>2.1</version>
       <scope>provided</scope>
     </dependency>
     <dependency>

Modified: magnoliamodules/trunk/openutils-mgnlstruts11/pom.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnlstruts11/pom.xml	2013-05-19 14:48:28 UTC (rev 4242)
+++ magnoliamodules/trunk/openutils-mgnlstruts11/pom.xml	2013-05-19 17:13:29 UTC (rev 4243)
@@ -84,13 +84,13 @@
     <dependency>
       <groupId>javax.servlet</groupId>
       <artifactId>servlet-api</artifactId>
-      <version>2.4</version>
+      <version>2.5</version>
       <scope>provided</scope>
     </dependency>
     <dependency>
-      <groupId>javax.servlet</groupId>
+      <groupId>javax.servlet.jsp</groupId>
       <artifactId>jsp-api</artifactId>
-      <version>2.0</version>
+      <version>2.1</version>
       <scope>provided</scope>
     </dependency>
     <dependency>

Modified: magnoliamodules/trunk/openutils-mgnltagcloud/pom.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnltagcloud/pom.xml	2013-05-19 14:48:28 UTC (rev 4242)
+++ magnoliamodules/trunk/openutils-mgnltagcloud/pom.xml	2013-05-19 17:13:29 UTC (rev 4243)
@@ -210,13 +210,13 @@
     <dependency>
       <groupId>javax.servlet</groupId>
       <artifactId>servlet-api</artifactId>
-      <version>2.4</version>
+      <version>2.5</version>
       <scope>provided</scope>
     </dependency>
     <dependency>
-      <groupId>javax.servlet</groupId>
+      <groupId>javax.servlet.jsp</groupId>
       <artifactId>jsp-api</artifactId>
-      <version>2.0</version>
+      <version>2.1</version>
       <scope>provided</scope>
     </dependency>
     <dependency>

Modified: magnoliamodules/trunk/openutils-mgnltasks/pom.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnltasks/pom.xml	2013-05-19 14:48:28 UTC (rev 4242)
+++ magnoliamodules/trunk/openutils-mgnltasks/pom.xml	2013-05-19 17:13:29 UTC (rev 4243)
@@ -92,13 +92,13 @@
     <dependency>
       <groupId>javax.servlet</groupId>
       <artifactId>servlet-api</artifactId>
-      <version>2.4</version>
+      <version>2.5</version>
       <scope>provided</scope>
     </dependency>
     <dependency>
-      <groupId>javax.servlet</groupId>
+      <groupId>javax.servlet.jsp</groupId>
       <artifactId>jsp-api</artifactId>
-      <version>2.0</version>
+      <version>2.1</version>
       <scope>provided</scope>
     </dependency>
     <dependency>

Modified: magnoliamodules/trunk/openutils-mgnltests/pom.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnltests/pom.xml	2013-05-19 14:48:28 UTC (rev 4242)
+++ magnoliamodules/trunk/openutils-mgnltests/pom.xml	2013-05-19 17:13:29 UTC (rev 4243)
@@ -105,7 +105,7 @@
     <dependency>
       <groupId>javax.servlet</groupId>
       <artifactId>servlet-api</artifactId>
-      <version>2.4</version>
+      <version>2.5</version>
       <scope>provided</scope>
     </dependency>
     <dependency>

Modified: magnoliamodules/trunk/openutils-mgnlutils/pom.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnlutils/pom.xml	2013-05-19 14:48:28 UTC (rev 4242)
+++ magnoliamodules/trunk/openutils-mgnlutils/pom.xml	2013-05-19 17:13:29 UTC (rev 4243)
@@ -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>
@@ -24,8 +25,10 @@
     </license>
   </licenses>
   <scm>
-    <connection>scm:svn:svn+ssh://svn.code.sf.net/p/openutils/code/magnoliamodules/trunk/openutils-mgnlutils</connection>
-    <developerConnection>scm:svn:svn+ssh://svn.code.sf.net/p/openutils/code/magnoliamodules/trunk/openutils-mgnlutils </developerConnection>
+    <connection>scm:svn:svn+ssh://svn.code.sf.net/p/openutils/code/magnoliamodules/trunk/openutils-mgnlutils
+    </connection>
+    <developerConnection>scm:svn:svn+ssh://svn.code.sf.net/p/openutils/code/magnoliamodules/trunk/openutils-mgnlutils
+    </developerConnection>
     <url>http://sourceforge.net/p/openutils/code/HEAD/tree/trunk/openutils-mgnlutils</url>
   </scm>
   <build>
@@ -123,10 +126,16 @@
     <dependency>
       <groupId>javax.servlet</groupId>
       <artifactId>servlet-api</artifactId>
-      <version>2.4</version>
+      <version>2.5</version>
       <scope>provided</scope>
     </dependency>
     <dependency>
+      <groupId>javax.servlet.jsp</groupId>
+      <artifactId>jsp-api</artifactId>
+      <version>2.1</version>
+      <scope>provided</scope>
+    </dependency>
+    <dependency>
       <groupId>net.sourceforge.openutils</groupId>
       <artifactId>openutils-mgnltests</artifactId>
       <version>5.0.0</version>

Added: magnoliamodules/trunk/openutils-mgnlutils/src/main/java/it/openutils/mgnlutils/el/NodeElResolver.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlutils/src/main/java/it/openutils/mgnlutils/el/NodeElResolver.java	                        (rev 0)
+++ magnoliamodules/trunk/openutils-mgnlutils/src/main/java/it/openutils/mgnlutils/el/NodeElResolver.java	2013-05-19 17:13:29 UTC (rev 4243)
@@ -0,0 +1,189 @@
+package it.openutils.mgnlutils.el;
+
+import info.magnolia.jcr.util.ContentMap;
+import info.magnolia.jcr.util.NodeUtil;
+import info.magnolia.jcr.util.PropertyUtil;
+
+import java.beans.FeatureDescriptor;
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.List;
+
+import javax.el.ELContext;
+import javax.el.ELResolver;
+import javax.el.PropertyNotWritableException;
+import javax.jcr.Node;
+import javax.jcr.Property;
+import javax.jcr.PropertyIterator;
+import javax.jcr.RepositoryException;
+
+import org.apache.commons.lang.ObjectUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+
+/**
+ * EL resolver for handing javax.jcr.Node, info.magnolia.jcr.util.ContentMap, info.magnolia.cms.core.Content in the same
+ * way in jsps.
+ * @author fgiust
+ * @version $Id$
+ */
+public class NodeElResolver extends javax.el.ELResolver
+{
+
+    private Logger log = LoggerFactory.getLogger(NodeElResolver.class);
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public boolean isReadOnly(ELContext context, Object base, Object property)
+    {
+        return true;
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public void setValue(ELContext context, Object base, Object property, Object value)
+    {
+        // readonly
+        throw new PropertyNotWritableException();
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public Object getValue(ELContext context, Object base, Object property)
+    {
+        if (base == null)
+        {
+            return null;
+        }
+
+        Node node = toNode(base);
+
+        if (node != null)
+        {
+            context.setPropertyResolved(true);
+            return NodeElResolverUtils.get(node, ObjectUtils.toString(property));
+        }
+
+        return null;
+    }
+
+    /**
+     * Convet the input param to a javax.jcr.Node if possible, or return null.
+     * @param base input value
+     * @return a javax.jcr.Node or null
+     */
+    @SuppressWarnings("deprecation")
+    private Node toNode(Object base)
+    {
+        if (base == null)
+        {
+            return null;
+        }
+
+        Node node = null;
+        if (base instanceof Node)
+        {
+            node = (Node) base;
+        }
+        else if (base instanceof ContentMap)
+        {
+            node = ((ContentMap) base).getJCRNode();
+        }
+        else if (base instanceof info.magnolia.cms.core.Content)
+        {
+            node = ((info.magnolia.cms.core.Content) base).getJCRNode();
+        }
+        return node;
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public Class< ? > getType(ELContext context, Object base, Object property)
+    {
+        if (toNode(base) != null)
+        {
+            context.setPropertyResolved(true);
+            return Object.class;
+        }
+        return null;
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public Iterator<FeatureDescriptor> getFeatureDescriptors(ELContext context, Object base)
+    {
+        if (base == null)
+        {
+            return null;
+        }
+
+        Node node = toNode(base);
+        if (node != null)
+        {
+            List<FeatureDescriptor> list = new ArrayList<FeatureDescriptor>();
+
+            PropertyIterator iter = null;
+            try
+            {
+                iter = node.getProperties();
+            }
+            catch (RepositoryException e)
+            {
+                log.warn("Unable to read properties from {}", NodeUtil.getPathIfPossible(node));
+            }
+            if (iter != null)
+            {
+                while (iter.hasNext())
+                {
+                    Property property = iter.nextProperty();
+
+                    try
+                    {
+                        FeatureDescriptor descriptor = new FeatureDescriptor();
+                        String name = property.getName();
+                        descriptor.setName(name);
+                        descriptor.setDisplayName(name);
+                        descriptor.setShortDescription("");
+                        descriptor.setExpert(false);
+                        descriptor.setHidden(false);
+                        descriptor.setPreferred(true);
+                        descriptor.setValue("type", String.class);
+                        descriptor.setValue(ELResolver.RESOLVABLE_AT_DESIGN_TIME, Boolean.TRUE);
+                        list.add(descriptor);
+                    }
+                    catch (RepositoryException e)
+                    {
+                        // ignore (can't read a property name??)
+                    }
+                }
+            }
+            return list.iterator();
+        }
+        return null;
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public Class< ? > getCommonPropertyType(ELContext context, Object base)
+    {
+        if (toNode(base) != null)
+        {
+            return Object.class;
+        }
+        return null;
+    }
+
+}


Property changes on: magnoliamodules/trunk/openutils-mgnlutils/src/main/java/it/openutils/mgnlutils/el/NodeElResolver.java
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Added: svn:keywords
## -0,0 +1 ##
+Author Date Id Revision
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: magnoliamodules/trunk/openutils-mgnlutils/src/main/java/it/openutils/mgnlutils/el/NodeElResolverUtils.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlutils/src/main/java/it/openutils/mgnlutils/el/NodeElResolverUtils.java	                        (rev 0)
+++ magnoliamodules/trunk/openutils-mgnlutils/src/main/java/it/openutils/mgnlutils/el/NodeElResolverUtils.java	2013-05-19 17:13:29 UTC (rev 4243)
@@ -0,0 +1,177 @@
+package it.openutils.mgnlutils.el;
+
+import java.lang.reflect.InvocationTargetException;
+
+import info.magnolia.cms.beans.runtime.FileProperties;
+import info.magnolia.jcr.util.NodeUtil;
+import info.magnolia.link.LinkException;
+import info.magnolia.link.LinkTransformerManager;
+
+import javax.jcr.Node;
+import javax.jcr.PathNotFoundException;
+import javax.jcr.Property;
+import javax.jcr.PropertyType;
+import javax.jcr.RepositoryException;
+import javax.jcr.Value;
+
+import org.apache.commons.beanutils.BeanUtils;
+import org.apache.commons.beanutils.PropertyUtils;
+import org.apache.commons.lang.StringUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+
+/**
+ * @author fgiust
+ * @version $Id$
+ */
+public class NodeElResolverUtils
+{
+
+    private static Logger log = LoggerFactory.getLogger(NodeElResolverUtils.class);
+
+    public static Object get(Node node, String key)
+    {
+        if (node == null || key == null)
+        {
+            return null;
+        }
+
+        if (StringUtils.equalsIgnoreCase(key, "uuid")
+            || StringUtils.equalsIgnoreCase(key, "@uuid")
+            || StringUtils.equalsIgnoreCase(key, "@id"))
+        {
+            return NodeUtil.getNodeIdentifierIfPossible(node);
+        }
+        else if (StringUtils.equals(key, "handle")
+            || StringUtils.equals(key, "@handle")
+            || StringUtils.equals(key, "@path"))
+        {
+            return NodeUtil.getPathIfPossible(node);
+        }
+        else if (StringUtils.equals(key, "@level") || StringUtils.equals(key, "@depth"))
+        {
+            try
+            {
+                return node.getDepth();
+            }
+            catch (RepositoryException e)
+            {
+                // ignore
+            }
+        }
+
+        try
+        {
+            Object property = BeanUtils.getProperty(node, key);
+
+            // the Node class has a property with this name, stop here
+            return property;
+        }
+        catch (IllegalAccessException e)
+        {
+            // ignore, we tried and failed
+        }
+        catch (NoSuchMethodException e)
+        {
+            // ignore, we tried and failed
+        }
+        catch (InvocationTargetException e)
+        {
+            // ignore, we tried and failed
+        }
+
+        Object nodeprop = getNodeProperty(node, key);
+
+        return nodeprop;
+    }
+
+    public static Object getNodeProperty(Node node, String keyStr)
+    {
+        try
+        {
+            if (node.hasProperty(keyStr))
+            {
+                Property prop = node.getProperty(keyStr);
+                int type = prop.getType();
+                if (type == PropertyType.DATE)
+                {
+                    return prop.getDate();
+                }
+                else if (type == PropertyType.BINARY)
+                {
+                    // what to do?
+                }
+                else if (type == PropertyType.BOOLEAN)
+                {
+                    return prop.getBoolean();
+                }
+                else if (type == PropertyType.LONG)
+                {
+                    return prop.getLong();
+                }
+                else if (type == PropertyType.DOUBLE)
+                {
+                    return prop.getDouble();
+                }
+                else if (type == PropertyType.DECIMAL)
+                {
+                    return prop.getDecimal();
+                }
+                else if (prop.isMultiple())
+                {
+
+                    Value[] values = prop.getValues();
+
+                    String[] valueStrings = new String[values.length];
+
+                    for (int j = 0; j < values.length; j++)
+                    {
+                        try
+                        {
+                            valueStrings[j] = values[j].getString();
+                        }
+                        catch (RepositoryException e)
+                        {
+                            log.debug(e.getMessage());
+                        }
+                    }
+
+                    return valueStrings;
+                }
+                else
+                {
+                    try
+                    {
+                        return info.magnolia.link.LinkUtil.convertLinksFromUUIDPattern(
+                            prop.getString(),
+                            LinkTransformerManager.getInstance().getBrowserLink(node.getPath()));
+                    }
+                    catch (LinkException e)
+                    {
+                        log.warn("Failed to parse links with from " + prop.getName(), e);
+                    }
+                }
+
+                return prop.getString();
+            }
+
+            if (node.hasNode(keyStr))
+            {
+                return node.getNode(keyStr);
+            }
+
+        }
+        catch (PathNotFoundException e)
+        {
+            // ignore, property doesn't exist
+        }
+        catch (RepositoryException e)
+        {
+            log.warn("Failed to retrieve {} on {} with {}", new Object[]{keyStr, node, e.getMessage() });
+        }
+
+        return null;
+    }
+
+}


Property changes on: magnoliamodules/trunk/openutils-mgnlutils/src/main/java/it/openutils/mgnlutils/el/NodeElResolverUtils.java
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Added: svn:keywords
## -0,0 +1 ##
+Author Date Id Revision
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: magnoliamodules/trunk/openutils-mgnlutils/src/main/java/it/openutils/mgnlutils/setup/MgnlUtilsModule.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlutils/src/main/java/it/openutils/mgnlutils/setup/MgnlUtilsModule.java	                        (rev 0)
+++ magnoliamodules/trunk/openutils-mgnlutils/src/main/java/it/openutils/mgnlutils/setup/MgnlUtilsModule.java	2013-05-19 17:13:29 UTC (rev 4243)
@@ -0,0 +1,45 @@
+package it.openutils.mgnlutils.setup;
+
+import info.magnolia.module.ModuleLifecycle;
+import info.magnolia.module.ModuleLifecycleContext;
+import it.openutils.mgnlutils.el.NodeElResolver;
+
+import javax.inject.Inject;
+import javax.servlet.ServletContext;
+import javax.servlet.jsp.JspFactory;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+
+/**
+ * @author fgiust
+ * @version $Id$
+ */
+public class MgnlUtilsModule implements ModuleLifecycle
+{
+
+    @Inject
+    private ServletContext servletContext;
+
+    private Logger log = LoggerFactory.getLogger(MgnlUtilsModule.class);
+
+    /**
+     * {@inheritDoc}
+     */
+    public void start(ModuleLifecycleContext moduleLifecycleContext)
+    {
+        log.warn("Adding EL resolver for javax.jcr.Node");
+        JspFactory.getDefaultFactory().getJspApplicationContext(servletContext).addELResolver(new NodeElResolver());
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public void stop(ModuleLifecycleContext moduleLifecycleContext)
+    {
+        // TODO Auto-generated method stub
+
+    }
+
+}


Property changes on: magnoliamodules/trunk/openutils-mgnlutils/src/main/java/it/openutils/mgnlutils/setup/MgnlUtilsModule.java
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Added: svn:keywords
## -0,0 +1 ##
+Author Date Id Revision
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Modified: trunk/openutils-deployment/pom.xml
===================================================================
--- trunk/openutils-deployment/pom.xml	2013-05-19 14:48:28 UTC (rev 4242)
+++ trunk/openutils-deployment/pom.xml	2013-05-19 17:13:29 UTC (rev...
 
[truncated message content]

[Openutils-svn] SF.net SVN: openutils:[4242] magnoliamodules/trunk/openutils-mgnlcriteria/ src

From: <fg...@us...> - 2013-05-19 14:48:32

Revision: 4242
          http://openutils.svn.sourceforge.net/openutils/?rev=4242&view=rev
Author:   fgiust
Date:     2013-05-19 14:48:28 +0000 (Sun, 19 May 2013)
Log Message:
-----------
use plain "javax.jcr.Node"s when possible

Modified Paths:
--------------
    magnoliamodules/trunk/openutils-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/advanced/impl/AccessibleResultItemResultIterator.java
    magnoliamodules/trunk/openutils-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/advanced/impl/AdvancedResultImpl.java
    magnoliamodules/trunk/openutils-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/advanced/impl/AdvancedResultItemResultIterator.java
    magnoliamodules/trunk/openutils-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/jcr/query/AdvancedResult.java
    magnoliamodules/trunk/openutils-mgnlcriteria/src/test/java/net/sourceforge/openutils/mgnlcriteria/advanced/BasePathTest.java
    magnoliamodules/trunk/openutils-mgnlcriteria/src/test/java/net/sourceforge/openutils/mgnlcriteria/advanced/BasePathWithSpacesTest.java
    magnoliamodules/trunk/openutils-mgnlcriteria/src/test/java/net/sourceforge/openutils/mgnlcriteria/advanced/Content2BeanTest.java
    magnoliamodules/trunk/openutils-mgnlcriteria/src/test/java/net/sourceforge/openutils/mgnlcriteria/advanced/FirstDigitEscapeTest.java
    magnoliamodules/trunk/openutils-mgnlcriteria/src/test/java/net/sourceforge/openutils/mgnlcriteria/advanced/JcrContainsCriteriaSearchTest.java
    magnoliamodules/trunk/openutils-mgnlcriteria/src/test/java/net/sourceforge/openutils/mgnlcriteria/advanced/JcrContainsQuestionMarkTest.java
    magnoliamodules/trunk/openutils-mgnlcriteria/src/test/java/net/sourceforge/openutils/mgnlcriteria/advanced/OrderingTest.java
    magnoliamodules/trunk/openutils-mgnlcriteria/src/test/java/net/sourceforge/openutils/mgnlcriteria/advanced/PaginationTest.java
    magnoliamodules/trunk/openutils-mgnlcriteria/src/test/java/net/sourceforge/openutils/mgnlcriteria/advanced/ScoreAnalizerAndSortTest.java
    magnoliamodules/trunk/openutils-mgnlcriteria/src/test/java/net/sourceforge/openutils/mgnlcriteria/advanced/XpathEscapeTest.java
    magnoliamodules/trunk/openutils-mgnlcriteria/src/test/java/net/sourceforge/openutils/mgnlcriteria/advanced/impl/AccessibleResultItemResultIteratorTest.java
    magnoliamodules/trunk/openutils-mgnlcriteria/src/test/java/net/sourceforge/openutils/mgnlcriteria/jcr/query/CriteriaTest.java
    magnoliamodules/trunk/openutils-mgnlcriteria/src/test/java/net/sourceforge/openutils/mgnlcriteria/jcr/query/lucene/AclSearchIndexTest.java
    magnoliamodules/trunk/openutils-mgnlcriteria/src/test/java/net/sourceforge/openutils/mgnlcriteria/tests/CriteriaTestUtils.java

Modified: magnoliamodules/trunk/openutils-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/advanced/impl/AccessibleResultItemResultIterator.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/advanced/impl/AccessibleResultItemResultIterator.java	2013-05-19 14:12:47 UTC (rev 4241)
+++ magnoliamodules/trunk/openutils-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/advanced/impl/AccessibleResultItemResultIterator.java	2013-05-19 14:48:28 UTC (rev 4242)
@@ -25,6 +25,7 @@
 
 import java.util.NoSuchElementException;
 
+import javax.jcr.Node;
 import javax.jcr.RepositoryException;
 import javax.jcr.Session;
 import javax.jcr.query.RowIterator;
@@ -84,7 +85,7 @@
             {
                 if (!PermissionUtil.isGranted(
                     next.getSession().getWorkspace().getName(),
-                    NodeUtil.getPathIfPossible(next.getJCRNode()),
+                    NodeUtil.getPathIfPossible(next),
                     Session.ACTION_READ))
                 {
                     next = null;

Modified: magnoliamodules/trunk/openutils-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/advanced/impl/AdvancedResultImpl.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/advanced/impl/AdvancedResultImpl.java	2013-05-19 14:12:47 UTC (rev 4241)
+++ magnoliamodules/trunk/openutils-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/advanced/impl/AdvancedResultImpl.java	2013-05-19 14:48:28 UTC (rev 4242)
@@ -19,11 +19,10 @@
 
 package net.sourceforge.openutils.mgnlcriteria.advanced.impl;
 
-import info.magnolia.content2bean.Content2BeanException;
-import info.magnolia.content2bean.Content2BeanUtil;
 import info.magnolia.jcr.RuntimeRepositoryException;
 
 import javax.jcr.Item;
+import javax.jcr.Node;
 import javax.jcr.RepositoryException;
 import javax.jcr.Value;
 import javax.jcr.query.InvalidQueryException;

Modified: magnoliamodules/trunk/openutils-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/advanced/impl/AdvancedResultItemResultIterator.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/advanced/impl/AdvancedResultItemResultIterator.java	2013-05-19 14:12:47 UTC (rev 4241)
+++ magnoliamodules/trunk/openutils-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/advanced/impl/AdvancedResultItemResultIterator.java	2013-05-19 14:48:28 UTC (rev 4242)
@@ -22,6 +22,7 @@
 import info.magnolia.cms.security.AccessDeniedException;
 
 import javax.jcr.Item;
+import javax.jcr.Node;
 import javax.jcr.RepositoryException;
 import javax.jcr.query.Row;
 import javax.jcr.query.RowIterator;

Modified: magnoliamodules/trunk/openutils-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/jcr/query/AdvancedResult.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/jcr/query/AdvancedResult.java	2013-05-19 14:12:47 UTC (rev 4241)
+++ magnoliamodules/trunk/openutils-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/jcr/query/AdvancedResult.java	2013-05-19 14:48:28 UTC (rev 4242)
@@ -21,7 +21,9 @@
 
 import java.util.Iterator;
 
+import javax.jcr.Node;
 
+
 /**
  * The result of a jcr query. You can access to the actual result items using getItems(). This bean will also give you
  * information about the total number of available items, the current page number, the total number of pages.

Modified: magnoliamodules/trunk/openutils-mgnlcriteria/src/test/java/net/sourceforge/openutils/mgnlcriteria/advanced/BasePathTest.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlcriteria/src/test/java/net/sourceforge/openutils/mgnlcriteria/advanced/BasePathTest.java	2013-05-19 14:12:47 UTC (rev 4241)
+++ magnoliamodules/trunk/openutils-mgnlcriteria/src/test/java/net/sourceforge/openutils/mgnlcriteria/advanced/BasePathTest.java	2013-05-19 14:48:28 UTC (rev 4242)
@@ -34,8 +34,9 @@
 import java.util.Collection;
 import java.util.List;
 
+import javax.jcr.Node;
+
 import net.sourceforge.openutils.mgnlcriteria.jcr.query.AdvancedResult;
-import net.sourceforge.openutils.mgnlcriteria.jcr.query.AdvancedResultItem;
 import net.sourceforge.openutils.mgnlcriteria.jcr.query.Criteria;
 import net.sourceforge.openutils.mgnlcriteria.jcr.query.JCRCriteriaFactory;
 import net.sourceforge.openutils.mgnlcriteria.jcr.query.ResultIterator;
@@ -187,7 +188,7 @@
             criteria.add(Restrictions.eq("@title", title));
         }
         AdvancedResult advResult = criteria.execute();
-        ResultIterator<AdvancedResultItem> items = advResult.getItems();
+        ResultIterator<? extends Node> items = advResult.getItems();
         List<String> paths = new ArrayList<String>();
         while (items.hasNext())
         {

Modified: magnoliamodules/trunk/openutils-mgnlcriteria/src/test/java/net/sourceforge/openutils/mgnlcriteria/advanced/BasePathWithSpacesTest.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlcriteria/src/test/java/net/sourceforge/openutils/mgnlcriteria/advanced/BasePathWithSpacesTest.java	2013-05-19 14:12:47 UTC (rev 4241)
+++ magnoliamodules/trunk/openutils-mgnlcriteria/src/test/java/net/sourceforge/openutils/mgnlcriteria/advanced/BasePathWithSpacesTest.java	2013-05-19 14:48:28 UTC (rev 4242)
@@ -29,8 +29,10 @@
 import info.magnolia.test.ComponentsTestUtil;
 import it.openutils.mgnlutils.test.RepositoryTestConfiguration;
 import it.openutils.mgnlutils.test.TestNgRepositoryTestcase;
+
+import javax.jcr.Node;
+
 import net.sourceforge.openutils.mgnlcriteria.jcr.query.AdvancedResult;
-import net.sourceforge.openutils.mgnlcriteria.jcr.query.AdvancedResultItem;
 import net.sourceforge.openutils.mgnlcriteria.jcr.query.Criteria;
 import net.sourceforge.openutils.mgnlcriteria.jcr.query.JCRCriteriaFactory;
 import net.sourceforge.openutils.mgnlcriteria.jcr.query.ResultIterator;
@@ -84,7 +86,7 @@
         criteria.setBasePath("/Lorem ipsum dolor sit amet");
         criteria.add(Restrictions.eq(Criterion.JCR_PRIMARYTYPE, "mgnl:content"));
         AdvancedResult advResult = criteria.execute();
-        ResultIterator<AdvancedResultItem> items = advResult.getItems();
+        ResultIterator<? extends Node> items = advResult.getItems();
         Assert.assertTrue(items.hasNext());
         Assert.assertEquals(items.next().getName(), "consectetur adipisici elit");
     }

Modified: magnoliamodules/trunk/openutils-mgnlcriteria/src/test/java/net/sourceforge/openutils/mgnlcriteria/advanced/Content2BeanTest.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlcriteria/src/test/java/net/sourceforge/openutils/mgnlcriteria/advanced/Content2BeanTest.java	2013-05-19 14:12:47 UTC (rev 4241)
+++ magnoliamodules/trunk/openutils-mgnlcriteria/src/test/java/net/sourceforge/openutils/mgnlcriteria/advanced/Content2BeanTest.java	2013-05-19 14:48:28 UTC (rev 4242)
@@ -34,8 +34,9 @@
 
 import java.util.Map;
 
+import javax.jcr.Node;
+
 import net.sourceforge.openutils.mgnlcriteria.jcr.query.AdvancedResult;
-import net.sourceforge.openutils.mgnlcriteria.jcr.query.AdvancedResultItem;
 import net.sourceforge.openutils.mgnlcriteria.jcr.query.Criteria;
 import net.sourceforge.openutils.mgnlcriteria.jcr.query.JCRCriteriaFactory;
 import net.sourceforge.openutils.mgnlcriteria.jcr.query.ResultIterator;
@@ -95,8 +96,8 @@
         AdvancedResult advResult = criteria.execute();
         Assert.assertNotNull(advResult);
         Assert.assertEquals(advResult.getTotalSize(), 1);
-        ResultIterator<AdvancedResultItem> items = advResult.getItems();
-        AdvancedResultItem item = items.next();
+        ResultIterator<? extends Node> items = advResult.getItems();
+        Node item = items.next();
         Assert.assertEquals(CriteriaTestUtils.title(item), "lorem ipsum");
         Assert.assertEquals(CriteriaTestUtils.path(item), "/contains/lorem-ipsum");
 

Modified: magnoliamodules/trunk/openutils-mgnlcriteria/src/test/java/net/sourceforge/openutils/mgnlcriteria/advanced/FirstDigitEscapeTest.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlcriteria/src/test/java/net/sourceforge/openutils/mgnlcriteria/advanced/FirstDigitEscapeTest.java	2013-05-19 14:12:47 UTC (rev 4241)
+++ magnoliamodules/trunk/openutils-mgnlcriteria/src/test/java/net/sourceforge/openutils/mgnlcriteria/advanced/FirstDigitEscapeTest.java	2013-05-19 14:48:28 UTC (rev 4242)
@@ -29,8 +29,10 @@
 import info.magnolia.test.ComponentsTestUtil;
 import it.openutils.mgnlutils.test.RepositoryTestConfiguration;
 import it.openutils.mgnlutils.test.TestNgRepositoryTestcase;
+
+import javax.jcr.Node;
+
 import net.sourceforge.openutils.mgnlcriteria.jcr.query.AdvancedResult;
-import net.sourceforge.openutils.mgnlcriteria.jcr.query.AdvancedResultItem;
 import net.sourceforge.openutils.mgnlcriteria.jcr.query.Criteria;
 import net.sourceforge.openutils.mgnlcriteria.jcr.query.JCRCriteriaFactory;
 import net.sourceforge.openutils.mgnlcriteria.jcr.query.ResultIterator;
@@ -83,7 +85,7 @@
 
         AdvancedResult advResult = criteria.execute();
 
-        ResultIterator<AdvancedResultItem> resultIterator = advResult.getItems();
+        ResultIterator<? extends Node> resultIterator = advResult.getItems();
         Assert.assertTrue(resultIterator.hasNext());
         Assert.assertEquals(CriteriaTestUtils.name(resultIterator.next()), "ceb55065-e6cd-451a-8ce0-7e495e7e8fbc");
     }
@@ -98,7 +100,7 @@
 
         AdvancedResult advResult = criteria.execute();
 
-        ResultIterator<AdvancedResultItem> resultIterator = advResult.getItems();
+        ResultIterator<? extends Node> resultIterator = advResult.getItems();
         Assert.assertFalse(resultIterator.hasNext());
     }
 
@@ -112,7 +114,7 @@
 
         AdvancedResult advResult = criteria.execute();
 
-        ResultIterator<AdvancedResultItem> resultIterator = advResult.getItems();
+        ResultIterator<? extends Node> resultIterator = advResult.getItems();
         Assert.assertFalse(resultIterator.hasNext());
     }
 

Modified: magnoliamodules/trunk/openutils-mgnlcriteria/src/test/java/net/sourceforge/openutils/mgnlcriteria/advanced/JcrContainsCriteriaSearchTest.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlcriteria/src/test/java/net/sourceforge/openutils/mgnlcriteria/advanced/JcrContainsCriteriaSearchTest.java	2013-05-19 14:12:47 UTC (rev 4241)
+++ magnoliamodules/trunk/openutils-mgnlcriteria/src/test/java/net/sourceforge/openutils/mgnlcriteria/advanced/JcrContainsCriteriaSearchTest.java	2013-05-19 14:48:28 UTC (rev 4242)
@@ -36,6 +36,8 @@
 import java.util.Collections;
 import java.util.List;
 
+import javax.jcr.Node;
+
 import net.sourceforge.openutils.mgnlcriteria.jcr.query.AdvancedResult;
 import net.sourceforge.openutils.mgnlcriteria.jcr.query.AdvancedResultItem;
 import net.sourceforge.openutils.mgnlcriteria.jcr.query.Criteria;
@@ -99,8 +101,8 @@
         AdvancedResult advResult = criteria.execute();
         Assert.assertNotNull(advResult);
         Assert.assertEquals(advResult.getTotalSize(), 1);
-        ResultIterator<AdvancedResultItem> items = advResult.getItems();
-        AdvancedResultItem item = items.next();
+        ResultIterator<? extends Node> items = advResult.getItems();
+        Node item = items.next();
         Assert.assertEquals(CriteriaTestUtils.title(item), "lorem ipsum");
     }
 
@@ -111,8 +113,8 @@
         AdvancedResult advResult = criteria.execute();
         Assert.assertNotNull(advResult);
         Assert.assertEquals(advResult.getTotalSize(), 1);
-        ResultIterator<AdvancedResultItem> items = advResult.getItems();
-        AdvancedResultItem item = items.next();
+        ResultIterator<? extends Node> items = advResult.getItems();
+        Node item = items.next();
         Assert.assertEquals(CriteriaTestUtils.title(item), "lorem");
     }
 
@@ -123,7 +125,7 @@
         AdvancedResult advResult = criteria.execute();
         Assert.assertNotNull(advResult);
         Assert.assertEquals(advResult.getTotalSize(), 2);
-        ResultIterator<AdvancedResultItem> items = advResult.getItems();
+        ResultIterator<? extends Node> items = advResult.getItems();
         List<String> titles = new ArrayList<String>();
         while (items.hasNext())
         {
@@ -144,7 +146,7 @@
         AdvancedResult advResult = criteria.execute();
         Assert.assertNotNull(advResult);
         Assert.assertEquals(advResult.getTotalSize(), 2);
-        ResultIterator<AdvancedResultItem> items = advResult.getItems();
+        ResultIterator<? extends Node> items = advResult.getItems();
         List<String> titles = new ArrayList<String>();
         while (items.hasNext())
         {
@@ -174,8 +176,8 @@
         }
         Assert.assertNotNull(advResult);
         Assert.assertEquals(advResult.getTotalSize(), 1);
-        ResultIterator<AdvancedResultItem> items = advResult.getItems();
-        AdvancedResultItem item = items.next();
+        ResultIterator<? extends Node> items = advResult.getItems();
+        Node item = items.next();
         Assert.assertEquals(CriteriaTestUtils.title(item), "hello test? world");
     }
 
@@ -198,8 +200,8 @@
         }
         Assert.assertNotNull(advResult);
         Assert.assertEquals(advResult.getTotalSize(), 1);
-        ResultIterator<AdvancedResultItem> items = advResult.getItems();
-        AdvancedResultItem item = items.next();
+        ResultIterator<? extends Node> items = advResult.getItems();
+        Node item = items.next();
         Assert.assertEquals(CriteriaTestUtils.title(item), "hello te?st world");
     }
 
@@ -223,8 +225,8 @@
         }
         Assert.assertNotNull(advResult);
         Assert.assertEquals(advResult.getTotalSize(), 1);
-        ResultIterator<AdvancedResultItem> items = advResult.getItems();
-        AdvancedResultItem item = items.next();
+        ResultIterator<? extends Node> items = advResult.getItems();
+        Node item = items.next();
         Assert.assertEquals(CriteriaTestUtils.title(item), "hello \"Milano\" world");
     }
 

Modified: magnoliamodules/trunk/openutils-mgnlcriteria/src/test/java/net/sourceforge/openutils/mgnlcriteria/advanced/JcrContainsQuestionMarkTest.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlcriteria/src/test/java/net/sourceforge/openutils/mgnlcriteria/advanced/JcrContainsQuestionMarkTest.java	2013-05-19 14:12:47 UTC (rev 4241)
+++ magnoliamodules/trunk/openutils-mgnlcriteria/src/test/java/net/sourceforge/openutils/mgnlcriteria/advanced/JcrContainsQuestionMarkTest.java	2013-05-19 14:48:28 UTC (rev 4242)
@@ -38,6 +38,7 @@
 import net.sourceforge.openutils.mgnlcriteria.advanced.impl.AdvancedResultImpl;
 import net.sourceforge.openutils.mgnlcriteria.advanced.impl.QueryExecutorHelper;
 import net.sourceforge.openutils.mgnlcriteria.jcr.query.JCRQueryException;
+import net.sourceforge.openutils.mgnlcriteria.tests.CriteriaTestUtils;
 
 import org.testng.Assert;
 import org.testng.annotations.BeforeClass;
@@ -121,7 +122,7 @@
         AdvancedResultImpl advResult = QueryExecutorHelper.execute(stmt, Query.XPATH, hm, -1, 0, null, false);
 
         Assert.assertEquals(advResult.getTotalSize(), 1);
-        Assert.assertEquals(advResult.getItems().next().getTitle(), "hello test? world");
+        Assert.assertEquals(CriteriaTestUtils.title(advResult.getItems().next()), "hello test? world");
     }
 
     @SuppressWarnings("deprecation")
@@ -139,6 +140,6 @@
         stmt = "//*[((@jcr:primaryType='mgnl:content') and (jcr:contains(@title,'te\\?st')))] order by @jcr:score";
         advResult = QueryExecutorHelper.execute(stmt, Query.XPATH, hm, -1, 0, null, false);
         Assert.assertEquals(advResult.getTotalSize(), 1);
-        Assert.assertEquals(advResult.getItems().next().getTitle(), "hello te?st world");
+        Assert.assertEquals(CriteriaTestUtils.title(advResult.getItems().next()), "hello te?st world");
     }
 }

Modified: magnoliamodules/trunk/openutils-mgnlcriteria/src/test/java/net/sourceforge/openutils/mgnlcriteria/advanced/OrderingTest.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlcriteria/src/test/java/net/sourceforge/openutils/mgnlcriteria/advanced/OrderingTest.java	2013-05-19 14:12:47 UTC (rev 4241)
+++ magnoliamodules/trunk/openutils-mgnlcriteria/src/test/java/net/sourceforge/openutils/mgnlcriteria/advanced/OrderingTest.java	2013-05-19 14:48:28 UTC (rev 4242)
@@ -31,8 +31,10 @@
 import info.magnolia.test.ComponentsTestUtil;
 import it.openutils.mgnlutils.test.RepositoryTestConfiguration;
 import it.openutils.mgnlutils.test.TestNgRepositoryTestcase;
+
+import javax.jcr.Node;
+
 import net.sourceforge.openutils.mgnlcriteria.jcr.query.AdvancedResult;
-import net.sourceforge.openutils.mgnlcriteria.jcr.query.AdvancedResultItem;
 import net.sourceforge.openutils.mgnlcriteria.jcr.query.Criteria;
 import net.sourceforge.openutils.mgnlcriteria.jcr.query.JCRCriteriaFactory;
 import net.sourceforge.openutils.mgnlcriteria.jcr.query.ResultIterator;
@@ -130,11 +132,11 @@
 
         Assert.assertEquals(advResult.getTotalSize(), LETTERS_ARRAY.length);
 
-        ResultIterator<AdvancedResultItem> resultIterator = advResult.getItems();
+        ResultIterator<? extends Node> resultIterator = advResult.getItems();
         Assert.assertEquals(resultIterator.getSize(), LETTERS_ARRAY.length);
 
         int i = 0;
-        for (AdvancedResultItem currentResult : resultIterator)
+        for (Node currentResult : resultIterator)
         {
             Assert.assertEquals(CriteriaTestUtils.title(currentResult), LETTERS_ARRAY[i]);
             i++;
@@ -161,11 +163,11 @@
 
         Assert.assertEquals(advResult.getTotalSize(), LETTERS_ARRAY.length, "Unset total size.");
 
-        ResultIterator<AdvancedResultItem> resultIterator = advResult.getItems();
+        ResultIterator<? extends Node> resultIterator = advResult.getItems();
         Assert.assertEquals(resultIterator.getSize(), PAGINATION_LENGTH, "Wrong iterator size.");
 
         int i = 0;
-        for (AdvancedResultItem currentResult : resultIterator)
+        for (Node currentResult : resultIterator)
         {
             Assert.assertEquals(CriteriaTestUtils.title(currentResult), LETTERS_ARRAY[i], "Position "
                 + i
@@ -183,7 +185,7 @@
         // check that hasNext doesn't change the result of getPosition()
         while (resultIterator.hasNext() && resultIterator.hasNext() && resultIterator.hasNext())
         {
-            AdvancedResultItem currentResult = resultIterator.next();
+            Node currentResult = resultIterator.next();
             Assert.assertEquals(CriteriaTestUtils.title(currentResult), LETTERS_ARRAY[i], "Position "
                 + i
                 + ": found "
@@ -260,11 +262,11 @@
 
         Assert.assertEquals(advResult.getTotalSize(), LETTERS_ARRAY.length, "Unset total size.");
 
-        ResultIterator<AdvancedResultItem> resultIterator = advResult.getItems();
+        ResultIterator<? extends Node> resultIterator = advResult.getItems();
         Assert.assertEquals(resultIterator.getSize(), LETTERS_ARRAY.length - offset, "Wrong iterator size.");
 
         int i = 0;
-        for (AdvancedResultItem currentResult : resultIterator)
+        for (Node currentResult : resultIterator)
         {
             Assert.assertEquals(CriteriaTestUtils.title(currentResult), LETTERS_ARRAY[i + offset], "Position "
                 + i
@@ -282,7 +284,7 @@
         // check that hasNext doesn't change the result of getPosition()
         while (resultIterator.hasNext() && resultIterator.hasNext() && resultIterator.hasNext())
         {
-            AdvancedResultItem currentResult = resultIterator.next();
+            Node currentResult = resultIterator.next();
             Assert.assertEquals(CriteriaTestUtils.title(currentResult), LETTERS_ARRAY[i + offset], "Position "
                 + i
                 + ": found "

Modified: magnoliamodules/trunk/openutils-mgnlcriteria/src/test/java/net/sourceforge/openutils/mgnlcriteria/advanced/PaginationTest.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlcriteria/src/test/java/net/sourceforge/openutils/mgnlcriteria/advanced/PaginationTest.java	2013-05-19 14:12:47 UTC (rev 4241)
+++ magnoliamodules/trunk/openutils-mgnlcriteria/src/test/java/net/sourceforge/openutils/mgnlcriteria/advanced/PaginationTest.java	2013-05-19 14:48:28 UTC (rev 4242)
@@ -31,8 +31,10 @@
 import info.magnolia.test.ComponentsTestUtil;
 import it.openutils.mgnlutils.test.RepositoryTestConfiguration;
 import it.openutils.mgnlutils.test.TestNgRepositoryTestcase;
+
+import javax.jcr.Node;
+
 import net.sourceforge.openutils.mgnlcriteria.jcr.query.AdvancedResult;
-import net.sourceforge.openutils.mgnlcriteria.jcr.query.AdvancedResultItem;
 import net.sourceforge.openutils.mgnlcriteria.jcr.query.Criteria;
 import net.sourceforge.openutils.mgnlcriteria.jcr.query.JCRCriteriaFactory;
 import net.sourceforge.openutils.mgnlcriteria.jcr.query.ResultIterator;
@@ -101,12 +103,12 @@
 
         Assert.assertEquals(advResult.getTotalSize(), 26);
 
-        ResultIterator<AdvancedResultItem> resultIterator = advResult.getItems();
+        ResultIterator<? extends Node> resultIterator = advResult.getItems();
         Assert.assertEquals(resultIterator.getSize(), 26);
 
         Assert.assertEquals(CriteriaTestUtils.title(resultIterator.next()), "A");
 
-        AdvancedResultItem content = null;
+        Node content = null;
         while (resultIterator.hasNext())
         {
             content = resultIterator.next();
@@ -125,7 +127,7 @@
 
         int count = 0;
 
-        for (AdvancedResultItem content : advResult.getItems())
+        for (Node content : advResult.getItems())
         {
             Assert.assertNotNull(content);
             count++;
@@ -150,7 +152,7 @@
 
         Assert.assertEquals(advResult.getTotalSize(), 26);
 
-        ResultIterator<AdvancedResultItem> resultIterator = advResult.getItems();
+        ResultIterator<? extends Node> resultIterator = advResult.getItems();
 
         Assert.assertEquals(CriteriaTestUtils.title(resultIterator.next()), "J");
         Assert.assertEquals(resultIterator.getSize(), 17);
@@ -172,10 +174,10 @@
 
         Assert.assertEquals(advResult.getTotalSize(), 26);
 
-        ResultIterator<AdvancedResultItem> resultIterator = advResult.getItems();
+        ResultIterator<? extends Node> resultIterator = advResult.getItems();
         Assert.assertEquals(resultIterator.getSize(), 10);
 
-        AdvancedResultItem content = null;
+        Node content = null;
         while (resultIterator.hasNext())
         {
             content = resultIterator.next();
@@ -199,7 +201,7 @@
 
         Assert.assertEquals(advResult.getTotalSize(), 26);
 
-        ResultIterator<AdvancedResultItem> resultIterator = advResult.getItems();
+        ResultIterator<? extends Node> resultIterator = advResult.getItems();
 
         Assert.assertEquals(resultIterator.getSize(), 5);
         Assert.assertEquals(CriteriaTestUtils.title(resultIterator.next()), "K");
@@ -225,7 +227,7 @@
 
         Assert.assertEquals(advResult.getTotalSize(), 26);
 
-        ResultIterator<AdvancedResultItem> resultIterator = advResult.getItems();
+        ResultIterator<? extends Node> resultIterator = advResult.getItems();
 
         Assert.assertEquals(resultIterator.getSize(), 2);
         Assert.assertEquals(CriteriaTestUtils.title(resultIterator.next()), "Y");
@@ -249,7 +251,7 @@
         Assert.assertEquals(advResult.getTotalSize(), 26);
         Assert.assertEquals(advResult.getNumberOfPages(), 6);
 
-        ResultIterator<AdvancedResultItem> resultIterator = advResult.getItems();
+        ResultIterator<? extends Node> resultIterator = advResult.getItems();
         Assert.assertEquals(resultIterator.getSize(), 5);
     }
 }

Modified: magnoliamodules/trunk/openutils-mgnlcriteria/src/test/java/net/sourceforge/openutils/mgnlcriteria/advanced/ScoreAnalizerAndSortTest.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlcriteria/src/test/java/net/sourceforge/openutils/mgnlcriteria/advanced/ScoreAnalizerAndSortTest.java	2013-05-19 14:12:47 UTC (rev 4241)
+++ magnoliamodules/trunk/openutils-mgnlcriteria/src/test/java/net/sourceforge/openutils/mgnlcriteria/advanced/ScoreAnalizerAndSortTest.java	2013-05-19 14:48:28 UTC (rev 4242)
@@ -35,6 +35,8 @@
 import java.util.Collection;
 import java.util.List;
 
+import javax.jcr.Node;
+
 import net.sourceforge.openutils.mgnlcriteria.jcr.query.AdvancedResult;
 import net.sourceforge.openutils.mgnlcriteria.jcr.query.AdvancedResultItem;
 import net.sourceforge.openutils.mgnlcriteria.jcr.query.ResultIterator;
@@ -84,7 +86,7 @@
         // Alighieri, Dante
 
         AdvancedResult advResult = CriteriaTestUtils.search("Dante Alighieri", 1, 200);
-        Collection<AdvancedResultItem> result = CriteriaTestUtils.collectCollectionFromResult(advResult);
+        Collection<Node> result = CriteriaTestUtils.collectCollectionFromResult(advResult);
 
         CriteriaTestUtils.assertNumOfResults(2, result, "Dante Alighieri");
     }
@@ -97,19 +99,21 @@
         // fàgiànò
 
         AdvancedResult advResult = CriteriaTestUtils.search("fagiano", 1, 200);
-        Collection<AdvancedResultItem> result = CriteriaTestUtils.collectCollectionFromResult(advResult);
+        Collection<Node> result = CriteriaTestUtils.collectCollectionFromResult(advResult);
 
         CriteriaTestUtils.assertNumOfResults(3, result, "fagiano");
 
-        ResultIterator<AdvancedResultItem> iterator = advResult.getItems();
+        ResultIterator<? extends Node> iterator = advResult.getItems();
 
-        Assert.assertTrue(iterator.next().getScore() > iterator.next().getScore());
+        Assert.assertTrue(((AdvancedResultItem) iterator.next()).getScore() > ((AdvancedResultItem) iterator.next())
+            .getScore());
 
         iterator = advResult.getItems();
 
         // not sure what the selector name "s" means, but that's the only valid selector for this query, according to
         // jackrabbit
-        Assert.assertTrue(iterator.next().getScore("s") > iterator.next().getScore("s"));
+        Assert.assertTrue(((AdvancedResultItem) iterator.next()).getScore("s") > ((AdvancedResultItem) iterator.next())
+            .getScore("s"));
     }
 
     @Test
@@ -119,7 +123,7 @@
         // canna da pesca
 
         AdvancedResult advResult = CriteriaTestUtils.search("pesca", 1, 200);
-        Collection<AdvancedResultItem> result = CriteriaTestUtils.collectCollectionFromResult(advResult);
+        Collection<Node> result = CriteriaTestUtils.collectCollectionFromResult(advResult);
 
         CriteriaTestUtils.assertSortedResults(new String[]{"pèsca", "canna da pesca" }, result, "pesca");
     }
@@ -161,7 +165,7 @@
         // "Faccina sorridente :)"
 
         AdvancedResult advResult = CriteriaTestUtils.search("francia", 1, 200);
-        Collection<AdvancedResultItem> result = CriteriaTestUtils.collectCollectionFromResult(advResult);
+        Collection<Node> result = CriteriaTestUtils.collectCollectionFromResult(advResult);
 
         Assert.assertEquals(advResult.getTotalSize(), 7);
 
@@ -182,7 +186,7 @@
 
         CriteriaTestUtils.assertUnsortedResults(
             new String[]{"Frància", "Parigi (Francia)", "Parigi (Frància)", },
-            ((List<AdvancedResultItem>) result).subList(0, 3),
+            ((List<Node>) result).subList(0, 3),
             "francia");
 
         // the remaining 4 pages have the same score, so the order is not stable

Modified: magnoliamodules/trunk/openutils-mgnlcriteria/src/test/java/net/sourceforge/openutils/mgnlcriteria/advanced/XpathEscapeTest.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlcriteria/src/test/java/net/sourceforge/openutils/mgnlcriteria/advanced/XpathEscapeTest.java	2013-05-19 14:12:47 UTC (rev 4241)
+++ magnoliamodules/trunk/openutils-mgnlcriteria/src/test/java/net/sourceforge/openutils/mgnlcriteria/advanced/XpathEscapeTest.java	2013-05-19 14:48:28 UTC (rev 4242)
@@ -34,6 +34,8 @@
 
 import java.util.Collection;
 
+import javax.jcr.Node;
+
 import net.sourceforge.openutils.mgnlcriteria.jcr.query.AdvancedResult;
 import net.sourceforge.openutils.mgnlcriteria.jcr.query.AdvancedResultItem;
 import net.sourceforge.openutils.mgnlcriteria.jcr.query.Criteria;
@@ -101,9 +103,9 @@
 
         Assert.assertEquals(CriteriaTestUtils.title(advResult.getFirstResult()), title);
 
-        Collection<AdvancedResultItem> collection = CriteriaTestUtils.collectCollectionFromResult(advResult);
+        Collection<Node> collection = CriteriaTestUtils.collectCollectionFromResult(advResult);
         Assert.assertEquals(collection.size(), 1);
-        for (AdvancedResultItem content : collection)
+        for (Node content : collection)
         {
             Assert.assertEquals(CriteriaTestUtils.title(content), title);
         }
@@ -186,7 +188,7 @@
     {
 
         AdvancedResult advResult = CriteriaTestUtils.search("superuser", 1, 200);
-        Collection<AdvancedResultItem> result = CriteriaTestUtils.collectCollectionFromResult(advResult);
+        Collection<Node> result = CriteriaTestUtils.collectCollectionFromResult(advResult);
 
         CriteriaTestUtils.assertNumOfResults(0, result, "superuser");
     }
@@ -195,7 +197,7 @@
     public void testNotInPrivatePropertiesNoTemplates()
     {
         AdvancedResult advResult = CriteriaTestUtils.search("t-redirect", 1, 200);
-        Collection<AdvancedResultItem> result = CriteriaTestUtils.collectCollectionFromResult(advResult);
+        Collection<Node> result = CriteriaTestUtils.collectCollectionFromResult(advResult);
 
         CriteriaTestUtils.assertNumOfResults(0, result, "t-redirect");
     }
@@ -322,7 +324,7 @@
             "//*[( (@jcr:primaryType='mgnl:content')  and  ( jcr:contains(@title, '\\:') )  )] ");
 
         AdvancedResult advResult = criteria.execute();
-        Collection<AdvancedResultItem> result = CriteriaTestUtils.collectCollectionFromResult(advResult);
+        Collection<Node> result = CriteriaTestUtils.collectCollectionFromResult(advResult);
 
         CriteriaTestUtils.assertNumOfResults(0, result, searchText);
     }
@@ -340,7 +342,7 @@
         Assert.assertEquals(criteria.toXpathExpression(), "//*[( ( jcr:contains(@title, '\\)') )  )] ");
 
         AdvancedResult advResult = criteria.execute();
-        Collection<AdvancedResultItem> result = CriteriaTestUtils.collectCollectionFromResult(advResult);
+        Collection<Node> result = CriteriaTestUtils.collectCollectionFromResult(advResult);
 
         CriteriaTestUtils.assertNumOfResults(0, result, searchText);
     }
@@ -359,7 +361,7 @@
         Assert.assertEquals(criteria.toXpathExpression(), "//*[( ( jcr:contains(@title, '\\: \\)') )  )] ");
 
         AdvancedResult advResult = criteria.execute();
-        Collection<AdvancedResultItem> result = CriteriaTestUtils.collectCollectionFromResult(advResult);
+        Collection<Node> result = CriteriaTestUtils.collectCollectionFromResult(advResult);
 
         CriteriaTestUtils.assertNumOfResults(0, result, searchText);
     }
@@ -431,7 +433,7 @@
         Assert.assertEquals(criteria.toXpathExpression(), "//*[( ( jcr:contains(@title, '\\: \\)') )  )] ");
 
         AdvancedResult advResult = criteria.execute();
-        Collection<AdvancedResultItem> result = CriteriaTestUtils.collectCollectionFromResult(advResult);
+        Collection<Node> result = CriteriaTestUtils.collectCollectionFromResult(advResult);
 
         CriteriaTestUtils.assertNumOfResults(0, result, searchText);
     }

Modified: magnoliamodules/trunk/openutils-mgnlcriteria/src/test/java/net/sourceforge/openutils/mgnlcriteria/advanced/impl/AccessibleResultItemResultIteratorTest.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlcriteria/src/test/java/net/sourceforge/openutils/mgnlcriteria/advanced/impl/AccessibleResultItemResultIteratorTest.java	2013-05-19 14:12:47 UTC (rev 4241)
+++ magnoliamodules/trunk/openutils-mgnlcriteria/src/test/java/net/sourceforge/openutils/mgnlcriteria/advanced/impl/AccessibleResultItemResultIteratorTest.java	2013-05-19 14:48:28 UTC (rev 4242)
@@ -36,10 +36,10 @@
 
 import java.util.Calendar;
 
+import javax.jcr.Node;
 import javax.jcr.Session;
 
 import net.sourceforge.openutils.mgnlcriteria.jcr.query.AdvancedResult;
-import net.sourceforge.openutils.mgnlcriteria.jcr.query.AdvancedResultItem;
 import net.sourceforge.openutils.mgnlcriteria.jcr.query.Criteria;
 import net.sourceforge.openutils.mgnlcriteria.jcr.query.JCRCriteriaFactory;
 import net.sourceforge.openutils.mgnlcriteria.jcr.query.ResultIterator;
@@ -51,73 +51,70 @@
 import org.testng.annotations.BeforeClass;
 import org.testng.annotations.Test;
 
+
 /**
- * A test which retrieves a bunch of nodes, some of them actually forbidden by
- * the magnolia ACLs on the website repo. Iterating on the returned result
- * should probably generate an AccessDeniedException that we have to decide how
- * to handle (probably just by silently skipping nodes during the iteration as a
- * first solution)
- * 
+ * A test which retrieves a bunch of nodes, some of them actually forbidden by the magnolia ACLs on the website repo.
+ * Iterating on the returned result should probably generate an AccessDeniedException that we have to decide how to
+ * handle (probably just by silently skipping nodes during the iteration as a first solution)
  * @author dschivo
  */
 @RepositoryTestConfiguration(jackrabbitRepositoryConfig = "/crit-repository/jackrabbit-test-configuration.xml", repositoryConfig = "/crit-repository/test-repositories.xml", bootstrapFiles = {
     "/crit-bootstrap/website.pets.xml",
     "/crit-bootstrap/userroles.anonymous.xml",
     "/crit-bootstrap/users.system.anonymous.xml" })
-public class AccessibleResultItemResultIteratorTest extends
-		TestNgRepositoryTestcase {
+public class AccessibleResultItemResultIteratorTest extends TestNgRepositoryTestcase
+{
 
     /**
-	 * {@inheritDoc}
-	 */
-	@Override
-	@BeforeClass
-	public void setUp() throws Exception {
-		super.setUp();
+     * {@inheritDoc}
+     */
+    @Override
+    @BeforeClass
+    public void setUp() throws Exception
+    {
+        super.setUp();
 
-		// Nodes in this workspace:
-		// - pets (title=Pets)
-		// --- cats (title=Cats)
-		// ----- 1 (title=Leo, petType=cat, birthDate=2000-09-07)
-		// ----- 7 (title=Samantha, petType=cat, birthDate=1995-09-04)
-		// ----- 8 (title=Max, petType=cat, birthDate=1995-09-04)
-		// ----- 13 (title=Sly, petType=cat, birthDate=2002-06-08)
-		// --- dogs (title=Dogs)
-		// ----- 3 (title=Rosy, petType=dog, birthDate=2001-04-17)
-		// ----- 4 (title=Jewel, petType=dog, birthDate=2000-03-07)
-		// ----- 10 (title=Mulligan, petType=dog, birthDate=1997-02-24)
-		// ----- 12 (title=Lucky, petType=dog, birthDate=2000-06-24)
-		// --- lizards (title=Lizards)
-		// ----- 5 (title=Iggy, petType=lizard, birthDate=2000-11-30)
-		// --- snakes (title=Snakes)
-		// ----- 6 (title=George, petType=snake, birthDate=2000-01-20)
-		// --- birds (title=Birds)
-		// ----- 9 (title=Lucky, petType=bird, birthDate=1999-08-06)
-		// ----- 11 (title=Freddy, petType=bird, birthDate=2000-03-09)
-		// --- hamsters (title=Hamsters)
-		// ----- 2 (title=Basil, petType=hamster, birthDate=2002-08-06)
- 
-		MgnlContext.getJCRSession(RepositoryConstants.WEBSITE).save();
- 
+        // Nodes in this workspace:
+        // - pets (title=Pets)
+        // --- cats (title=Cats)
+        // ----- 1 (title=Leo, petType=cat, birthDate=2000-09-07)
+        // ----- 7 (title=Samantha, petType=cat, birthDate=1995-09-04)
+        // ----- 8 (title=Max, petType=cat, birthDate=1995-09-04)
+        // ----- 13 (title=Sly, petType=cat, birthDate=2002-06-08)
+        // --- dogs (title=Dogs)
+        // ----- 3 (title=Rosy, petType=dog, birthDate=2001-04-17)
+        // ----- 4 (title=Jewel, petType=dog, birthDate=2000-03-07)
+        // ----- 10 (title=Mulligan, petType=dog, birthDate=1997-02-24)
+        // ----- 12 (title=Lucky, petType=dog, birthDate=2000-06-24)
+        // --- lizards (title=Lizards)
+        // ----- 5 (title=Iggy, petType=lizard, birthDate=2000-11-30)
+        // --- snakes (title=Snakes)
+        // ----- 6 (title=George, petType=snake, birthDate=2000-01-20)
+        // --- birds (title=Birds)
+        // ----- 9 (title=Lucky, petType=bird, birthDate=1999-08-06)
+        // ----- 11 (title=Freddy, petType=bird, birthDate=2000-03-09)
+        // --- hamsters (title=Hamsters)
+        // ----- 2 (title=Basil, petType=hamster, birthDate=2002-08-06)
 
+        MgnlContext.getJCRSession(RepositoryConstants.WEBSITE).save();
+
         Session userrolesSession = MgnlContext.getJCRSession("userroles");
         PropertyUtil.setProperty(userrolesSession.getNode("/anonymous/acl_website/0"), "path", "/pets/dogs/*");
         userrolesSession.save();
 
-		ComponentsTestUtil.setInstance(I18nContentSupport.class, new DefaultI18nContentSupport());
+        ComponentsTestUtil.setInstance(I18nContentSupport.class, new DefaultI18nContentSupport());
 
         // info.magnolia.cms.security.SecurityTest.setUp()
         final SecuritySupportImpl sec = new SecuritySupportImpl();
         sec.addUserManager(Realm.REALM_SYSTEM.getName(), new SystemUserManager());
         sec.setRoleManager(new MgnlRoleManager());
         ComponentsTestUtil.setInstance(SecuritySupport.class, sec);
-	}
+    }
 
-	/**
-	 * Tests that the website HierarchyManager allows access only to /pets/dogs.
-	 * 
-	 * @throws Exception
-	 */
+    /**
+     * Tests that the website HierarchyManager allows access only to /pets/dogs.
+     * @throws Exception
+     */
     @Test
     public void testGetContent() throws Exception
     {
@@ -132,48 +129,49 @@
             "should not be allowed to read path /pets/cats");
     }
 
-	/**
-	 * Tests the method of an advanced result for iterating over accessible
-	 * nodes (i.e. those which do not throw an AccessDeniedException).
-	 * 
-	 * @throws Exception
-	 */
-	@Test
-	public void testGetAccessibleItems() throws Exception {
-		Calendar begin = Calendar.getInstance();
-		begin.set(1999, Calendar.JANUARY, 1);
-		Calendar end = Calendar.getInstance();
-		end.set(2001, Calendar.DECEMBER, 31);
+    /**
+     * Tests the method of an advanced result for iterating over accessible nodes (i.e. those which do not throw an
+     * AccessDeniedException).
+     * @throws Exception
+     */
+    @Test
+    public void testGetAccessibleItems() throws Exception
+    {
+        Calendar begin = Calendar.getInstance();
+        begin.set(1999, Calendar.JANUARY, 1);
+        Calendar end = Calendar.getInstance();
+        end.set(2001, Calendar.DECEMBER, 31);
 
-		Criteria criteria = JCRCriteriaFactory.createCriteria().setWorkspace(
-				RepositoryConstants.WEBSITE).setBasePath("/pets").add(
-				Restrictions.between("@birthDate", begin, end)).addOrder(
-				Order.asc("@birthDate"));
+        Criteria criteria = JCRCriteriaFactory
+            .createCriteria()
+            .setWorkspace(RepositoryConstants.WEBSITE)
+            .setBasePath("/pets")
+            .add(Restrictions.between("@birthDate", begin, end))
+            .addOrder(Order.asc("@birthDate"));
 
-		// Query results:
-		// --- 9 (title=Lucky, petType=bird, birthDate=1999-08-06)
-		// --- 6 (title=George, petType=snake, birthDate=2000-01-20)
-		// --- 4 (title=Jewel, petType=dog, birthDate=2000-03-07)
-		// --- 11 (title=Freddy, petType=bird, birthDate=2000-03-09)
-		// --- 12 (title=Lucky, petType=dog, birthDate=2000-06-24)
-		// --- 1 (title=Leo, petType=cat, birthDate=2000-09-07)
-		// --- 5 (title=Iggy, petType=lizard, birthDate=2000-11-30)
-		// --- 3 (title=Rosy, petType=dog, birthDate=2001-04-17)
-		AdvancedResult result = criteria.execute();
+        // Query results:
+        // --- 9 (title=Lucky, petType=bird, birthDate=1999-08-06)
+        // --- 6 (title=George, petType=snake, birthDate=2000-01-20)
+        // --- 4 (title=Jewel, petType=dog, birthDate=2000-03-07)
+        // --- 11 (title=Freddy, petType=bird, birthDate=2000-03-09)
+        // --- 12 (title=Lucky, petType=dog, birthDate=2000-06-24)
+        // --- 1 (title=Leo, petType=cat, birthDate=2000-09-07)
+        // --- 5 (title=Iggy, petType=lizard, birthDate=2000-11-30)
+        // --- 3 (title=Rosy, petType=dog, birthDate=2001-04-17)
+        AdvancedResult result = criteria.execute();
 
-		// Accessible results (dogs only):
-		// --- 4 (title=Jewel, petType=dog, birthDate=2000-03-07)
-		// --- 12 (title=Lucky, petType=dog, birthDate=2000-06-24)
-		// --- 3 (title=Rosy, petType=dog, birthDate=2001-04-17)
-		ResultIterator<AdvancedResultItem> iterator = result.getItems();
+        // Accessible results (dogs only):
+        // --- 4 (title=Jewel, petType=dog, birthDate=2000-03-07)
+        // --- 12 (title=Lucky, petType=dog, birthDate=2000-06-24)
+        // --- 3 (title=Rosy, petType=dog, birthDate=2001-04-17)
+        ResultIterator< ? extends Node> iterator = result.getItems();
 
-		Assert.assertTrue(iterator.hasNext());
-		Assert.assertEquals(CriteriaTestUtils.name(iterator.next()), "4");
-		Assert.assertTrue(iterator.hasNext());
-		Assert.assertEquals(CriteriaTestUtils.name(iterator.next()), "12");
-		Assert.assertTrue(iterator.hasNext());
-		Assert.assertEquals(CriteriaTestUtils.name(iterator.next()), "3");
-		Assert.assertFalse(iterator.hasNext());
-	}
-
+        Assert.assertTrue(iterator.hasNext());
+        Assert.assertEquals(CriteriaTestUtils.name(iterator.next()), "4");
+        Assert.assertTrue(iterator.hasNext());
+        Assert.assertEquals(CriteriaTestUtils.name(iterator.next()), "12");
+        Assert.assertTrue(iterator.hasNext());
+        Assert.assertEquals(CriteriaTestUtils.name(iterator.next()), "3");
+        Assert.assertFalse(iterator.hasNext());
+    }
 }

Modified: magnoliamodules/trunk/openutils-mgnlcriteria/src/test/java/net/sourceforge/openutils/mgnlcriteria/jcr/query/CriteriaTest.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlcriteria/src/test/java/net/sourceforge/openutils/mgnlcriteria/jcr/query/CriteriaTest.java	2013-05-19 14:12:47 UTC (rev 4241)
+++ magnoliamodules/trunk/openutils-mgnlcriteria/src/test/java/net/sourceforge/openutils/mgnlcriteria/jcr/query/CriteriaTest.java	2013-05-19 14:48:28 UTC (rev 4242)
@@ -27,10 +27,8 @@
 import info.magnolia.cms.security.SecuritySupport;
 import info.magnolia.cms.security.SecuritySupportImpl;
 import info.magnolia.cms.security.SystemUserManager;
-import info.magnolia.cms.util.NodeDataUtil;
 import info.magnolia.context.MgnlContext;
 import info.magnolia.jcr.util.MetaDataUtil;
-import info.magnolia.jcr.util.NodeUtil;
 import info.magnolia.jcr.util.PropertyUtil;
 import info.magnolia.repository.RepositoryConstants;
 import info.magnolia.test.ComponentsTestUtil;
@@ -39,6 +37,8 @@
 
 import java.util.Calendar;
 
+import javax.jcr.Node;
+
 import net.sourceforge.openutils.mgnlcriteria.jcr.query.criterion.Order;
 import net.sourceforge.openutils.mgnlcriteria.jcr.query.criterion.Restrictions;
 import net.sourceforge.openutils.mgnlcriteria.jcr.query.xpath.utils.XPathTextUtils;
@@ -164,9 +164,9 @@
             .add(Restrictions.eq("@jcr:primaryType", MgnlNodeType.NT_CONTENT))
             .add(Restrictions.eq("@title", "Pets"));
         AdvancedResult result = criteria.execute();
-        ResultIterator<AdvancedResultItem> iterator = result.getItems();
+        ResultIterator<? extends Node> iterator = result.getItems();
         Assert.assertTrue(iterator.hasNext());
-        AdvancedResultItem resultNode = iterator.next();
+        Node resultNode = iterator.next();
         Assert.assertEquals(CriteriaTestUtils.title(resultNode), "Pets");
     }
 
@@ -182,7 +182,7 @@
         AdvancedResult result = criteria.execute();
         Assert.assertEquals(result.getTotalSize(), 1);
 
-        ResultIterator<AdvancedResultItem> iterator = result.getItems();
+        ResultIterator<? extends Node> iterator = result.getItems();
         Assert.assertEquals(iterator.getSize(), 1);
         Assert.assertEquals(CriteriaTestUtils.name(iterator.next()), "12");
     }
@@ -242,7 +242,7 @@
         // --- 3 (title=Rosy, petType=dog, birthDate=2001-04-17)
         Assert.assertEquals(result.getTotalSize(), 8);
 
-        ResultIterator<AdvancedResultItem> iterator = result.getItems();
+        ResultIterator<? extends Node> iterator = result.getItems();
         Assert.assertEquals(iterator.getSize(), 3);
         Assert.assertEquals(CriteriaTestUtils.name(iterator.next()), "1");
         Assert.assertEquals(CriteriaTestUtils.name(iterator.next()), "5");
@@ -282,7 +282,7 @@
         // --- 3 (title=Rosy, petType=dog, birthDate=2001-04-17)
         Assert.assertEquals(result.getTotalSize(), 8);
 
-        ResultIterator<AdvancedResultItem> iterator = result.getItems();
+        ResultIterator<? extends Node> iterator = result.getItems();
         Assert.assertEquals(iterator.getSize(), 3);
         Assert.assertEquals(CriteriaTestUtils.name(iterator.next()), "1");
         Assert.assertEquals(CriteriaTestUtils.name(iterator.next()), "5");
@@ -297,7 +297,7 @@
     public void testAddOrder() throws Exception
     {
         Criteria criteria;
-        ResultIterator<AdvancedResultItem> iterator;
+        ResultIterator<? extends Node> iterator;
         Calendar birthDate;
 
         // gets the oldest pet (ascending order)
@@ -311,7 +311,7 @@
         // ----- 7 (title=Samantha, petType=cat, birthDate=1995-09-04)
         // ----- 8 (title=Max, petType=cat, birthDate=1995-09-04)
         Assert.assertTrue(iterator.hasNext());
-     
+
         birthDate = PropertyUtil.getDate(iterator.next(), "birthDate", null);
         Assert.assertEquals(birthDate.get(Calendar.YEAR), 1995);
         Assert.assertEquals(birthDate.get(Calendar.MONTH) + 1, 9);
@@ -342,7 +342,7 @@
     public void testAddOrderMultiple() throws Exception
     {
         Criteria criteria;
-        ResultIterator<AdvancedResultItem> iterator;
+        ResultIterator<? extends Node> iterator;
 
         // order by @birthDate ascending, @title ascending
         criteria = JCRCriteriaFactory
@@ -381,8 +381,8 @@
     public void testDateComparison() throws Exception
     {
         Criteria criteria;
-        ResultIterator<AdvancedResultItem> iterator;
-        AdvancedResultItem node;
+        ResultIterator<? extends Node> iterator;
+        Node node;
         Calendar date;
 
         criteria = JCRCriteriaFactory

Modified: magnoliamodules/trunk/openutils-mgnlcriteria/src/test/java/net/sourceforge/openutils/mgnlcriteria/jcr/query/lucene/AclSearchIndexTest.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlcriteria/src/test/java/net/sourceforge/openutils/mgnlcriteria/jcr/query/lucene/AclSearchIndexTest.java	2013-05-19 14:12:47 UTC (rev 4241)
+++ magnoliamodules/trunk/openutils-mgnlcriteria/src/test/java/net/sourceforge/openutils/mgnlcriteria/jcr/query/lucene/AclSearchIndexTest.java	2013-05-19 14:48:28 UTC (rev 4242)
@@ -36,6 +36,7 @@
 import java.util.Calendar;
 import java.util.List;
 
+import javax.jcr.Node;
 import javax.jcr.Session;
 
 import net.sourceforge.openutils.mgnlcriteria.jcr.query.AdvancedResult;
@@ -187,7 +188,7 @@
             // --- 4 (title=Jewel, petType=dog, birthDate=2000-03-07)
             // --- 12 (title=Lucky, petType=dog, birthDate=2000-06-24)
             // --- 3 (title=Rosy, petType=dog, birthDate=2001-04-17)
-            ResultIterator<AdvancedResultItem> iterator = result.getItems();
+            ResultIterator<? extends Node> iterator = result.getItems();
 
             Assert.assertTrue(iterator.hasNext());
             Assert.assertEquals(CriteriaTestUtils.name(iterator.next()), "4");
@@ -278,7 +279,7 @@
             // --- 11 (title=Freddy, petType=bird, birthDate=2000-03-09)
             // --- 1 (title=Leo, petType=cat, birthDate=2000-09-07)
             // --- 5 (title=Iggy, petType=lizard, birthDate=2000-11-30)
-            ResultIterator<AdvancedResultItem> iterator = result.getItems();
+            ResultIterator<? extends Node> iterator = result.getItems();
 
             Assert.assertTrue(iterator.hasNext());
             Assert.assertEquals(CriteriaTestUtils.name(iterator.next()), "9");

Modified: magnoliamodules/trunk/openutils-mgnlcriteria/src/test/java/net/sourceforge/openutils/mgnlcriteria/tests/CriteriaTestUtils.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlcriteria/src/test/java/net/sourceforge/openutils/mgnlcriteria/tests/CriteriaTestUtils.java	2013-05-19 14:12:47 UTC (rev 4241)
+++ magnoliamodules/trunk/openutils-mgnlcriteria/src/test/java/net/sourceforge/openutils/mgnlcriteria/tests/CriteriaTestUtils.java	2013-05-19 14:48:28 UTC (rev 4242)
@@ -19,6 +19,8 @@
 
 package net.sourceforge.openutils.mgnlcriteria.tests;
 
+import info.magnolia.jcr.util.NodeUtil;
+import info.magnolia.jcr.util.PropertyUtil;
 import info.magnolia.repository.RepositoryConstants;
 
 import java.io.StringWriter;
@@ -28,6 +30,8 @@
 import java.util.Collections;
 import java.util.List;
 
+import javax.jcr.Node;
+
 import net.sourceforge.openutils.mgnlcriteria.jcr.query.AdvancedResult;
 import net.sourceforge.openutils.mgnlcriteria.jcr.query.AdvancedResultItem;
 import net.sourceforge.openutils.mgnlcriteria.jcr.query.Criteria;
@@ -51,12 +55,12 @@
 public class CriteriaTestUtils
 {
 
-    public static void assertNumOfResults(int expected, Collection<AdvancedResultItem> result, String search)
+    public static void assertNumOfResults(int expected, Collection<Node> result, String search)
     {
         if (result.size() != expected)
         {
             List<String> titles = new ArrayList<String>();
-            for (AdvancedResultItem content : result)
+            for (Node content : result)
             {
                 titles.add(title(content));
             }
@@ -72,13 +76,13 @@
         }
     }
 
-    public static void assertUnsortedResults(String[] expected, Collection<AdvancedResultItem> result, String search)
+    public static void assertUnsortedResults(String[] expected, Collection<Node> result, String search)
     {
         Arrays.sort(expected);
 
         List<String> titles = new ArrayList<String>();
 
-        for (AdvancedResultItem content : result)
+        for (Node content : result)
         {
             titles.add(title(content));
         }
@@ -102,10 +106,10 @@
 
     }
 
-    public static void assertSortedResults(String[] expected, Collection<AdvancedResultItem> result, String search)
+    public static void assertSortedResults(String[] expected, Collection<Node> result, String search)
     {
         List<String> titles = new ArrayList<String>();
-        for (AdvancedResultItem content : result)
+        for (Node content : result)
         {
             titles.add(title(content));
         }
@@ -199,28 +203,28 @@
         return criteria;
     }
 
-    public static Collection<AdvancedResultItem> collectCollectionFromResult(AdvancedResult result)
+    public static Collection<Node> collectCollectionFromResult(AdvancedResult result)
     {
 
-        ResultIterator<AdvancedResultItem> items = result.getItems();
-        ArrayList<AdvancedResultItem> list = new ArrayList<AdvancedResultItem>();
+        ResultIterator<? extends Node> items = result.getItems();
+        ArrayList<Node> list = new ArrayList<Node>();
 
         CollectionUtils.addAll(list, items);
         return list;
     }
 
-    public static String title(AdvancedResultItem item)
+    public static String title(Node item)
     {
-        return item.getTitle();
+        return PropertyUtil.getString(item, "title");
     }
 
-    public static String name(AdvancedResultItem item)
+    public static String name(Node item)
     {
-        return item.getName();
+        return NodeUtil.getName(item);
     }
 
-    public static String path(AdvancedResultItem item)
+    public static String path(Node item)
     {
-        return item.getHandle();
+        return NodeUtil.getPathIfPossible(item);
     }
 }

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

[Openutils-svn] SF.net SVN: openutils:[4241] magnoliamodules/trunk/openutils-mgnlmedia/src/ main/java/net/sourceforge/openutils/mgnlmedia

From: <fg...@us...> - 2013-05-19 14:12:51

Revision: 4241
          http://openutils.svn.sourceforge.net/openutils/?rev=4241&view=rev
Author:   fgiust
Date:     2013-05-19 14:12:47 +0000 (Sun, 19 May 2013)
Log Message:
-----------
removing deprecations, work in progress (currently broken)

Modified Paths:
--------------
    magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/configuration/MediaConfigurationManager.java
    magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/configuration/MediaUsedInManager.java
    magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/setup/AddExtensionToType.java
    magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/setup/ConditionallySubscribeMediaRepositoriesTask.java
    magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/setup/MediaModuleVersionHandler.java
    magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/setup/MoveOriginalNodeTask.java
    magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/setup/RemoveExtensionFromType.java
    magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/tags/el/MediaEl.java
    magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/playlist/pages/PlaylistView.java
    magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/playlist/utils/PlaylistIterateUtils.java

Modified: magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/configuration/MediaConfigurationManager.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/configuration/MediaConfigurationManager.java	2013-05-19 12:40:38 UTC (rev 4240)
+++ magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/configuration/MediaConfigurationManager.java	2013-05-19 14:12:47 UTC (rev 4241)
@@ -32,6 +32,8 @@
 import info.magnolia.cms.util.NodeDataUtil;
 import info.magnolia.content2bean.Content2BeanUtil;
 import info.magnolia.context.MgnlContext;
+import info.magnolia.jcr.util.NodeUtil;
+import info.magnolia.jcr.util.PropertyUtil;
 import info.magnolia.repository.RepositoryConstants;
 
 import java.util.ArrayList;
@@ -42,6 +44,7 @@
 import java.util.Map;
 
 import javax.inject.Singleton;
+import javax.jcr.Node;
 import javax.jcr.RepositoryException;
 import javax.jcr.query.InvalidQueryException;
 
@@ -267,27 +270,33 @@
         return qr.getContent(MediaConfigurationManager.MGNL_MEDIA_TYPE);
     }
 
+    @Deprecated
+    public MediaTypeConfiguration getMediaTypeConfigurationFromMedia(Content media)
+    {
+        return getMediaTypeConfigurationFromMedia(media.getJCRNode());
+    }
+
     /**
      * Get the type configuration for a media
      * @param media media
      * @return type configuration
      */
-    public MediaTypeConfiguration getMediaTypeConfigurationFromMedia(Content media)
+    public MediaTypeConfiguration getMediaTypeConfigurationFromMedia(Node media)
     {
         try
         {
-            if (!media.getItemType().equals(MEDIA))
+            if (!StringUtils.equals(media.getPrimaryNodeType().getName(), MGNL_MEDIA_TYPE))
             {
                 return null;
             }
         }
         catch (RepositoryException e)
         {
-            log.error("Error getting item type on node {} module media", media.getHandle(), e);
+            log.error("Error getting item type on node {} module media", NodeUtil.getPathIfPossible(media), e);
             return null;
         }
 
-        return types.get(NodeDataUtil.getString(media, "type"));
+        return types.get(PropertyUtil.getString(media, "type"));
     }
 
     /**

Modified: magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/configuration/MediaUsedInManager.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/configuration/MediaUsedInManager.java	2013-05-19 12:40:38 UTC (rev 4240)
+++ magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/configuration/MediaUsedInManager.java	2013-05-19 14:12:47 UTC (rev 4241)
@@ -37,6 +37,7 @@
 import java.util.Set;
 
 import javax.inject.Singleton;
+import javax.jcr.Node;
 import javax.jcr.RepositoryException;
 import javax.jcr.query.InvalidQueryException;
 
@@ -138,19 +139,19 @@
                 return Collections.emptyList();
             }
         }
-        List<Content> nodes = getUsedInWorkspaceNodes(mediaUUID, uiw);
+        List<Node> nodes = getUsedInWorkspaceNodes(mediaUUID, uiw);
         List<String> paths = new ArrayList<String>(nodes.size());
-        for (Content node : nodes)
+        for (Node node : nodes)
         {
-            paths.add(node.getHandle());
+            paths.add(node.getPath());
         }
         return paths;
     }
 
-    private static List<Content> getUsedInWorkspaceNodes(String mediaUUID, UsedInWorkspace uiw)
+    private static List<Node> getUsedInWorkspaceNodes(String mediaUUID, UsedInWorkspace uiw)
         throws InvalidQueryException, RepositoryException
     {
-        List<Content> nodes = new ArrayList<Content>();
+        List<Node> nodes = new ArrayList<Node>();
         Set<String> handles = new HashSet<String>();
 
         String basepath = "/jcr:root" + StringUtils.defaultString(uiw.getBasePath());
@@ -173,18 +174,18 @@
 
         log.debug("{} > {}", criteria.toXpathExpression(), result.getTotalSize());
 
-        for (Content item : result.getItems())
+        for (Node item : result.getItems())
         {
-            // log.debug("{} {}", item.getJCRNode().getPrimaryNodeType().getName(), item.getHandle());
-
-            while (!item.getNodeTypeName().equals(uiw.getNodeType()) && item.getLevel() > 1)
+            while (!StringUtils.equals(item.getPrimaryNodeType().getName(), uiw.getNodeType()) && item.getDepth() > 1)
             {
                 item = item.getParent();
             }
-            if (item.getNodeTypeName().equals(uiw.getNodeType()) && !handles.contains(item.getHandle()))
+
+            if (StringUtils.equals(item.getPrimaryNodeType().getName(), uiw.getNodeType())
+                && !handles.contains(item.getPath()))
             {
                 nodes.add(item);
-                handles.add(item.getHandle());
+                handles.add(item.getPath());
             }
         }
 

Modified: magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/setup/AddExtensionToType.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/setup/AddExtensionToType.java	2013-05-19 12:40:38 UTC (rev 4240)
+++ magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/setup/AddExtensionToType.java	2013-05-19 14:12:47 UTC (rev 4241)
@@ -19,12 +19,12 @@
 
 package net.sourceforge.openutils.mgnlmedia.media.setup;
 
-import info.magnolia.cms.beans.config.ContentRepository;
 import info.magnolia.cms.core.Content;
 import info.magnolia.cms.core.HierarchyManager;
 import info.magnolia.module.InstallContext;
 import info.magnolia.module.delta.AbstractRepositoryTask;
 import info.magnolia.module.delta.TaskExecutionException;
+import info.magnolia.repository.RepositoryConstants;
 
 import javax.jcr.RepositoryException;
 
@@ -66,7 +66,7 @@
     protected void doExecute(InstallContext ctx) throws RepositoryException, TaskExecutionException
     {
 
-        final HierarchyManager hm = ctx.getHierarchyManager(ContentRepository.CONFIG);
+        final HierarchyManager hm = ctx.getHierarchyManager(RepositoryConstants.CONFIG);
         String nodePath = "/modules/media/mediatypes/" + this.mediatype;
 
         try

Modified: magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/setup/ConditionallySubscribeMediaRepositoriesTask.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/setup/ConditionallySubscribeMediaRepositoriesTask.java	2013-05-19 12:40:38 UTC (rev 4240)
+++ magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/setup/ConditionallySubscribeMediaRepositoriesTask.java	2013-05-19 14:12:47 UTC (rev 4241)
@@ -19,7 +19,6 @@
 
 package net.sourceforge.openutils.mgnlmedia.media.setup;
 
-import info.magnolia.cms.beans.config.ContentRepository;
 import info.magnolia.cms.core.Content;
 import info.magnolia.cms.core.ItemType;
 import info.magnolia.cms.exchange.ActivationManager;
@@ -31,6 +30,7 @@
 import info.magnolia.module.delta.TaskExecutionException;
 import info.magnolia.module.model.ModuleDefinition;
 import info.magnolia.module.model.RepositoryDefinition;
+import info.magnolia.repository.RepositoryConstants;
 
 import java.util.Collection;
 import java.util.List;
@@ -59,7 +59,7 @@
 
         // check for the sigleinstance flag directly in jcr, the module is not started yet
         boolean singleinstance = false;
-        Content moduleConfigNode = ContentUtil.getContent(ContentRepository.CONFIG, "/modules/media/config");
+        Content moduleConfigNode = ContentUtil.getContent(RepositoryConstants.CONFIG, "/modules/media/config");
         if (moduleConfigNode != null)
         {
             singleinstance = moduleConfigNode.getNodeData("singleinstance").getBoolean();
@@ -95,7 +95,7 @@
         {
             if (!subscriber.isSubscribed("/", repository))
             {
-                Content subscriptionsNode = ContentUtil.getContent(ContentRepository.CONFIG, sManager.getConfigPath()
+                Content subscriptionsNode = ContentUtil.getContent(RepositoryConstants.CONFIG, sManager.getConfigPath()
                     + "/"
                     + subscriber.getName()
                     + "/subscriptions");

Modified: magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/setup/MediaModuleVersionHandler.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/setup/MediaModuleVersionHandler.java	2013-05-19 12:40:38 UTC (rev 4240)
+++ magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/setup/MediaModuleVersionHandler.java	2013-05-19 14:12:47 UTC (rev 4241)
@@ -19,12 +19,12 @@
 
 package net.sourceforge.openutils.mgnlmedia.media.setup;
 
-import info.magnolia.cms.beans.config.ContentRepository;
 import info.magnolia.cms.core.SystemProperty;
 import info.magnolia.module.InstallContext;
 import info.magnolia.module.ModuleRegistry;
 import info.magnolia.module.delta.SetupModuleRepositoriesTask;
 import info.magnolia.module.delta.Task;
+import info.magnolia.repository.RepositoryConstants;
 import it.openutils.mgnltasks.BootstrapMissingNodesTask;
 import it.openutils.mgnltasks.ChangeExistingPropertyTask;
 import it.openutils.mgnltasks.CreateMissingPropertyTask;
@@ -88,48 +88,48 @@
         // tasks.add(new MoveOriginalNodeTask());
 
         tasks.add(new CreateMissingPropertyTask(
-            ContentRepository.CONFIG,
+            RepositoryConstants.CONFIG,
             "/modules/media/config",
             "singleinstance",
             Boolean.FALSE));
 
         tasks.add(new CreateMissingPropertyTask(
-            ContentRepository.CONFIG,
+            RepositoryConstants.CONFIG,
             "/modules/media/config",
             "player",
             "jwplayer5"));
 
         tasks.add(new CreateMissingPropertyTask(
-            ContentRepository.CONFIG,
+            RepositoryConstants.CONFIG,
             "/modules/media/config",
             "folderViewItemsPerPage",
             10L));
 
         // MEDIA-70 new enabled property for media type
         tasks.add(new CreateMissingPropertyTask(
-            ContentRepository.CONFIG,
+            RepositoryConstants.CONFIG,
             "/modules/media/mediatypes/image",
             "enabled",
             Boolean.TRUE));
         tasks.add(new CreateMissingPropertyTask(
-            ContentRepository.CONFIG,
+            RepositoryConstants.CONFIG,
             "/modules/media/mediatypes/video",
             "enabled",
             Boolean.TRUE));
         tasks.add(new CreateMissingPropertyTask(
-            ContentRepository.CONFIG,
+            RepositoryConstants.CONFIG,
             "/modules/media/mediatypes/youtube",
             "enabled",
             Boolean.TRUE));
         tasks.add(new CreateMissingPropertyTask(
-            ContentRepository.CONFIG,
+            RepositoryConstants.CONFIG,
             "/modules/media/mediatypes/audio",
             "enabled",
             Boolean.TRUE));
 
         // change "external video" handler
         tasks.add(new ChangeExistingPropertyTask(
-            ContentRepository.CONFIG,
+            RepositoryConstants.CONFIG,
             "/modules/media/mediatypes/youtube/handler",
             "class",
             "net.sourceforge.openutils.mgnlmedia.media.types.impl.YouTubeVideoTypeHandler",
@@ -137,7 +137,7 @@
 
         // change "external video" icon
         tasks.add(new ChangeExistingPropertyTask(
-            ContentRepository.CONFIG,
+            RepositoryConstants.CONFIG,
             "/modules/media/mediatypes/youtube",
             "menuIcon",
             "/.resources/media/icons/film.gif",
@@ -145,7 +145,7 @@
 
         // change "audio" icon
         tasks.add(new ChangeExistingPropertyTask(
-            ContentRepository.CONFIG,
+            RepositoryConstants.CONFIG,
             "/modules/media/mediatypes/audio",
             "menuIcon",
             "/.resources/media/icons/audio.gif",
@@ -153,7 +153,7 @@
 
         // change "video" icon
         tasks.add(new ChangeExistingPropertyTask(
-            ContentRepository.CONFIG,
+            RepositoryConstants.CONFIG,
             "/modules/media/mediatypes/video",
             "menuIcon",
             "/.resources/media/icons/film.gif",
@@ -161,7 +161,7 @@
 
         // change "image" icon
         tasks.add(new ChangeExistingPropertyTask(
-            ContentRepository.CONFIG,
+            RepositoryConstants.CONFIG,
             "/modules/media/mediatypes/image",
             "menuIcon",
             "/.resources/media/icons/image16.gif",
@@ -174,7 +174,7 @@
         tasks.add(new NodeSortTask("config", "/modules/media/mediatypes", "order"));
 
         tasks.add(new CreateMissingPropertyTask(
-            ContentRepository.CONFIG,
+            RepositoryConstants.CONFIG,
             "/modules/media/mediatypes/youtube/handler",
             "parseremotefiles",
             Boolean.TRUE));
@@ -196,7 +196,7 @@
 
             // extended template renderer
             tasks.add(new ChangeExistingPropertyTask(
-                ContentRepository.CONFIG,
+                RepositoryConstants.CONFIG,
                 "/modules/standard-templating-kit/template-renderers/stk",
                 "renderer",
                 "net.sourceforge.openutils.mgnlmedia.freemarker.SktSimpleMediaTemplateRenderer",
@@ -204,7 +204,7 @@
 
             // extended paragraph renderer
             tasks.add(new ChangeExistingPropertyTask(
-                ContentRepository.CONFIG,
+                RepositoryConstants.CONFIG,
                 "/modules/standard-templating-kit/paragraph-renderers/stk",
                 "class",
                 "net.sourceforge.openutils.mgnlmedia.freemarker.SktSimpleMediaParagraphRenderer",
@@ -219,33 +219,33 @@
 
         // change "playlists" icon and description
         tasks.add(new ChangeExistingPropertyTask(
-            ContentRepository.CONFIG,
+            RepositoryConstants.CONFIG,
             "/modules/adminInterface/config/menu/media/playlists",
             "icon",
             "/.resources/media/icons/ico16-playlist.png",
             "/.resources/media/icons/ico16-playlists.png"));
         tasks.add(new ChangeExistingPropertyTask(
-            ContentRepository.CONFIG,
+            RepositoryConstants.CONFIG,
             "/modules/adminInterface/config/menu/media/playlists",
             "label",
             "Playlists",
             "media.menu.playlists"));
 
         tasks.add(new CreateMissingPropertyTask(
-            ContentRepository.CONFIG,
+            RepositoryConstants.CONFIG,
             "/modules/media/config/search/filters/query",
             "wildcards",
             Boolean.TRUE));
 
         tasks.add(new ChangeExistingPropertyTask(
-            ContentRepository.CONFIG,
+            RepositoryConstants.CONFIG,
             "/modules/media/mediausedin/website",
             "nodeType",
             "mgnl:content",
             "mgnl:page"));
 
         // empty placeholder
-        tasks.add(new CreateMissingPropertyTask(ContentRepository.CONFIG, "/modules/media/config", "baseurl", ""));
+        tasks.add(new CreateMissingPropertyTask(RepositoryConstants.CONFIG, "/modules/media/config", "baseurl", ""));
 
         return tasks;
     }

Modified: magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/setup/MoveOriginalNodeTask.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/setup/MoveOriginalNodeTask.java	2013-05-19 12:40:38 UTC (rev 4240)
+++ magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/setup/MoveOriginalNodeTask.java	2013-05-19 14:12:47 UTC (rev 4241)
@@ -19,21 +19,14 @@
 
 package net.sourceforge.openutils.mgnlmedia.media.setup;
 
-import info.magnolia.cms.core.Content;
-import info.magnolia.cms.core.HierarchyManager;
-import info.magnolia.cms.core.NodeData;
 import info.magnolia.cms.core.search.Query;
 import info.magnolia.context.MgnlContext;
 import info.magnolia.module.InstallContext;
 import info.magnolia.module.delta.Task;
 import info.magnolia.module.delta.TaskExecutionException;
 
-import java.io.InputStream;
-import java.util.List;
-
 import javax.jcr.RepositoryException;
-import javax.jcr.Value;
-import javax.jcr.nodetype.ConstraintViolationException;
+import javax.jcr.Session;
 
 import net.sourceforge.openutils.mgnlcriteria.jcr.query.AdvancedResult;
 import net.sourceforge.openutils.mgnlcriteria.jcr.query.AdvancedResultItem;
@@ -44,7 +37,6 @@
 import net.sourceforge.openutils.mgnlmedia.media.lifecycle.MediaModule;
 import net.sourceforge.openutils.mgnlmedia.media.types.impl.BaseTypeHandler;
 
-import org.apache.commons.io.IOUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -59,7 +51,7 @@
     /**
      * Logger.
      */
-    private Logger log = LoggerFactory.getLogger(this.getClass());
+    private static Logger log = LoggerFactory.getLogger(MoveOriginalNodeTask.class);
 
     public String getName()
     {
@@ -73,12 +65,12 @@
 
     public void execute(InstallContext installContext) throws TaskExecutionException
     {
-        HierarchyManager mgr = installContext.getHierarchyManager(MediaModule.REPO);
         try
         {
-            reset(mgr, "image", "image");
-            reset(mgr, "video", "video");
-            reset(mgr, "audio", "audio");
+            Session session = installContext.getJCRSession(MediaModule.REPO);
+            reset(session, "image", "image");
+            reset(session, "video", "video");
+            reset(session, "audio", "audio");
         }
         catch (RepositoryException ex)
         {
@@ -88,18 +80,17 @@
 
     public static void execute() throws RepositoryException
     {
-        HierarchyManager mgr = MgnlContext.getHierarchyManager(MediaModule.REPO);
+        Session session = MgnlContext.getJCRSession(MediaModule.REPO);
 
-        reset(mgr, "image", "image");
-        reset(mgr, "video", "video");
-        reset(mgr, "audio", "audio");
+        reset(session, "image", "image");
+        reset(session, "video", "video");
+        reset(session, "audio", "audio");
     }
 
-    public static void reset(HierarchyManager queryManager, String type, String nodedataOldName)
-        throws RepositoryException
+    public static void reset(Session session, String type, String nodedataOldName) throws RepositoryException
     {
 
-        DirectJcrQuery query = JCRCriteriaFactory.createDirectJcrQuery(queryManager, "//*[@jcr:primaryType = '"
+        DirectJcrQuery query = JCRCriteriaFactory.createDirectJcrQuery(session, "//*[@jcr:primaryType = '"
             + MediaConfigurationManager.MEDIA.getSystemName()
             + "' and "
             + nodedataOldName
@@ -113,30 +104,25 @@
 
         while (items.hasNext())
         {
-            Content media = items.next();
+            AdvancedResultItem media = items.next();
 
-            NodeData nd = media.getNodeData(nodedataOldName);
-            Value value = nd.getValue();
-            if (value != null)
+            if (media.hasProperty(nodedataOldName))
             {
-                InputStream stream = value.getStream();
-                NodeData ndNew = media.createNodeData(BaseTypeHandler.ORGINAL_NODEDATA_NAME, stream);
-                for (String attributeName : ((List<String>) nd.getAttributeNames()))
+                try
                 {
-                    try
-                    {
-                        ndNew.setAttribute(attributeName, nd.getAttribute(attributeName));
-                    }
-                    catch (ConstraintViolationException ex)
-                    {
-                        // go on
-                    }
+                    // it's a binary nodedata -> node
+                    session.getWorkspace().move(
+                        media.getPath() + "/" + nodedataOldName,
+                        media.getPath() + "/" + BaseTypeHandler.ORGINAL_NODEDATA_NAME);
                 }
-                IOUtils.closeQuietly(stream);
-                nd.delete();
+                catch (RepositoryException e)
+                {
+                    log.warn(
+                        "Unable to move node from {} to {}",
+                        media.getPath() + "/" + nodedataOldName,
+                        media.getPath() + "/" + BaseTypeHandler.ORGINAL_NODEDATA_NAME);
+                }
             }
-
-            media.save();
         }
     }
 }
\ No newline at end of file

Modified: magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/setup/RemoveExtensionFromType.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/setup/RemoveExtensionFromType.java	2013-05-19 12:40:38 UTC (rev 4240)
+++ magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/setup/RemoveExtensionFromType.java	2013-05-19 14:12:47 UTC (rev 4241)
@@ -19,12 +19,12 @@
 
 package net.sourceforge.openutils.mgnlmedia.media.setup;
 
-import info.magnolia.cms.beans.config.ContentRepository;
 import info.magnolia.cms.core.Content;
 import info.magnolia.cms.core.HierarchyManager;
 import info.magnolia.module.InstallContext;
 import info.magnolia.module.delta.AbstractRepositoryTask;
 import info.magnolia.module.delta.TaskExecutionException;
+import info.magnolia.repository.RepositoryConstants;
 
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -70,7 +70,7 @@
     protected void doExecute(InstallContext ctx) throws RepositoryException, TaskExecutionException
     {
 
-        final HierarchyManager hm = ctx.getHierarchyManager(ContentRepository.CONFIG);
+        final HierarchyManager hm = ctx.getHierarchyManager(RepositoryConstants.CONFIG);
         String nodePath = "/modules/media/mediatypes/" + this.mediatype;
 
         try

Modified: magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/tags/el/MediaEl.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/tags/el/MediaEl.java	2013-05-19 12:40:38 UTC (rev 4240)
+++ magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/tags/el/MediaEl.java	2013-05-19 14:12:47 UTC (rev 4241)
@@ -21,12 +21,12 @@
 
 import info.magnolia.cms.beans.runtime.FileProperties;
 import info.magnolia.cms.core.Content;
-import info.magnolia.cms.core.HierarchyManager;
 import info.magnolia.cms.core.NodeData;
 import info.magnolia.cms.i18n.I18nContentWrapper;
 import info.magnolia.cms.util.NodeDataUtil;
 import info.magnolia.cms.util.NodeMapWrapper;
 import info.magnolia.context.MgnlContext;
+import info.magnolia.jcr.util.ContentMap;
 import info.magnolia.module.ModuleRegistry;
 
 import java.awt.Point;
@@ -105,53 +105,15 @@
     public static Content node(Object obj)
     {
         // TODO use openutils-mgnlutils 1.0.8:
-        // return it.openutils.mgnlutils.el.MgnlUtilsElFunctions.node(obj, MediaModule.REPO);
+        // return
 
         if (obj == null)
         {
             return null;
         }
 
-        Content content = null;
+        Content content = it.openutils.mgnlutils.el.MgnlUtilsElFunctions.node(obj, MediaModule.REPO);
 
-        if (obj instanceof String)
-        {
-            String mediaIdentifier = (String) obj;
-
-            if (StringUtils.isBlank(mediaIdentifier))
-            {
-                return null;
-            }
-
-            HierarchyManager hm = MgnlContext.getHierarchyManager(MediaModule.REPO);
-            try
-            {
-                if (mediaIdentifier.startsWith("/"))
-                {
-                    if (hm.isExist(mediaIdentifier))
-                    {
-                        content = hm.getContent(mediaIdentifier);
-                    }
-                }
-                else
-                {
-                    content = hm.getContentByUUID(StringUtils.trim(mediaIdentifier));
-                }
-            }
-            catch (ItemNotFoundException e)
-            {
-                log.debug("Node \"" + mediaIdentifier + "\" not found");
-            }
-            catch (RepositoryException e)
-            {
-                log.error(e.getClass().getName() + " getting node \"" + mediaIdentifier + "\"", e);
-            }
-        }
-        else if (obj instanceof Content)
-        {
-            content = (Content) obj;
-        }
-
         if (content != null && !(content instanceof NodeMapWrapper))
         {
             Content currentpage = null;
@@ -562,65 +524,26 @@
      * @param obj playlist node or UUID
      * @return Iterator of media nodes
      */
-    public static Iterator<Content> mediaNodesInPlaylist(Object obj)
+    public static Iterator<ContentMap> mediaNodesInPlaylist(Object obj)
     {
-        // TODO use openutils-mgnlutils 1.0.8:
-        // Content playlistNode = it.openutils.mgnlutils.el.MgnlUtilsElFunctions.node(obj, PlaylistConstants.REPO);
-        Content playlistNode = null;
         if (obj == null)
         {
             return null;
         }
 
-        if (obj instanceof String)
-        {
-            String identifier = (String) obj;
+        Content playlistNode = it.openutils.mgnlutils.el.MgnlUtilsElFunctions.node(obj, PlaylistConstants.REPO);
 
-            if (StringUtils.isBlank(identifier))
+        Iterator<ContentMap> iter = Iterators.transform(
+            PlaylistIterateUtils.iterate(playlistNode.getJCRNode()),
+            new Function<MediaNodeAndEntryPath, ContentMap>()
             {
-                return null;
-            }
 
-            HierarchyManager hm = MgnlContext.getHierarchyManager(PlaylistConstants.REPO);
-            try
-            {
-                if (identifier.startsWith("/"))
-                {
-                    if (hm.isExist(identifier))
-                    {
-                        playlistNode = hm.getContent(identifier);
-                    }
-                }
-                else
-                {
-                    playlistNode = hm.getContentByUUID(StringUtils.trim(identifier));
-                }
-            }
-            catch (ItemNotFoundException e)
-            {
-                log.debug("Node \"" + identifier + "\" not found");
-            }
-            catch (RepositoryException e)
-            {
-                log.error(e.getClass().getName() + " getting node \"" + identifier + "\"", e);
-            }
-        }
-        else if (obj instanceof Content)
-        {
-            playlistNode = (Content) obj;
-        }
-
-        Iterator<Content> iter = Iterators.transform(
-            PlaylistIterateUtils.iterate(playlistNode),
-            new Function<MediaNodeAndEntryPath, Content>()
-            {
-
                 /**
                  * {@inheritDoc}
                  */
-                public Content apply(MediaNodeAndEntryPath from)
+                public ContentMap apply(MediaNodeAndEntryPath from)
                 {
-                    return from.getMediaNode();
+                    return (ContentMap) from.getMediaNode();
                 }
             });
         return Iterators.filter(iter, Predicates.notNull());

Modified: magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/playlist/pages/PlaylistView.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/playlist/pages/PlaylistView.java	2013-05-19 12:40:38 UTC (rev 4240)
+++ magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/playlist/pages/PlaylistView.java	2013-05-19 14:12:47 UTC (rev 4241)
@@ -24,6 +24,7 @@
 import info.magnolia.cms.util.ContentUtil;
 import info.magnolia.cms.util.NodeDataUtil;
 import info.magnolia.context.MgnlContext;
+import info.magnolia.jcr.util.PropertyUtil;
 import info.magnolia.module.ModuleRegistry;
 
 import java.io.IOException;
@@ -42,6 +43,7 @@
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
+import net.sourceforge.openutils.mgnlcriteria.jcr.query.AdvancedResultItem;
 import net.sourceforge.openutils.mgnlmedia.media.configuration.MediaConfigurationManager;
 import net.sourceforge.openutils.mgnlmedia.media.configuration.MediaTypeConfiguration;
 import net.sourceforge.openutils.mgnlmedia.media.lifecycle.MediaModule;
@@ -202,10 +204,11 @@
                 playlist.setDescription(NodeDataUtil.getString(node, propNames.get("description")));
                 List<PlaylistEntryBean> entries = new ArrayList<PlaylistEntryBean>();
 
-                for (Iterator<MediaNodeAndEntryPath> iterator = PlaylistIterateUtils.iterate(node); iterator.hasNext();)
+                for (Iterator<MediaNodeAndEntryPath> iterator = PlaylistIterateUtils.iterate(node.getJCRNode()); iterator
+                    .hasNext();)
                 {
                     MediaNodeAndEntryPath item = iterator.next();
-                    Content media = item.getMediaNode();
+                    AdvancedResultItem media = item.getMediaNode();
                     if (media == null)
                     {
                         continue;
@@ -222,18 +225,18 @@
                         entry.setMediaDialog(typeConf.getDialog());
                     }
                     entry.setThumbnail(MediaEl.thumbnail(media));
-                    entry.setType(NodeDataUtil.getString(media, "type"));
+                    entry.setType(PropertyUtil.getString(media, "type"));
                     entry.setTitle(I18nContentSupportFactory
                         .getI18nSupport()
-                        .getNodeData(media, propNames.get("title"))
+                        .getProperty(media, propNames.get("title"))
                         .getString());
                     entry.setDescription(I18nContentSupportFactory
                         .getI18nSupport()
-                        .getNodeData(media, propNames.get("description"))
+                        .getProperty(media, propNames.get("description"))
                         .getString());
                     entry.setTags(I18nContentSupportFactory
                         .getI18nSupport()
-                        .getNodeData(media, propNames.get("tags"))
+                        .getProperty(media, propNames.get("tags"))
                         .getString());
                     entries.add(entry);
                 }

Modified: magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/playlist/utils/PlaylistIterateUtils.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/playlist/utils/PlaylistIterateUtils.java	2013-05-19 12:40:38 UTC (rev 4240)
+++ magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/playlist/utils/PlaylistIterateUtils.java	2013-05-19 14:12:47 UTC (rev 4241)
@@ -32,6 +32,7 @@
 import java.util.Iterator;
 import java.util.Map;
 
+import javax.jcr.Node;
 import javax.jcr.RepositoryException;
 import javax.jcr.Value;
 import javax.servlet.http.HttpServletRequest;
@@ -75,7 +76,7 @@
      * @return
      */
     @SuppressWarnings("unchecked")
-    public static Iterator<MediaNodeAndEntryPath> iterate(final Content playlistNode)
+    public static Iterator<MediaNodeAndEntryPath> iterate(final Node playlistNode)
     {
         if (playlistNode == null)
         {
@@ -136,13 +137,13 @@
             {
                 return Iterators.transform(
                     playlistNode.getChildren(PlaylistConstants.PLAYLIST_ENTRY).iterator(),
-                    new Function<Content, MediaNodeAndEntryPath>()
+                    new Function<AdvancedResultItem, MediaNodeAndEntryPath>()
                     {
 
                         /**
                          * {@inheritDoc}
                          */
-                        public MediaNodeAndEntryPath apply(Content playlistEntry)
+                        public MediaNodeAndEntryPath apply(AdvancedResultItem playlistEntry)
                         {
                             String mediaUUID = NodeDataUtil.getString(playlistEntry, "media");
                             Content mediaNode = MediaEl.node(mediaUUID);
@@ -150,10 +151,10 @@
                             {
                                 log.warn(
                                     "Node {} referenced by entry {} of playlist {} does not exist in media repository",
-                                    new Object[]{mediaUUID, playlistEntry.getName(), playlistNode.getHandle() });
+                                    new Object[]{mediaUUID, playlistEntry.getName(), playlistNode.getPath() });
                             }
 
-                            return new MediaNodeAndEntryPath(mediaNode, playlistEntry.getHandle());
+                            return new MediaNodeAndEntryPath(mediaNode, playlistEntry.getPath());
                         }
                     });
             }
@@ -168,14 +169,14 @@
     public static class MediaNodeAndEntryPath
     {
 
-        private final Content mediaNode;
+        private final AdvancedResultItem mediaNode;
 
         private final String playlistEntryPath;
 
         /**
          * 
          */
-        public MediaNodeAndEntryPath(Content mediaNode, String playlistEntryPath)
+        public MediaNodeAndEntryPath(AdvancedResultItem mediaNode, String playlistEntryPath)
         {
             this.mediaNode = mediaNode;
             this.playlistEntryPath = playlistEntryPath;
@@ -185,7 +186,7 @@
          * Returns the mediaNode.
          * @return the mediaNode
          */
-        public Content getMediaNode()
+        public AdvancedResultItem getMediaNode()
         {
             return mediaNode;
         }
@@ -280,23 +281,27 @@
             }
         }
 
+        @Override
         public String[] getParameterValues(String name)
         {
             String[] value = ((String[]) paramsMap.get(name));
             return value != null ? (String[]) value.clone() : null;
         }
 
+        @Override
         public String getParameter(String name)
         {
             String[] values = (String[]) paramsMap.get(name);
             return values != null && values.length > 0 ? values[0] : null;
         }
 
+        @Override
         public Enumeration getParameterNames()
         {
             return Collections.enumeration(paramsMap.keySet());
         }
 
+        @Override
         public Map getParameterMap()
         {
             HashMap clone = (HashMap) paramsMap.clone();

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

Flat | Threaded

<< < 1 .. 14 15 16 17 18 .. 227 > >> (Page 16 of 227)