openutils-svn Mailing List for openutils (Page 9)

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

[Openutils-svn] SF.net SVN: openutils:[4440] magnoliamodules/trunk/openutils-mgnlmedia/src/ main/java/net/sourceforge/openutils/mgnlmedia/media/utils/ImageUtils.java

From: <fg...@us...> - 2013-11-01 21:24:45

Revision: 4440
          http://openutils.svn.sourceforge.net/openutils/?rev=4440&view=rev
Author:   fgiust
Date:     2013-11-01 21:24:42 +0000 (Fri, 01 Nov 2013)
Log Message:
-----------
MEDIA-305 wrong check for existing resolution

Modified Paths:
--------------
    magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/utils/ImageUtils.java

Modified: magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/utils/ImageUtils.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/utils/ImageUtils.java	2013-11-01 21:20:50 UTC (rev 4439)
+++ magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/utils/ImageUtils.java	2013-11-01 21:24:42 UTC (rev 4440)
@@ -836,7 +836,7 @@
         }
         try
         {
-            if (resolutions != null && resolutions.hasProperty(getResolutionPath(resolution)))
+            if (resolutions != null && resolutions.hasNode(getResolutionPath(resolution)))
             {
                 if (lazy)
                 {

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

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

From: <fg...@us...> - 2013-11-01 21:20:55

Revision: 4439
          http://openutils.svn.sourceforge.net/openutils/?rev=4439&view=rev
Author:   fgiust
Date:     2013-11-01 21:20:50 +0000 (Fri, 01 Nov 2013)
Log Message:
-----------
refactoring basename configuration

Modified Paths:
--------------
    magnoliamodules/trunk/openutils-mgnlmessages/src/main/java/net/sourceforge/openutils/mgnlmessages/MessagesModule.java
    magnoliamodules/trunk/openutils-mgnlmessages/src/main/java/net/sourceforge/openutils/mgnlmessages/MessagesUtils.java
    magnoliamodules/trunk/openutils-mgnlmessages/src/main/java/net/sourceforge/openutils/mgnlmessages/configuration/MessagesConfigurationManager.java
    magnoliamodules/trunk/openutils-mgnlmessages/src/main/java/net/sourceforge/openutils/mgnlmessages/i18n/MultiBundleMessagesImpl.java
    magnoliamodules/trunk/openutils-mgnlmessages/src/main/java/net/sourceforge/openutils/mgnlmessages/pages/MessagesEditPage.java
    magnoliamodules/trunk/openutils-mgnlmessages/src/main/java/net/sourceforge/openutils/mgnlmessages/pages/MessagesImpExpPage.java
    magnoliamodules/trunk/openutils-mgnlmessages/src/main/java/net/sourceforge/openutils/mgnlmessages/setup/MessagesModuleVersionHandler.java

Added Paths:
-----------
    magnoliamodules/trunk/openutils-mgnlmessages/src/main/resources/mgnl-bootstrap/messages-nooverwrite/config.modules.messages.config.basenames.xml

Removed Paths:
-------------
    magnoliamodules/trunk/openutils-mgnlmessages/src/main/java/net/sourceforge/openutils/mgnlmessages/lifecycle/
    magnoliamodules/trunk/openutils-mgnlmessages/src/main/resources/mgnl-bootstrap/messages-nooverwrite/config.modules.messages.basenames.xml

Modified: magnoliamodules/trunk/openutils-mgnlmessages/src/main/java/net/sourceforge/openutils/mgnlmessages/MessagesModule.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlmessages/src/main/java/net/sourceforge/openutils/mgnlmessages/MessagesModule.java	2013-11-01 14:39:20 UTC (rev 4438)
+++ magnoliamodules/trunk/openutils-mgnlmessages/src/main/java/net/sourceforge/openutils/mgnlmessages/MessagesModule.java	2013-11-01 21:20:50 UTC (rev 4439)
@@ -23,8 +23,13 @@
 import info.magnolia.module.ModuleLifecycle;
 import info.magnolia.module.ModuleLifecycleContext;
 import info.magnolia.objectfactory.Components;
+
+import java.util.ArrayList;
+import java.util.List;
+
 import net.sourceforge.openutils.mgnlmessages.configuration.MessagesConfigurationManager;
 
+import org.apache.commons.lang.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -35,13 +40,12 @@
 public class MessagesModule implements ModuleLifecycle
 {
 
-    /**
-     *
-     */
     public static final String REPO = "messages";
 
     private Logger log = LoggerFactory.getLogger(MessagesModule.class);
 
+    private List<String> basenames = new ArrayList<String>();
+
     /**
      * {@inheritDoc}
      */
@@ -50,7 +54,7 @@
         log.info("Starting module messages");
         ctx.registerModuleObservingComponent("locales", Components.getComponent(MessagesConfigurationManager.class));
 
-        Components.getComponent(MessagesManager.class).init();
+        Components.getComponent(MessagesManager.class).reload();
     }
 
     /**
@@ -61,4 +65,34 @@
         log.info("Stopping module messages");
     }
 
+    /**
+     * Returns the basenames.
+     * @return the basenames
+     */
+    public List<String> getBasenames()
+    {
+        return basenames;
+    }
+
+    /**
+     * Sets the basenames.
+     * @param basenames the basenames to set
+     */
+    public void setBasenames(List<String> basenames)
+    {
+        this.basenames = basenames;
+    }
+
+    /**
+     * Sets the basenames.
+     * @param basenames the basenames to set
+     */
+    public void addBasenames(String basename)
+    {
+        if (StringUtils.isNotBlank(basename))
+        {
+            this.basenames.add(basename);
+        }
+    }
+
 }

Modified: magnoliamodules/trunk/openutils-mgnlmessages/src/main/java/net/sourceforge/openutils/mgnlmessages/MessagesUtils.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlmessages/src/main/java/net/sourceforge/openutils/mgnlmessages/MessagesUtils.java	2013-11-01 14:39:20 UTC (rev 4438)
+++ magnoliamodules/trunk/openutils-mgnlmessages/src/main/java/net/sourceforge/openutils/mgnlmessages/MessagesUtils.java	2013-11-01 21:20:50 UTC (rev 4439)
@@ -26,10 +26,15 @@
 import info.magnolia.objectfactory.Components;
 import it.openutils.mgnlutils.util.NodeUtilsExt;
 
+import java.util.List;
+import java.util.Locale;
+
 import javax.jcr.Node;
 import javax.jcr.RepositoryException;
 import javax.jcr.Session;
 
+import net.sourceforge.openutils.mgnlmessages.configuration.MessagesConfigurationManager;
+
 import org.apache.commons.lang.StringUtils;
 
 
@@ -70,4 +75,9 @@
 
         session.save();
     }
+
+    public static List<Locale> getAvaiableLocales()
+    {
+        return Components.getComponent(MessagesConfigurationManager.class).getLocales();
+    }
 }

Modified: magnoliamodules/trunk/openutils-mgnlmessages/src/main/java/net/sourceforge/openutils/mgnlmessages/configuration/MessagesConfigurationManager.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlmessages/src/main/java/net/sourceforge/openutils/mgnlmessages/configuration/MessagesConfigurationManager.java	2013-11-01 14:39:20 UTC (rev 4438)
+++ magnoliamodules/trunk/openutils-mgnlmessages/src/main/java/net/sourceforge/openutils/mgnlmessages/configuration/MessagesConfigurationManager.java	2013-11-01 21:20:50 UTC (rev 4439)
@@ -20,13 +20,9 @@
 package net.sourceforge.openutils.mgnlmessages.configuration;
 
 import info.magnolia.cms.core.MgnlNodeType;
-import info.magnolia.context.SystemContext;
 import info.magnolia.jcr.RuntimeRepositoryException;
 import info.magnolia.jcr.util.NodeUtil;
 import info.magnolia.jcr.util.PropertyUtil;
-import info.magnolia.objectfactory.Components;
-import info.magnolia.repository.RepositoryConstants;
-import it.openutils.mgnlutils.util.NodeUtilsExt;
 import it.openutils.mgnlutils.util.ObservedManagerAdapter;
 
 import java.util.ArrayList;
@@ -38,13 +34,8 @@
 import javax.inject.Singleton;
 import javax.jcr.Node;
 import javax.jcr.RepositoryException;
-import javax.jcr.Session;
 
-import net.sourceforge.openutils.mgnlmessages.MessagesModule;
 
-import org.apache.commons.lang.StringUtils;
-
-
 /**
  * @author molaschi
  */
@@ -116,43 +107,6 @@
         }
     }
 
-    public static List<Locale> getAvaiableLocales()
-    {
-        return Components.getComponent(MessagesConfigurationManager.class).getLocales();
-    }
-
-    @SuppressWarnings("unchecked")
-    public static List<String> getBaseNames()
-    {
-        Session session;
-        try
-        {
-            session = Components.getComponent(SystemContext.class).getJCRSession(RepositoryConstants.CONFIG);
-        }
-        catch (RepositoryException e)
-        {
-            throw new RuntimeRepositoryException(e);
-        }
-        try
-        {
-            Node basenamesNode = session.getNode("/modules/messages/basenames");
-
-            Iterable<Node> nodes = NodeUtil.getNodes(basenamesNode, NodeUtil.EXCLUDE_META_DATA_FILTER);
-
-            List<String> basenames = new ArrayList<String>();
-
-            for (Node bn : nodes)
-            {
-                basenames.add(PropertyUtil.getString(bn, "basename"));
-            }
-            return basenames;
-        }
-        catch (RepositoryException e)
-        {
-            return new ArrayList<String>();
-        }
-    }
-
     /**
      * Returns the locales.
      * @return the locales

Modified: magnoliamodules/trunk/openutils-mgnlmessages/src/main/java/net/sourceforge/openutils/mgnlmessages/i18n/MultiBundleMessagesImpl.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlmessages/src/main/java/net/sourceforge/openutils/mgnlmessages/i18n/MultiBundleMessagesImpl.java	2013-11-01 14:39:20 UTC (rev 4438)
+++ magnoliamodules/trunk/openutils-mgnlmessages/src/main/java/net/sourceforge/openutils/mgnlmessages/i18n/MultiBundleMessagesImpl.java	2013-11-01 21:20:50 UTC (rev 4439)
@@ -20,6 +20,8 @@
 package net.sourceforge.openutils.mgnlmessages.i18n;
 
 import info.magnolia.cms.i18n.AbstractMessagesImpl;
+import info.magnolia.module.ModuleRegistry;
+import info.magnolia.objectfactory.Components;
 
 import java.util.ArrayList;
 import java.util.HashSet;
@@ -29,6 +31,7 @@
 import java.util.MissingResourceException;
 import java.util.Set;
 
+import net.sourceforge.openutils.mgnlmessages.MessagesModule;
 import net.sourceforge.openutils.mgnlmessages.configuration.MessagesConfigurationManager;
 
 import org.apache.commons.collections.IteratorUtils;
@@ -52,9 +55,13 @@
     {
         super(null, locale);
         messages = new ArrayList<OpenutilsMessagesImpl>();
-        for (String basename : MessagesConfigurationManager.getBaseNames())
+        if (Components.getComponent(ModuleRegistry.class).getModuleInstance("messages") != null)
         {
-            messages.add(new OpenutilsMessagesImpl(basename, locale));
+            for (String basename : ((MessagesModule) Components.getComponent(ModuleRegistry.class).getModuleInstance(
+                "messages")).getBasenames())
+            {
+                messages.add(new OpenutilsMessagesImpl(basename, locale));
+            }
         }
     }
 

Modified: magnoliamodules/trunk/openutils-mgnlmessages/src/main/java/net/sourceforge/openutils/mgnlmessages/pages/MessagesEditPage.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlmessages/src/main/java/net/sourceforge/openutils/mgnlmessages/pages/MessagesEditPage.java	2013-11-01 14:39:20 UTC (rev 4438)
+++ magnoliamodules/trunk/openutils-mgnlmessages/src/main/java/net/sourceforge/openutils/mgnlmessages/pages/MessagesEditPage.java	2013-11-01 21:20:50 UTC (rev 4439)
@@ -45,7 +45,6 @@
 
 import net.sourceforge.openutils.mgnlmessages.MessagesModule;
 import net.sourceforge.openutils.mgnlmessages.MessagesUtils;
-import net.sourceforge.openutils.mgnlmessages.configuration.MessagesConfigurationManager;
 import net.sourceforge.openutils.mgnlmessages.el.MessagesEl;
 
 import org.apache.commons.lang.StringUtils;
@@ -125,7 +124,7 @@
             }
             Collections.sort(keys);
 
-            locales = MessagesConfigurationManager.getAvaiableLocales();
+            locales = MessagesUtils.getAvaiableLocales();
 
             Locale loc = this.request.getLocale();
             if (locales != null && !locales.isEmpty() && !locales.contains(loc))
@@ -241,7 +240,7 @@
         if (!StringUtils.isBlank(text))
         {
             Locale locBk = MgnlContext.getLocale();
-            for (Locale newLoc : MessagesConfigurationManager.getAvaiableLocales())
+            for (Locale newLoc : MessagesUtils.getAvaiableLocales())
             {
                 MgnlContext.setLocale(newLoc);
                 Messages messages = MgnlContext.getMessages();

Modified: magnoliamodules/trunk/openutils-mgnlmessages/src/main/java/net/sourceforge/openutils/mgnlmessages/pages/MessagesImpExpPage.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlmessages/src/main/java/net/sourceforge/openutils/mgnlmessages/pages/MessagesImpExpPage.java	2013-11-01 14:39:20 UTC (rev 4438)
+++ magnoliamodules/trunk/openutils-mgnlmessages/src/main/java/net/sourceforge/openutils/mgnlmessages/pages/MessagesImpExpPage.java	2013-11-01 21:20:50 UTC (rev 4439)
@@ -23,6 +23,7 @@
 import info.magnolia.cms.i18n.Messages;
 import info.magnolia.cms.util.AlertUtil;
 import info.magnolia.module.admininterface.TemplatedMVCHandler;
+import info.magnolia.objectfactory.Components;
 
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
@@ -44,8 +45,8 @@
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
+import net.sourceforge.openutils.mgnlmessages.MessagesModule;
 import net.sourceforge.openutils.mgnlmessages.MessagesUtils;
-import net.sourceforge.openutils.mgnlmessages.configuration.MessagesConfigurationManager;
 
 import org.apache.commons.io.IOUtils;
 import org.apache.commons.lang.StringUtils;
@@ -93,9 +94,9 @@
         HSSFWorkbook wb = new HSSFWorkbook();
 
         Map<String, Set<Messages>> messages = new HashMap<String, Set<Messages>>();
-        List<Locale> locales = MessagesConfigurationManager.getAvaiableLocales();
+        List<Locale> locales = MessagesUtils.getAvaiableLocales();
 
-        for (String basename : MessagesConfigurationManager.getBaseNames())
+        for (String basename : Components.getComponent(MessagesModule.class).getBasenames())
         {
 
             Set<Messages> msgs = new LinkedHashSet<Messages>();

Modified: magnoliamodules/trunk/openutils-mgnlmessages/src/main/java/net/sourceforge/openutils/mgnlmessages/setup/MessagesModuleVersionHandler.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlmessages/src/main/java/net/sourceforge/openutils/mgnlmessages/setup/MessagesModuleVersionHandler.java	2013-11-01 14:39:20 UTC (rev 4438)
+++ magnoliamodules/trunk/openutils-mgnlmessages/src/main/java/net/sourceforge/openutils/mgnlmessages/setup/MessagesModuleVersionHandler.java	2013-11-01 21:20:50 UTC (rev 4439)
@@ -19,13 +19,38 @@
 
 package net.sourceforge.openutils.mgnlmessages.setup;
 
+import info.magnolia.module.InstallContext;
+import info.magnolia.module.delta.Task;
+import info.magnolia.repository.RepositoryConstants;
+import it.openutils.mgnltasks.MoveSubnodesAndDeleteTask;
 import it.openutils.mgnltasks.SimpleModuleVersionHandler;
 
+import java.util.ArrayList;
+import java.util.List;
 
+
 /**
  * @author manuel
  * @version $Id
  */
 public class MessagesModuleVersionHandler extends SimpleModuleVersionHandler
 {
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    protected List<Task> getStartupTasks(InstallContext installContext)
+    {
+        List<Task> tasks = new ArrayList<Task>();
+
+        tasks
+            .add(new MoveSubnodesAndDeleteTask(
+                RepositoryConstants.CONFIG,
+                "/modules/messages/basenames",
+                "/modules/messages/config/basenames",
+                "Basenames configuration has been migrated from /modules/messages/basenames to /modules/messages/config/basenames. Please check your configuration"));
+
+        return tasks;
+    }
 }

Deleted: magnoliamodules/trunk/openutils-mgnlmessages/src/main/resources/mgnl-bootstrap/messages-nooverwrite/config.modules.messages.basenames.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnlmessages/src/main/resources/mgnl-bootstrap/messages-nooverwrite/config.modules.messages.basenames.xml	2013-11-01 14:39:20 UTC (rev 4438)
+++ magnoliamodules/trunk/openutils-mgnlmessages/src/main/resources/mgnl-bootstrap/messages-nooverwrite/config.modules.messages.basenames.xml	2013-11-01 21:20:50 UTC (rev 4439)
@@ -1,72 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<sv:node sv:name="basenames" xmlns:sv="http://www.jcp.org/jcr/sv/1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-  <sv:property sv:name="jcr:primaryType" sv:type="Name">
-    <sv:value>mgnl:content</sv:value>
-  </sv:property>
-  <sv:property sv:name="jcr:mixinTypes" sv:type="Name">
-    <sv:value>mix:lockable</sv:value>
-  </sv:property>
-  <sv:property sv:name="jcr:uuid" sv:type="String">
-    <sv:value>ac73a05e-e7c3-4ec2-90a9-9a68c1042ebd</sv:value>
-  </sv:property>
-  <sv:node sv:name="MetaData">
-    <sv:property sv:name="jcr:primaryType" sv:type="Name">
-      <sv:value>mgnl:metaData</sv:value>
-    </sv:property>
-    <sv:property sv:name="mgnl:activated" sv:type="Boolean">
-      <sv:value>false</sv:value>
-    </sv:property>
-    <sv:property sv:name="mgnl:activatorid" sv:type="String">
-      <sv:value>admin</sv:value>
-    </sv:property>
-    <sv:property sv:name="mgnl:authorid" sv:type="String">
-      <sv:value>admin</sv:value>
-    </sv:property>
-    <sv:property sv:name="mgnl:creationdate" sv:type="Date">
-      <sv:value>2008-07-15T14:01:08.195Z</sv:value>
-    </sv:property>
-    <sv:property sv:name="mgnl:lastaction" sv:type="Date">
-      <sv:value>2008-07-15T14:01:13.990Z</sv:value>
-    </sv:property>
-    <sv:property sv:name="mgnl:lastmodified" sv:type="Date">
-      <sv:value>2008-07-15T14:01:14.001Z</sv:value>
-    </sv:property>
-  </sv:node>
-  <sv:node sv:name="admin">
-    <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>6802fef7-bbed-4dd6-9c8e-e1b8069756d6</sv:value>
-    </sv:property>
-    <sv:property sv:name="basename" sv:type="String">
-      <sv:value>info.magnolia.module.admininterface.messages</sv:value>
-    </sv:property>
-    <sv:node sv:name="MetaData">
-      <sv:property sv:name="jcr:primaryType" sv:type="Name">
-        <sv:value>mgnl:metaData</sv:value>
-      </sv:property>
-      <sv:property sv:name="mgnl:activated" sv:type="Boolean">
-        <sv:value>false</sv:value>
-      </sv:property>
-      <sv:property sv:name="mgnl:activatorid" sv:type="String">
-        <sv:value>admin</sv:value>
-      </sv:property>
-      <sv:property sv:name="mgnl:authorid" sv:type="String">
-        <sv:value>admin</sv:value>
-      </sv:property>
-      <sv:property sv:name="mgnl:creationdate" sv:type="Date">
-        <sv:value>2008-07-15T14:01:17.570Z</sv:value>
-      </sv:property>
-      <sv:property sv:name="mgnl:lastaction" sv:type="Date">
-        <sv:value>2008-07-15T14:01:36.269Z</sv:value>
-      </sv:property>
-      <sv:property sv:name="mgnl:lastmodified" sv:type="Date">
-        <sv:value>2008-07-15T14:02:12.839Z</sv:value>
-      </sv:property>
-    </sv:node>
-  </sv:node>
-</sv:node>
\ No newline at end of file

Added: magnoliamodules/trunk/openutils-mgnlmessages/src/main/resources/mgnl-bootstrap/messages-nooverwrite/config.modules.messages.config.basenames.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnlmessages/src/main/resources/mgnl-bootstrap/messages-nooverwrite/config.modules.messages.config.basenames.xml	                        (rev 0)
+++ magnoliamodules/trunk/openutils-mgnlmessages/src/main/resources/mgnl-bootstrap/messages-nooverwrite/config.modules.messages.config.basenames.xml	2013-11-01 21:20:50 UTC (rev 4439)
@@ -0,0 +1,84 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<sv:node sv:name="basenames" xmlns:sv="http://www.jcp.org/jcr/sv/1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <sv:property sv:name="jcr:primaryType" sv:type="Name">
+    <sv:value>mgnl:content</sv:value>
+  </sv:property>
+  <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
+    <sv:value>mix:lockable</sv:value>
+  </sv:property>
+  <sv:property sv:name="jcr:uuid" sv:type="String">
+    <sv:value>153abc2e-da60-4945-906d-99df11c7dc7b</sv:value>
+  </sv:property>
+  <sv:property sv:name="jcr:createdBy" sv:type="String">
+    <sv:value>admin</sv:value>
+  </sv:property>
+  <sv:node sv:name="MetaData">
+    <sv:property sv:name="jcr:primaryType" sv:type="Name">
+      <sv:value>mgnl:metaData</sv:value>
+    </sv:property>
+    <sv:property sv:name="jcr:createdBy" sv:type="String">
+      <sv:value>admin</sv:value>
+    </sv:property>
+    <sv:property sv:name="mgnl:activated" sv:type="Boolean">
+      <sv:value>false</sv:value>
+    </sv:property>
+    <sv:property sv:name="mgnl:activatorid" sv:type="String">
+      <sv:value>admin</sv:value>
+    </sv:property>
+    <sv:property sv:name="mgnl:authorid" sv:type="String">
+      <sv:value>superuser</sv:value>
+    </sv:property>
+    <sv:property sv:name="mgnl:creationdate" sv:type="Date">
+      <sv:value>2008-07-15T14:01:08.195Z</sv:value>
+    </sv:property>
+    <sv:property sv:name="mgnl:lastaction" sv:type="Date">
+      <sv:value>2008-07-15T14:01:13.990Z</sv:value>
+    </sv:property>
+    <sv:property sv:name="mgnl:lastmodified" sv:type="Date">
+      <sv:value>2013-11-01T15:39:37.102+01:00</sv:value>
+    </sv:property>
+  </sv:node>
+  <sv:node sv:name="admin">
+    <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>ec64ae54-6127-4dd4-9aaf-988772ddfa05</sv:value>
+    </sv:property>
+    <sv:property sv:name="basename" sv:type="String">
+      <sv:value>info.magnolia.module.admininterface.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:activated" sv:type="Boolean">
+        <sv:value>false</sv:value>
+      </sv:property>
+      <sv:property sv:name="mgnl:activatorid" sv:type="String">
+        <sv:value>admin</sv:value>
+      </sv:property>
+      <sv:property sv:name="mgnl:authorid" sv:type="String">
+        <sv:value>admin</sv:value>
+      </sv:property>
+      <sv:property sv:name="mgnl:creationdate" sv:type="Date">
+        <sv:value>2008-07-15T14:01:17.570Z</sv:value>
+      </sv:property>
+      <sv:property sv:name="mgnl:lastaction" sv:type="Date">
+        <sv:value>2008-07-15T14:01:36.269Z</sv:value>
+      </sv:property>
+      <sv:property sv:name="mgnl:lastmodified" sv:type="Date">
+        <sv:value>2008-07-15T14:02:12.839Z</sv:value>
+      </sv:property>
+    </sv:node>
+  </sv:node>
+</sv:node>


Property changes on: magnoliamodules/trunk/openutils-mgnlmessages/src/main/resources/mgnl-bootstrap/messages-nooverwrite/config.modules.messages.config.basenames.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
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

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

From: <fg...@us...> - 2013-11-01 14:39:23

Revision: 4438
          http://openutils.svn.sourceforge.net/openutils/?rev=4438&view=rev
Author:   fgiust
Date:     2013-11-01 14:39:20 +0000 (Fri, 01 Nov 2013)
Log Message:
-----------
cleaning up

Modified Paths:
--------------
    magnoliamodules/trunk/openutils-mgnlmessages/src/main/java/net/sourceforge/openutils/mgnlmessages/MessagesServlet.java
    magnoliamodules/trunk/openutils-mgnlmessages/src/main/java/net/sourceforge/openutils/mgnlmessages/configuration/MessagesConfigurationManager.java
    magnoliamodules/trunk/openutils-mgnlmessages/src/main/java/net/sourceforge/openutils/mgnlmessages/pages/MessagesEditPage.java
    magnoliamodules/trunk/openutils-mgnlmessages/src/main/java/net/sourceforge/openutils/mgnlmessages/pages/MessagesImpExpPage.java
    magnoliamodules/trunk/openutils-mgnlmessages/src/main/resources/META-INF/magnolia/messages.xml

Added Paths:
-----------
    magnoliamodules/trunk/openutils-mgnlmessages/src/main/java/net/sourceforge/openutils/mgnlmessages/MessagesModule.java
    magnoliamodules/trunk/openutils-mgnlmessages/src/main/java/net/sourceforge/openutils/mgnlmessages/MessagesUtils.java

Removed Paths:
-------------
    magnoliamodules/trunk/openutils-mgnlmessages/src/main/java/net/sourceforge/openutils/mgnlmessages/lifecycle/MessagesModuleLifecycle.java

Copied: magnoliamodules/trunk/openutils-mgnlmessages/src/main/java/net/sourceforge/openutils/mgnlmessages/MessagesModule.java (from rev 4406, magnoliamodules/trunk/openutils-mgnlmessages/src/main/java/net/sourceforge/openutils/mgnlmessages/lifecycle/MessagesModuleLifecycle.java)
===================================================================
--- magnoliamodules/trunk/openutils-mgnlmessages/src/main/java/net/sourceforge/openutils/mgnlmessages/MessagesModule.java	                        (rev 0)
+++ magnoliamodules/trunk/openutils-mgnlmessages/src/main/java/net/sourceforge/openutils/mgnlmessages/MessagesModule.java	2013-11-01 14:39:20 UTC (rev 4438)
@@ -0,0 +1,64 @@
+/**
+ *
+ * Messages Module for Magnolia CMS (http://www.openmindlab.com/lab/products/messages.html)
+ * Copyright(C) 2008-2013, Openmind S.r.l. http://www.openmindonline.it
+ *
+ *  This program is free software: you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation, either version 3 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package net.sourceforge.openutils.mgnlmessages;
+
+import info.magnolia.cms.i18n.MessagesManager;
+import info.magnolia.module.ModuleLifecycle;
+import info.magnolia.module.ModuleLifecycleContext;
+import info.magnolia.objectfactory.Components;
+import net.sourceforge.openutils.mgnlmessages.configuration.MessagesConfigurationManager;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+
+/**
+ * @author molaschi
+ */
+public class MessagesModule implements ModuleLifecycle
+{
+
+    /**
+     *
+     */
+    public static final String REPO = "messages";
+
+    private Logger log = LoggerFactory.getLogger(MessagesModule.class);
+
+    /**
+     * {@inheritDoc}
+     */
+    public void start(ModuleLifecycleContext ctx)
+    {
+        log.info("Starting module messages");
+        ctx.registerModuleObservingComponent("locales", Components.getComponent(MessagesConfigurationManager.class));
+
+        Components.getComponent(MessagesManager.class).init();
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public void stop(ModuleLifecycleContext ctx)
+    {
+        log.info("Stopping module messages");
+    }
+
+}

Modified: magnoliamodules/trunk/openutils-mgnlmessages/src/main/java/net/sourceforge/openutils/mgnlmessages/MessagesServlet.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlmessages/src/main/java/net/sourceforge/openutils/mgnlmessages/MessagesServlet.java	2013-11-01 14:29:03 UTC (rev 4437)
+++ magnoliamodules/trunk/openutils-mgnlmessages/src/main/java/net/sourceforge/openutils/mgnlmessages/MessagesServlet.java	2013-11-01 14:39:20 UTC (rev 4438)
@@ -27,9 +27,7 @@
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
-import net.sourceforge.openutils.mgnlmessages.configuration.MessagesConfigurationManager;
 
-
 /**
  * @author molaschi
  * @version $Id: $
@@ -58,7 +56,7 @@
 
         try
         {
-            MessagesConfigurationManager.saveKeyValue(key, text, locale);
+            MessagesUtils.saveKeyValue(key, text, locale);
         }
         catch (RepositoryException ex)
         {

Added: magnoliamodules/trunk/openutils-mgnlmessages/src/main/java/net/sourceforge/openutils/mgnlmessages/MessagesUtils.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlmessages/src/main/java/net/sourceforge/openutils/mgnlmessages/MessagesUtils.java	                        (rev 0)
+++ magnoliamodules/trunk/openutils-mgnlmessages/src/main/java/net/sourceforge/openutils/mgnlmessages/MessagesUtils.java	2013-11-01 14:39:20 UTC (rev 4438)
@@ -0,0 +1,73 @@
+/**
+ *
+ * Messages Module for Magnolia CMS (http://www.openmindlab.com/lab/products/messages.html)
+ * Copyright(C) 2008-2013, Openmind S.r.l. http://www.openmindonline.it
+ *
+ *  This program is free software: you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation, either version 3 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package net.sourceforge.openutils.mgnlmessages;
+
+import info.magnolia.cms.core.MgnlNodeType;
+import info.magnolia.context.SystemContext;
+import info.magnolia.jcr.RuntimeRepositoryException;
+import info.magnolia.jcr.util.NodeUtil;
+import info.magnolia.objectfactory.Components;
+import it.openutils.mgnlutils.util.NodeUtilsExt;
+
+import javax.jcr.Node;
+import javax.jcr.RepositoryException;
+import javax.jcr.Session;
+
+import org.apache.commons.lang.StringUtils;
+
+
+/**
+ * @author fgiust
+ * @version $Id$
+ */
+public class MessagesUtils
+{
+
+    public static void saveKeyValue(String key, String value, String locale) throws RepositoryException
+    {
+        Session session;
+        try
+        {
+            session = Components.getComponent(SystemContext.class).getJCRSession(MessagesModule.REPO);
+        }
+        catch (RepositoryException e)
+        {
+            throw new RuntimeRepositoryException(e);
+        }
+
+        String path = "/" + StringUtils.replace(key, ".", "/");
+
+        Node content = NodeUtil.createPath(session.getRootNode(), path, MgnlNodeType.NT_CONTENTNODE);
+
+        if (!StringUtils.isEmpty(locale))
+        {
+            if (!StringUtils.isEmpty(value))
+            {
+                content.setProperty(locale, value);
+            }
+            else
+            {
+                NodeUtilsExt.deletePropertyIfExist(content, locale);
+            }
+        }
+
+        session.save();
+    }
+}


Property changes on: magnoliamodules/trunk/openutils-mgnlmessages/src/main/java/net/sourceforge/openutils/mgnlmessages/MessagesUtils.java
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Added: svn:keywords
## -0,0 +1 ##
+Author Date Id Revision
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Modified: magnoliamodules/trunk/openutils-mgnlmessages/src/main/java/net/sourceforge/openutils/mgnlmessages/configuration/MessagesConfigurationManager.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlmessages/src/main/java/net/sourceforge/openutils/mgnlmessages/configuration/MessagesConfigurationManager.java	2013-11-01 14:29:03 UTC (rev 4437)
+++ magnoliamodules/trunk/openutils-mgnlmessages/src/main/java/net/sourceforge/openutils/mgnlmessages/configuration/MessagesConfigurationManager.java	2013-11-01 14:39:20 UTC (rev 4438)
@@ -40,7 +40,7 @@
 import javax.jcr.RepositoryException;
 import javax.jcr.Session;
 
-import net.sourceforge.openutils.mgnlmessages.lifecycle.MessagesModuleLifecycle;
+import net.sourceforge.openutils.mgnlmessages.MessagesModule;
 
 import org.apache.commons.lang.StringUtils;
 
@@ -153,37 +153,6 @@
         }
     }
 
-    public static void saveKeyValue(String key, String value, String locale) throws RepositoryException
-    {
-        Session session;
-        try
-        {
-            session = Components.getComponent(SystemContext.class).getJCRSession(MessagesModuleLifecycle.REPO);
-        }
-        catch (RepositoryException e)
-        {
-            throw new RuntimeRepositoryException(e);
-        }
-
-        String path = "/" + StringUtils.replace(key, ".", "/");
-
-        Node content = NodeUtil.createPath(session.getRootNode(), path, MgnlNodeType.NT_CONTENTNODE);
-
-        if (!StringUtils.isEmpty(locale))
-        {
-            if (!StringUtils.isEmpty(value))
-            {
-                content.setProperty(locale, value);
-            }
-            else
-            {
-                NodeUtilsExt.deletePropertyIfExist(content, locale);
-            }
-        }
-
-        session.save();
-    }
-
     /**
      * Returns the locales.
      * @return the locales

Deleted: magnoliamodules/trunk/openutils-mgnlmessages/src/main/java/net/sourceforge/openutils/mgnlmessages/lifecycle/MessagesModuleLifecycle.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlmessages/src/main/java/net/sourceforge/openutils/mgnlmessages/lifecycle/MessagesModuleLifecycle.java	2013-11-01 14:29:03 UTC (rev 4437)
+++ magnoliamodules/trunk/openutils-mgnlmessages/src/main/java/net/sourceforge/openutils/mgnlmessages/lifecycle/MessagesModuleLifecycle.java	2013-11-01 14:39:20 UTC (rev 4438)
@@ -1,64 +0,0 @@
-/**
- *
- * Messages Module for Magnolia CMS (http://www.openmindlab.com/lab/products/messages.html)
- * Copyright(C) 2008-2013, Openmind S.r.l. http://www.openmindonline.it
- *
- *  This program is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-package net.sourceforge.openutils.mgnlmessages.lifecycle;
-
-import info.magnolia.cms.i18n.MessagesManager;
-import info.magnolia.module.ModuleLifecycle;
-import info.magnolia.module.ModuleLifecycleContext;
-import info.magnolia.objectfactory.Components;
-import net.sourceforge.openutils.mgnlmessages.configuration.MessagesConfigurationManager;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-
-/**
- * @author molaschi
- */
-public class MessagesModuleLifecycle implements ModuleLifecycle
-{
-
-    /**
-     *
-     */
-    public static final String REPO = "messages";
-
-    private Logger log = LoggerFactory.getLogger(MessagesModuleLifecycle.class);
-
-    /**
-     * {@inheritDoc}
-     */
-    public void start(ModuleLifecycleContext ctx)
-    {
-        log.info("Starting module messages");
-        ctx.registerModuleObservingComponent("locales", Components.getComponent(MessagesConfigurationManager.class));
-
-        Components.getComponent(MessagesManager.class).init();
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public void stop(ModuleLifecycleContext ctx)
-    {
-        log.info("Stopping module messages");
-    }
-
-}

Modified: magnoliamodules/trunk/openutils-mgnlmessages/src/main/java/net/sourceforge/openutils/mgnlmessages/pages/MessagesEditPage.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlmessages/src/main/java/net/sourceforge/openutils/mgnlmessages/pages/MessagesEditPage.java	2013-11-01 14:29:03 UTC (rev 4437)
+++ magnoliamodules/trunk/openutils-mgnlmessages/src/main/java/net/sourceforge/openutils/mgnlmessages/pages/MessagesEditPage.java	2013-11-01 14:39:20 UTC (rev 4438)
@@ -43,9 +43,10 @@
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
+import net.sourceforge.openutils.mgnlmessages.MessagesModule;
+import net.sourceforge.openutils.mgnlmessages.MessagesUtils;
 import net.sourceforge.openutils.mgnlmessages.configuration.MessagesConfigurationManager;
 import net.sourceforge.openutils.mgnlmessages.el.MessagesEl;
-import net.sourceforge.openutils.mgnlmessages.lifecycle.MessagesModuleLifecycle;
 
 import org.apache.commons.lang.StringUtils;
 import org.slf4j.Logger;
@@ -171,7 +172,7 @@
     {
         try
         {
-            MessagesConfigurationManager.saveKeyValue(key, text, locale);
+            MessagesUtils.saveKeyValue(key, text, locale);
             json = "rootObj = {value: 'OK'}";
         }
         catch (RepositoryException e)
@@ -187,7 +188,7 @@
     {
         try
         {
-            Session session = Components.getComponent(SystemContext.class).getJCRSession(MessagesModuleLifecycle.REPO);
+            Session session = Components.getComponent(SystemContext.class).getJCRSession(MessagesModule.REPO);
 
             String path = "/" + StringUtils.replace(key, ".", "/");
             session.removeItem(path);
@@ -285,7 +286,7 @@
      */
     protected void moveNode(String source, String destination) throws RepositoryException
     {
-        Session session = Components.getComponent(SystemContext.class).getJCRSession(MessagesModuleLifecycle.REPO);
+        Session session = Components.getComponent(SystemContext.class).getJCRSession(MessagesModule.REPO);
 
         String goTo = destination;
 

Modified: magnoliamodules/trunk/openutils-mgnlmessages/src/main/java/net/sourceforge/openutils/mgnlmessages/pages/MessagesImpExpPage.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlmessages/src/main/java/net/sourceforge/openutils/mgnlmessages/pages/MessagesImpExpPage.java	2013-11-01 14:29:03 UTC (rev 4437)
+++ magnoliamodules/trunk/openutils-mgnlmessages/src/main/java/net/sourceforge/openutils/mgnlmessages/pages/MessagesImpExpPage.java	2013-11-01 14:39:20 UTC (rev 4438)
@@ -44,6 +44,7 @@
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
+import net.sourceforge.openutils.mgnlmessages.MessagesUtils;
 import net.sourceforge.openutils.mgnlmessages.configuration.MessagesConfigurationManager;
 
 import org.apache.commons.io.IOUtils;
@@ -296,7 +297,7 @@
                     {
                         try
                         {
-                            MessagesConfigurationManager.saveKeyValue(key, value, locales.get(c - 1));
+                            MessagesUtils.saveKeyValue(key, value, locales.get(c - 1));
                         }
                         catch (RepositoryException e)
                         {

Modified: magnoliamodules/trunk/openutils-mgnlmessages/src/main/resources/META-INF/magnolia/messages.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnlmessages/src/main/resources/META-INF/magnolia/messages.xml	2013-11-01 14:29:03 UTC (rev 4437)
+++ magnoliamodules/trunk/openutils-mgnlmessages/src/main/resources/META-INF/magnolia/messages.xml	2013-11-01 14:39:20 UTC (rev 4438)
@@ -4,7 +4,7 @@
   <name>messages</name>
   <displayName>magnolia messages module</displayName>
   <description>magnolia messages module</description>
-  <class>net.sourceforge.openutils.mgnlmessages.lifecycle.MessagesModuleLifecycle</class>
+  <class>net.sourceforge.openutils.mgnlmessages.MessagesModule</class>
   <versionHandler>net.sourceforge.openutils.mgnlmessages.setup.MessagesModuleVersionHandler</versionHandler>
   <version>${project.version}</version>
   <properties>

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

[Openutils-svn] SF.net SVN: openutils:[4437] magnoliamodules/trunk/openutils-mgnlmessages/ src/main/java/net/sourceforge/openutils/mgnlmessages/i18n/ SimpleMessagesImpl.java

From: <fg...@us...> - 2013-11-01 14:29:06

Revision: 4437
          http://openutils.svn.sourceforge.net/openutils/?rev=4437&view=rev
Author:   fgiust
Date:     2013-11-01 14:29:03 +0000 (Fri, 01 Nov 2013)
Log Message:
-----------
warning for missing bundles

Modified Paths:
--------------
    magnoliamodules/trunk/openutils-mgnlmessages/src/main/java/net/sourceforge/openutils/mgnlmessages/i18n/SimpleMessagesImpl.java

Modified: magnoliamodules/trunk/openutils-mgnlmessages/src/main/java/net/sourceforge/openutils/mgnlmessages/i18n/SimpleMessagesImpl.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlmessages/src/main/java/net/sourceforge/openutils/mgnlmessages/i18n/SimpleMessagesImpl.java	2013-11-01 14:26:07 UTC (rev 4436)
+++ magnoliamodules/trunk/openutils-mgnlmessages/src/main/java/net/sourceforge/openutils/mgnlmessages/i18n/SimpleMessagesImpl.java	2013-11-01 14:29:03 UTC (rev 4437)
@@ -135,6 +135,11 @@
                 IOUtils.closeQuietly(stream);
             }
         }
+
+        if (bundle == null)
+        {
+            log.warn("Got a request for a missing bundle {}, please check your configuration", basename);
+        }
         return bundle;
     }
 

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

[Openutils-svn] SF.net SVN: openutils:[4436] magnoliamodules/trunk/openutils-mgnlmedia/src/ main/java/net/sourceforge/openutils/mgnlmedia/media/utils/MediaLoadUtils. java

From: <fg...@us...> - 2013-11-01 14:26:10

Revision: 4436
          http://openutils.svn.sourceforge.net/openutils/?rev=4436&view=rev
Author:   fgiust
Date:     2013-11-01 14:26:07 +0000 (Fri, 01 Nov 2013)
Log Message:
-----------
MEDIA-304 check for duplicates nodes on zip upload

Modified Paths:
--------------
    magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/utils/MediaLoadUtils.java

Modified: magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/utils/MediaLoadUtils.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/utils/MediaLoadUtils.java	2013-10-28 10:39:07 UTC (rev 4435)
+++ magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/utils/MediaLoadUtils.java	2013-11-01 14:26:07 UTC (rev 4436)
@@ -220,13 +220,22 @@
         {
             if (StringUtils.isNotEmpty(contentNodeName))
             {
-                currContent = currContent.addNode(contentNodeName, MediaConfigurationManager.NT_FOLDER);
 
-                if (MediaEl.module().isSingleinstance() && !MetaDataUtil.getMetaData(currContent).getIsActivated())
+                if (currContent.hasNode(contentNodeName))
                 {
-                    MetaDataUtil.getMetaData(currContent).setActivated();
+                    currContent = currContent.getNode(contentNodeName);
                 }
+                else
+                {
+                    currContent = currContent.addNode(contentNodeName, MediaConfigurationManager.NT_FOLDER);
+
+                    if (MediaEl.module().isSingleinstance() && !MetaDataUtil.getMetaData(currContent).getIsActivated())
+                    {
+                        MetaDataUtil.getMetaData(currContent).setActivated();
+                    }
+                }
             }
+
         }
         return currContent;
 

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

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

From: <fg...@us...> - 2013-10-28 10:39:11

Revision: 4435
          http://openutils.svn.sourceforge.net/openutils/?rev=4435&view=rev
Author:   fgiust
Date:     2013-10-28 10:39:07 +0000 (Mon, 28 Oct 2013)
Log Message:
-----------
added support for checkbox controls

Added Paths:
-----------
    magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/java/net/sourceforge/openutils/mgnlcontextmenu/dialog/DialogButtonSetControl.java
    magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/resources/mgnl-bootstrap/contextmenu-nooverwrite/config.modules.contextmenu.controls.contextmenu-checkbox.xml
    magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/resources/mgnl-bootstrap/contextmenu-nooverwrite/config.modules.contextmenu.controls.contextmenu-checkboxSwitch.xml
    magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/resources/mgnl-bootstrap/contextmenu-nooverwrite/config.modules.contextmenu.controls.contextmenu-edit.xml
    magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/resources/mgnl-bootstrap/contextmenu-nooverwrite/config.modules.contextmenu.controls.contextmenu-fckEdit.xml
    magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/resources/mgnl-bootstrap/contextmenu-nooverwrite/config.modules.contextmenu.controls.contextmenu-globalTab.xml
    magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/resources/mgnl-bootstrap/contextmenu-nooverwrite/config.modules.contextmenu.controls.contextmenu-media.xml
    magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/resources/mgnl-bootstrap/contextmenu-nooverwrite/config.modules.contextmenu.controls.contextmenu-radio.xml

Removed Paths:
-------------
    magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/resources/mgnl-bootstrap/contextmenu/config.modules.contextmenu.controls.contextmenu-edit.xml
    magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/resources/mgnl-bootstrap/contextmenu/config.modules.contextmenu.controls.contextmenu-fckEdit.xml
    magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/resources/mgnl-bootstrap/contextmenu/config.modules.contextmenu.controls.contextmenu-globalTab.xml
    magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/resources/mgnl-bootstrap/contextmenu/config.modules.contextmenu.controls.contextmenu-media.xml

Added: magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/java/net/sourceforge/openutils/mgnlcontextmenu/dialog/DialogButtonSetControl.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/java/net/sourceforge/openutils/mgnlcontextmenu/dialog/DialogButtonSetControl.java	                        (rev 0)
+++ magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/java/net/sourceforge/openutils/mgnlcontextmenu/dialog/DialogButtonSetControl.java	2013-10-28 10:39:07 UTC (rev 4435)
@@ -0,0 +1,82 @@
+/**
+ *
+ * ContextMenu Module for Magnolia CMS (http://www.openmindlab.com/lab/products/mgnlcontextmenu.html)
+ * Copyright(C) 2010-2013, Openmind S.r.l. http://www.openmindonline.it
+ *
+ *  This program is free software: you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  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.mgnlcontextmenu.dialog;
+
+import info.magnolia.cms.core.Content;
+import info.magnolia.cms.gui.control.ControlImpl;
+import info.magnolia.cms.gui.dialog.DialogButtonSet;
+
+import javax.jcr.RepositoryException;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+import org.apache.commons.lang.StringUtils;
+
+
+/**
+ * @author fgiust
+ * @version $Id$
+ */
+public class DialogButtonSetControl extends DialogButtonSet
+{
+
+    private HttpServletRequest request;
+
+    @Override
+    public void init(HttpServletRequest request, HttpServletResponse response, Content storageNode, Content configNode)
+        throws RepositoryException
+    {
+        super.init(request, response, storageNode, configNode);
+        this.request = request;
+
+        String controlType = this.getConfigValue("controlType");
+
+        // custom settings
+        if (StringUtils.containsIgnoreCase(controlType, "radio")) { //$NON-NLS-1$
+            setButtonType(ControlImpl.BUTTONTYPE_RADIO);
+            setOptions(configNode, true);
+        }
+        else if (StringUtils.containsIgnoreCase(controlType, "checkboxSwitch")) { //$NON-NLS-1$
+            setButtonType(ControlImpl.BUTTONTYPE_CHECKBOX);
+            setOption(configNode);
+        }
+        else if (StringUtils.containsIgnoreCase(controlType, "checkbox")) { //$NON-NLS-1$
+            setButtonType(ControlImpl.BUTTONTYPE_CHECKBOX);
+            setOptions(configNode, false);
+            setConfig("valueType", "multiple");
+            setConfig("multiple", "true");
+        }
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public String getValue()
+    {
+        if (this.value == null)
+        {
+            this.value = DialogControlUtils.getValue(
+                request,
+                getStorageNode().getJCRNode(),
+                getConfigValue("scope", "local"));
+        }
+        return this.value;
+    }
+}


Property changes on: magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/java/net/sourceforge/openutils/mgnlcontextmenu/dialog/DialogButtonSetControl.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
Deleted: magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/resources/mgnl-bootstrap/contextmenu/config.modules.contextmenu.controls.contextmenu-edit.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/resources/mgnl-bootstrap/contextmenu/config.modules.contextmenu.controls.contextmenu-edit.xml	2013-10-28 10:25:04 UTC (rev 4434)
+++ magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/resources/mgnl-bootstrap/contextmenu/config.modules.contextmenu.controls.contextmenu-edit.xml	2013-10-28 10:39:07 UTC (rev 4435)
@@ -1,38 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<sv:node sv:name="contextmenu-edit" 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>0769fc3e-349e-4f42-922f-d203902230e1</sv:value>
-  </sv:property>
-  <sv:property sv:name="class" sv:type="String">
-    <sv:value>net.sourceforge.openutils.mgnlcontextmenu.dialog.EditDialogControl</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:authorid" sv:type="String">
-      <sv:value>superuser</sv:value>
-    </sv:property>
-    <sv:property sv:name="mgnl:creationdate" sv:type="String">
-      <sv:value>2005-04-30T14:46:54.316+02:00</sv:value>
-    </sv:property>
-    <sv:property sv:name="mgnl:lastmodified" sv:type="Date">
-      <sv:value>2010-05-19T10:51:30.421+02:00</sv:value>
-    </sv:property>
-  </sv:node>
-</sv:node>

Deleted: magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/resources/mgnl-bootstrap/contextmenu/config.modules.contextmenu.controls.contextmenu-fckEdit.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/resources/mgnl-bootstrap/contextmenu/config.modules.contextmenu.controls.contextmenu-fckEdit.xml	2013-10-28 10:25:04 UTC (rev 4434)
+++ magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/resources/mgnl-bootstrap/contextmenu/config.modules.contextmenu.controls.contextmenu-fckEdit.xml	2013-10-28 10:39:07 UTC (rev 4435)
@@ -1,38 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<sv:node sv:name="contextmenu-fckEdit" 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>98513ad3-790d-4a61-9027-637655bd5435</sv:value>
-  </sv:property>
-  <sv:property sv:name="class" sv:type="String">
-    <sv:value>net.sourceforge.openutils.mgnlcontextmenu.dialog.FckEditDialogControl</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:authorid" sv:type="String">
-      <sv:value>superuser</sv:value>
-    </sv:property>
-    <sv:property sv:name="mgnl:creationdate" sv:type="String">
-      <sv:value>2005-04-30T14:46:54.316+02:00</sv:value>
-    </sv:property>
-    <sv:property sv:name="mgnl:lastmodified" sv:type="Date">
-      <sv:value>2010-05-19T11:05:47.703+02:00</sv:value>
-    </sv:property>
-  </sv:node>
-</sv:node>

Deleted: magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/resources/mgnl-bootstrap/contextmenu/config.modules.contextmenu.controls.contextmenu-globalTab.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/resources/mgnl-bootstrap/contextmenu/config.modules.contextmenu.controls.contextmenu-globalTab.xml	2013-10-28 10:25:04 UTC (rev 4434)
+++ magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/resources/mgnl-bootstrap/contextmenu/config.modules.contextmenu.controls.contextmenu-globalTab.xml	2013-10-28 10:39:07 UTC (rev 4435)
@@ -1,35 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<sv:node sv:name="contextmenu-globalTab" 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>5c49339f-415a-4efb-9d2c-ed8b173552c5</sv:value>
-  </sv:property>
-  <sv:property sv:name="class" sv:type="String">
-    <sv:value>net.sourceforge.openutils.mgnlcontextmenu.dialog.DialogGlobalTab</sv:value>
-  </sv:property>
-  <sv:property sv:name="jcr:createdBy" sv:type="String">
-    <sv:value>admin</sv:value>
-  </sv:property>
-  <sv:node sv:name="MetaData">
-    <sv:property sv:name="jcr:primaryType" sv:type="Name">
-      <sv:value>mgnl:metaData</sv:value>
-    </sv:property>
-    <sv:property sv:name="jcr:createdBy" sv:type="String">
-      <sv:value>admin</sv:value>
-    </sv:property>
-    <sv:property sv:name="mgnl:authorid" sv:type="String">
-      <sv:value>superuser</sv:value>
-    </sv:property>
-    <sv:property sv:name="mgnl:creationdate" sv:type="Date">
-      <sv:value>2010-05-25T11:44:50.500+02:00</sv:value>
-    </sv:property>
-    <sv:property sv:name="mgnl:lastmodified" sv:type="Date">
-      <sv:value>2010-05-25T11:45:13.375+02:00</sv:value>
-    </sv:property>
-  </sv:node>
-</sv:node>

Deleted: magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/resources/mgnl-bootstrap/contextmenu/config.modules.contextmenu.controls.contextmenu-media.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/resources/mgnl-bootstrap/contextmenu/config.modules.contextmenu.controls.contextmenu-media.xml	2013-10-28 10:25:04 UTC (rev 4434)
+++ magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/resources/mgnl-bootstrap/contextmenu/config.modules.contextmenu.controls.contextmenu-media.xml	2013-10-28 10:39:07 UTC (rev 4435)
@@ -1,38 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<sv:node sv:name="contextmenu-media" 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>9ef89795-90d3-4685-a6f9-3029ae18da44</sv:value>
-  </sv:property>
-  <sv:property sv:name="class" sv:type="String">
-    <sv:value>net.sourceforge.openutils.mgnlcontextmenu.dialog.MediaDialogControl</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:authorid" sv:type="String">
-      <sv:value>superuser</sv:value>
-    </sv:property>
-    <sv:property sv:name="mgnl:creationdate" sv:type="String">
-      <sv:value>2005-04-30T14:46:54.316+02:00</sv:value>
-    </sv:property>
-    <sv:property sv:name="mgnl:lastmodified" sv:type="Date">
-      <sv:value>2010-05-20T15:30:30.875+02:00</sv:value>
-    </sv:property>
-  </sv:node>
-</sv:node>

Added: magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/resources/mgnl-bootstrap/contextmenu-nooverwrite/config.modules.contextmenu.controls.contextmenu-checkbox.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/resources/mgnl-bootstrap/contextmenu-nooverwrite/config.modules.contextmenu.controls.contextmenu-checkbox.xml	                        (rev 0)
+++ magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/resources/mgnl-bootstrap/contextmenu-nooverwrite/config.modules.contextmenu.controls.contextmenu-checkbox.xml	2013-10-28 10:39:07 UTC (rev 4435)
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<sv:node sv:name="contextmenu-checkbox" 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>40878dcd-c7a7-4a63-a6af-c8d68dea0328</sv:value>
+  </sv:property>
+  <sv:property sv:name="class" sv:type="String">
+    <sv:value>net.sourceforge.openutils.mgnlcontextmenu.dialog.DialogButtonSetControl</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:authorid" sv:type="String">
+      <sv:value>superuser</sv:value>
+    </sv:property>
+    <sv:property sv:name="mgnl:creationdate" sv:type="String">
+      <sv:value>2005-04-30T14:46:54.316+02:00</sv:value>
+    </sv:property>
+    <sv:property sv:name="mgnl:lastmodified" sv:type="Date">
+      <sv:value>2013-10-24T11:56:27.761+02:00</sv:value>
+    </sv:property>
+  </sv:node>
+</sv:node>


Property changes on: magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/resources/mgnl-bootstrap/contextmenu-nooverwrite/config.modules.contextmenu.controls.contextmenu-checkbox.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-mgnlcontextmenu/src/main/resources/mgnl-bootstrap/contextmenu-nooverwrite/config.modules.contextmenu.controls.contextmenu-checkboxSwitch.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/resources/mgnl-bootstrap/contextmenu-nooverwrite/config.modules.contextmenu.controls.contextmenu-checkboxSwitch.xml	                        (rev 0)
+++ magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/resources/mgnl-bootstrap/contextmenu-nooverwrite/config.modules.contextmenu.controls.contextmenu-checkboxSwitch.xml	2013-10-28 10:39:07 UTC (rev 4435)
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<sv:node sv:name="contextmenu-checkboxSwitch" 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>5f7f1b0a-8ac8-4414-8e5b-2ecbcbcadb6a</sv:value>
+  </sv:property>
+  <sv:property sv:name="class" sv:type="String">
+    <sv:value>net.sourceforge.openutils.mgnlcontextmenu.dialog.DialogButtonSetControl</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:authorid" sv:type="String">
+      <sv:value>superuser</sv:value>
+    </sv:property>
+    <sv:property sv:name="mgnl:creationdate" sv:type="String">
+      <sv:value>2005-04-30T14:46:54.316+02:00</sv:value>
+    </sv:property>
+    <sv:property sv:name="mgnl:lastmodified" sv:type="Date">
+      <sv:value>2013-10-24T12:08:43.258+02:00</sv:value>
+    </sv:property>
+  </sv:node>
+</sv:node>


Property changes on: magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/resources/mgnl-bootstrap/contextmenu-nooverwrite/config.modules.contextmenu.controls.contextmenu-checkboxSwitch.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
Copied: magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/resources/mgnl-bootstrap/contextmenu-nooverwrite/config.modules.contextmenu.controls.contextmenu-edit.xml (from rev 4406, magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/resources/mgnl-bootstrap/contextmenu/config.modules.contextmenu.controls.contextmenu-edit.xml)
===================================================================
--- magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/resources/mgnl-bootstrap/contextmenu-nooverwrite/config.modules.contextmenu.controls.contextmenu-edit.xml	                        (rev 0)
+++ magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/resources/mgnl-bootstrap/contextmenu-nooverwrite/config.modules.contextmenu.controls.contextmenu-edit.xml	2013-10-28 10:39:07 UTC (rev 4435)
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<sv:node sv:name="contextmenu-edit" 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>0769fc3e-349e-4f42-922f-d203902230e1</sv:value>
+  </sv:property>
+  <sv:property sv:name="class" sv:type="String">
+    <sv:value>net.sourceforge.openutils.mgnlcontextmenu.dialog.EditDialogControl</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:authorid" sv:type="String">
+      <sv:value>superuser</sv:value>
+    </sv:property>
+    <sv:property sv:name="mgnl:creationdate" sv:type="String">
+      <sv:value>2005-04-30T14:46:54.316+02:00</sv:value>
+    </sv:property>
+    <sv:property sv:name="mgnl:lastmodified" sv:type="Date">
+      <sv:value>2010-05-19T10:51:30.421+02:00</sv:value>
+    </sv:property>
+  </sv:node>
+</sv:node>

Copied: magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/resources/mgnl-bootstrap/contextmenu-nooverwrite/config.modules.contextmenu.controls.contextmenu-fckEdit.xml (from rev 4406, magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/resources/mgnl-bootstrap/contextmenu/config.modules.contextmenu.controls.contextmenu-fckEdit.xml)
===================================================================
--- magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/resources/mgnl-bootstrap/contextmenu-nooverwrite/config.modules.contextmenu.controls.contextmenu-fckEdit.xml	                        (rev 0)
+++ magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/resources/mgnl-bootstrap/contextmenu-nooverwrite/config.modules.contextmenu.controls.contextmenu-fckEdit.xml	2013-10-28 10:39:07 UTC (rev 4435)
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<sv:node sv:name="contextmenu-fckEdit" 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>98513ad3-790d-4a61-9027-637655bd5435</sv:value>
+  </sv:property>
+  <sv:property sv:name="class" sv:type="String">
+    <sv:value>net.sourceforge.openutils.mgnlcontextmenu.dialog.FckEditDialogControl</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:authorid" sv:type="String">
+      <sv:value>superuser</sv:value>
+    </sv:property>
+    <sv:property sv:name="mgnl:creationdate" sv:type="String">
+      <sv:value>2005-04-30T14:46:54.316+02:00</sv:value>
+    </sv:property>
+    <sv:property sv:name="mgnl:lastmodified" sv:type="Date">
+      <sv:value>2010-05-19T11:05:47.703+02:00</sv:value>
+    </sv:property>
+  </sv:node>
+</sv:node>

Copied: magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/resources/mgnl-bootstrap/contextmenu-nooverwrite/config.modules.contextmenu.controls.contextmenu-globalTab.xml (from rev 4406, magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/resources/mgnl-bootstrap/contextmenu/config.modules.contextmenu.controls.contextmenu-globalTab.xml)
===================================================================
--- magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/resources/mgnl-bootstrap/contextmenu-nooverwrite/config.modules.contextmenu.controls.contextmenu-globalTab.xml	                        (rev 0)
+++ magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/resources/mgnl-bootstrap/contextmenu-nooverwrite/config.modules.contextmenu.controls.contextmenu-globalTab.xml	2013-10-28 10:39:07 UTC (rev 4435)
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<sv:node sv:name="contextmenu-globalTab" 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>5c49339f-415a-4efb-9d2c-ed8b173552c5</sv:value>
+  </sv:property>
+  <sv:property sv:name="class" sv:type="String">
+    <sv:value>net.sourceforge.openutils.mgnlcontextmenu.dialog.DialogGlobalTab</sv:value>
+  </sv:property>
+  <sv:property sv:name="jcr:createdBy" sv:type="String">
+    <sv:value>admin</sv:value>
+  </sv:property>
+  <sv:node sv:name="MetaData">
+    <sv:property sv:name="jcr:primaryType" sv:type="Name">
+      <sv:value>mgnl:metaData</sv:value>
+    </sv:property>
+    <sv:property sv:name="jcr:createdBy" sv:type="String">
+      <sv:value>admin</sv:value>
+    </sv:property>
+    <sv:property sv:name="mgnl:authorid" sv:type="String">
+      <sv:value>superuser</sv:value>
+    </sv:property>
+    <sv:property sv:name="mgnl:creationdate" sv:type="Date">
+      <sv:value>2010-05-25T11:44:50.500+02:00</sv:value>
+    </sv:property>
+    <sv:property sv:name="mgnl:lastmodified" sv:type="Date">
+      <sv:value>2010-05-25T11:45:13.375+02:00</sv:value>
+    </sv:property>
+  </sv:node>
+</sv:node>

Copied: magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/resources/mgnl-bootstrap/contextmenu-nooverwrite/config.modules.contextmenu.controls.contextmenu-media.xml (from rev 4406, magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/resources/mgnl-bootstrap/contextmenu/config.modules.contextmenu.controls.contextmenu-media.xml)
===================================================================
--- magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/resources/mgnl-bootstrap/contextmenu-nooverwrite/config.modules.contextmenu.controls.contextmenu-media.xml	                        (rev 0)
+++ magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/resources/mgnl-bootstrap/contextmenu-nooverwrite/config.modules.contextmenu.controls.contextmenu-media.xml	2013-10-28 10:39:07 UTC (rev 4435)
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<sv:node sv:name="contextmenu-media" 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>9ef89795-90d3-4685-a6f9-3029ae18da44</sv:value>
+  </sv:property>
+  <sv:property sv:name="class" sv:type="String">
+    <sv:value>net.sourceforge.openutils.mgnlcontextmenu.dialog.MediaDialogControl</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:authorid" sv:type="String">
+      <sv:value>superuser</sv:value>
+    </sv:property>
+    <sv:property sv:name="mgnl:creationdate" sv:type="String">
+      <sv:value>2005-04-30T14:46:54.316+02:00</sv:value>
+    </sv:property>
+    <sv:property sv:name="mgnl:lastmodified" sv:type="Date">
+      <sv:value>2010-05-20T15:30:30.875+02:00</sv:value>
+    </sv:property>
+  </sv:node>
+</sv:node>

Added: magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/resources/mgnl-bootstrap/contextmenu-nooverwrite/config.modules.contextmenu.controls.contextmenu-radio.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/resources/mgnl-bootstrap/contextmenu-nooverwrite/config.modules.contextmenu.controls.contextmenu-radio.xml	                        (rev 0)
+++ magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/resources/mgnl-bootstrap/contextmenu-nooverwrite/config.modules.contextmenu.controls.contextmenu-radio.xml	2013-10-28 10:39:07 UTC (rev 4435)
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<sv:node sv:name="contextmenu-radio" 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>4f3ba85b-7612-4822-819b-780580775049</sv:value>
+  </sv:property>
+  <sv:property sv:name="class" sv:type="String">
+    <sv:value>net.sourceforge.openutils.mgnlcontextmenu.dialog.DialogButtonSetControl</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:authorid" sv:type="String">
+      <sv:value>superuser</sv:value>
+    </sv:property>
+    <sv:property sv:name="mgnl:creationdate" sv:type="String">
+      <sv:value>2005-04-30T14:46:54.316+02:00</sv:value>
+    </sv:property>
+    <sv:property sv:name="mgnl:lastmodified" sv:type="Date">
+      <sv:value>2013-10-24T12:09:17.334+02:00</sv:value>
+    </sv:property>
+  </sv:node>
+</sv:node>


Property changes on: magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/resources/mgnl-bootstrap/contextmenu-nooverwrite/config.modules.contextmenu.controls.contextmenu-radio.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
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

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

From: <fg...@us...> - 2013-10-28 10:25:09

Revision: 4434
          http://openutils.svn.sourceforge.net/openutils/?rev=4434&view=rev
Author:   fgiust
Date:     2013-10-28 10:25:04 +0000 (Mon, 28 Oct 2013)
Log Message:
-----------
unit tests

Modified Paths:
--------------
    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/advanced/impl/CorrectElementsWithoutMaxResults.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/EscapeSignTest.java
    magnoliamodules/trunk/openutils-mgnlcriteria/src/test/java/net/sourceforge/openutils/mgnlcriteria/jcr/query/lucene/AclSearchIndexTest.java
    magnoliamodules/trunk/openutils-mgnlcriteria/src/test/resources/crit-repository/indexing_configuration.xml
    magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/lifecycle/MediaModule.java
    magnoliamodules/trunk/openutils-mgnlmedia/src/test/java/net/sourceforge/openutils/mgnlmedia/media/repotests/MediaTests.java
    magnoliamodules/trunk/openutils-mgnlmedia/src/test/java/net/sourceforge/openutils/mgnlmedia/media/utils/FileNode.java
    magnoliamodules/trunk/openutils-mgnlmedia/src/test/java/net/sourceforge/openutils/mgnlmedia/media/utils/ImageUtilsTest.java
    magnoliamodules/trunk/openutils-mgnlmedia/src/test/resources/log4j.xml
    magnoliamodules/trunk/openutils-mgnltagcloud/pom.xml
    magnoliamodules/trunk/openutils-mgnltests/src/main/java/it/openutils/mgnlutils/test/AbstractRepositoryTestcase.java
    magnoliamodules/trunk/openutils-mgnltests/src/main/java/it/openutils/mgnlutils/test/RepositoryTestConfiguration.java
    magnoliamodules/trunk/openutils-mgnltests/src/test/java/it/openutils/mgnlutils/test/testng/TestNgRepositoryTestcaseTest.java
    magnoliamodules/trunk/openutils-mgnlutils/src/test/java/it/openutils/mgnlutils/el/MgnlUtilsElFunctionsTest.java

Removed Paths:
-------------
    magnoliamodules/trunk/openutils-mgnlmedia/src/test/java/net/sourceforge/openutils/mgnlmedia/media/utils/FileNodeData.java

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-10-22 20:13:36 UTC (rev 4433)
+++ magnoliamodules/trunk/openutils-mgnlcriteria/src/test/java/net/sourceforge/openutils/mgnlcriteria/advanced/BasePathTest.java	2013-10-28 10:25:04 UTC (rev 4434)
@@ -20,14 +20,8 @@
 package net.sourceforge.openutils.mgnlcriteria.advanced;
 
 import info.magnolia.cms.core.MgnlNodeType;
-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;
 
@@ -61,7 +55,7 @@
     "/crit-bootstrap/userroles.anonymous.xml",
     "/crit-bootstrap/users.system.anonymous.xml",
     "/crit-bootstrap/config.server.auditLogging.xml",
-    "/crit-bootstrap/config.server.i18n.content.xml" })
+    "/crit-bootstrap/config.server.i18n.content.xml" }, security = true)
 public class BasePathTest extends TestNgRepositoryTestcase
 {
 
@@ -90,13 +84,6 @@
         // ------- AdvancedCriteriaImpl
         MgnlContext.getJCRSession(RepositoryConstants.WEBSITE).save();
 
-        // info.magnolia.cms.security.SecurityTest.setUp()
-        final SecuritySupportImpl sec = new SecuritySupportImpl();
-        SystemUserManager systemUserManager = new SystemUserManager();
-        systemUserManager.setRealmName(Realm.REALM_SYSTEM.getName());
-        sec.addUserManager(Realm.REALM_SYSTEM.getName(), systemUserManager);
-        sec.setRoleManager(new MgnlRoleManager());
-        ComponentsTestUtil.setInstance(SecuritySupport.class, sec);
     }
 
     /**

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-10-22 20:13:36 UTC (rev 4433)
+++ magnoliamodules/trunk/openutils-mgnlcriteria/src/test/java/net/sourceforge/openutils/mgnlcriteria/advanced/BasePathWithSpacesTest.java	2013-10-28 10:25:04 UTC (rev 4434)
@@ -20,14 +20,8 @@
 package net.sourceforge.openutils.mgnlcriteria.advanced;
 
 import info.magnolia.cms.core.MgnlNodeType;
-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;
 
@@ -54,7 +48,7 @@
     "/crit-bootstrap/userroles.anonymous.xml",
     "/crit-bootstrap/users.system.anonymous.xml",
     "/crit-bootstrap/config.server.auditLogging.xml",
-    "/crit-bootstrap/config.server.i18n.content.xml" })
+    "/crit-bootstrap/config.server.i18n.content.xml" }, security = true)
 public class BasePathWithSpacesTest extends TestNgRepositoryTestcase
 {
 
@@ -72,13 +66,6 @@
         // --- consectetur adipisici elit
         MgnlContext.getJCRSession(RepositoryConstants.WEBSITE).save();
 
-        // info.magnolia.cms.security.SecurityTest.setUp()
-        final SecuritySupportImpl sec = new SecuritySupportImpl();
-        SystemUserManager systemUserManager = new SystemUserManager();
-        systemUserManager.setRealmName(Realm.REALM_SYSTEM.getName());
-        sec.addUserManager(Realm.REALM_SYSTEM.getName(), systemUserManager);
-        sec.setRoleManager(new MgnlRoleManager());
-        ComponentsTestUtil.setInstance(SecuritySupport.class, sec);
     }
 
     /**

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-10-22 20:13:36 UTC (rev 4433)
+++ magnoliamodules/trunk/openutils-mgnlcriteria/src/test/java/net/sourceforge/openutils/mgnlcriteria/advanced/Content2BeanTest.java	2013-10-28 10:25:04 UTC (rev 4434)
@@ -22,19 +22,12 @@
 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 java.util.Map;
-
 import javax.jcr.Node;
 
 import net.sourceforge.openutils.mgnlcriteria.jcr.query.AdvancedResult;
@@ -61,7 +54,7 @@
     "/crit-bootstrap/userroles.anonymous.xml",
     "/crit-bootstrap/users.system.anonymous.xml",
     "/crit-bootstrap/config.server.auditLogging.xml",
-    "/crit-bootstrap/config.server.i18n.content.xml" })
+    "/crit-bootstrap/config.server.i18n.content.xml" }, security = true)
 public class Content2BeanTest extends TestNgRepositoryTestcase
 {
 
@@ -79,13 +72,6 @@
 
         ComponentsTestUtil.setInstance(I18nContentSupport.class, new DefaultI18nContentSupport());
 
-        // info.magnolia.cms.security.SecurityTest.setUp()
-        final SecuritySupportImpl sec = new SecuritySupportImpl();
-        SystemUserManager systemUserManager = new SystemUserManager();
-        systemUserManager.setRealmName(Realm.REALM_SYSTEM.getName());
-        sec.addUserManager(Realm.REALM_SYSTEM.getName(), systemUserManager);
-        sec.setRoleManager(new MgnlRoleManager());
-        ComponentsTestUtil.setInstance(SecuritySupport.class, sec);
     }
 
     @SuppressWarnings("unchecked")

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-10-22 20:13:36 UTC (rev 4433)
+++ magnoliamodules/trunk/openutils-mgnlcriteria/src/test/java/net/sourceforge/openutils/mgnlcriteria/advanced/FirstDigitEscapeTest.java	2013-10-28 10:25:04 UTC (rev 4434)
@@ -20,14 +20,8 @@
 package net.sourceforge.openutils.mgnlcriteria.advanced;
 
 import info.magnolia.cms.core.MgnlNodeType;
-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;
 
@@ -55,7 +49,7 @@
     "/crit-bootstrap/userroles.anonymous.xml",
     "/crit-bootstrap/users.system.anonymous.xml",
     "/crit-bootstrap/config.server.auditLogging.xml",
-    "/crit-bootstrap/config.server.i18n.content.xml" })
+    "/crit-bootstrap/config.server.i18n.content.xml" }, security = true)
 public class FirstDigitEscapeTest extends TestNgRepositoryTestcase
 {
 
@@ -70,14 +64,6 @@
         super.setUp();
 
         MgnlContext.getJCRSession(RepositoryConstants.WEBSITE).save();
-
-        // info.magnolia.cms.security.SecurityTest.setUp()
-        final SecuritySupportImpl sec = new SecuritySupportImpl();
-        SystemUserManager systemUserManager = new SystemUserManager();
-        systemUserManager.setRealmName(Realm.REALM_SYSTEM.getName());
-        sec.addUserManager(Realm.REALM_SYSTEM.getName(), systemUserManager);
-        sec.setRoleManager(new MgnlRoleManager());
-        ComponentsTestUtil.setInstance(SecuritySupport.class, sec);
     }
 
     @Test

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-10-22 20:13:36 UTC (rev 4433)
+++ magnoliamodules/trunk/openutils-mgnlcriteria/src/test/java/net/sourceforge/openutils/mgnlcriteria/advanced/JcrContainsCriteriaSearchTest.java	2013-10-28 10:25:04 UTC (rev 4434)
@@ -22,11 +22,6 @@
 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;
@@ -63,7 +58,7 @@
     "/crit-bootstrap/userroles.anonymous.xml",
     "/crit-bootstrap/users.system.anonymous.xml",
     "/crit-bootstrap/config.server.auditLogging.xml",
-    "/crit-bootstrap/config.server.i18n.content.xml" })
+    "/crit-bootstrap/config.server.i18n.content.xml" }, security = true)
 public class JcrContainsCriteriaSearchTest extends TestNgRepositoryTestcase
 {
 
@@ -88,14 +83,6 @@
         MgnlContext.getJCRSession(RepositoryConstants.WEBSITE).save();
 
         ComponentsTestUtil.setInstance(I18nContentSupport.class, new DefaultI18nContentSupport());
-
-        // info.magnolia.cms.security.SecurityTest.setUp()
-        final SecuritySupportImpl sec = new SecuritySupportImpl();
-        SystemUserManager systemUserManager = new SystemUserManager();
-        systemUserManager.setRealmName(Realm.REALM_SYSTEM.getName());
-        sec.addUserManager(Realm.REALM_SYSTEM.getName(), systemUserManager);
-        sec.setRoleManager(new MgnlRoleManager());
-        ComponentsTestUtil.setInstance(SecuritySupport.class, sec);
     }
 
     @Test

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-10-22 20:13:36 UTC (rev 4433)
+++ magnoliamodules/trunk/openutils-mgnlcriteria/src/test/java/net/sourceforge/openutils/mgnlcriteria/advanced/JcrContainsQuestionMarkTest.java	2013-10-28 10:25:04 UTC (rev 4434)
@@ -21,11 +21,6 @@
 
 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;
@@ -56,7 +51,7 @@
     "/crit-bootstrap/userroles.anonymous.xml",
     "/crit-bootstrap/users.system.anonymous.xml",
     "/crit-bootstrap/config.server.auditLogging.xml",
-    "/crit-bootstrap/config.server.i18n.content.xml" })
+    "/crit-bootstrap/config.server.i18n.content.xml" }, security = true)
 public class JcrContainsQuestionMarkTest extends TestNgRepositoryTestcase
 {
 
@@ -81,14 +76,6 @@
         MgnlContext.getJCRSession(RepositoryConstants.WEBSITE).save();
 
         ComponentsTestUtil.setInstance(I18nContentSupport.class, new DefaultI18nContentSupport());
-
-        // info.magnolia.cms.security.SecurityTest.setUp()
-        final SecuritySupportImpl sec = new SecuritySupportImpl();
-        SystemUserManager systemUserManager = new SystemUserManager();
-        systemUserManager.setRealmName(Realm.REALM_SYSTEM.getName());
-        sec.addUserManager(Realm.REALM_SYSTEM.getName(), systemUserManager);
-        sec.setRoleManager(new MgnlRoleManager());
-        ComponentsTestUtil.setInstance(SecuritySupport.class, sec);
     }
 
     @SuppressWarnings("deprecation")

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-10-22 20:13:36 UTC (rev 4433)
+++ magnoliamodules/trunk/openutils-mgnlcriteria/src/test/java/net/sourceforge/openutils/mgnlcriteria/advanced/OrderingTest.java	2013-10-28 10:25:04 UTC (rev 4434)
@@ -22,11 +22,6 @@
 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;
@@ -56,7 +51,7 @@
     "/crit-bootstrap/userroles.anonymous.xml",
     "/crit-bootstrap/users.system.anonymous.xml",
     "/crit-bootstrap/config.server.auditLogging.xml",
-    "/crit-bootstrap/config.server.i18n.content.xml" })
+    "/crit-bootstrap/config.server.i18n.content.xml" }, security = true)
 public class OrderingTest extends TestNgRepositoryTestcase
 {
 
@@ -112,14 +107,6 @@
         MgnlContext.getJCRSession(RepositoryConstants.WEBSITE).save();
 
         ComponentsTestUtil.setInstance(I18nContentSupport.class, new DefaultI18nContentSupport());
-
-        // info.magnolia.cms.security.SecurityTest.setUp()
-        final SecuritySupportImpl sec = new SecuritySupportImpl();
-        SystemUserManager systemUserManager = new SystemUserManager();
-        systemUserManager.setRealmName(Realm.REALM_SYSTEM.getName());
-        sec.addUserManager(Realm.REALM_SYSTEM.getName(), systemUserManager);
-        sec.setRoleManager(new MgnlRoleManager());
-        ComponentsTestUtil.setInstance(SecuritySupport.class, sec);
     }
 
     /**

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-10-22 20:13:36 UTC (rev 4433)
+++ magnoliamodules/trunk/openutils-mgnlcriteria/src/test/java/net/sourceforge/openutils/mgnlcriteria/advanced/PaginationTest.java	2013-10-28 10:25:04 UTC (rev 4434)
@@ -22,11 +22,6 @@
 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;
@@ -57,7 +52,7 @@
     "/crit-bootstrap/userroles.anonymous.xml",
     "/crit-bootstrap/users.system.anonymous.xml",
     "/crit-bootstrap/config.server.auditLogging.xml",
-    "/crit-bootstrap/config.server.i18n.content.xml" })
+    "/crit-bootstrap/config.server.i18n.content.xml" }, security = true)
 public class PaginationTest extends TestNgRepositoryTestcase
 {
 
@@ -83,14 +78,6 @@
         MgnlContext.getJCRSession(RepositoryConstants.WEBSITE).save();
 
         ComponentsTestUtil.setInstance(I18nContentSupport.class, new DefaultI18nContentSupport());
-
-        // info.magnolia.cms.security.SecurityTest.setUp()
-        final SecuritySupportImpl sec = new SecuritySupportImpl();
-        SystemUserManager systemUserManager = new SystemUserManager();
-        systemUserManager.setRealmName(Realm.REALM_SYSTEM.getName());
-        sec.addUserManager(Realm.REALM_SYSTEM.getName(), systemUserManager);
-        sec.setRoleManager(new MgnlRoleManager());
-        ComponentsTestUtil.setInstance(SecuritySupport.class, sec);
     }
 
     /**

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-10-22 20:13:36 UTC (rev 4433)
+++ magnoliamodules/trunk/openutils-mgnlcriteria/src/test/java/net/sourceforge/openutils/mgnlcriteria/advanced/ScoreAnalizerAndSortTest.java	2013-10-28 10:25:04 UTC (rev 4434)
@@ -21,11 +21,6 @@
 
 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;
@@ -56,7 +51,7 @@
     "/crit-bootstrap/userroles.anonymous.xml",
     "/crit-bootstrap/users.system.anonymous.xml",
     "/crit-bootstrap/config.server.auditLogging.xml",
-    "/crit-bootstrap/config.server.i18n.content.xml" })
+    "/crit-bootstrap/config.server.i18n.content.xml" }, security = true)
 public class ScoreAnalizerAndSortTest extends TestNgRepositoryTestcase
 {
 
@@ -73,14 +68,6 @@
         MgnlContext.getJCRSession(RepositoryConstants.WEBSITE).save();
 
         ComponentsTestUtil.setInstance(I18nContentSupport.class, new DefaultI18nContentSupport());
-
-        // info.magnolia.cms.security.SecurityTest.setUp()
-        final SecuritySupportImpl sec = new SecuritySupportImpl();
-        SystemUserManager systemUserManager = new SystemUserManager();
-        systemUserManager.setRealmName(Realm.REALM_SYSTEM.getName());
-        sec.addUserManager(Realm.REALM_SYSTEM.getName(), systemUserManager);
-        sec.setRoleManager(new MgnlRoleManager());
-        ComponentsTestUtil.setInstance(SecuritySupport.class, sec);
     }
 
     @Test
@@ -109,15 +96,23 @@
 
         ResultIterator< ? extends Node> iterator = advResult.getItems();
 
-        Assert.assertTrue(((AdvancedResultItem) iterator.next()).getScore() > ((AdvancedResultItem) iterator.next())
-            .getScore());
+        AdvancedResultItem first = (AdvancedResultItem) iterator.next();
+        AdvancedResultItem second = (AdvancedResultItem) iterator.next();
 
+        Assert.assertTrue(first.getScore() >= second.getScore(), "First element score "
+            + first.getScore()
+            + " is not greater of "
+            + second.getScore());
+        // actually, the score should be the same, since the word is always contained in the title... accents should not
+        // be considered
+
         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(((AdvancedResultItem) iterator.next()).getScore("s") > ((AdvancedResultItem) iterator.next())
-            .getScore("s"));
+        Assert
+            .assertTrue(((AdvancedResultItem) iterator.next()).getScore("s") >= ((AdvancedResultItem) iterator.next())
+                .getScore("s"));
     }
 
     @Test

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-10-22 20:13:36 UTC (rev 4433)
+++ magnoliamodules/trunk/openutils-mgnlcriteria/src/test/java/net/sourceforge/openutils/mgnlcriteria/advanced/XpathEscapeTest.java	2013-10-28 10:25:04 UTC (rev 4434)
@@ -22,11 +22,6 @@
 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;
@@ -60,7 +55,7 @@
     "/crit-bootstrap/userroles.anonymous.xml",
     "/crit-bootstrap/users.system.anonymous.xml",
     "/crit-bootstrap/config.server.auditLogging.xml",
-    "/crit-bootstrap/config.server.i18n.content.xml" })
+    "/crit-bootstrap/config.server.i18n.content.xml" }, security = true)
 public class XpathEscapeTest extends TestNgRepositoryTestcase
 {
 
@@ -76,14 +71,6 @@
         MgnlContext.getJCRSession(RepositoryConstants.WEBSITE).save();
 
         ComponentsTestUtil.setInstance(I18nContentSupport.class, new DefaultI18nContentSupport());
-
-        // info.magnolia.cms.security.SecurityTest.setUp()
-        final SecuritySupportImpl sec = new SecuritySupportImpl();
-        SystemUserManager systemUserManager = new SystemUserManager();
-        systemUserManager.setRealmName(Realm.REALM_SYSTEM.getName());
-        sec.addUserManager(Realm.REALM_SYSTEM.getName(), systemUserManager);
-        sec.setRoleManager(new MgnlRoleManager());
-        ComponentsTestUtil.setInstance(SecuritySupport.class, sec);
     }
 
     @Test

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-10-22 20:13:36 UTC (rev 4433)
+++ magnoliamodules/trunk/openutils-mgnlcriteria/src/test/java/net/sourceforge/openutils/mgnlcriteria/advanced/impl/AccessibleResultItemResultIteratorTest.java	2013-10-28 10:25:04 UTC (rev 4434)
@@ -21,12 +21,7 @@
 
 import info.magnolia.cms.i18n.DefaultI18nContentSupport;
 import info.magnolia.cms.i18n.I18nContentSupport;
-import info.magnolia.cms.security.MgnlRoleManager;
 import info.magnolia.cms.security.PermissionUtil;
-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.jcr.util.PropertyUtil;
 import info.magnolia.repository.RepositoryConstants;
@@ -63,7 +58,7 @@
     "/crit-bootstrap/userroles.anonymous.xml",
     "/crit-bootstrap/users.system.anonymous.xml",
     "/crit-bootstrap/config.server.auditLogging.xml",
-    "/crit-bootstrap/config.server.i18n.content.xml" })
+    "/crit-bootstrap/config.server.i18n.content.xml" }, security = true)
 public class AccessibleResultItemResultIteratorTest extends TestNgRepositoryTestcase
 {
 
@@ -106,13 +101,6 @@
 
         ComponentsTestUtil.setInstance(I18nContentSupport.class, new DefaultI18nContentSupport());
 
-        // info.magnolia.cms.security.SecurityTest.setUp()
-        final SecuritySupportImpl sec = new SecuritySupportImpl();
-        SystemUserManager systemUserManager = new SystemUserManager();
-        systemUserManager.setRealmName(Realm.REALM_SYSTEM.getName());
-        sec.addUserManager(Realm.REALM_SYSTEM.getName(), systemUserManager);
-        sec.setRoleManager(new MgnlRoleManager());
-        ComponentsTestUtil.setInstance(SecuritySupport.class, sec);
     }
 
     /**

Modified: magnoliamodules/trunk/openutils-mgnlcriteria/src/test/java/net/sourceforge/openutils/mgnlcriteria/advanced/impl/CorrectElementsWithoutMaxResults.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlcriteria/src/test/java/net/sourceforge/openutils/mgnlcriteria/advanced/impl/CorrectElementsWithoutMaxResults.java	2013-10-22 20:13:36 UTC (rev 4433)
+++ magnoliamodules/trunk/openutils-mgnlcriteria/src/test/java/net/sourceforge/openutils/mgnlcriteria/advanced/impl/CorrectElementsWithoutMaxResults.java	2013-10-28 10:25:04 UTC (rev 4434)
@@ -23,14 +23,8 @@
 package net.sourceforge.openutils.mgnlcriteria.advanced.impl;
 
 import info.magnolia.cms.core.MgnlNodeType;
-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 net.sourceforge.openutils.mgnlcriteria.jcr.query.Criteria;
@@ -50,7 +44,7 @@
     "/crit-bootstrap/userroles.anonymous.xml",
     "/crit-bootstrap/users.system.anonymous.xml",
     "/crit-bootstrap/config.server.auditLogging.xml",
-    "/crit-bootstrap/config.server.i18n.content.xml" })
+    "/crit-bootstrap/config.server.i18n.content.xml" }, security = true)
 public class CorrectElementsWithoutMaxResults extends TestNgRepositoryTestcase
 {
 
@@ -83,14 +77,6 @@
         // ************************************************************
         // total 13 pets
         MgnlContext.getJCRSession(RepositoryConstants.WEBSITE).save();
-
-        // info.magnolia.cms.security.SecurityTest.setUp()
-        final SecuritySupportImpl sec = new SecuritySupportImpl();
-        SystemUserManager systemUserManager = new SystemUserManager();
-        systemUserManager.setRealmName(Realm.REALM_SYSTEM.getName());
-        sec.addUserManager(Realm.REALM_SYSTEM.getName(), systemUserManager);
-        sec.setRoleManager(new MgnlRoleManager());
-        ComponentsTestUtil.setInstance(SecuritySupport.class, sec);
     }
 
     @Test

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-10-22 20:13:36 UTC (rev 4433)
+++ magnoliamodules/trunk/openutils-mgnlcriteria/src/test/java/net/sourceforge/openutils/mgnlcriteria/jcr/query/CriteriaTest.java	2013-10-28 10:25:04 UTC (rev 4434)
@@ -22,11 +22,6 @@
 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.jcr.util.MetaDataUtil;
 import info.magnolia.jcr.util.PropertyUtil;
@@ -58,8 +53,7 @@
     "/crit-bootstrap/website.pets.xml",
     "/crit-bootstrap/userroles.anonymous.xml",
     "/crit-bootstrap/users.system.anonymous.xml",
-    "/crit-bootstrap/config.server.auditLogging.xml",
-    "/crit-bootstrap/config.server.i18n.content.xml" })
+    "/crit-bootstrap/config.server.auditLogging.xml" }, security = true)
 public class CriteriaTest extends TestNgRepositoryTestcase
 {
 
@@ -96,14 +90,6 @@
         MgnlContext.getJCRSession(RepositoryConstants.WEBSITE).save();
 
         ComponentsTestUtil.setInstance(I18nContentSupport.class, new DefaultI18nContentSupport());
-
-        // info.magnolia.cms.security.SecurityTest.setUp()
-        final SecuritySupportImpl sec = new SecuritySupportImpl();
-        SystemUserManager systemUserManager = new SystemUserManager();
-        systemUserManager.setRealmName(Realm.REALM_SYSTEM.getName());
-        sec.addUserManager(Realm.REALM_SYSTEM.getName(), systemUserManager);
-        sec.setRoleManager(new MgnlRoleManager());
-        ComponentsTestUtil.setInstance(SecuritySupport.class, sec);
     }
 
     /**
@@ -184,7 +170,7 @@
         Criteria criteria = toXpathExpressionJavadocExampleCriteria();
 
         AdvancedResult result = criteria.execute();
-        Assert.assertEquals(result.getTotalSize(), 1);
+        Assert.assertEquals(result.getTotalSize(), 1, "Expected 1 result for query " + criteria.toXpathExpression());
 
         ResultIterator< ? extends Node> iterator = result.getItems();
         Assert.assertEquals(iterator.getSize(), 1);

Modified: magnoliamodules/trunk/openutils-mgnlcriteria/src/test/java/net/sourceforge/openutils/mgnlcriteria/jcr/query/EscapeSignTest.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlcriteria/src/test/java/net/sourceforge/openutils/mgnlcriteria/jcr/query/EscapeSignTest.java	2013-10-22 20:13:36 UTC (rev 4433)
+++ magnoliamodules/trunk/openutils-mgnlcriteria/src/test/java/net/sourceforge/openutils/mgnlcriteria/jcr/query/EscapeSignTest.java	2013-10-28 10:25:04 UTC (rev 4434)
@@ -22,11 +22,6 @@
 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;
@@ -51,7 +46,7 @@
     "/crit-bootstrap/userroles.anonymous.xml",
     "/crit-bootstrap/users.system.anonymous.xml",
     "/crit-bootstrap/config.server.auditLogging.xml",
-    "/crit-bootstrap/config.server.i18n.content.xml" })
+    "/crit-bootstrap/config.server.i18n.content.xml" }, security = true)
 public class EscapeSignTest extends TestNgRepositoryTestcase
 {
 
@@ -73,14 +68,6 @@
         MgnlContext.getJCRSession(RepositoryConstants.WEBSITE).save();
 
         ComponentsTestUtil.setInstance(I18nContentSupport.class, new DefaultI18nContentSupport());
-
-        // info.magnolia.cms.security.SecurityTest.setUp()
-        final SecuritySupportImpl sec = new SecuritySupportImpl();
-        SystemUserManager systemUserManager = new SystemUserManager();
-        systemUserManager.setRealmName(Realm.REALM_SYSTEM.getName());
-        sec.addUserManager(Realm.REALM_SYSTEM.getName(), systemUserManager);
-        sec.setRoleManager(new MgnlRoleManager());
-        ComponentsTestUtil.setInstance(SecuritySupport.class, sec);
     }
 
     /**

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-10-22 20:13:36 UTC (rev 4433)
+++ magnoliamodules/trunk/openutils-mgnlcriteria/src/test/java/net/sourceforge/openutils/mgnlcriteria/jcr/query/lucene/AclSearchIndexTest.java	2013-10-28 10:25:04 UTC (rev 4434)
@@ -20,17 +20,11 @@
 package net.sourceforge.openutils.mgnlcriteria.jcr.query.lucene;
 
 import info.magnolia.cms.security.AccessManager;
-import info.magnolia.cms.security.MgnlRoleManager;
 import info.magnolia.cms.security.Permission;
-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.Context;
 import info.magnolia.context.ContextDecorator;
 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;
 
@@ -63,7 +57,7 @@
     "/crit-bootstrap/userroles.anonymous.xml",
     "/crit-bootstrap/users.system.anonymous.xml",
     "/crit-bootstrap/config.server.auditLogging.xml",
-    "/crit-bootstrap/config.server.i18n.content.xml" })
+    "/crit-bootstrap/config.server.i18n.content.xml" }, security = true)
 public class AclSearchIndexTest extends TestNgRepositoryTestcase
 {
 
@@ -101,13 +95,6 @@
         Session hm = MgnlContext.getJCRSession(RepositoryConstants.WEBSITE);
         hm.save();
 
-        // info.magnolia.cms.security.SecurityTest.setUp()
-        final SecuritySupportImpl sec = new SecuritySupportImpl();
-        SystemUserManager systemUserManager = new SystemUserManager();
-        systemUserManager.setRealmName(Realm.REALM_SYSTEM.getName());
-        sec.addUserManager(Realm.REALM_SYSTEM.getName(), systemUserManager);
-        sec.setRoleManager(new MgnlRoleManager());
-        ComponentsTestUtil.setInstance(SecuritySupport.class, sec);
     }
 
     /**

Modified: magnoliamodules/trunk/openutils-mgnlcriteria/src/test/resources/crit-repository/indexing_configuration.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnlcriteria/src/test/resources/crit-repository/indexing_configuration.xml	2013-10-22 20:13:36 UTC (rev 4433)
+++ magnoliamodules/trunk/openutils-mgnlcriteria/src/test/resources/crit-repository/indexing_configuration.xml	2013-10-28 10:25:04 UTC (rev 4434)
@@ -14,20 +14,14 @@
     </analyzer>
   </analyzers>
 
-
+ 
   <index-rule nodeType="nt:hierarchyNode">
     <property boost="10" useInExcerpt="false">title</property>
     <property boost="1.0" useInExcerpt="true">text</property>
+    <property useInExcerpt="false" nodeScopeIndex="false" isRegexp="true">.*</property>
+    <property useInExcerpt="false" nodeScopeIndex="false" isRegexp="true">.*:.*</property>
   </index-rule>
-  <index-rule nodeType="mgnl:page">
-    <property boost="10" useInExcerpt="false">title</property>
-    <property boost="1.0" useInExcerpt="true">text</property>
-  </index-rule>
-  <index-rule nodeType="mgnl:component">
-    <property boost="0.5"   useInExcerpt="false">title</property>
-    <property boost="1.0"   useInExcerpt="true">text</property>
-  </index-rule>
-
+  
   <!-- index text content on paragraphs -->
   <!-- aggregates content on the main column -->
 

Modified: magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/lifecycle/MediaModule.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/lifecycle/MediaModule.java	2013-10-22 20:13:36 UTC (rev 4433)
+++ magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/lifecycle/MediaModule.java	2013-10-28 10:25:04 UTC (rev 4434)
@@ -104,8 +104,11 @@
     public void start(ModuleLifecycleContext ctx)
     {
         log.info("Starting module media");
-        ctx.registerModuleObservingComponent("mediatypes", (ObservedManager) mediaConfigurationManager);
-        version = ctx.getCurrentModuleDefinition().getVersion().toString();
+        if (ctx != null)
+        {
+            ctx.registerModuleObservingComponent("mediatypes", (ObservedManager) mediaConfigurationManager);
+            version = ctx.getCurrentModuleDefinition().getVersion().toString();
+        }
     }
 
     /**

Modified: magnoliamodules/trunk/openutils-mgnlmedia/src/test/java/net/sourceforge/openutils/mgnlmedia/media/repotests/MediaTests.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlmedia/src/test/java/net/sourceforge/openutils/mgnlmedia/media/repotests/MediaTests.java	2013-10-22 20:13:36 UTC (rev 4433)
+++ magnoliamodules/trunk/openutils-mgnlmedia/src/test/java/net/sourceforge/openutils/mgnlmedia/media/repotests/MediaTests.java	2013-10-28 10:25:04 UTC (rev 4434)
@@ -22,6 +22,7 @@
 import info.magnolia.cms.core.MgnlNodeType;
 import info.magnolia.context.MgnlContext;
 import info.magnolia.jcr.util.NodeUtil;
+import info.magnolia.test.ComponentsTestUtil;
 import it.openutils.mgnlutils.test.RepositoryTestConfiguration;
 import it.openutils.mgnlutils.test.TestNgRepositoryTestcase;
 
@@ -30,6 +31,8 @@
 import javax.jcr.Node;
 import javax.jcr.Session;
 
+import net.sourceforge.openutils.mgnlmedia.media.configuration.DefaultMediaConfigurationManager;
+import net.sourceforge.openutils.mgnlmedia.media.configuration.MediaConfigurationManager;
 import net.sourceforge.openutils.mgnlmedia.media.utils.MediaLoadUtils;
 
 import org.apache.commons.io.IOUtils;
@@ -41,9 +44,11 @@
  * @author fgiust
  * @version $Id$
  */
-@RepositoryTestConfiguration(jackrabbitRepositoryConfig = "/test-repository/jackrabbit-test-configuration.xml", repositoryConfig = "/test-repository/test-repositories.xml", autostart = true)
-// , startModules = @ModuleConfiguration(name = "media", moduleclass = MediaModule.class)
-// , bootstrapFiles = "/test-bootstrap/media.x.xml"
+@RepositoryTestConfiguration(jackrabbitRepositoryConfig = "/test-repository/jackrabbit-test-configuration.xml", //
+repositoryConfig = "/test-repository/test-repositories.xml", //
+autostart = true, //
+bootstrapDirectory = {"/mgnl-bootstrap/media", "/mgnl-bootstrap/media-nooverwrite" })
+// , startModules = @ModuleConfiguration(name = "media", moduleclass = MediaModule.class))
 public class MediaTests extends TestNgRepositoryTestcase
 {
 
@@ -53,6 +58,7 @@
     {
         super.setUp();
         // MgnlContext.getHierarchyManager("media").save();
+        ComponentsTestUtil.setImplementation(MediaConfigurationManager.class, DefaultMediaConfigurationManager.class);
     }
 
     @Test(enabled = true)

Modified: magnoliamodules/trunk/openutils-mgnlmedia/src/test/java/net/sourceforge/openutils/mgnlmedia/media/utils/FileNode.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlmedia/src/test/java/net/sourceforge/openutils/mgnlmedia/media/utils/FileNode.java	2013-10-22 20:13:36 UTC (rev 4433)
+++ magnoliamodules/trunk/openutils-mgnlmedia/src/test/java/net/sourceforge/openutils/mgnlmedia/media/utils/FileNode.java	2013-10-28 10:25:04 UTC (rev 4434)
@@ -19,912 +19,52 @@
 
 package net.sourceforge.openutils.mgnlmedia.media.utils;
 
-import java.io.ByteArrayInputStream;
+import info.magnolia.test.mock.jcr.MockNode;
+import info.magnolia.test.mock.jcr.MockValue;
+
 import java.io.IOException;
 import java.io.InputStream;
-import java.math.BigDecimal;
-import java.util.Calendar;
 
-import javax.jcr.AccessDeniedException;
-import javax.jcr.Binary;
-import javax.jcr.InvalidItemStateException;
-import javax.jcr.InvalidLifecycleTransitionException;
-import javax.jcr.Item;
-import javax.jcr.ItemExistsException;
-import javax.jcr.ItemNotFoundException;
-import javax.jcr.ItemVisitor;
-import javax.jcr.MergeException;
-import javax.jcr.NoSuchWorkspaceException;
 import javax.jcr.Node;
-import javax.jcr.NodeIterator;
-import javax.jcr.PathNotFoundException;
-import javax.jcr.Property;
-import javax.jcr.PropertyIterator;
-import javax.jcr.ReferentialIntegrityException;
-import javax.jcr.RepositoryException;
-import javax.jcr.Session;
-import javax.jcr.UnsupportedRepositoryOperationException;
-import javax.jcr.Value;
-import javax.jcr.ValueFormatException;
-import javax.jcr.lock.Lock;
-import javax.jcr.lock.LockException;
-import javax.jcr.nodetype.ConstraintViolationException;
-import javax.jcr.nodetype.NoSuchNodeTypeException;
-import javax.jcr.nodetype.NodeDefinition;
-import javax.jcr.nodetype.NodeType;
-import javax.jcr.version.ActivityViolationException;
-import javax.jcr.version.Version;
-import javax.jcr.version.VersionException;
-import javax.jcr.version.VersionHistory;
 
 import org.apache.commons.io.IOUtils;
 import org.apache.commons.lang.StringUtils;
+import org.apache.jackrabbit.value.BinaryImpl;
 
 
 /**
  * @author fgiust
  * @version $Id: FileNodeData.java 4331 2013-09-20 12:38:39Z fgiust $
  */
-public class FileNode implements Node
+public class FileNode extends MockNode implements Node
 {
 
-    private byte[] content;
-
-    private String extension;
-
     /**
      * @param classpathLocation
      * @throws IOException
      */
     public FileNode(String classpathLocation) throws IOException
     {
+        super(StringUtils.substringAfterLast(classpathLocation, "/"));
         InputStream is = getClass().getResourceAsStream(classpathLocation);
 
         if (is == null)
         {
             throw new IllegalArgumentException("Classpath resource " + classpathLocation + " cannot be found");
         }
+        String extension = StringUtils.substringAfterLast(classpathLocation, ".");
+        setProperty("extension", extension);
+
         try
         {
-            extension = StringUtils.substringAfterLast(classpathLocation, ".");
-
-            content = IOUtils.toByteArray(is);
+            byte[] byteArray = IOUtils.toByteArray(is);
+            setProperty("jcr:data", new MockValue(new BinaryImpl(byteArray)));
         }
         finally
         {
             IOUtils.closeQuietly(is);
         }
-    }
 
-    /**
-     * {@inheritDoc}
-     */
-    public String getAttribute(String key)
-    {
-        if (StringUtils.equals(key, "extension"))
-        {
-            return this.extension;
-        }
-        // TODO Auto-generated method stub
-        return null;
     }
 
-    /**
-     * {@inheritDoc}
-     */
-    public InputStream getStream()
-    {
-        return new ByteArrayInputStream(content);
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public String getPath() throws RepositoryException
-    {
-        // TODO Auto-generated method stub
-        return null;
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public String getName() throws RepositoryException
-    {
-        // TODO Auto-generated method stub
-        return null;
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public Item getAncestor(int depth) throws ItemNotFoundException, AccessDeniedException, RepositoryException
-    {
-        // TODO Auto-generated method stub
-        return null;
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public Node getParent() throws ItemNotFoundException, AccessDeniedException, RepositoryException
-    {
-        // TODO Auto-generated method stub
-        return null;
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public int getDepth() throws RepositoryException
-    {
-        // TODO Auto-generated method stub
-        return 0;
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public Session getSession() throws RepositoryException
-    {
-        // TODO Auto-generated method stub
-        return null;
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public boolean isNode()
-    {
-        // TODO Auto-generated method stub
-        return false;
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public boolean isNew()
-    {
-        // TODO Auto-generated method stub
-        return false;
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public boolean isModified()
-    {
-        // TODO Auto-generated method stub
-        return false;
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public boolean isSame(Item otherItem) throws RepositoryException
-    {
-        // TODO Auto-generated method stub
-        return false;
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public void accept(ItemVisitor visitor) throws RepositoryException
-    {
-        // TODO Auto-generated method stub
-
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public void save() throws AccessDeniedException, ItemExistsException, ConstraintViolationException,
-        InvalidItemStateException, ReferentialIntegrityException, VersionException, LockException,
-        NoSuchNodeTypeException, RepositoryException
-    {
-        // TODO Auto-generated method stub
-
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public void refresh(boolean keepChanges) throws InvalidItemStateException, RepositoryException
-    {
-        // TODO Auto-generated method stub
-
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public void remove() throws VersionException, LockException, ConstraintViolationException, AccessDeniedException,
-        RepositoryException
-    {
-        // TODO Auto-generated method stub
-
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public Node addNode(String relPath) throws ItemExistsException, PathNotFoundException, VersionException,
-        ConstraintViolationException, LockException, RepositoryException
-    {
-        // TODO Auto-generated method stub
-        return null;
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public Node addNode(String relPath, String primaryNodeTypeName) throws ItemExistsException, PathNotFoundException,
-        NoSuchNodeTypeException, LockException, VersionException, ConstraintViolationException, RepositoryException
-    {
-        // TODO Auto-generated method stub
-        return null;
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public void orderBefore(String srcChildRelPath, String destChildRelPath)
-        throws UnsupportedRepositoryOperationException, VersionException, ConstraintViolationException,
-        ItemNotFoundException, LockException, RepositoryException
-    {
-        // TODO Auto-generated method stub
-
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public Property setProperty(String name, Value value) throws ValueFormatException, VersionException, LockException,
-        ConstraintViolationException, RepositoryException
-    {
-        // TODO Auto-generated method stub
-        return null;
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public Property setProperty(String name, Value value, int type) throws ValueFormatException, VersionException,
-        LockException, ConstraintViolationException, RepositoryException
-    {
-        // TODO Auto-generated method stub
-        return null;
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public Property setProperty(String name, Value[] values) throws ValueFormatException, VersionException,
-        LockException, ConstraintViolationException, RepositoryException
-    {
-        // TODO Auto-generated method stub
-        return null;
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public Property setProperty(String name, Value[] values, int type) throws ValueFormatException, VersionException,
-        LockException, ConstraintViolationException, RepositoryException
-    {
-        // TODO Auto-generated method stub
-        return null;
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public Property setProperty(String name, String[] values) throws ValueFormatException, VersionException,
-        LockException, ConstraintViolationException, RepositoryException
-    {
-        // TODO Auto-generated method stub
-        return null;
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public Property setProperty(String name, String[] values, int type) throws ValueFormatException, VersionException,
-        LockException, ConstraintViolationException, RepositoryException
-    {
-        // TODO Auto-generated method stub
-        return null;
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public Property setProperty(String name, String value) throws ValueFormatException, VersionException,
-        LockException, ConstraintViolationException, RepositoryException
-    {
-        // TODO Auto-generated method stub
-        return null;
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public Property setProperty(String name, String value, int type) throws ValueFormatException, VersionException,
-        LockException, ConstraintViolationException, RepositoryException
-    {
-        // TODO Auto-generated method stub
-        return null;
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public Property setProperty(String name, InputStream value) throws ValueFormatException, VersionException,
-        LockException, ConstraintViolationException, RepositoryException
-    {
-        // TODO Auto-generated method stub
-        return null;
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public Property setProperty(String name, Binary value) throws ValueFormatException, VersionException,
-        LockException, ConstraintViolationException, RepositoryException
-    {
-        // TODO Auto-generated method stub
-        return null;
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public Property setProperty(String name, boolean value) throws ValueFormatException, VersionException,
-        LockException, ConstraintViolationException, RepositoryException
-    {
-        // TODO Auto-generated method stub
-        return null;
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public Property setProperty(String name, double value) throws ValueFormatException, VersionException,
-        LockException, ConstraintViolationException, RepositoryException
-    {
-        // TODO Auto-generated method stub
-        return null;
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public Property setProperty(String name, BigDecimal value) throws ValueFormatException, VersionException,
-        LockException, ConstraintViolationException, RepositoryException
-    {
-        // TODO Auto-generated method stub
-        return null;
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public Property setProperty(String name, long value) throws ValueFormatException, VersionException, LockException,
-        ConstraintViolationException, RepositoryException
-    {
-        // TODO Auto-generated method stub
-        return null;
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public Property setProperty(String name, Calendar value) throws ValueFormatException, VersionException,
-        LockException, ConstraintViolationException, RepositoryException
-    {
-        // TODO Auto-generated method stub
-        return null;
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public Property setProperty(String name, Node value) throws ValueFormatException, VersionException, LockException,
-        ConstraintViolationException, RepositoryException
-    {
-        // TODO Auto-generated method stub
-        return null;
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public Node getNode(String relPath) throws PathNotFoundException, RepositoryException
-    {
-        // TODO Auto-generated method stub
-        return null;
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public NodeIterator getNodes() throws RepositoryException
-    {
-        // TODO Auto-generated method stub
-        return null;
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public NodeIterator getNodes(String namePattern) throws RepositoryException
-    {
-        // TODO Auto-generated method stub
-        return null;
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public NodeIterator getNodes(String[] nameGlobs) throws RepositoryException
-    {
-        // TODO Auto-generated method stub
-        return null;
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public Property getProperty(String relPath) throws PathNotFoundException, RepositoryException
-    {
-        // TODO Auto-generated method stub
-        return null;
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public PropertyIterator getProperties() throws RepositoryException
-    {
-        // TODO Auto-generated method stub
-        return null;
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public PropertyIterator getProperties(String namePattern) throws RepositoryException
-    {
-        // TODO Auto-generated method stub
-        return null;
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public PropertyIterator getProperties(String[] nameGlobs) throws RepositoryException
-    {
-        // TODO Auto-generated method stub
-        return null;
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public Item getPrimaryItem() throws ItemNotFoundException, RepositoryException
-    {
-        // TODO Auto-generated method stub
-        return null;
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public String getUUID() throws UnsupportedRepositoryOperationException, RepositoryException
-    {
-        // TODO Auto-generated method stub
-        return null;
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public String getIdentifier() throws RepositoryException
-    {
-        // TODO Auto-generated method stub
-        return null;
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public int getIndex() throws RepositoryException
-    {
-        // TODO Auto-generated method stub
-        return 0;
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public PropertyIterator getReferences() throws RepositoryException
-    {
-        // TODO Auto-generated method stub
-        return null;
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public PropertyIterator getReferences(String name) throws RepositoryException
-    {
-        // TODO Auto-generated method stub
-        return null;
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public PropertyIterator getWeakReferences() throws RepositoryException
-    {
-        // TODO Auto-generated method stub
-        return null;
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public PropertyIterator getWeakReferences(String name) throws RepositoryException
-    {
-        // TODO Auto-generated method stub
-        return null;
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public boolean hasNode(String relPath) throws RepositoryException
-    {
-        // TODO Auto-generated method stub
-        return false;
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public boolean hasProperty(String relPath) throws RepositoryException
-    {
-        // TODO Auto-generated method stub
-        return false;
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public boolean hasNodes() throws RepositoryException
-    {
-        // TODO Auto-generated method stub
-        return false;
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public boolean hasProperties() throws RepositoryException
-    {
-        // TODO Auto-generated method stub
-        return false;
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public NodeType getPrimaryNodeType() throws RepositoryException
-    {
-        // TODO Auto-generated method stub
-        return null;
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public NodeType[] getMixinNodeTypes() throws RepositoryException
-    {
-        // TODO Auto-generated method stub
-        return null;
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public boolean isNodeType(String nodeTypeName) throws RepositoryException
-    {
-        // TODO Auto-generate...
 
[truncated message content]

[Openutils-svn] SF.net SVN: openutils:[4433] magnoliamodules/trunk/openutils-mgnlmedia/src/ main/java/net/sourceforge/openutils/mgnlmedia/media/dialog/LayerDialogMVC. java

From: <fg...@us...> - 2013-10-22 20:13:39

Revision: 4433
          http://openutils.svn.sourceforge.net/openutils/?rev=4433&view=rev
Author:   fgiust
Date:     2013-10-22 20:13:36 +0000 (Tue, 22 Oct 2013)
Log Message:
-----------
change nodename if file name changes

Modified Paths:
--------------
    magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/dialog/LayerDialogMVC.java

Modified: magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/dialog/LayerDialogMVC.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/dialog/LayerDialogMVC.java	2013-10-21 14:12:00 UTC (rev 4432)
+++ magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/dialog/LayerDialogMVC.java	2013-10-22 20:13:36 UTC (rev 4433)
@@ -25,6 +25,7 @@
 import info.magnolia.cms.core.Path;
 import info.magnolia.cms.gui.dialog.Dialog;
 import info.magnolia.cms.gui.misc.Sources;
+import info.magnolia.cms.util.ContentUtil;
 import info.magnolia.cms.util.NodeDataUtil;
 import info.magnolia.context.MgnlContext;
 import info.magnolia.module.admininterface.SaveHandler;
@@ -150,9 +151,52 @@
 
         String type = NodeDataUtil.getString(node, "type");
 
-        // TODO rename dei nodi in base al filename?
+        // rename node if image filename has changed
+        if (!StringUtils.equals(handler.getNodeName(), "mgnlNew"))
+        {
+            String newnodename = Components
+                .getComponent(MediaConfigurationManager.class)
+                .getTypes()
+                .get(type)
+                .getHandler()
+                .getNewNodeName(form, request);
 
-        return Components.getComponent(MediaConfigurationManager.class).getTypes().get(type).getHandler().onPostSave(node.getJCRNode());
+            Content c;
+            try
+            {
+                Content previousnode = hm.getContent(handler.getPath());
+                c = previousnode.getParent();
+
+                String validatedlabel = Path.getValidatedLabel(newnodename);
+
+                if (!StringUtils.equals(handler.getNodeName(), validatedlabel))
+                {
+                    log.debug("Node name changed from {} to {}", handler.getNodeName(), validatedlabel);
+
+                    String uniqueLabel = Path.getUniqueLabel(c, validatedlabel);
+
+                    log.debug("Renaming node from {} to {}", previousnode.getHandle(), c.getHandle()
+                        + "/"
+                        + uniqueLabel);
+
+                    ContentUtil.moveInSession(previousnode, c.getHandle() + "/" + uniqueLabel);
+                    c.getJCRNode().getSession().save();
+
+                }
+            }
+            catch (RepositoryException e)
+            {
+                // ignore, can't rename
+                log.warn("Unable to rename node {}", node.getHandle());
+            }
+        }
+
+        return Components
+            .getComponent(MediaConfigurationManager.class)
+            .getTypes()
+            .get(type)
+            .getHandler()
+            .onPostSave(node.getJCRNode());
     }
 
     /**
@@ -178,7 +222,8 @@
             }
             control.setNodeName(Path.getUniqueLabel(
                 c,
-                Path.getValidatedLabel(Components.getComponent(MediaConfigurationManager.class)
+                Path.getValidatedLabel(Components
+                    .getComponent(MediaConfigurationManager.class)
                     .getTypes()
                     .get(type)
                     .getHandler()

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

[Openutils-svn] SF.net SVN: openutils:[4432] magnoliamodules/trunk/openutils-mgnllms/src/ main/resources/mgnl-resources/mgnllms/js

From: <luc...@us...> - 2013-10-21 14:12:04

Revision: 4432
          http://openutils.svn.sourceforge.net/openutils/?rev=4432&view=rev
Author:   lucaboati
Date:     2013-10-21 14:12:00 +0000 (Mon, 21 Oct 2013)
Log Message:
-----------
fix rules, fix js, IE compatible

Modified Paths:
--------------
    magnoliamodules/trunk/openutils-mgnllms/src/main/resources/mgnl-resources/mgnllms/js/ActivityTree.js
    magnoliamodules/trunk/openutils-mgnllms/src/main/resources/mgnl-resources/mgnllms/js/AuxClass.js
    magnoliamodules/trunk/openutils-mgnllms/src/main/resources/mgnl-resources/mgnllms/js/GlobalSharedObjective.js
    magnoliamodules/trunk/openutils-mgnllms/src/main/resources/mgnl-resources/mgnllms/js/IScorm.js
    magnoliamodules/trunk/openutils-mgnllms/src/main/resources/mgnl-resources/mgnllms/js/Objective.js
    magnoliamodules/trunk/openutils-mgnllms/src/main/resources/mgnl-resources/mgnllms/js/RollupProcess.js
    magnoliamodules/trunk/openutils-mgnllms/src/main/resources/mgnl-resources/mgnllms/js/TrackingModel.js
    magnoliamodules/trunk/openutils-mgnllms/src/main/resources/mgnl-resources/mgnllms/js/api_scorm.js
    magnoliamodules/trunk/openutils-mgnllms/src/main/resources/mgnl-resources/mgnllms/js/store.js
    magnoliamodules/trunk/openutils-mgnllms/src/main/resources/mgnl-resources/mgnllms/js/validator.js

Modified: magnoliamodules/trunk/openutils-mgnllms/src/main/resources/mgnl-resources/mgnllms/js/ActivityTree.js
===================================================================
--- magnoliamodules/trunk/openutils-mgnllms/src/main/resources/mgnl-resources/mgnllms/js/ActivityTree.js	2013-10-21 13:58:10 UTC (rev 4431)
+++ magnoliamodules/trunk/openutils-mgnllms/src/main/resources/mgnl-resources/mgnllms/js/ActivityTree.js	2013-10-21 14:12:00 UTC (rev 4432)
@@ -45,6 +45,7 @@
 	 */ 
 	start: function(){
 		var req = this.suspendedActivity ? "resumeall" : !this.current ? "start" :"";
+		this.recHideAndDisable()
 		this.overallSequencingProcess(req);
 	},
 	
@@ -63,7 +64,7 @@
 		var toEncode = new Hash({
 			objectives: new Hash(),
 			tracks: new Hash(),
-			suspendedActivity: this.suspendedActivity ? this.suspendedActivity.getName() : "",
+			suspendedActivity: this.suspendedActivity ? this.suspendedActivity.getName() : ""
 		});
 		
 		function recExplo(node,i){
@@ -206,12 +207,12 @@
 				return{
 					activity: null,
 					endSs: fs.endSs,
-					exception: fs.exception,
+					exception: fs.exception
 				}
 			}else{
 				return{
 					activity: fs.activity,
-					exception: null,
+					exception: null
 				}
 			}
 		}
@@ -526,7 +527,7 @@
 				activity: fats.activity,
 				deliverable: fats.deliverable,
 				endSs: fats.endSs,
-				exception: fats.exception,
+				exception: fats.exception
 			};
 		}
 	},
@@ -595,7 +596,7 @@
 			return {
 				activity: node,
 				deliverable: false,
-				exception: "SB.2.2-1",
+				exception: "SB.2.2-1"
 			};
 		}
 		/*
@@ -612,7 +613,7 @@
 					activity: node,
 					deliverable: false,
 					endSs: ftts.endSs,
-					exception: ftts.exception,
+					exception: ftts.exception
 				};
 			/* 3.3 */
 			}else{
@@ -640,7 +641,7 @@
 			return {
 				deliverable: false,
 				activity: node,
-				exception: "SB.2.2-2",
+				exception: "SB.2.2-2"
 			};
 		}
 		/* 6 */
@@ -999,7 +1000,7 @@
 				});
 				this.current = this.root;
 				temp.valid = true;
-				temp. sequencingRequest = 'exit';
+				temp.sequencingRequest = 'exit';
 				return temp;
 			break;
 		}
@@ -1015,7 +1016,7 @@
 			if(node.options.data.item.sequencing.deliveryControls.tracked == true){
 				if (node.options.data.item.sequencing.deliveryControls.completionSetByContent==false
 						&& node.options.data.track.getAttemptProgressStatus()==false){
-					node.options.data.track.getAttemptProgressStatus()==true;
+					node.options.data.track.setAttemptProgressStatus(true);
 					node.options.data.track.setAttemptCompletionStatus(true);
 				}
 				if (node.options.data.item.sequencing.deliveryControls.objectiveSetByContent==false){
@@ -1046,9 +1047,14 @@
 		new RollupProcess(node,this).overallRollupProcess();
 		
 		node.deselectNode();
-		console.debug("Attempt end: " + node.options.label);
+		this.recHideAndDisable()
 		if (!node.options.enabled && !node.options.data.track.activityIsActive){
-			node.disable();
+			try{
+				node.disable();
+			}catch(e){
+				//non facciamo niente, potrebbe esserci un errore di mootools 
+				//facendo il fade del nodo
+			}
 		}
 //		API_1484_11 = null;
 		$('scormFrame').src = null;
@@ -1078,7 +1084,7 @@
 	
 	/* Overall Sequencing Process [OP.1] */
 	overallSequencingProcess: function(request,target){
-		at.clearDebounce.delay(1000);
+		at.clearDebounce.delay(1000,at);
 		
 		var pendingRequest;
 		
@@ -1094,7 +1100,7 @@
 		
 		if (nr.valid==false){
 			/* handle exception */
-			console.error('Sequencing request process exception: ',nr.exception);
+//			console.error('Sequencing request process exception: ',nr.exception);
 			return;
 		}
 		target=nr.target;
@@ -1102,7 +1108,7 @@
 			var tr = this.terminationRequestProcess(nr.terminationRequest.toLowerCase());
 			if (!tr.valid){
 				/* handle exception */
-				console.error('Sequencing request process exception: ',tr.exception);
+//				console.error('Sequencing request process exception: ',tr.exception);
 				return;
 			}
 			if (tr.sequencingRequest){
@@ -1115,7 +1121,7 @@
 			var sr = this.sequencingRequestProcess(nr.sequencingRequest.toLowerCase(),target);
 			if (!sr.valid){
 				/* handle exception */
-				console.error('Sequencing request process exception: ',sr.exception);
+//				console.error('Sequencing request process exception: ',sr.exception);
 				return;
 			}
 			/* 1.4.3 */
@@ -1130,7 +1136,7 @@
 // }else{
 // location.reload();
 // }
-				console.info("End sequencing session");
+//				console.info("End sequencing session");
 				return;
 				/*
 				 * Exit Overall Sequencing Process - the sequencing session has
@@ -1147,7 +1153,7 @@
 		if (delivery){
 			var drp = this.deliveryRequestProcess(delivery);
 			if (false == drp.valid){
-				console.log(drp);
+//				console.log(drp);
 				return;
 			}
 			this.contentDeliveryEnvironmentProcess(delivery);
@@ -1228,64 +1234,8 @@
 			this.scormPlayer.layout.buttons.previousBtn.setEnabled(false);
 		}
 		
-		function recHideAndDisable(node,at,rec,rec2){
-			node.enable()
-			var descend = false;
-			var descend2 = false;
-			var rp = new RollupProcess(node,at);
-// var nr = navigationRequest["choice"].bind(at)(node);
-// var nr = at.choiceSequencingRequestProcess(delivery);
-			var current = at.current;
-			var nr = at.sequencingRequestProcess('choice',node,true);
-			at.current = current;
-			
-			if(nr.valid==false ){
-// if(nr.exception!=null){
-				node.disable();
-			}
-			
-			if (rp.sequencingRulesCheckProcess(node,['disabled'])|| rec){
-				node.disable();
-				descend = true
-			}
-			
-			if (node != delivery 
-					&& !!node.options.data.item.sequencing.limitConditions 
-					&& !!node.options.data.item.sequencing.limitConditions.attemptLimit 
-					&& node.options.data.track.activityAttemptCount >= node.options.data.item.sequencing.limitConditions.attemptLimit || rec2){
-				node.disable();
-				descend2 = true;
-			}
-			
-			if (node.nodes){
-				node.nodes.each(function(n){
-					recHideAndDisable(n, at, descend, descend2);
-				})
-			}
-			var f = new Fx.Slide(node.domObj);
-			f.show();
-			
-			if (rp.sequencingRulesCheckProcess(node,['hiddenfromchoice'])){
-				new Fx.Slide(node.domObj).hide();
-			}
-			/*
-			 * isvisible (optional): The isvisible attribute indicates whether
-			 * or not this item is displayed when the structure of the package
-			 * is displayed or rendered. If not present, value is defaulted to
-			 * be true [3]. The value only affects the item for which it is
-			 * defined and not the children of the item or a resource associated
-			 * with an item. XML Data Type: xs:boolean.
-			 */
-			if (node.options.data.item.isvisible == false){
-				new Fx.Slide(node.domLabel.getParent()).hide();
-			}
-		}
+		this.recHideAndDisable();
 		
-		
-		
-		
-		recHideAndDisable(this.root,this);
-		
 		var path = delivery.pathFromRoot().reverse();
 		path.each(function(n){
 			if (n.getControlMode().choiceExit==false){
@@ -1346,7 +1296,7 @@
 		if (delivery.nodes){
 			return {
 				valid: false,
-				exception: "DB.1.1-1",
+				exception: "DB.1.1-1"
 			};
 		}
 		var actPath = delivery.pathFromRoot();
@@ -1354,7 +1304,7 @@
 		if (actPath.length == 0){
 			return {
 				valid: false,
-				exception: "DB.1.1-2",
+				exception: "DB.1.1-2"
 			};
 		}
 		var toReturn = {valid: true, exception: null};
@@ -1447,7 +1397,7 @@
 			this.debounce = true;
 			this.overallSequencingProcess('exitall');
 			this.debounce = false;
-			window.close();
+			//window.close();
 		}
 	},
 
@@ -1510,8 +1460,8 @@
 					}),
 					pause: new Element('img',{
 						src: contextPath + ".resources/mgnllms/icons/pause.png"
-					}),
-				},
+					})
+				}
 		};
 		
     	node.setOptions(options);
@@ -1566,5 +1516,61 @@
 			this.objectives[obj.id].update(obj,this);
 		},this);
 		this.current.options.data.track.update(s);
+	},
+	/**
+	 * rec e rec2 servono per disabilitare tutto un ramo una volta che trovo un nodo da disabilitare
+	 */
+	recHideAndDisable: function (node,rec,rec2){
+		if (!node){
+			node = this.root
+		}
+		node.enable()
+		var descend = false
+		 	,descend2 = false
+			,rp = new RollupProcess(node,this)
+			,current = this.current
+			,nr = this.sequencingRequestProcess('choice',node,true);
+			
+		this.current = current;
+		
+		if(nr.valid==false ){
+			node.disable();
+		}
+		
+		if (rp.sequencingRulesCheckProcess(node,['disabled'])|| rec){
+			node.disable();
+			descend = true
+		}
+		
+		if (node
+				&& !!node.options.data.item.sequencing.limitConditions 
+				&& !!node.options.data.item.sequencing.limitConditions.attemptLimit 
+				&& node.options.data.track.activityAttemptCount >= node.options.data.item.sequencing.limitConditions.attemptLimit || rec2){
+			node.disable();
+			descend2 = true;
+		}
+		
+		if (node.nodes){
+			node.nodes.each(function(n){
+				this.recHideAndDisable(n, descend, descend2);
+			},this)
+		}
+		var f = new Fx.Slide(node.domObj);
+		f.show();
+		
+		if (rp.sequencingRulesCheckProcess(node,['hiddenfromchoice'])){
+			new Fx.Slide(node.domObj).hide();
+		}
+		/*
+		 * isvisible (optional): The isvisible attribute indicates whether
+		 * or not this item is displayed when the structure of the package
+		 * is displayed or rendered. If not present, value is defaulted to
+		 * be true [3]. The value only affects the item for which it is
+		 * defined and not the children of the item or a resource associated
+		 * with an item. XML Data Type: xs:boolean.
+		 */
+		if (node.options.data.item.isvisible == false){
+			new Fx.Slide(node.domLabel.getParent()).hide();
+		}
 	}
 });
\ No newline at end of file

Modified: magnoliamodules/trunk/openutils-mgnllms/src/main/resources/mgnl-resources/mgnllms/js/AuxClass.js
===================================================================
--- magnoliamodules/trunk/openutils-mgnllms/src/main/resources/mgnl-resources/mgnllms/js/AuxClass.js	2013-10-21 13:58:10 UTC (rev 4431)
+++ magnoliamodules/trunk/openutils-mgnllms/src/main/resources/mgnl-resources/mgnllms/js/AuxClass.js	2013-10-21 14:12:00 UTC (rev 4432)
@@ -204,6 +204,7 @@
 	
 	COMPLETED: function(rc) {
 		var res =scormAND(this.tm.getAttemptProgressStatus(),this.tm.getAttemptCompletionStatus());
+		//var res =this.tm.getAttemptCompletionStatus();
 		return res;
 	},
 	ACTIVITYPROGRESSKNOWN: function(rc) {
@@ -256,7 +257,7 @@
 				terminationRequest: null,
 				sequencingRequest: 	'start',
 				targetActivity: 	null,
-				exception: null,
+				exception: null
 			};
 		}else{
 			return {
@@ -264,7 +265,7 @@
 				terminationRequest: null,
 				sequencingRequest: 	null,
 				targetActivity: 	null,
-				exception: "NB.2.1-1",
+				exception: "NB.2.1-1"
 			};
 		}
 	},
@@ -607,5 +608,5 @@
 			temp.exception = 'NB.2.1-2';
 			return temp;
 		}
-	},
+	}
 });
\ No newline at end of file

Modified: magnoliamodules/trunk/openutils-mgnllms/src/main/resources/mgnl-resources/mgnllms/js/GlobalSharedObjective.js
===================================================================
--- magnoliamodules/trunk/openutils-mgnllms/src/main/resources/mgnl-resources/mgnllms/js/GlobalSharedObjective.js	2013-10-21 13:58:10 UTC (rev 4431)
+++ magnoliamodules/trunk/openutils-mgnllms/src/main/resources/mgnl-resources/mgnllms/js/GlobalSharedObjective.js	2013-10-21 14:12:00 UTC (rev 4432)
@@ -20,5 +20,5 @@
 		this.toJSON = _toJSON(/^(_current|id|caller)$/,
 				this);
 		this.fromJSON = _fromJSON.bind(this);
-	},
+	}
 });
\ No newline at end of file

Modified: magnoliamodules/trunk/openutils-mgnllms/src/main/resources/mgnl-resources/mgnllms/js/IScorm.js
===================================================================
--- magnoliamodules/trunk/openutils-mgnllms/src/main/resources/mgnl-resources/mgnllms/js/IScorm.js	2013-10-21 13:58:10 UTC (rev 4431)
+++ magnoliamodules/trunk/openutils-mgnllms/src/main/resources/mgnl-resources/mgnllms/js/IScorm.js	2013-10-21 14:12:00 UTC (rev 4432)
@@ -75,8 +75,8 @@
 					}),
 					pause: new Element('img',{
 						src: contextPath + ".resources/mgnllms/icons/pause.png"
-					}),
-				},
+					})
+				}
 		};
 		
     	node.setOptions(options);
@@ -125,7 +125,7 @@
 				found = this.owner.nodes[this.options.data.index-i];
 		}while(!found && this.options.data.index-i == 0);
 		return found;
-	},
+	}
 });
 
 var ScormTreeItem = new Class({
@@ -178,7 +178,7 @@
 
 var ScormTree = new Class({
 	Extends: Jx.Tree,
-	Implements: IScorm,
+	Implements: IScorm
 });
 
 function defaulter (item,seqCollection){
@@ -210,7 +210,7 @@
 		completionSetByContent: item.sequencing.deliveryControls.completionSetByContent == 
 			null ? false: item.sequencing.deliveryControls.completionSetByContent,
 		objectiveSetByContent: item.sequencing.deliveryControls.objectiveSetByContent == 
-			null ? false: item.sequencing.deliveryControls.objectiveSetByContent,
+			null ? false: item.sequencing.deliveryControls.objectiveSetByContent
 	};
 	
 	/*
@@ -220,14 +220,14 @@
 	item.completionThreshold = {
 		completedByMeasure: !item.completionThreshold.completedByMeasure ? false : item.completionThreshold.completedByMeasure,
 		minProgressMeasure: !item.completionThreshold.minProgressMeasure ? 1.0   : item.completionThreshold.minProgressMeasure,
-		progressWeight: 	!item.completionThreshold.progressWeight	 ? 1.0	 : item.completionThreshold.progressWeight, 
+		progressWeight: 	!item.completionThreshold.progressWeight	 ? 1.0	 : item.completionThreshold.progressWeight 
 	};
 	
 	
 	if (!item.sequencing.constrainedChoiceConsiderations) item.sequencing.constrainedChoiceConsiderations = {};
 	item.sequencing.constrainedChoiceConsiderations = {
 		preventActivation : !item.sequencing.constrainedChoiceConsiderations.preventActivation ? false : item.sequencing.constrainedChoiceConsiderations.preventActivation,
-		constrainChoice : !item.sequencing.constrainedChoiceConsiderations.constrainChoice ? false : item.sequencing.constrainedChoiceConsiderations.constrainChoice,
+		constrainChoice : !item.sequencing.constrainedChoiceConsiderations.constrainChoice ? false : item.sequencing.constrainedChoiceConsiderations.constrainChoice
 	};
 	
 	if (!item.sequencing.rollupRules) item.sequencing.rollupRules ={};
@@ -235,7 +235,7 @@
 			rollupObjectiveSatisfied: !item.sequencing.rollupRules.rollupObjectiveSatisfied  ? true: item.sequencing.rollupRules.rollupObjectiveSatisfied,
 			rollupProgressCompletion: !item.sequencing.rollupRules.rollupProgressCompletion  ? true: item.sequencing.rollupRules.rollupProgressCompletion,
 			objectiveMeasureWeight: !item.sequencing.rollupRules.objectiveMeasureWeight  ? 1.0000: item.sequencing.rollupRules.objectiveMeasureWeight,
-			rollupRule: !item.sequencing.rollupRules.rollupRule ? [] : item.sequencing.rollupRules.rollupRule,
+			rollupRule: !item.sequencing.rollupRules.rollupRule ? [] : item.sequencing.rollupRules.rollupRule
 	};
 	
 	if (!item.sequencing.rollupConsiderations) item.sequencing.rollupConsiderations = {};

Modified: magnoliamodules/trunk/openutils-mgnllms/src/main/resources/mgnl-resources/mgnllms/js/Objective.js
===================================================================
--- magnoliamodules/trunk/openutils-mgnllms/src/main/resources/mgnl-resources/mgnllms/js/Objective.js	2013-10-21 13:58:10 UTC (rev 4431)
+++ magnoliamodules/trunk/openutils-mgnllms/src/main/resources/mgnl-resources/mgnllms/js/Objective.js	2013-10-21 14:12:00 UTC (rev 4432)
@@ -3,6 +3,9 @@
 // se vengono cambiati i nomi delle variabili che persistono i
 // dati nel jcr, cambiare i corrispondenti campi in
 // MagnoliaLearnerActivitiesManager.java
+
+//PATCH aggiunto ai setter degli attribuiti degli obiettivi la propagazione utilizzando le mapInfo 
+
 var Objective = new Class(
 		{
 			initialize : function(objective, node, at) {
@@ -218,18 +221,22 @@
 
 			setObjectiveProgressStatus : function(v) {
 				this._objectiveProgressStatus = v
+				this.writeObjectiveMaps()
 			},
 
 			setObjectiveNormalizedMeasure : function(v) {
 				this._objectiveNormalizedMeasure = parseFloat(v);
+                this.writeObjectiveMaps()
 			},
 
 			setObjectiveSatisfiedStatus : function(v) {
 				this._objectiveSatisfiedStatus = v;
+                this.writeObjectiveMaps()
 			},
 
 			setObjectiveMeasureStatus : function(v) {
 				this._objectiveMeasureStatus = v
+				this.writeObjectiveMaps()
 			}
 
 		});
\ No newline at end of file

Modified: magnoliamodules/trunk/openutils-mgnllms/src/main/resources/mgnl-resources/mgnllms/js/RollupProcess.js
===================================================================
--- magnoliamodules/trunk/openutils-mgnllms/src/main/resources/mgnl-resources/mgnllms/js/RollupProcess.js	2013-10-21 13:58:10 UTC (rev 4431)
+++ magnoliamodules/trunk/openutils-mgnllms/src/main/resources/mgnl-resources/mgnllms/js/RollupProcess.js	2013-10-21 14:12:00 UTC (rev 4432)
@@ -116,7 +116,7 @@
 							target.setObjectiveSatisfiedStatus(false);
 						}
 					}else{
-						target.setObjectiveProgressStatus(false);
+						//target.setObjectiveProgressStatus(false);
 					}
 				}
 			}
@@ -145,11 +145,11 @@
 					rollupCondition: [{
 						condition: 'satisfied',
 						operator: 'noop'
-					}],
+					}]
 				}),
 				rollupAction: new Hash({
 					action: 'satisfied'
-				}),
+				})
 			});
 			
 			/*
@@ -184,9 +184,11 @@
 	/* Activity Progress Rollup Using Measure Process [RB.1.3 a] */
 	activityRollupUsingMeasureProcess: function(node){
 		var tm = node.options.data.track;
-		tm.setAttemptProgressStatus(false);
-		tm.setAttemptCompletionStatus(false);
 		if (node.options.data.item.completionThreshold.completedByMeasure == true){
+			
+			tm.setAttemptProgressStatus(false);
+			tm.setAttemptCompletionStatus(false);
+			
 			if (tm.attemptCompletionAmount == 0){
 				tm.setAttemptCompletionStatus(false);
 			}else{
@@ -199,7 +201,7 @@
 				}
 			}
 		}else{
-			tm.setAttemptProgressStatus(false);
+			//tm.setAttemptProgressStatus(false);
 		} 
 	},
 	
@@ -225,11 +227,11 @@
 					rollupCondition: [{
 						condition: 'completed',
 						operator: 'noop'
-					}],
+					}]
 				}),
 				rollupAction: new Hash({
 					action: 'completed'
-				}),
+				})
 			});
 			
 			/*
@@ -391,8 +393,19 @@
 					}
 				},this);
 			}
-			return !!contributingChildren.length 
-				&& contributingChildren[rr.childActivitySet.toLowerCase()](function(i){return i && i!='unknown'},rr.minimumCount ? rr.minimumCount : rr.minimumPercent);
+			
+			var child = contributingChildren[rr.childActivitySet.toLowerCase()](
+					function(i){
+						return i && i!='unknown'
+					},
+					rr.minimumCount ? rr.minimumCount : rr.minimumPercent
+				);
+
+			// vecchia funzione
+			// && contributingChildren[rr.childActivitySet.toLowerCase()](function(i){return i && i!='unknown'},rr.minimumCount ? rr.minimumCount : rr.minimumPercent);
+			var check = !!contributingChildren.length &&  child ;
+				
+			return check;
 		},this);
 	
 	},

Modified: magnoliamodules/trunk/openutils-mgnllms/src/main/resources/mgnl-resources/mgnllms/js/TrackingModel.js
===================================================================
--- magnoliamodules/trunk/openutils-mgnllms/src/main/resources/mgnl-resources/mgnllms/js/TrackingModel.js	2013-10-21 13:58:10 UTC (rev 4431)
+++ magnoliamodules/trunk/openutils-mgnllms/src/main/resources/mgnl-resources/mgnllms/js/TrackingModel.js	2013-10-21 14:12:00 UTC (rev 4432)
@@ -165,7 +165,7 @@
 					
 				}else{
 					/*No objective defined for the activity, create artificial objective for tracking purpose*/
-					this.primaryObjective = new Objective({objectiveID:"artificialObjective-"+this.node.options.data.item.identifier,mapInfo: new Hash()},this.node,node.at);
+					this.primaryObjective = new Objective({objectiveID:"artificialObjective-"+this.node.options.data.item.identifier,mapInfo: new Hash()},this.node,this.node.at);
 					this.primaryObjective.setPrimary();
 					this.at.objectives.set(this.primaryObjective.id,this.primaryObjective);
 					this.objectives.push(this.primaryObjective.id);
@@ -224,7 +224,7 @@
 				} else {
 					return this._attemptCompletionAmount;
 				}
-			},
+			}
 		});
 
 

Modified: magnoliamodules/trunk/openutils-mgnllms/src/main/resources/mgnl-resources/mgnllms/js/api_scorm.js
===================================================================
--- magnoliamodules/trunk/openutils-mgnllms/src/main/resources/mgnl-resources/mgnllms/js/api_scorm.js	2013-10-21 13:58:10 UTC (rev 4431)
+++ magnoliamodules/trunk/openutils-mgnllms/src/main/resources/mgnl-resources/mgnllms/js/api_scorm.js	2013-10-21 14:12:00 UTC (rev 4432)
@@ -12,12 +12,16 @@
 	GetValue : function(cmiKey) {
 		try {
 			validatorGetValueStatus(this.status);
-			r = this.s.get(cmiKey);
+			var r = this.s.get(cmiKey);
+			if(cmiKey.indexOf("_children") > 0 && $type(r)=="array" ){
+				r = r.join(',');
+			}
+			//console.info("GetValue",cmiKey," -> ",r)
 			this.lastError = 0;
 			return r;
 		} catch (e) {
 			this.lastError = e.errorNumber;
-			console.error(e.message);
+			//console.error(e.message);
 			return "";
 		}
 	},
@@ -25,24 +29,26 @@
 	SetValue : function(cmiKey, value) {
 		try {
 			validatorSetValueStatus(this.status);
-			console.info("SetValue",cmiKey,value)
+			//console.info("SetValue",cmiKey,value)
 			this.s.set(cmiKey, value);
 			this.lastError = 0;
 			return "true";
 		} catch (e) {
 			this.lastError = e.errorNumber;
-			console.error(e.message);
+			//console.error(e.message);
 			return "false"
 		}
 	},
 	
 	GetLastError : function() {
-		console.info("GetLastError: " + this.lastError);
+		if(this.lastError){
+			//console.info("GetLastError: " + this.lastError);
+		}
 		return this.lastError;
 	},
 
 	GetErrorString : function(input) {
-		console.info("GetErrorString ", input, " ", ErrorMessages[input]);
+		//console.info("GetErrorString ", input, " ", ErrorMessages[input]);
 		return ErrorMessages[input]?ErrorMessages[input]:"";
 	},
 
@@ -52,7 +58,7 @@
 
 	Initialize : function(input) {
 		try {
-			console.group("Initialize");
+			//console.group("Initialize");
 			validatorEmptyStringInput(input);
 			validatorInitializeStatus(this.status);
 			new Request({
@@ -60,7 +66,7 @@
 				url: this.at.context+urlPersistence,
 				async : false,
 				onSuccess:function(response){
-					var decodedJson = JSON.decode(response)
+					var decodedJson = JSON.decode(response);
 					new Hash(decodedJson.cmi).each(function(v,k){
 						if (v.array){
 							if (k=="interactions"){
@@ -83,14 +89,17 @@
 						}
 					},this);
 
+					if(decodedJson != null && decodedJson.adl!=null)
+						{
 					decodedJson.adl.each(function(v,i){
 						this.s.adl.data.array.push(new Hash({
 							id : v.id,
 							store : v.store,
 							readSharedData: v.readSharedData,
-							writeSharedData: v.writeSharedData,
+							writeSharedData: v.writeSharedData
 						}));
 					},this);
+						}
 					if (this.s.cmi.entry != "ab-initio"){
 						switch (this.s.cmi.exit){
 							case "suspend":
@@ -108,7 +117,7 @@
 				command: 'initialize',
 				mgnlPath: path,
 				mgnlRepository: 'lms',
-				activityId : this.node.getName(),
+				activityId : this.node.getName()
 			});
 			this.lastError = 0;
 			this.status = RUNNING;
@@ -116,7 +125,7 @@
 			return "true";
 		} catch (e) {
 			this.lastError = e.errorNumber?e.errorNumber:1000;
-			console.error(e.message?e.message:"Module error",e);
+			//console.error(e.message?e.message:"Module error",e);
 			this.at.debounce = false;
 			return "false"
 		}
@@ -129,8 +138,8 @@
 			if (this.s.cmi.total_time && this.s.cmi.session_time){
 				this.s.cmi.total_time = new ScormTime(this.s.cmi.total_time).add(new ScormTime(this.s.cmi.session_time)).time;
 			}
-			console.info("Terminate", this.node.options.label);
-			console.groupEnd()
+			//console.info("Terminate", this.node.options.label);
+			//console.groupEnd()
 			validatorEmptyStringInput(input);
 			validatorTerminateStatus(this.status);
 			this.lastError = 0;
@@ -143,35 +152,60 @@
 				url: this.at.context+urlPersistence,
 				async : false,
 				onSuccess: function(response){
-					console.log(response);
+					//console.log(response);
 				}.bind(this),
 				onFailure: function(){
 					throw new ScormError(391)
 				}
 			}).post({
 				command: 'terminate',
-				values: this.s.cmi.exit == "suspend" ? JSON.encode(new Hash(this.s.cmi).filter(function(item,key){
+				values:  JSON.encode(new Hash(this.s.cmi).filter(function(item,key){
 					return !/^(completion_threshold|launch_data|max_time_allowed|scaled_passing_score|time_limit_action|version)$/.test(key);
-				})).slice(1,-1): "",
+				})).slice(1,-1),
 				adldata: JSON.encode(this.s.adl.data.array),
+				'cmi.exit': this.s.cmi.exit,
 				mgnlPath: path,
 				mgnlRepository: 'lms',
-				activityId : this.node.getName(),
+				activityId : this.node.getName()
 			});
+			
 			if (this.s.adl.nav.request!='_none_'){
 				this.at.overallSequencingProcess(this.s.adl.nav.request);
 			}
+
+			//LB questa chiamata richiama il processo di exitall per far parsare correttamente gli stati success e satistied
+			// l'alberatura si chiuederà ma va bene cosi.
+			this.at.endAttemptProcess(this.at.current);
+			
+			//LB richiamo il setStatus per memorizzare i dati.
+			var current = this.at;
+	    	var  json = current.toJSON();
+			
+	       	new Request({
+			  method: 'post',
+			  url: this.at.context+urlPersistence,
+			  async: false,
+			  onSuccess: function(response){
+					//console.log(response);
+				}.bind(this)
+			}).post({
+			  courseStatus: json,
+			  mgnlPath: path,
+			  mgnlRepository: 'lms',
+			  command: 'setStatus'
+			});
+			
 			return "true";
 		} catch (e) {
 			this.lastError = e.errorNumber;
-			console.error(e.message);
+			//console.error(e.message);
 			return "false"
 		}
 	},
 
 	Commit : function(input) {
 		try {
-			console.info("Commit");
+			//console.info("Commit");
 			validatorEmptyStringInput(input);
 			validatorCommitStatus(this.status);
 			new Request({
@@ -179,7 +213,7 @@
 				url: this.at.context+urlPersistence,
 				async : false,
 				onSuccess: function(response){
-					console.log(response);
+					//console.log(response);
 				}.bind(this),
 				onFailure: function(){
 					throw new ScormError(391)
@@ -192,13 +226,13 @@
 				adldata: JSON.encode(this.s.adl.data.array),
 				mgnlPath: path,
 				mgnlRepository: 'lms',
-				activityId : this.node.getName(),
+				activityId : this.node.getName()
 			});
 			this.lastError = 0;
 			return "true";
 		} catch (e) {
 			this.lastError = e.errorNumber;
-			console.error(e.message);
+			//console.error(e.message);
 			return "false"
 		}
 	},
@@ -209,5 +243,5 @@
 
 	_getStore: function(){
 		return this.s;
-	},
+	}
 });
\ No newline at end of file

Modified: magnoliamodules/trunk/openutils-mgnllms/src/main/resources/mgnl-resources/mgnllms/js/store.js
===================================================================
--- magnoliamodules/trunk/openutils-mgnllms/src/main/resources/mgnl-resources/mgnllms/js/store.js	2013-10-21 13:58:10 UTC (rev 4431)
+++ magnoliamodules/trunk/openutils-mgnllms/src/main/resources/mgnl-resources/mgnllms/js/store.js	2013-10-21 14:12:00 UTC (rev 4432)
@@ -20,7 +20,7 @@
 	406 : "Data Model Element Type Mismatch",
 	407 : "Data Model Element Value Out Of Range",
 	408 : "Data Model Dependency Not Established",
-	1000: "Module error",
+	1000: "Module error"
 });
 
 NOT_INITIALIZED = 0;
@@ -35,7 +35,7 @@
 				+ ErrorMessages.get(this.errorNumber);
 		if (info) {
 			this.info = info;
-			console.error(errorNumber,this.info)
+//			console.error(errorNumber,this.info)
 		}
 	}
 });
@@ -53,16 +53,16 @@
 			audio_level : 1,
 			language: "",
 			delivery_speed : 1,
-			audio_captioning: 0,
+			audio_captioning: 0
 		}),
 		completion_status: "unknown",
 		success_status: "unknown",
-		completion_threshold: "",
+		completion_threshold: ""
 		
 	},
 	adl : {
 		nav: $empty(),
-		data: $empty(),
+		data: $empty()
 	},
 
 	initialize : function(at) {

Modified: magnoliamodules/trunk/openutils-mgnllms/src/main/resources/mgnl-resources/mgnllms/js/validator.js
===================================================================
--- magnoliamodules/trunk/openutils-mgnllms/src/main/resources/mgnl-resources/mgnllms/js/validator.js	2013-10-21 13:58:10 UTC (rev 4431)
+++ magnoliamodules/trunk/openutils-mgnllms/src/main/resources/mgnl-resources/mgnllms/js/validator.js	2013-10-21 14:12:00 UTC (rev 4432)
@@ -131,6 +131,11 @@
 			var splitted = value.split("[,]");
 			var splittedHash = new Hash();
 
+			/*
+			 * Chissà a cosa sarebbe dovuto servire. Commentato il codice perchè altrimenti non è possibile
+			 * inserire due pattern uguali in diverse interaction
+			 * RTE REQ_64.7.2.7.1 (verificato anche nella versione più attuale della documentazione)
+			 * commentiamo comunque questa verifica 
 			for ( var i = 0; i < this.cmi.interactions.array.length; i++) {
 				for (j = 0; j < this.cmi.interactions.array[i].correct_responses.array.length; j++) {
 					if (this.cmi.interactions.array[i].correct_responses.array[j].pattern == value) {
@@ -138,6 +143,7 @@
 					}
 				}
 			}
+			*/
 
 			if (value != "") {
 				for ( var i = 0; i < splitted.length; i++) {

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

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

From: <luc...@us...> - 2013-10-21 13:58:14

Revision: 4431
          http://openutils.svn.sourceforge.net/openutils/?rev=4431&view=rev
Author:   lucaboati
Date:     2013-10-21 13:58:10 +0000 (Mon, 21 Oct 2013)
Log Message:
-----------
add bootstrap css

Modified Paths:
--------------
    magnoliamodules/trunk/openutils-mgnllms/src/main/resources/mgnl-files/templates/samples-lms/courses.jsp
    magnoliamodules/trunk/openutils-mgnllms/src/main/resources/mgnl-files/templates/samples-lms/index.jsp

Added Paths:
-----------
    magnoliamodules/trunk/openutils-mgnllms/src/main/resources/mgnl-resources/bootstrap/
    magnoliamodules/trunk/openutils-mgnllms/src/main/resources/mgnl-resources/bootstrap/3.0/
    magnoliamodules/trunk/openutils-mgnllms/src/main/resources/mgnl-resources/bootstrap/3.0/css/
    magnoliamodules/trunk/openutils-mgnllms/src/main/resources/mgnl-resources/bootstrap/3.0/css/bootstrap-theme.css
    magnoliamodules/trunk/openutils-mgnllms/src/main/resources/mgnl-resources/bootstrap/3.0/css/bootstrap-theme.min.css
    magnoliamodules/trunk/openutils-mgnllms/src/main/resources/mgnl-resources/bootstrap/3.0/css/bootstrap.css
    magnoliamodules/trunk/openutils-mgnllms/src/main/resources/mgnl-resources/bootstrap/3.0/css/bootstrap.min.css
    magnoliamodules/trunk/openutils-mgnllms/src/main/resources/mgnl-resources/bootstrap/3.0/fonts/
    magnoliamodules/trunk/openutils-mgnllms/src/main/resources/mgnl-resources/bootstrap/3.0/fonts/glyphicons-halflings-regular.eot
    magnoliamodules/trunk/openutils-mgnllms/src/main/resources/mgnl-resources/bootstrap/3.0/fonts/glyphicons-halflings-regular.svg
    magnoliamodules/trunk/openutils-mgnllms/src/main/resources/mgnl-resources/bootstrap/3.0/fonts/glyphicons-halflings-regular.ttf
    magnoliamodules/trunk/openutils-mgnllms/src/main/resources/mgnl-resources/bootstrap/3.0/fonts/glyphicons-halflings-regular.woff
    magnoliamodules/trunk/openutils-mgnllms/src/main/resources/mgnl-resources/bootstrap/3.0/js/
    magnoliamodules/trunk/openutils-mgnllms/src/main/resources/mgnl-resources/bootstrap/3.0/js/bootstrap.js
    magnoliamodules/trunk/openutils-mgnllms/src/main/resources/mgnl-resources/bootstrap/3.0/js/bootstrap.min.js

Modified: magnoliamodules/trunk/openutils-mgnllms/src/main/resources/mgnl-files/templates/samples-lms/courses.jsp
===================================================================
--- magnoliamodules/trunk/openutils-mgnllms/src/main/resources/mgnl-files/templates/samples-lms/courses.jsp	2013-10-21 13:45:43 UTC (rev 4430)
+++ magnoliamodules/trunk/openutils-mgnllms/src/main/resources/mgnl-files/templates/samples-lms/courses.jsp	2013-10-21 13:58:10 UTC (rev 4431)
@@ -12,19 +12,22 @@
       <title>${actpage.title}</title>
       <cms:init />
       <link rel="stylesheet" type="text/css"
-        href="${pageContext.request.contextPath}/.resources/media-samples/css/bootstrap.min.css" />
+        href="${pageContext.request.contextPath}/.resources/bootstrap/3.0/css/bootstrap.min.css" />
     </head>
     <body>
-      <h1>${actpage.title}</h1>
-      <p>Click on a course in the list below. It opens a popup with the course inside</p>
-      <ul>
-        <c:forEach items="${lmsfn:courseList()}" var="course">
-          <li>
-            <lmsfn:playerUrl course="${course}" target="blank" />
-          </li>
-        </c:forEach>
-      </ul>
-      <p>The code to create the list is:</p>
+      <div id="main" class="container">
+        <div id="header">
+          <h1>${actpage.title}</h1>
+        </div>
+        <p>Click on a course in the list below. It opens a popup with the course inside</p>
+        <ul>
+          <c:forEach items="${lmsfn:courseList()}" var="course">
+            <li>
+              <lmsfn:playerUrl course="${course}" target="blank" />
+            </li>
+          </c:forEach>
+        </ul>
+        <p>The code to create the list is:</p>
       <pre>
         &amp;lt;ul&amp;gt;
           &amp;lt;c:forEach items="\${lmsfn:courseList()}" var="course"&amp;gt;
@@ -34,6 +37,7 @@
           &amp;lt;/c:forEach&amp;gt;
         &amp;lt;/ul&amp;gt;
       </pre>
+      </div>
     </body>
   </html>
 </jsp:root>
\ No newline at end of file

Modified: magnoliamodules/trunk/openutils-mgnllms/src/main/resources/mgnl-files/templates/samples-lms/index.jsp
===================================================================
--- magnoliamodules/trunk/openutils-mgnllms/src/main/resources/mgnl-files/templates/samples-lms/index.jsp	2013-10-21 13:45:43 UTC (rev 4430)
+++ magnoliamodules/trunk/openutils-mgnllms/src/main/resources/mgnl-files/templates/samples-lms/index.jsp	2013-10-21 13:58:10 UTC (rev 4431)
@@ -12,70 +12,74 @@
       <title>${actpage.title}</title>
       <cms:init />
       <link rel="stylesheet" type="text/css"
-        href="${pageContext.request.contextPath}/.resources/media-samples/css/bootstrap.min.css" />
+        href="${pageContext.request.contextPath}/.resources/bootstrap/3.0/css/bootstrap.min.css" />
     </head>
     <body>
-      <h1>${actpage.title}</h1>
-      <p>Welcome to Magnolia LMS Module sample page.</p>
-      <p>The sample course repository is structured as:</p>
-      <ul>
-        <li>
-          <b>samples</b>
-          <ul>
-            <li>
-              <b>std-level-1</b>
-              <ol>
-                <li>Simple course 1</li>
-                <li>Simple course 2</li>
-              </ol>
-              <ul>
-                <li>
-                  <b>std-level2a</b>
-                  <ol>
-                    <li>Simple course 1</li>
-                  </ol>
-                </li>
-                <li>
-                  <b>std-level2b</b>
-                  <ol>
-                    <li>Simple course 1</li>
-                  </ol>
-                </li>
-              </ul>
-            </li>
-          </ul>
-        </li>
-      </ul>
-      <p>There are three roles, one for each folder:</p>
-      <ul>
-        <li>
-          <b>std-level-1</b>
-          which can view its courses but not subfolders
-        </li>
-        <li>
-          <b>std-level-2a</b>
-          which can view its courses but not subfolders
-        </li>
-        <li>
-          <b>std-level-3a</b>
-          which can view its courses but not subfolders
-        </li>
-      </ul>
-      <p>
-        The user student/student has the role std-level-1; there is an example listener
-        (net.sourceforge.openutils.mgnllms.samples.listeners.StudentLevelListener defined in
-        /modules/lms/lms-config/listeners/student-level), that is called whenever a user complete a course and performs
-        following actions:
-        <ol>
-          <li>check if the user has successfully completed all courses to which he has access</li>
-          <li>if true assign to user additional roles corresponding to the names of subfolders of the last completed
-            course</li>
-        </ol>
-      </p>
-      <p>
-        <a href="${pageContext.request.contextPath}/sample-lms/courses.html">Go to the courses list!</a>
-        (use student/student to access)
-      </p>
+      <div id="main" class="container">
+        <div id="header">
+          <h1>${actpage.title}</h1>
+          <p>Welcome to Magnolia LMS Module sample page.</p>
+          <p>The sample course repository is structured as:</p>
+        </div>
+        <ul>
+          <li>
+            <b>samples</b>
+            <ul>
+              <li>
+                <b>std-level-1</b>
+                <ol>
+                  <li>Simple course 1</li>
+                  <li>Simple course 2</li>
+                </ol>
+                <ul>
+                  <li>
+                    <b>std-level2a</b>
+                    <ol>
+                      <li>Simple course 1</li>
+                    </ol>
+                  </li>
+                  <li>
+                    <b>std-level2b</b>
+                    <ol>
+                      <li>Simple course 1</li>
+                    </ol>
+                  </li>
+                </ul>
+              </li>
+            </ul>
+          </li>
+        </ul>
+        <p>There are three roles, one for each folder:</p>
+        <ul>
+          <li>
+            <b>std-level-1</b>
+            which can view its courses but not subfolders
+          </li>
+          <li>
+            <b>std-level-2a</b>
+            which can view its courses but not subfolders
+          </li>
+          <li>
+            <b>std-level-3a</b>
+            which can view its courses but not subfolders
+          </li>
+        </ul>
+        <p>
+          The user student/student has the role std-level-1; there is an example listener
+          (net.sourceforge.openutils.mgnllms.samples.listeners.StudentLevelListener defined in
+          /modules/lms/lms-config/listeners/student-level), that is called whenever a user complete a course and
+          performs following actions:
+          <ol>
+            <li>check if the user has successfully completed all courses to which he has access</li>
+            <li>if true assign to user additional roles corresponding to the names of subfolders of the last completed
+              course</li>
+          </ol>
+        </p>
+        <p>
+          <a href="${pageContext.request.contextPath}/sample-lms/courses.html">Go to the courses list!</a>
+          (use student/student to access)
+        </p>
+      </div>
     </body>
   </html>
 </jsp:root>
\ No newline at end of file

Added: magnoliamodules/trunk/openutils-mgnllms/src/main/resources/mgnl-resources/bootstrap/3.0/css/bootstrap-theme.css
===================================================================
--- magnoliamodules/trunk/openutils-mgnllms/src/main/resources/mgnl-resources/bootstrap/3.0/css/bootstrap-theme.css	                        (rev 0)
+++ magnoliamodules/trunk/openutils-mgnllms/src/main/resources/mgnl-resources/bootstrap/3.0/css/bootstrap-theme.css	2013-10-21 13:58:10 UTC (rev 4431)
@@ -0,0 +1,384 @@
+.btn-default,
+.btn-primary,
+.btn-success,
+.btn-info,
+.btn-warning,
+.btn-danger {
+  text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.2);
+  -webkit-box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.15), 0 1px 1px rgba(0, 0, 0, 0.075);
+          box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.15), 0 1px 1px rgba(0, 0, 0, 0.075);
+}
+
+.btn-default:active,
+.btn-primary:active,
+.btn-success:active,
+.btn-info:active,
+.btn-warning:active,
+.btn-danger:active,
+.btn-default.active,
+.btn-primary.active,
+.btn-success.active,
+.btn-info.active,
+.btn-warning.active,
+.btn-danger.active {
+  -webkit-box-shadow: inset 0 3px 5px rgba(0, 0, 0, 0.125);
+          box-shadow: inset 0 3px 5px rgba(0, 0, 0, 0.125);
+}
+
+.btn:active,
+.btn.active {
+  background-image: none;
+}
+
+.btn-default {
+  text-shadow: 0 1px 0 #fff;
+  background-image: -webkit-gradient(linear, left 0%, left 100%, from(#ffffff), to(#e6e6e6));
+  background-image: -webkit-linear-gradient(top, #ffffff, 0%, #e6e6e6, 100%);
+  background-image: -moz-linear-gradient(top, #ffffff 0%, #e6e6e6 100%);
+  background-image: linear-gradient(to bottom, #ffffff 0%, #e6e6e6 100%);
+  background-repeat: repeat-x;
+  border-color: #e0e0e0;
+  border-color: #ccc;
+  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffffff', endColorstr='#ffe6e6e6', GradientType=0);
+}
+
+.btn-default:active,
+.btn-default.active {
+  background-color: #e6e6e6;
+  border-color: #e0e0e0;
+}
+
+.btn-primary {
+  background-image: -webkit-gradient(linear, left 0%, left 100%, from(#428bca), to(#3071a9));
+  background-image: -webkit-linear-gradient(top, #428bca, 0%, #3071a9, 100%);
+  background-image: -moz-linear-gradient(top, #428bca 0%, #3071a9 100%);
+  background-image: linear-gradient(to bottom, #428bca 0%, #3071a9 100%);
+  background-repeat: repeat-x;
+  border-color: #2d6ca2;
+  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff428bca', endColorstr='#ff3071a9', GradientType=0);
+}
+
+.btn-primary:active,
+.btn-primary.active {
+  background-color: #3071a9;
+  border-color: #2d6ca2;
+}
+
+.btn-success {
+  background-image: -webkit-gradient(linear, left 0%, left 100%, from(#5cb85c), to(#449d44));
+  background-image: -webkit-linear-gradient(top, #5cb85c, 0%, #449d44, 100%);
+  background-image: -moz-linear-gradient(top, #5cb85c 0%, #449d44 100%);
+  background-image: linear-gradient(to bottom, #5cb85c 0%, #449d44 100%);
+  background-repeat: repeat-x;
+  border-color: #419641;
+  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff5cb85c', endColorstr='#ff449d44', GradientType=0);
+}
+
+.btn-success:active,
+.btn-success.active {
+  background-color: #449d44;
+  border-color: #419641;
+}
+
+.btn-warning {
+  background-image: -webkit-gradient(linear, left 0%, left 100%, from(#f0ad4e), to(#ec971f));
+  background-image: -webkit-linear-gradient(top, #f0ad4e, 0%, #ec971f, 100%);
+  background-image: -moz-linear-gradient(top, #f0ad4e 0%, #ec971f 100%);
+  background-image: linear-gradient(to bottom, #f0ad4e 0%, #ec971f 100%);
+  background-repeat: repeat-x;
+  border-color: #eb9316;
+  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#fff0ad4e', endColorstr='#ffec971f', GradientType=0);
+}
+
+.btn-warning:active,
+.btn-warning.active {
+  background-color: #ec971f;
+  border-color: #eb9316;
+}
+
+.btn-danger {
+  background-image: -webkit-gradient(linear, left 0%, left 100%, from(#d9534f), to(#c9302c));
+  background-image: -webkit-linear-gradient(top, #d9534f, 0%, #c9302c, 100%);
+  background-image: -moz-linear-gradient(top, #d9534f 0%, #c9302c 100%);
+  background-image: linear-gradient(to bottom, #d9534f 0%, #c9302c 100%);
+  background-repeat: repeat-x;
+  border-color: #c12e2a;
+  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffd9534f', endColorstr='#ffc9302c', GradientType=0);
+}
+
+.btn-danger:active,
+.btn-danger.active {
+  background-color: #c9302c;
+  border-color: #c12e2a;
+}
+
+.btn-info {
+  background-image: -webkit-gradient(linear, left 0%, left 100%, from(#5bc0de), to(#31b0d5));
+  background-image: -webkit-linear-gradient(top, #5bc0de, 0%, #31b0d5, 100%);
+  background-image: -moz-linear-gradient(top, #5bc0de 0%, #31b0d5 100%);
+  background-image: linear-gradient(to bottom, #5bc0de 0%, #31b0d5 100%);
+  background-repeat: repeat-x;
+  border-color: #2aabd2;
+  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff5bc0de', endColorstr='#ff31b0d5', GradientType=0);
+}
+
+.btn-info:active,
+.btn-info.active {
+  background-color: #31b0d5;
+  border-color: #2aabd2;
+}
+
+.thumbnail,
+.img-thumbnail {
+  -webkit-box-shadow: 0 1px 2px rgba(0, 0, 0, 0.075);
+          box-shadow: 0 1px 2px rgba(0, 0, 0, 0.075);
+}
+
+.dropdown-menu > li > a:hover,
+.dropdown-menu > li > a:focus,
+.dropdown-menu > .active > a,
+.dropdown-menu > .active > a:hover,
+.dropdown-menu > .active > a:focus {
+  background-color: #357ebd;
+  background-image: -webkit-gradient(linear, left 0%, left 100%, from(#428bca), to(#357ebd));
+  background-image: -webkit-linear-gradient(top, #428bca, 0%, #357ebd, 100%);
+  background-image: -moz-linear-gradient(top, #428bca 0%, #357ebd 100%);
+  background-image: linear-gradient(to bottom, #428bca 0%, #357ebd 100%);
+  background-repeat: repeat-x;
+  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff428bca', endColorstr='#ff357ebd', GradientType=0);
+}
+
+.navbar {
+  background-image: -webkit-gradient(linear, left 0%, left 100%, from(#ffffff), to(#f8f8f8));
+  background-image: -webkit-linear-gradient(top, #ffffff, 0%, #f8f8f8, 100%);
+  background-image: -moz-linear-gradient(top, #ffffff 0%, #f8f8f8 100%);
+  background-image: linear-gradient(to bottom, #ffffff 0%, #f8f8f8 100%);
+  background-repeat: repeat-x;
+  border-radius: 4px;
+  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffffff', endColorstr='#fff8f8f8', GradientType=0);
+  -webkit-box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.15), 0 1px 5px rgba(0, 0, 0, 0.075);
+          box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.15), 0 1px 5px rgba(0, 0, 0, 0.075);
+}
+
+.navbar .navbar-nav > .active > a {
+  background-color: #f8f8f8;
+}
+
+.navbar-brand,
+.navbar-nav > li > a {
+  text-shadow: 0 1px 0 rgba(255, 255, 255, 0.25);
+}
+
+.navbar-inverse {
+  background-image: -webkit-gradient(linear, left 0%, left 100%, from(#3c3c3c), to(#222222));
+  background-image: -webkit-linear-gradient(top, #3c3c3c, 0%, #222222, 100%);
+  background-image: -moz-linear-gradient(top, #3c3c3c 0%, #222222 100%);
+  background-image: linear-gradient(to bottom, #3c3c3c 0%, #222222 100%);
+  background-repeat: repeat-x;
+  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff3c3c3c', endColorstr='#ff222222', GradientType=0);
+}
+
+.navbar-inverse .navbar-nav > .active > a {
+  background-color: #222222;
+}
+
+.navbar-inverse .navbar-brand,
+.navbar-inverse .navbar-nav > li > a {
+  text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25);
+}
+
+.navbar-static-top,
+.navbar-fixed-top,
+.navbar-fixed-bottom {
+  border-radius: 0;
+}
+
+.alert {
+  text-shadow: 0 1px 0 rgba(255, 255, 255, 0.2);
+  -webkit-box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.25), 0 1px 2px rgba(0, 0, 0, 0.05);
+          box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.25), 0 1px 2px rgba(0, 0, 0, 0.05);
+}
+
+.alert-success {
+  background-image: -webkit-gradient(linear, left 0%, left 100%, from(#dff0d8), to(#c8e5bc));
+  background-image: -webkit-linear-gradient(top, #dff0d8, 0%, #c8e5bc, 100%);
+  background-image: -moz-linear-gradient(top, #dff0d8 0%, #c8e5bc 100%);
+  background-image: linear-gradient(to bottom, #dff0d8 0%, #c8e5bc 100%);
+  background-repeat: repeat-x;
+  border-color: #b2dba1;
+  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffdff0d8', endColorstr='#ffc8e5bc', GradientType=0);
+}
+
+.alert-info {
+  background-image: -webkit-gradient(linear, left 0%, left 100%, from(#d9edf7), to(#b9def0));
+  background-image: -webkit-linear-gradient(top, #d9edf7, 0%, #b9def0, 100%);
+  background-image: -moz-linear-gradient(top, #d9edf7 0%, #b9def0 100%);
+  background-image: linear-gradient(to bottom, #d9edf7 0%, #b9def0 100%);
+  background-repeat: repeat-x;
+  border-color: #9acfea;
+  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffd9edf7', endColorstr='#ffb9def0', GradientType=0);
+}
+
+.alert-warning {
+  background-image: -webkit-gradient(linear, left 0%, left 100%, from(#fcf8e3), to(#f8efc0));
+  background-image: -webkit-linear-gradient(top, #fcf8e3, 0%, #f8efc0, 100%);
+  background-image: -moz-linear-gradient(top, #fcf8e3 0%, #f8efc0 100%);
+  background-image: linear-gradient(to bottom, #fcf8e3 0%, #f8efc0 100%);
+  background-repeat: repeat-x;
+  border-color: #f5e79e;
+  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#fffcf8e3', endColorstr='#fff8efc0', GradientType=0);
+}
+
+.alert-danger {
+  background-image: -webkit-gradient(linear, left 0%, left 100%, from(#f2dede), to(#e7c3c3));
+  background-image: -webkit-linear-gradient(top, #f2dede, 0%, #e7c3c3, 100%);
+  background-image: -moz-linear-gradient(top, #f2dede 0%, #e7c3c3 100%);
+  background-image: linear-gradient(to bottom, #f2dede 0%, #e7c3c3 100%);
+  background-repeat: repeat-x;
+  border-color: #dca7a7;
+  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#fff2dede', endColorstr='#ffe7c3c3', GradientType=0);
+}
+
+.progress {
+  background-image: -webkit-gradient(linear, left 0%, left 100%, from(#ebebeb), to(#f5f5f5));
+  background-image: -webkit-linear-gradient(top, #ebebeb, 0%, #f5f5f5, 100%);
+  background-image: -moz-linear-gradient(top, #ebebeb 0%, #f5f5f5 100%);
+  background-image: linear-gradient(to bottom, #ebebeb 0%, #f5f5f5 100%);
+  background-repeat: repeat-x;
+  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffebebeb', endColorstr='#fff5f5f5', GradientType=0);
+}
+
+.progress-bar {
+  background-image: -webkit-gradient(linear, left 0%, left 100%, from(#428bca), to(#3071a9));
+  background-image: -webkit-linear-gradient(top, #428bca, 0%, #3071a9, 100%);
+  background-image: -moz-linear-gradient(top, #428bca 0%, #3071a9 100%);
+  background-image: linear-gradient(to bottom, #428bca 0%, #3071a9 100%);
+  background-repeat: repeat-x;
+  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff428bca', endColorstr='#ff3071a9', GradientType=0);
+}
+
+.progress-bar-success {
+  background-image: -webkit-gradient(linear, left 0%, left 100%, from(#5cb85c), to(#449d44));
+  background-image: -webkit-linear-gradient(top, #5cb85c, 0%, #449d44, 100%);
+  background-image: -moz-linear-gradient(top, #5cb85c 0%, #449d44 100%);
+  background-image: linear-gradient(to bottom, #5cb85c 0%, #449d44 100%);
+  background-repeat: repeat-x;
+  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff5cb85c', endColorstr='#ff449d44', GradientType=0);
+}
+
+.progress-bar-info {
+  background-image: -webkit-gradient(linear, left 0%, left 100%, from(#5bc0de), to(#31b0d5));
+  background-image: -webkit-linear-gradient(top, #5bc0de, 0%, #31b0d5, 100%);
+  background-image: -moz-linear-gradient(top, #5bc0de 0%, #31b0d5 100%);
+  background-image: linear-gradient(to bottom, #5bc0de 0%, #31b0d5 100%);
+  background-repeat: repeat-x;
+  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff5bc0de', endColorstr='#ff31b0d5', GradientType=0);
+}
+
+.progress-bar-warning {
+  background-image: -webkit-gradient(linear, left 0%, left 100%, from(#f0ad4e), to(#ec971f));
+  background-image: -webkit-linear-gradient(top, #f0ad4e, 0%, #ec971f, 100%);
+  background-image: -moz-linear-gradient(top, #f0ad4e 0%, #ec971f 100%);
+  background-image: linear-gradient(to bottom, #f0ad4e 0%, #ec971f 100%);
+  background-repeat: repeat-x;
+  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#fff0ad4e', endColorstr='#ffec971f', GradientType=0);
+}
+
+.progress-bar-danger {
+  background-image: -webkit-gradient(linear, left 0%, left 100%, from(#d9534f), to(#c9302c));
+  background-image: -webkit-linear-gradient(top, #d9534f, 0%, #c9302c, 100%);
+  background-image: -moz-linear-gradient(top, #d9534f 0%, #c9302c 100%);
+  background-image: linear-gradient(to bottom, #d9534f 0%, #c9302c 100%);
+  background-repeat: repeat-x;
+  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffd9534f', endColorstr='#ffc9302c', GradientType=0);
+}
+
+.list-group {
+  border-radius: 4px;
+  -webkit-box-shadow: 0 1px 2px rgba(0, 0, 0, 0.075);
+          box-shadow: 0 1px 2px rgba(0, 0, 0, 0.075);
+}
+
+.list-group-item.active,
+.list-group-item.active:hover,
+.list-group-item.active:focus {
+  text-shadow: 0 -1px 0 #3071a9;
+  background-image: -webkit-gradient(linear, left 0%, left 100%, from(#428bca), to(#3278b3));
+  background-image: -webkit-linear-gradient(top, #428bca, 0%, #3278b3, 100%);
+  background-image: -moz-linear-gradient(top, #428bca 0%, #3278b3 100%);
+  background-image: linear-gradient(to bottom, #428bca 0%, #3278b3 100%);
+  background-repeat: repeat-x;
+  border-color: #3278b3;
+  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff428bca', endColorstr='#ff3278b3', GradientType=0);
+}
+
+.panel {
+  -webkit-box-shadow: 0 1px 2px rgba(0, 0, 0, 0.05);
+          box-shadow: 0 1px 2px rgba(0, 0, 0, 0.05);
+}
+
+.panel-default > .panel-heading {
+  background-image: -webkit-gradient(linear, left 0%, left 100%, from(#f5f5f5), to(#e8e8e8));
+  background-image: -webkit-linear-gradient(top, #f5f5f5, 0%, #e8e8e8, 100%);
+  background-image: -moz-linear-gradient(top, #f5f5f5 0%, #e8e8e8 100%);
+  background-image: linear-gradient(to bottom, #f5f5f5 0%, #e8e8e8 100%);
+  background-repeat: repeat-x;
+  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#fff5f5f5', endColorstr='#ffe8e8e8', GradientType=0);
+}
+
+.panel-primary > .panel-heading {
+  background-image: -webkit-gradient(linear, left 0%, left 100%, from(#428bca), to(#357ebd));
+  background-image: -webkit-linear-gradient(top, #428bca, 0%, #357ebd, 100%);
+  background-image: -moz-linear-gradient(top, #428bca 0%, #357ebd 100%);
+  background-image: linear-gradient(to bottom, #428bca 0%, #357ebd 100%);
+  background-repeat: repeat-x;
+  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff428bca', endColorstr='#ff357ebd', GradientType=0);
+}
+
+.panel-success > .panel-heading {
+  background-image: -webkit-gradient(linear, left 0%, left 100%, from(#dff0d8), to(#d0e9c6));
+  background-image: -webkit-linear-gradient(top, #dff0d8, 0%, #d0e9c6, 100%);
+  background-image: -moz-linear-gradient(top, #dff0d8 0%, #d0e9c6 100%);
+  background-image: linear-gradient(to bottom, #dff0d8 0%, #d0e9c6 100%);
+  background-repeat: repeat-x;
+  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffdff0d8', endColorstr='#ffd0e9c6', GradientType=0);
+}
+
+.panel-info > .panel-heading {
+  background-image: -webkit-gradient(linear, left 0%, left 100%, from(#d9edf7), to(#c4e3f3));
+  background-image: -webkit-linear-gradient(top, #d9edf7, 0%, #c4e3f3, 100%);
+  background-image: -moz-linear-gradient(top, #d9edf7 0%, #c4e3f3 100%);
+  background-image: linear-gradient(to bottom, #d9edf7 0%, #c4e3f3 100%);
+  background-repeat: repeat-x;
+  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffd9edf7', endColorstr='#ffc4e3f3', GradientType=0);
+}
+
+.panel-warning > .panel-heading {
+  background-image: -webkit-gradient(linear, left 0%, left 100%, from(#fcf8e3), to(#faf2cc));
+  background-image: -webkit-linear-gradient(top, #fcf8e3, 0%, #faf2cc, 100%);
+  background-image: -moz-linear-gradient(top, #fcf8e3 0%, #faf2cc 100%);
+  background-image: linear-gradient(to bottom, #fcf8e3 0%, #faf2cc 100%);
+  background-repeat: repeat-x;
+  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#fffcf8e3', endColorstr='#fffaf2cc', GradientType=0);
+}
+
+.panel-danger > .panel-heading {
+  background-image: -webkit-gradient(linear, left 0%, left 100%, from(#f2dede), to(#ebcccc));
+  background-image: -webkit-linear-gradient(top, #f2dede, 0%, #ebcccc, 100%);
+  background-image: -moz-linear-gradient(top, #f2dede 0%, #ebcccc 100%);
+  background-image: linear-gradient(to bottom, #f2dede 0%, #ebcccc 100%);
+  background-repeat: repeat-x;
+  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#fff2dede', endColorstr='#ffebcccc', GradientType=0);
+}
+
+.well {
+  background-image: -webkit-gradient(linear, left 0%, left 100%, from(#e8e8e8), to(#f5f5f5));
+  background-image: -webkit-linear-gradient(top, #e8e8e8, 0%, #f5f5f5, 100%);
+  background-image: -moz-linear-gradient(top, #e8e8e8 0%, #f5f5f5 100%);
+  background-image: linear-gradient(to bottom, #e8e8e8 0%, #f5f5f5 100%);
+  background-repeat: repeat-x;
+  border-color: #dcdcdc;
+  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffe8e8e8', endColorstr='#fff5f5f5', GradientType=0);
+  -webkit-box-shadow: inset 0 1px 3px rgba(0, 0, 0, 0.05), 0 1px 0 rgba(255, 255, 255, 0.1);
+          box-shadow: inset 0 1px 3px rgba(0, 0, 0, 0.05), 0 1px 0 rgba(255, 255, 255, 0.1);
+}
\ No newline at end of file

Added: magnoliamodules/trunk/openutils-mgnllms/src/main/resources/mgnl-resources/bootstrap/3.0/css/bootstrap-theme.min.css
===================================================================
--- magnoliamodules/trunk/openutils-mgnllms/src/main/resources/mgnl-resources/bootstrap/3.0/css/bootstrap-theme.min.css	                        (rev 0)
+++ magnoliamodules/trunk/openutils-mgnllms/src/main/resources/mgnl-resources/bootstrap/3.0/css/bootstrap-theme.min.css	2013-10-21 13:58:10 UTC (rev 4431)
@@ -0,0 +1 @@
+.btn-default,.btn-primary,.btn-success,.btn-info,.btn-warning,.btn-danger{text-shadow:0 -1px 0 rgba(0,0,0,0.2);-webkit-box-shadow:inset 0 1px 0 rgba(255,255,255,0.15),0 1px 1px rgba(0,0,0,0.075);box-shadow:inset 0 1px 0 rgba(255,255,255,0.15),0 1px 1px rgba(0,0,0,0.075)}.btn-default:active,.btn-primary:active,.btn-success:active,.btn-info:active,.btn-warning:active,.btn-danger:active,.btn-default.active,.btn-primary.active,.btn-success.active,.btn-info.active,.btn-warning.active,.btn-danger.active{-webkit-box-shadow:inset 0 3px 5px rgba(0,0,0,0.125);box-shadow:inset 0 3px 5px rgba(0,0,0,0.125)}.btn:active,.btn.active{background-image:none}.btn-default{text-shadow:0 1px 0 #fff;background-image:-webkit-gradient(linear,left 0,left 100%,from(#fff),to(#e6e6e6));background-image:-webkit-linear-gradient(top,#fff,0%,#e6e6e6,100%);background-image:-moz-linear-gradient(top,#fff 0,#e6e6e6 100%);background-image:linear-gradient(to bottom,#fff 0,#e6e6e6 100%);background-repeat:repeat-x;border-color:#e0e0e0;border-color:#ccc;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffffff',endColorstr='#ffe6e6e6',GradientType=0)}.btn-default:active,.btn-default.active{background-color:#e6e6e6;border-color:#e0e0e0}.btn-primary{background-image:-webkit-gradient(linear,left 0,left 100%,from(#428bca),to(#3071a9));background-image:-webkit-linear-gradient(top,#428bca,0%,#3071a9,100%);background-image:-moz-linear-gradient(top,#428bca 0,#3071a9 100%);background-image:linear-gradient(to bottom,#428bca 0,#3071a9 100%);background-repeat:repeat-x;border-color:#2d6ca2;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff428bca',endColorstr='#ff3071a9',GradientType=0)}.btn-primary:active,.btn-primary.active{background-color:#3071a9;border-color:#2d6ca2}.btn-success{background-image:-webkit-gradient(linear,left 0,left 100%,from(#5cb85c),to(#449d44));background-image:-webkit-linear-gradient(top,#5cb85c,0%,#449d44,100%);background-image:-moz-linear-gradient(top,#5cb85c 0,#449d44 100%);background-image:linear-gradient(to bottom,#5cb85c 0,#449d44 100%);background-repeat:repeat-x;border-color:#419641;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff5cb85c',endColorstr='#ff449d44',GradientType=0)}.btn-success:active,.btn-success.active{background-color:#449d44;border-color:#419641}.btn-warning{background-image:-webkit-gradient(linear,left 0,left 100%,from(#f0ad4e),to(#ec971f));background-image:-webkit-linear-gradient(top,#f0ad4e,0%,#ec971f,100%);background-image:-moz-linear-gradient(top,#f0ad4e 0,#ec971f 100%);background-image:linear-gradient(to bottom,#f0ad4e 0,#ec971f 100%);background-repeat:repeat-x;border-color:#eb9316;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#fff0ad4e',endColorstr='#ffec971f',GradientType=0)}.btn-warning:active,.btn-warning.active{background-color:#ec971f;border-color:#eb9316}.btn-danger{background-image:-webkit-gradient(linear,left 0,left 100%,from(#d9534f),to(#c9302c));background-image:-webkit-linear-gradient(top,#d9534f,0%,#c9302c,100%);background-image:-moz-linear-gradient(top,#d9534f 0,#c9302c 100%);background-image:linear-gradient(to bottom,#d9534f 0,#c9302c 100%);background-repeat:repeat-x;border-color:#c12e2a;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffd9534f',endColorstr='#ffc9302c',GradientType=0)}.btn-danger:active,.btn-danger.active{background-color:#c9302c;border-color:#c12e2a}.btn-info{background-image:-webkit-gradient(linear,left 0,left 100%,from(#5bc0de),to(#31b0d5));background-image:-webkit-linear-gradient(top,#5bc0de,0%,#31b0d5,100%);background-image:-moz-linear-gradient(top,#5bc0de 0,#31b0d5 100%);background-image:linear-gradient(to bottom,#5bc0de 0,#31b0d5 100%);background-repeat:repeat-x;border-color:#2aabd2;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff5bc0de',endColorstr='#ff31b0d5',GradientType=0)}.btn-info:active,.btn-info.active{background-color:#31b0d5;border-color:#2aabd2}.thumbnail,.img-thumbnail{-webkit-box-shadow:0 1px 2px rgba(0,0,0,0.075);box-shadow:0 1px 2px rgba(0,0,0,0.075)}.dropdown-menu>li>a:hover,.dropdown-menu>li>a:focus,.dropdown-menu>.active>a,.dropdown-menu>.active>a:hover,.dropdown-menu>.active>a:focus{background-color:#357ebd;background-image:-webkit-gradient(linear,left 0,left 100%,from(#428bca),to(#357ebd));background-image:-webkit-linear-gradient(top,#428bca,0%,#357ebd,100%);background-image:-moz-linear-gradient(top,#428bca 0,#357ebd 100%);background-image:linear-gradient(to bottom,#428bca 0,#357ebd 100%);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff428bca',endColorstr='#ff357ebd',GradientType=0)}.navbar{background-image:-webkit-gradient(linear,left 0,left 100%,from(#fff),to(#f8f8f8));background-image:-webkit-linear-gradient(top,#fff,0%,#f8f8f8,100%);background-image:-moz-linear-gradient(top,#fff 0,#f8f8f8 100%);background-image:linear-gradient(to bottom,#fff 0,#f8f8f8 100%);background-repeat:repeat-x;border-radius:4px;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffffff',endColorstr='#fff8f8f8',GradientType=0);-webkit-box-shadow:inset 0 1px 0 rgba(255,255,255,0.15),0 1px 5px rgba(0,0,0,0.075);box-shadow:inset 0 1px 0 rgba(255,255,255,0.15),0 1px 5px rgba(0,0,0,0.075)}.navbar .navbar-nav>.active>a{background-color:#f8f8f8}.navbar-brand,.navbar-nav>li>a{text-shadow:0 1px 0 rgba(255,255,255,0.25)}.navbar-inverse{background-image:-webkit-gradient(linear,left 0,left 100%,from(#3c3c3c),to(#222));background-image:-webkit-linear-gradient(top,#3c3c3c,0%,#222,100%);background-image:-moz-linear-gradient(top,#3c3c3c 0,#222 100%);background-image:linear-gradient(to bottom,#3c3c3c 0,#222 100%);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff3c3c3c',endColorstr='#ff222222',GradientType=0)}.navbar-inverse .navbar-nav>.active>a{background-color:#222}.navbar-inverse .navbar-brand,.navbar-inverse .navbar-nav>li>a{text-shadow:0 -1px 0 rgba(0,0,0,0.25)}.navbar-static-top,.navbar-fixed-top,.navbar-fixed-bottom{border-radius:0}.alert{text-shadow:0 1px 0 rgba(255,255,255,0.2);-webkit-box-shadow:inset 0 1px 0 rgba(255,255,255,0.25),0 1px 2px rgba(0,0,0,0.05);box-shadow:inset 0 1px 0 rgba(255,255,255,0.25),0 1px 2px rgba(0,0,0,0.05)}.alert-success{background-image:-webkit-gradient(linear,left 0,left 100%,from(#dff0d8),to(#c8e5bc));background-image:-webkit-linear-gradient(top,#dff0d8,0%,#c8e5bc,100%);background-image:-moz-linear-gradient(top,#dff0d8 0,#c8e5bc 100%);background-image:linear-gradient(to bottom,#dff0d8 0,#c8e5bc 100%);background-repeat:repeat-x;border-color:#b2dba1;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffdff0d8',endColorstr='#ffc8e5bc',GradientType=0)}.alert-info{background-image:-webkit-gradient(linear,left 0,left 100%,from(#d9edf7),to(#b9def0));background-image:-webkit-linear-gradient(top,#d9edf7,0%,#b9def0,100%);background-image:-moz-linear-gradient(top,#d9edf7 0,#b9def0 100%);background-image:linear-gradient(to bottom,#d9edf7 0,#b9def0 100%);background-repeat:repeat-x;border-color:#9acfea;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffd9edf7',endColorstr='#ffb9def0',GradientType=0)}.alert-warning{background-image:-webkit-gradient(linear,left 0,left 100%,from(#fcf8e3),to(#f8efc0));background-image:-webkit-linear-gradient(top,#fcf8e3,0%,#f8efc0,100%);background-image:-moz-linear-gradient(top,#fcf8e3 0,#f8efc0 100%);background-image:linear-gradient(to bottom,#fcf8e3 0,#f8efc0 100%);background-repeat:repeat-x;border-color:#f5e79e;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#fffcf8e3',endColorstr='#fff8efc0',GradientType=0)}.alert-danger{background-image:-webkit-gradient(linear,left 0,left 100%,from(#f2dede),to(#e7c3c3));background-image:-webkit-linear-gradient(top,#f2dede,0%,#e7c3c3,100%);background-image:-moz-linear-gradient(top,#f2dede 0,#e7c3c3 100%);background-image:linear-gradient(to bottom,#f2dede 0,#e7c3c3 100%);background-repeat:repeat-x;border-color:#dca7a7;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#fff2dede',endColorstr='#ffe7c3c3',GradientType=0)}.progress{background-image:-webkit-gradient(linear,left 0,left 100%,from(#ebebeb),to(#f5f5f5));background-image:-webkit-linear-gradient(top,#ebebeb,0%,#f5f5f5,100%);background-image:-moz-linear-gradient(top,#ebebeb 0,#f5f5f5 100%);background-image:linear-gradient(to bottom,#ebebeb 0,#f5f5f5 100%);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffebebeb',endColorstr='#fff5f5f5',GradientType=0)}.progress-bar{background-image:-webkit-gradient(linear,left 0,left 100%,from(#428bca),to(#3071a9));background-image:-webkit-linear-gradient(top,#428bca,0%,#3071a9,100%);background-image:-moz-linear-gradient(top,#428bca 0,#3071a9 100%);background-image:linear-gradient(to bottom,#428bca 0,#3071a9 100%);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff428bca',endColorstr='#ff3071a9',GradientType=0)}.progress-bar-success{background-image:-webkit-gradient(linear,left 0,left 100%,from(#5cb85c),to(#449d44));background-image:-webkit-linear-gradient(top,#5cb85c,0%,#449d44,100%);background-image:-moz-linear-gradient(top,#5cb85c 0,#449d44 100%);background-image:linear-gradient(to bottom,#5cb85c 0,#449d44 100%);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff5cb85c',endColorstr='#ff449d44',GradientType=0)}.progress-bar-info{background-image:-webkit-gradient(linear,left 0,left 100%,from(#5bc0de),to(#31b0d5));background-image:-webkit-linear-gradient(top,#5bc0de,0%,#31b0d5,100%);background-image:-moz-linear-gradient(top,#5bc0de 0,#31b0d5 100%);background-image:linear-gradient(to bottom,#5bc0de 0,#31b0d5 100%);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff5bc0de',endColorstr='#ff31b0d5',GradientType=0)}.progress-bar-warning{background-image:-webkit-gradient(linear,left 0,left 100%,from(#f0ad4e),to(#ec971f));background-image:-webkit-linear-gradient(top,#f0ad4e,0%,#ec971f,100%);background-image:-moz-linear-gradient(top,#f0ad4e 0,#ec971f 100%);background-image:linear-gradient(to bottom,#f0ad4e 0,#ec971f 100%);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#fff0ad4e',endColorstr='#ffec971f',GradientType=0)}.progress-bar-danger{background-image:-webkit-gradient(linear,left 0,left 100%,from(#d9534f),to(#c9302c));background-image:-webkit-linear-gradient(top,#d9534f,0%,#c9302c,100%);background-image:-moz-linear-gradient(top,#d9534f 0,#c9302c 100%);background-image:linear-gradient(to bottom,#d9534f 0,#c9302c 100%);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffd9534f',endColorstr='#ffc9302c',GradientType=0)}.list-group{border-radius:4px;-webkit-box-shadow:0 1px 2px rgba(0,0,0,0.075);box-shadow:0 1px 2px rgba(0,0,0,0.075)}.list-group-item.active,.list-group-item.active:hover,.list-group-item.active:focus{text-shadow:0 -1px 0 #3071a9;background-image:-webkit-gradient(linear,left 0,left 100%,from(#428bca),to(#3278b3));background-image:-webkit-linear-gradient(top,#428bca,0%,#3278b3,100%);background-image:-moz-linear-gradient(top,#428bca 0,#3278b3 100%);background-image:linear-gradient(to bottom,#428bca 0,#3278b3 100%);background-repeat:repeat-x;border-color:#3278b3;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff428bca',endColorstr='#ff3278b3',GradientType=0)}.panel{-webkit-box-shadow:0 1px 2px rgba(0,0,0,0.05);box-shadow:0 1px 2px rgba(0,0,0,0.05)}.panel-default>.panel-heading{background-image:-webkit-gradient(linear,left 0,left 100%,from(#f5f5f5),to(#e8e8e8));background-image:-webkit-linear-gradient(top,#f5f5f5,0%,#e8e8e8,100%);background-image:-moz-linear-gradient(top,#f5f5f5 0,#e8e8e8 100%);background-image:linear-gradient(to bottom,#f5f5f5 0,#e8e8e8 100%);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#fff5f5f5',endColorstr='#ffe8e8e8',GradientType=0)}.panel-primary>.panel-heading{background-image:-webkit-gradient(linear,left 0,left 100%,from(#428bca),to(#357ebd));background-image:-webkit-linear-gradient(top,#428bca,0%,#357ebd,100%);background-image:-moz-linear-gradient(top,#428bca 0,#357ebd 100%);background-image:linear-gradient(to bottom,#428bca 0,#357ebd 100%);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff428bca',endColorstr='#ff357ebd',GradientType=0)}.panel-success>.panel-heading{background-image:-webkit-gradient(linear,left 0,left 100%,from(#dff0d8),to(#d0e9c6));background-image:-webkit-linear-gradient(top,#dff0d8,0%,#d0e9c6,100%);background-image:-moz-linear-gradient(top,#dff0d8 0,#d0e9c6 100%);background-image:linear-gradient(to bottom,#dff0d8 0,#d0e9c6 100%);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffdff0d8',endColorstr='#ffd0e9c6',GradientType=0)}.panel-info>.panel-heading{background-image:-webkit-gradient(linear,left 0,left 100%,from(#d9edf7),to(#c4e3f3));background-image:-webkit-linear-gradient(top,#d9edf7,0%,#c4e3f3,100%);background-image:-moz-linear-gradient(top,#d9edf7 0,#c4e3f3 100%);background-image:linear-gradient(to bottom,#d9edf7 0,#c4e3f3 100%);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffd9edf7',endColorstr='#ffc4e3f3',GradientType=0)}.panel-warning>.panel-heading{background-image:-webkit-gradient(linear,left 0,left 100%,from(#fcf8e3),to(#faf2cc));background-image:-webkit-linear-gradient(top,#fcf8e3,0%,#faf2cc,100%);background-image:-moz-linear-gradient(top,#fcf8e3 0,#faf2cc 100%);background-image:linear-gradient(to bottom,#fcf8e3 0,#faf2cc 100%);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#fffcf8e3',endColorstr='#fffaf2cc',GradientType=0)}.panel-danger>.panel-heading{background-image:-webkit-gradient(linear,left 0,left 100%,from(#f2dede),to(#ebcccc));background-image:-webkit-linear-gradient(top,#f2dede,0%,#ebcccc,100%);background-image:-moz-linear-gradient(top,#f2dede 0,#ebcccc 100%);background-image:linear-gradient(to bottom,#f2dede 0,#ebcccc 100%);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#fff2dede',endColorstr='#ffebcccc',GradientType=0)}.well{background-image:-webkit-gradient(linear,left 0,left 100%,from(#e8e8e8),to(#f5f5f5));background-image:-webkit-linear-gradient(top,#e8e8e8,0%,#f5f5f5,100%);background-image:-moz-linear-gradient(top,#e8e8e8 0,#f5f5f5 100%);background-image:linear-gradient(to bottom,#e8e8e8 0,#f5f5f5 100%);background-repeat:repeat-x;border-color:#dcdcdc;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffe8e8e8',endColorstr='#fff5f5f5',GradientType=0);-webkit-box-shadow:inset 0 1px 3px rgba(0,0,0,0.05),0 1px 0 rgba(255,255,255,0.1);box-shadow:inset 0 1px 3px rgba(0,0,0,0.05),0 1px 0 rgba(255,255,255,0.1)}
\ No newline at end of file

Added: magnoliamodules/trunk/openutils-mgnllms/src/main/resources/mgnl-resources/bootstrap/3.0/css/bootstrap.css
===================================================================
--- magnoliamodules/trunk/openutils-mgnllms/src/main/resources/mgnl-resources/bootstrap/3.0/css/bootstrap.css	                        (rev 0)
+++ magnoliamodules/trunk/openutils-mgnllms/src/main/resources/mgnl-resources/bootstrap/3.0/css/bootstrap.css	2013-10-21 13:58:10 UTC (rev 4431)
@@ -0,0 +1,6805 @@
+/*!
+ * Bootstrap v3.0.0
+ *
+ * Copyright 2013 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 by @mdo and @fat.
+ */
+
+/*! normalize.css v2.1.0 | MIT License | git.io/normalize */
+
+article,
+aside,
+details,
+figcaption,
+figure,
+footer,
+header,
+hgroup,
+main,
+nav,
+section,
+summary {
+  display: block;
+}
+
+audio,
+canvas,
+video {
+  display: inline-block;
+}
+
+audio:not([controls]) {
+  display: none;
+  height: 0;
+}
+
+[hidden] {
+  display: none;
+}
+
+html {
+  font-family: sans-serif;
+  -webkit-text-size-adjust: 100%;
+      -ms-text-size-adjust: 100%;
+}
+
+body {
+  margin: 0;
+}
+
+a:focus {
+  outline: thin dotted;
+}
+
+a:active,
+a:hover {
+  outline: 0;
+}
+
+h1 {
+  margin: 0.67em 0;
+  font-size: 2em;
+}
+
+abbr[title] {
+  border-bottom: 1px dotted;
+}
+
+b,
+strong {
+  font-weight: bold;
+}
+
+dfn {
+  font-style: italic;
+}
+
+hr {
+  height: 0;
+  -moz-box-sizing: content-box;
+       box-sizing: content-box;
+}
+
+mark {
+  color: #000;
+  background: #ff0;
+}
+
+code,
+kbd,
+pre,
+samp {
+  font-family: monospace, serif;
+  font-size: 1em;
+}
+
+pre {
+  white-space: pre-wrap;
+}
+
+q {
+  quotes: "\201C" "\201D" "\2018" "\2019";
+}
+
+small {
+  font-size: 80%;
+}
+
+sub,
+sup {
+  position: relative;
+  font-size: 75%;
+  line-height: 0;
+  vertical-align: baseline;
+}
+
+sup {
+  top: -0.5em;
+}
+
+sub {
+  bottom: -0.25em;
+}
+
+img {
+  border: 0;
+}
+
+svg:not(:root) {
+  overflow: hidden;
+}
+
+figure {
+  margin: 0;
+}
+
+fieldset {
+  padding: 0.35em 0.625em 0.75em;
+  margin: 0 2px;
+  border: 1px solid #c0c0c0;
+}
+
+legend {
+  padding: 0;
+  border: 0;
+}
+
+button,
+input,
+select,
+textarea {
+  margin: 0;
+  font-family: inherit;
+  font-size: 100%;
+}
+
+button,
+input {
+  line-height: normal;
+}
+
+button,
+select {
+  text-transform: none;
+}
+
+button,
+html input[type="button"],
+input[type="reset"],
+input[type="submit"] {
+  cursor: pointer;
+  -webkit-appearance: button;
+}
+
+button[disabled],
+html input[disabled] {
+  cursor: default;
+}
+
+input[type="checkbox"],
+input[type="radio"] {
+  padding: 0;
+  box-sizing: border-box;
+}
+
+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-cancel-button,
+input[type="search"]::-webkit-search-decoration {
+  -webkit-appearance: none;
+}
+
+button::-moz-focus-inner,
+input::-moz-focus-inner {
+  padding: 0;
+  border: 0;
+}
+
+textarea {
+  overflow: auto;
+  vertical-align: top;
+}
+
+table {
+  border-collapse: collapse;
+  border-spacing: 0;
+}
+
+@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: 2cm .5cm;
+  }
+  p,
+  h2,
+  h3 {
+    orphans: 3;
+    widows: 3;
+  }
+  h2,
+  h3 {
+    page-break-after: avoid;
+  }
+  .navbar {
+    display: none;
+  }
+  .table td,
+  .table th {
+    background-color: #fff !important;
+  }
+  .btn > .caret,
+  .dropup > .btn > .caret {
+    border-top-color: #000 !important;
+  }
+  .label {
+    border: 1px solid #000;
+  }
+  .table {
+    border-collapse: collapse !important;
+  }
+  .table-bordered th,
+  .table-bordered td {
+    border: 1px solid #ddd !important;
+  }
+}
+
+*,
+*:before,
+*:after {
+  -webkit-box-sizing: border-box;
+     -moz-box-sizing: border-box;
+          box-sizing: border-box;
+}
+
+html {
+  font-size: 62.5%;
+  -webkit-tap-highlight-color: rgba(0, 0, 0, 0);
+}
+
+body {
+  font-family: "Helvetica Neue", Helvetica, Arial, sans-serif;
+  font-size: 14px;
+  line-height: 1.428571429;
+  color: #333333;
+  background-color: #ffffff;
+}
+
+input,
+button,
+select,
+textarea {
+  font-family: inherit;
+  font-size: inherit;
+  line-height: inherit;
+}
+
+button,
+input,
+select[multiple],
+textarea {
+  background-image: none;
+}
+
+a {
+  color: #428bca;
+  text-decoration: none;
+}
+
+a:hover,
+a:focus {
+  color: #2a6496;
+  text-decoration: underline;
+}
+
+a:focus {
+  outline: thin dotted #333;
+  outline: 5px auto -webkit-focus-ring-color;
+  outline-offset: -2px;
+}
+
+img {
+  vertical-align: middle;
+}
+
+.img-responsive {
+  display: block;
+  height: auto;
+  max-width: 100%;
+}
+
+.img-rounded {
+  border-radius: 6px;
+}
+
+.img-thumbnail {
+  display: inline-block;
+  height: auto;
+  max-width: 100%;
+  padding: 4px;
+  line-height: 1.428571429;
+  background-color: #ffffff;
+  border: 1px solid #dddddd;
+  border-radius: 4px;
+  -webkit-transition: all 0.2s ease-in-out;
+          transition: all 0.2s ease-in-out;
+}
+
+.img-circle {
+  border-radius: 50%;
+}
+
+hr {
+  margin-top: 20px;
+  margin-bottom: 20px;
+  border: 0;
+  border-top: 1px solid #eeeeee;
+}
+
+.sr-only {
+  position: absolute;
+  width: 1px;
+  height: 1px;
+  padding: 0;
+  margin: -1px;
+  overflow: hidden;
+  clip: rect(0 0 0 0);
+  border: 0;
+}
+
+p {
+  margin: 0 0 10px;
+}
+
+.lead {
+  margin-bottom: 20px;
+  font-size: 16.099999999999998px;
+  font-weight: 200;
+  line-height: 1.4;
+}
+
+@media (min-width: 768px) {
+  .lead {
+    font-size: 21px;
+  }
+}
+
+small {
+  font-size: 85%;
+}
+
+cite {
+  font-style: normal;
+}
+
+.text-muted {
+  color: #999999;
+}
+
+.text-primary {
+  color: #428bca;
+}
+
+.text-warning {
+  color: #c09853;
+}
+
+.text-danger {
+  color: #b94a48;
+}
+
+.text-success {
+  color: #468847;
+}
+
+.text-info {
+  color: #3a87ad;
+}
+
+.text-left {
+  text-align: left;
+}
+
+.text-right {
+  text-align: right;
+}
+
+.text-center {
+  text-align: center;
+}
+
+h1,
+h2,
+h3,
+h4,
+h5,
+h6,
+.h1,
+.h2,
+.h3,
+.h4,
+.h5,
+.h6 {
+  font-family: "Helvetica Neue", Helvetica, Arial, sans-serif;
+  font-weight: 500;
+  line-height: 1.1;
+}
+
+h1 small,
+h2 small,
+h3 small,
+h4 small,
+h5 small,
+h6 small,
+.h1 small,
+.h2 small,
+.h3 small,
+.h4 small,
+.h5 small,
+.h6 small {
+  font-weight: normal;
+  line-height: 1;
+  color: #999999;
+}
+
+h1,
+h2,
+h3 {
+  margin-top: 20px;
+  margin-bottom: 10px;
+}
+
+h4,
+h5,
+h6 {
+  margin-top: 10px;
+  margin-bottom: 10px;
+}
+
+h1,
+.h1 {
+  font-size: 36px;
+}
+
+h2,
+.h2 {
+  font-size: 30px;
+}
+
+h3,
+.h3 {
+  font-size: 24px;
+}
+
+h4,
+.h4 {
+  font-size: 18px;
+}
+
+h5,
+.h5 {
+  font-size: 14px;
+}
+
+h6,
+.h6 {
+  font-size: 12px;
+}
+
+h1 small,
+.h1 small {
+  font-size: 24px;
+}
+
+h2 small,
+.h2 small {
+  font-size: 18px;
+}
+
+h3 small,
+.h3 small,
+h4 small,
+.h4 small {
+  font-size: 14px;
+}
+
+.page-header {
+  padding-bottom: 9px;
+  margin: 40px 0 20px;
+  border-bottom: 1px solid #eeeeee;
+}
+
+ul,
+ol {
+  margin-top: 0;
+  margin-bottom: 10px;
+}
+
+ul ul,
+ol ul,
+ul ol,
+ol ol {
+  margin-bottom: 0;
+}
+
+.list-unstyled {
+  padding-left: 0;
+  list-style: none;
+}
+
+.list-inline {
+  padding-left: 0;
+  list-style: none;
+}
+
+.list-inline > li {
+  display: inline-block;
+  padding-right: 5px;
+  padding-left: 5px;
+}
+
+dl {
+  margin-bottom: 20px;
+}
+
+dt,
+dd {
+  line-height: 1.428571429;
+}
+
+dt {
+  font-weight: bold;
+}
+
+dd {
+  margin-left: 0;
+}
+
+@media (min-width: 768px) {
+  .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;
+  }
+  .dl-horizontal dd:before,
+  .dl-horizontal dd:after {
+    display: table;
+    content: " ";
+  }
+  .dl-horizontal dd:after {
+    clear: both;
+  }
+  .dl-horizontal dd:before,
+  .dl-horizontal dd:after {
+    display: table;
+    content: " ";
+  }
+  .dl-horizontal dd:after {
+    clear: both;
+  }
+}
+
+abbr[title],
+abbr[data-original-title] {
+  cursor: help;
+  border-bottom: 1px dotted #999999;
+}
+
+abbr.initialism {
+  font-size: 90%;
+  text-transform: uppercase;
+}
+
+blockquote {
+  padding: 10px 20px;
+  margin: 0 0 20px;
+  border-left: 5px solid #eeeeee;
+}
+
+blockquote p {
+  font-size: 17.5px;
+  font-weight: 300;
+  line-height: 1.25;
+}
+
+blockquote p:last-child {
+  margin-bottom: 0;
+}
+
+blockquote small {
+  display: block;
+  line-height: 1.428571429;
+  color: #999999;
+}
+
+blockquote small:before {
+  content: '\2014 \00A0';
+}
+
+blockquote.pull-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: 1.428571429;
+}
+
+code,
+pre {
+  font-family: Monaco, Menlo, Consolas, "Courier New", monospace;
+}
+
+code {
+  padding: 2px 4px;
+  font-size: 90%;
+  color: #c7254e;
+  white-space: nowrap;
+  background-color: #f9f2f4;
+  border-radius: 4px;
+}
+
+pre {
+  display: block;
+  padding: 9.5px;
+  margin: 0 0 10px;
+  font-size: 13px;
+  line-height: 1.428571429;
+  color: #333333;
+  word-break: break-all;
+  word-wrap: break-word;
+  background-color: #f5f5f5;
+  border: 1px solid #cccccc;
+  border-radius: 4px;
+}
+
+pre.prettyprint {
+  margin-bottom: 20px;
+}
+
+pre code {
+  padding: 0;
+  font-size: inherit;
+  color: inherit;
+  white-space: pre-wrap;
+  background-color: transparent;
+  border: 0;
+}
+
+.pre-scrollable {
+  max-height: 340px;
+  overflow-y: scroll;
+}
+
+.container {
+  padding-right: 15px;
+  padding-left: 15px;
+  margin-right: auto;
+  margin-left: auto;
+}
+
+.container:before,
+.container:after {
+  display: table;
+  content: " ";
+}
+
+.container:after {
+  clear: both;
+}
+
+.container:before,
+.container:after {
+  display: table;
+  content: " ";
+}
+
+.container:after {
+  clear: both;
+}
+
+.row {
+  margin-right: -15px;
+  margin-left: -15px;
+}
+
+.row:before,
+.row:after {
+  display: table;
+  content: " ";
+}
+
+.row:after {
+  clear: both;
+}
+
+.row:before,
+.row:after {
+  display: table;
+  content: " ";
+}
+
+.row:after {
+  clear: both;
+}
+
+.col-xs-1,
+.col-xs-2,
+.col-xs-3,
+.col-xs-4,
+.col-xs-5,
+.col-xs-6,
+.col-xs-7,
+.col-xs-8,
+.col-xs-9,
+.col-xs-10,
+.col-xs-11,
+.col-xs-12,
+.col-sm-1,
+.col-sm-2,
+.col-sm-3,
+.col-sm-4,
+.col-sm-5,
+.col-sm-6,
+.col-sm-7,
+.col-sm-8,
+.col-sm-9,
+.col-sm-10,
+.col-sm-11,
+.col-sm-12,
+.col-md-1,
+.col-md-2,
+.col-md-3,
+.col-md-4,
+.col-md-5,
+.col-md-6,
+.col-md-7,
+.col-md-8,
+.col-md-9,
+.col-md-10,
+.col-md-11,
+.col-md-12,
+.col-lg-1,
+.col-lg-2,
+.col-lg-3,
+.col-lg-4,
+.col-lg-5,
+.col-lg-6,
+.col-lg-7,
+.col-lg-8,
+.col-lg-9,
+.col-lg-10,
+.col-lg-11,
+.col-lg-12 {
+  position: relative;
+  min-height: 1px;
+  padding-right: 15px;
+  padding-left: 15px;
+}
+
+.col-xs-1,
+.col-xs-2,
+.col-xs-3,
+.col-xs-4,
+.col-xs-5,
+.col-xs-6,
+.col-xs-7,
+.col-xs-8,
+.col-xs-9,
+.col-xs-10,
+.col-xs-11 {
+  float: left;
+}
+
+.col-xs-1 {
+  width: 8.333333333333332%;
+}
+
+.col-xs-2 {
+  width: 16.666666666666664%;
+}
+
+.col-xs-3 {
+  width: 25%;
+}
+
+.col-xs-4 {
+  width: 33.33333333333333%;
+}
+
+.col-xs-5 {
+  width: 41.66666666666667%;
+}
+
+.col-xs-6 {
+  width: 50%;
+}
+
+.col-xs-7 {
+  width: 58.333333333333336%;
+}
+
+.col-xs-8 {
+  width: 66.66666666666666%;
+}
+
+.col-xs-9 {
+  width: 75%;
+}
+
+.col-xs-10 {
+  width: 83.33333333333334%;
+}
+
+.col-xs-11 {
+  width: 91.66666666666666%;
+}
+
+.col-xs-12 {
+  width: 100%;
+}
+
+@media (min-width: 768px) {
+  .container {
+    max-width: 750px;
+  }
+  .col-sm-1,
+  .col-sm-2,
+  .col-sm-3,
+  .col-sm-4,
+  .col-sm-5,
+  .col-sm-6,
+  .col-sm-7,
+  .col-sm-8,
+  .col-sm-9,
+  .col-sm-10,
+  .col-sm-11 {
+    float: left;
+  }
+  .col-sm-1 {
+    width: 8.333333333333332%;
+  }
+  .col-sm-2 {
+    width: 16.666666666666664%;
+  }
+  .col-sm-3 {
+    width: 25%;
+  }
+  .col-sm-4 {
+    width: 33.33333333333333%;
+  }
+  .col-sm-5 {
+    width: 41.66666666666667%;
+  }
+  .col-sm-6 {
+    width: 50%;
+  }
+  .col-sm-7 {
+    width: 58.333333333333336%;
+  }
+  .col-sm-8 {
+    width: 66.66666666666666%;
+  }
+  .col-sm-9 {
+    width: 75%;
+  }
+  .col-sm-10 {
+    width: 83.33333333333334%;
+  }
+  .col-sm-11 {
+    width: 91.66666666666666%;
+  }
+  .col-sm-12 {
+    width: 100%;
+  }
+  .col-sm-push-1 {
+    left: 8.333333333333332%;
+  }
+  .col-sm-push-2 {
+    left: 16.666666666666664%;
+  }
+  .col-sm-push-3 {
+    left: 25%;
+  }
+  .col-sm-push-4 {
+    left: 33.33333333333333%;
+  }
+  .col-sm-push-5 {
+    left: 41.66666666666667%;
+  }
+  .col-sm-push-6 {
+    left: 50%;
+  }
+  .col-sm-push-7 {
+    left: 58.333333333333336%;
+  }
+  .col-sm-push-8 {
+    left: 66.66666666666666%;
+  }
+  .col-sm-push-9 {
+    left: 75%;
+  }
+  .col-sm-push-10 {
+    left: 83.33333333333334%;
+  }
+  .col-sm-push-11 {
+    left: 91.66666666666666%;
+  }
+  .col-sm-pull-1 {
+    right: 8.333333333333332%;
+  }
+  .col-sm-pull-2 {
+    right: 16.666666666666664%;
+  }
+  .col-sm-pull-3 {
+    right: 25%;
+  }
+  .col-sm-pull-4 {
+    right: 33.33333333333333%;
+  }
+  .col-sm-pull-5 {
+    right: 41.66666666666667%;
+  }
+  .col-sm-pull-6 {
+    right: 50%;
+  }
+  .col-sm-pull-7 {
+    right: 58.333333333333336%;
+  }
+  .col-sm-pull-8 {
+    right: 66.66666666666666%;
+  }
+  .col-sm-pull-9 {
+    right: 75%;
+  }
+  .col-sm-pull-10 {
+    right: 83.33333333333334%;
+  }
+  .col-sm-pull-11 {
+    right: 91.66666666666666%;
+  }
+  .col-sm-offset-1 {
+    margin-left: 8.333333333333332%;
+  }
+  .col-sm-offset-2 {
+    margin-left: 16.666666666666664%;
+  }
+  .col-sm-offset-3 {
+    margin-left: 25%;
+  }
+  .col-sm-offset-4 {
+    margin-left: 33.33333333333333%;
+  }
+  .col-sm-offset-5 {
+    margin-left: 41.66666666666667%;
+  }
+  .col-sm-offset-6 {
+    margin-left: 50%;
+  }
+  .col-sm-offset-7 {
+    margin-left: 58.333333333333336%;
+  }
+  .col-sm-offset-8 {
+    margin-left: 66.66666666666666%;
+  }
+  .col-sm-offset-9 {
+    margin-left: 75%;
+  }
+  .col-sm-offset-10 {
+    margin-left: 83.33333333333334%;
+  }
+  .col-sm-offset-11 {
+    margin-left: 91.66666666666666%;
+  }
+}
+
+@media (min-width: 992px) {
+  .container {
+    max-width: 970px;
+  }
+  .col-md-1,
+  .col-md-2,
+  .col-md-3,
+  .col-md-4,
+  .col-md-5,
+  .col-md-6,
+  .col-md-7,
+  .col-md-8,
+  .col-md-9,
+  .col-md-10,
+  .col-md-11 {
+    float: left;
+  }
+  .col-md-1 {
+    width: 8.333333333333332%;
+  }
+  .col-md-2 {
+    width: 16.666666666666664%;
+  }
+  .col-md-3 {
+    width: 25%;
+  }
+  .col-md-4 {
+    width: 33.33333333333333%;
+  }
+  .col-md-5 {
+    width: 41.66666666666667%;
+  }
+  .col-md-6 {
+    width: 50%;
+  }
+  .col-md-7 {
+    width: 58.333333333333336%;
+  }
+  .col-md-8 {
+    width: 66.66666666666666%;
+  }
+  .col-md-9 {
+    width: 75%;
+  }
+  .col-md-10 {
+    width: 83.33333333333334%;
+  }
+  .col-md-11 {
+    width: 91.66666666666666%;
+  }
+  .col-md-12 {
+    width: 100%;
+  }
+  .col-md-push-0 {
+    left: auto;
+  }
+  .col-md-push-1 {
+    left: 8.333333333333332%;
+  }
+  .col-md-push-2 {
+    left: 16.666666666666664%;
+  }
+  .col-md-push-3 {
+    left: 25%;
+  }
+  .col-md-push-4 {
+    left: 33.33333333333333%;
+  }
+  .col-md-push-5 {
+    left: 41.66666666666667%;
+  }
+  .col-md-push-6 {
+    left: 50%;
+  }
+  .col-md-push-7 {
+    left: 58.333333333333336%;
+  }
+  .col-md-push-8 {
+    left: 66.66666666666666%;
+  }
+  .col-md-push-9 {
+    left: 75%;
+  }
+  .col-md-push-10 {
+    left: 83.33333333333334%;
+  }
+  .col-md-push-11 {
+    left: 91.66666666666666%;
+  }
+  .col-md-pull-0 {
+    right: auto;
+  }
+  .col-md-pull-1 {
+    right: 8.333333333333332%;
+  }
+  .col-md-pull-2 {
+    right: 16.666666666666664%;
+  }
+  .col-md-pull-3 {
+    right: 25%;
+  }
+  .col-md-pull-4 {
+    right: 33.33333333333333%;
+  }
+  .col-md-pull-5 {
+    right: 41.66666666666667%;
+  }
+  .col-md-pull-6 {
+    right: 50%;
+  }
+  .col-md-pull-7 {
+    right: 58.333333333333336%;
+  }
+  .col-md-pull-8 {
+    right: 66.66666666666666%;
+  }
+  .col-md-pull-9 {
+    right: 75%;
+  }
+  .col-md-pull-10 {
+    right: 83.33333333333334%;
+  }
+  .col-md-pull-11 {
+    right: 91.66666666666666%;
+  }
+  .col-md-offset-0 {
+    margin-left: 0;
+  }
+  .col-md-offset-1 {
+    margin-left: 8.333333333333332%;
+  }
+  .col-md-offset-2 {
+    margin-left: 16.666666666666664%;
+  }
+  .col-md-offset-3 {
+    margin-left: 25%;
+  }
+  .col-md-offset-4 {
+    margin-left: 33.33333333333333%;
+  }
+  .col-md-offset-5 {
+    margin-left: 41.66666666666667%;
+  }
+  .col-md-offset-6 {
+    margin-left: 50%;
+  }
+  .col-md-offset-7 {
+    margin-left: 58.333333333333336%;
+  }
+  .col-md-offset-8 {
+    margin-left: 66.66666666666666%;
+  }
+  .col-md-offset-9 {
+    margin-l...
 
[truncated message content]

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

From: <luc...@us...> - 2013-10-21 13:45:48

Revision: 4430
          http://openutils.svn.sourceforge.net/openutils/?rev=4430&view=rev
Author:   lucaboati
Date:     2013-10-21 13:45:43 +0000 (Mon, 21 Oct 2013)
Log Message:
-----------
fix for 4.5, read file from temp folder

Modified Paths:
--------------
    magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/filters/AggregatorServingZipFilter.java
    magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/filters/RenderingServingZipFilter.java
    magnoliamodules/trunk/openutils-mgnllms/src/main/resources/mgnl-bootstrap/mgnllms/config.modules.mgnllms.virtualURIMapping.persistence.xml
    magnoliamodules/trunk/openutils-mgnllms/src/main/resources/mgnl-bootstrap/mgnllms/config.modules.mgnllms.virtualURIMapping.player.xml
    magnoliamodules/trunk/openutils-mgnllms/src/main/resources/mgnl-files/templates/samples-lms/courses.jsp
    magnoliamodules/trunk/openutils-mgnllms/src/main/resources/mgnl-files/templates/samples-lms/index.jsp

Modified: magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/filters/AggregatorServingZipFilter.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/filters/AggregatorServingZipFilter.java	2013-10-21 12:24:28 UTC (rev 4429)
+++ magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/filters/AggregatorServingZipFilter.java	2013-10-21 13:45:43 UTC (rev 4430)
@@ -1,7 +1,7 @@
-/**
+/**  
  *
  * E-learning Module for Magnolia CMS (http://www.openmindlab.com/lab/products/lms.html)
- * Copyright(C) 2010-2013, Openmind S.r.l. http://www.openmindonline.it
+ * Copyright(C) 2010-2011, Openmind S.r.l. http://www.openmindonline.it
  *
  *  This program is free software: you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
@@ -16,6 +16,7 @@
  *  You should have received a copy of the GNU General Public License
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
+
 package net.sourceforge.openutils.mgnllms.filters;
 
 import info.magnolia.cms.beans.runtime.File;
@@ -27,7 +28,6 @@
 import info.magnolia.cms.filters.AggregatorFilter;
 import info.magnolia.context.MgnlContext;
 
-import javax.jcr.PathNotFoundException;
 import javax.jcr.PropertyType;
 import javax.jcr.RepositoryException;
 
@@ -67,7 +67,7 @@
             {
                 nonExistingN = hm.getNodeData(handleToCheck);
             }
-            catch (PathNotFoundException e)
+            catch (Exception e)
             {
                 // go on
             }

Modified: magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/filters/RenderingServingZipFilter.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/filters/RenderingServingZipFilter.java	2013-10-21 12:24:28 UTC (rev 4429)
+++ magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/filters/RenderingServingZipFilter.java	2013-10-21 13:45:43 UTC (rev 4430)
@@ -1,7 +1,7 @@
 /**
  *
  * E-learning Module for Magnolia CMS (http://www.openmindlab.com/lab/products/lms.html)
- * Copyright(C) 2010-2013, Openmind S.r.l. http://www.openmindonline.it
+ * Copyright(C) 2010-2011, Openmind S.r.l. http://www.openmindonline.it
  *
  *  This program is free software: you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
@@ -16,6 +16,7 @@
  *  You should have received a copy of the GNU General Public License
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
+
 package net.sourceforge.openutils.mgnllms.filters;
 
 import info.magnolia.cms.core.AggregationState;
@@ -26,12 +27,16 @@
 import info.magnolia.rendering.engine.RenderingFilter;
 import info.magnolia.rendering.template.registry.TemplateDefinitionRegistry;
 
+import java.io.BufferedInputStream;
+import java.io.BufferedOutputStream;
+import java.io.ByteArrayInputStream;
 import java.io.File;
 import java.io.FileOutputStream;
 import java.io.IOException;
 import java.io.InputStream;
 import java.util.Enumeration;
 import java.util.zip.ZipEntry;
+import java.util.zip.ZipException;
 import java.util.zip.ZipFile;
 
 import javax.jcr.PathNotFoundException;
@@ -42,6 +47,7 @@
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
+import org.apache.commons.io.FileUtils;
 import org.apache.commons.io.IOUtils;
 import org.apache.commons.lang.StringUtils;
 import org.apache.commons.lang.math.NumberUtils;
@@ -62,7 +68,9 @@
      */
     private Logger log = LoggerFactory.getLogger(RenderingServingZipFilter.class);
 
-    public RenderingServingZipFilter(RenderingEngine renderingEngine, TemplateDefinitionRegistry templateDefinitionRegistry)
+    public RenderingServingZipFilter(
+        RenderingEngine renderingEngine,
+        TemplateDefinitionRegistry templateDefinitionRegistry)
     {
         super(renderingEngine, templateDefinitionRegistry);
     }
@@ -82,28 +90,39 @@
 
             HierarchyManager hm = MgnlContext.getHierarchyManager(aggregationState.getRepository());
 
+            String tempDir = System.getProperty("java.io.tmpdir");
+            File parentFile = new File(tempDir);
+            if (!parentFile.exists())
+            {
+                parentFile.mkdirs();
+            }
+
             InputStream is = null;
             try
             {
+
+                String zippedResourceURI = StringUtils.substringAfter(aggregationState.getCurrentURI(), resourceHandle);
+                if (StringUtils.isBlank(zippedResourceURI))
+                {
+                    zippedResourceURI = "/";
+                }
+                zippedResourceURI = zippedResourceURI.substring(1);
+
                 String fileName = aggregationState.getFile().getFileName()
                     + "."
                     + aggregationState.getFile().getExtension();
-                is = getNodedataAstream(resourceHandle, hm, response);
-                if (null != is)
+
+                File requestResource = new File(parentFile, fileName);
+                if (!requestResource.exists())
                 {
+                    is = getNodedataAstream(resourceHandle, hm, response);
+                }
+                if (null != is || requestResource.exists())
+                {
 
                     if ("zip".equals(aggregationState.getFile().getExtension()))
                     {
 
-                        String zippedResourceURI = StringUtils.substringAfter(
-                            aggregationState.getCurrentURI(),
-                            resourceHandle);
-                        if (StringUtils.isBlank(zippedResourceURI))
-                        {
-                            zippedResourceURI = "/";
-                        }
-                        zippedResourceURI = zippedResourceURI.substring(1);
-
                         File temp = null;
                         try
                         {
@@ -124,50 +143,74 @@
                             }
                             else
                             {
-                                temp = File.createTempFile(fileName, ".zip");
-                                FileOutputStream fos = new FileOutputStream(temp);
-                                IOUtils.copy(is, fos);
 
-                                IOUtils.closeQuietly(fos);
-                                IOUtils.closeQuietly(is);
-
-                                ZipFile zip = new ZipFile(temp);
-
-                                Enumeration< ? extends ZipEntry> entries = zip.entries();
-                                while (entries.hasMoreElements())
+                                temp = new File(parentFile, fileName);
+                                if (!temp.exists())
                                 {
-                                    ZipEntry entry = entries.nextElement();
+                                    temp = new File(parentFile, fileName);
 
-                                    String path = entry.getName();
+                                    FileOutputStream fos = new FileOutputStream(temp);
+                                    IOUtils.copy(is, fos);
 
-                                    if (zippedResourceURI.equals(path))
-                                    {
+                                    unZipIt(fileName, tempDir);
 
-                                        InputStream inputStream = zip.getInputStream(entry);
-                                        response.setContentLength(((int) entry.getSize()));
-                                        sendUnCompressed(inputStream, response);
-                                        IOUtils.closeQuietly(inputStream);
+                                    IOUtils.closeQuietly(fos);
+                                    IOUtils.closeQuietly(is);
 
-                                        return;
-
-                                    }
                                 }
-                                log.debug("Resource not found, redirecting request for [{}] to 404 URI", request
-                                    .getRequestURI());
 
-                                if (!response.isCommitted())
+                                String newPath = temp.getAbsolutePath().substring(
+                                    0,
+                                    temp.getAbsolutePath().length() - 4);
+                                File requestFile = new File(newPath, zippedResourceURI);
+                                if (requestFile.exists())
                                 {
-                                    response.sendError(HttpServletResponse.SC_NOT_FOUND);
+                                    is = new ByteArrayInputStream(FileUtils.readFileToByteArray(requestFile));
+                                    response.setContentLength(((int) requestFile.length()));
+                                    sendUnCompressed(is, response);
+                                    IOUtils.closeQuietly(is);
+                                    return;
                                 }
-                                else
-                                {
-                                    log.info(
-                                        "Unable to redirect to 404 page, response is already committed. URI was {}",
-                                        request.getRequestURI());
-                                }
-                                // stop the chain
-                                return;
+
                             }
+
+                            // ZipFile zip = new ZipFile(temp);
+                            //
+                            // Enumeration< ? extends ZipEntry> entries = zip.entries();
+                            // while (entries.hasMoreElements())
+                            // {
+                            // ZipEntry entry = entries.nextElement();
+                            //
+                            // String path = entry.getName();
+                            //
+                            // if (zippedResourceURI.equals(path))
+                            // {
+                            //
+                            // InputStream inputStream = zip.getInputStream(entry);
+                            // response.setContentLength(((int) entry.getSize()));
+                            // sendUnCompressed(inputStream, response);
+                            // IOUtils.closeQuietly(inputStream);
+                            //
+                            // return;
+                            //
+                            // }
+                            // }
+                            log.debug(
+                                "Resource not found, redirecting request for [{}] to 404 URI",
+                                request.getRequestURI());
+
+                            if (!response.isCommitted())
+                            {
+                                response.sendError(HttpServletResponse.SC_NOT_FOUND);
+                            }
+                            else
+                            {
+                                log.info(
+                                    "Unable to redirect to 404 page, response is already committed. URI was {}",
+                                    request.getRequestURI());
+                            }
+                            // stop the chain
+                            return;
                         }
                         catch (IOException e)
                         {
@@ -178,7 +221,7 @@
                             IOUtils.closeQuietly(is);
                             if (temp != null)
                             {
-                                temp.delete();
+                                // temp.delete();
                             }
                         }
                     }
@@ -221,6 +264,77 @@
         }
     }
 
+    private void unZipIt(String zipFile, String tempDir)
+    {
+
+        zipFile = tempDir + File.separator + zipFile;
+        log.debug(zipFile);
+        int BUFFER = 2048;
+        File file = new File(zipFile);
+
+        ZipFile zip;
+        try
+        {
+            zip = new ZipFile(file);
+
+            String newPath = zipFile.substring(0, zipFile.length() - 4);
+
+            new File(newPath).mkdir();
+            Enumeration zipFileEntries = zip.entries();
+
+            // Process each entry
+            while (zipFileEntries.hasMoreElements())
+            {
+                // grab a zip file entry
+                ZipEntry entry = (ZipEntry) zipFileEntries.nextElement();
+                String currentEntry = entry.getName();
+                File destFile = new File(newPath, currentEntry);
+                // destFile = new File(newPath, destFile.getName());
+                File destinationParent = destFile.getParentFile();
+
+                // create the parent directory structure if needed
+                destinationParent.mkdirs();
+
+                if (!entry.isDirectory())
+                {
+                    BufferedInputStream is = new BufferedInputStream(zip.getInputStream(entry));
+                    int currentByte;
+                    // establish buffer for writing file
+                    byte data[] = new byte[BUFFER];
+
+                    // write the current file to disk
+                    FileOutputStream fos = new FileOutputStream(destFile);
+                    BufferedOutputStream dest = new BufferedOutputStream(fos, BUFFER);
+
+                    // read and write until last byte is encountered
+                    while ((currentByte = is.read(data, 0, BUFFER)) != -1)
+                    {
+                        dest.write(data, 0, currentByte);
+                    }
+                    dest.flush();
+                    dest.close();
+                    is.close();
+                }
+
+// if (currentEntry.endsWith(".zip"))
+// {
+// // found a zip file, try to open
+// extractFolder(destFile.getAbsolutePath());
+// }
+            }
+        }
+        catch (ZipException e)
+        {
+            // TODO Auto-generated catch block
+            e.printStackTrace();
+        }
+        catch (IOException e)
+        {
+            // TODO Auto-generated catch block
+            e.printStackTrace();
+        }
+    }
+
     /**
      * Send data as is.
      * @param is Input stream for the resource

Modified: magnoliamodules/trunk/openutils-mgnllms/src/main/resources/mgnl-bootstrap/mgnllms/config.modules.mgnllms.virtualURIMapping.persistence.xml
===================================================================
(Binary files differ)

Modified: magnoliamodules/trunk/openutils-mgnllms/src/main/resources/mgnl-bootstrap/mgnllms/config.modules.mgnllms.virtualURIMapping.player.xml
===================================================================
(Binary files differ)

Modified: magnoliamodules/trunk/openutils-mgnllms/src/main/resources/mgnl-files/templates/samples-lms/courses.jsp
===================================================================
--- magnoliamodules/trunk/openutils-mgnllms/src/main/resources/mgnl-files/templates/samples-lms/courses.jsp	2013-10-21 12:24:28 UTC (rev 4429)
+++ magnoliamodules/trunk/openutils-mgnllms/src/main/resources/mgnl-files/templates/samples-lms/courses.jsp	2013-10-21 13:45:43 UTC (rev 4430)
@@ -1,6 +1,7 @@
-<jsp:root version="2.0" xmlns:jsp="http://java.sun.com/JSP/Page" xmlns:cms="urn:jsptld:cms-taglib" xmlns:cmsu="urn:jsptld:cms-util-taglib"
-  xmlns:c="urn:jsptld:http://java.sun.com/jsp/jstl/core" xmlns:fmt="urn:jsptld:http://java.sun.com/jsp/jstl/fmt"
-  xmlns:cmsfn="http://www.magnolia.info/tlds/cmsfn-taglib.tld" xmlns:lmsfn="urn:jsptld:lms-fn">
+<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:cmsu="cms-util-taglib" xmlns:cmsfn="http://magnolia-cms.com/taglib/templating-components/cmsfn" xmlns:media="http://net.sourceforge.openutils/mgnlMedia"
+  xmlns:lmsfn="urn:jsptld:lms-fn">
   <jsp:directive.page contentType="text/html; charset=UTF-8" session="false" />
   <jsp:text>
     <![CDATA[<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> ]]>
@@ -9,7 +10,9 @@
     <head>
       <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
       <title>${actpage.title}</title>
-      <cms:links />
+      <cms:init />
+      <link rel="stylesheet" type="text/css"
+        href="${pageContext.request.contextPath}/.resources/media-samples/css/bootstrap.min.css" />
     </head>
     <body>
       <h1>${actpage.title}</h1>

Modified: magnoliamodules/trunk/openutils-mgnllms/src/main/resources/mgnl-files/templates/samples-lms/index.jsp
===================================================================
--- magnoliamodules/trunk/openutils-mgnllms/src/main/resources/mgnl-files/templates/samples-lms/index.jsp	2013-10-21 12:24:28 UTC (rev 4429)
+++ magnoliamodules/trunk/openutils-mgnllms/src/main/resources/mgnl-files/templates/samples-lms/index.jsp	2013-10-21 13:45:43 UTC (rev 4430)
@@ -1,6 +1,7 @@
-<jsp:root version="2.0" xmlns:jsp="http://java.sun.com/JSP/Page" xmlns:cms="urn:jsptld:cms-taglib" xmlns:cmsu="urn:jsptld:cms-util-taglib"
-  xmlns:c="urn:jsptld:http://java.sun.com/jsp/jstl/core" xmlns:fmt="urn:jsptld:http://java.sun.com/jsp/jstl/fmt"
-  xmlns:cmsfn="http://www.magnolia.info/tlds/cmsfn-taglib.tld" xmlns:lmsfn="urn:jsptld:lms-fn">
+<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:cmsu="cms-util-taglib" xmlns:cmsfn="http://magnolia-cms.com/taglib/templating-components/cmsfn" xmlns:media="http://net.sourceforge.openutils/mgnlMedia"
+  xmlns:lmsfn="urn:jsptld:lms-fn">
   <jsp:directive.page contentType="text/html; charset=UTF-8" session="false" />
   <jsp:text>
     <![CDATA[<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> ]]>
@@ -9,7 +10,9 @@
     <head>
       <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
       <title>${actpage.title}</title>
-      <cms:links />
+      <cms:init />
+      <link rel="stylesheet" type="text/css"
+        href="${pageContext.request.contextPath}/.resources/media-samples/css/bootstrap.min.css" />
     </head>
     <body>
       <h1>${actpage.title}</h1>
@@ -45,18 +48,34 @@
       </ul>
       <p>There are three roles, one for each folder:</p>
       <ul>
-        <li><b>std-level-1</b> which can view its courses but not subfolders</li>
-        <li><b>std-level-2a</b> which can view its courses but not subfolders</li>
-        <li><b>std-level-3a</b> which can view its courses but not subfolders</li>
+        <li>
+          <b>std-level-1</b>
+          which can view its courses but not subfolders
+        </li>
+        <li>
+          <b>std-level-2a</b>
+          which can view its courses but not subfolders
+        </li>
+        <li>
+          <b>std-level-3a</b>
+          which can view its courses but not subfolders
+        </li>
       </ul>
-      <p>The user student/student has the role std-level-1; there is an example listener (net.sourceforge.openutils.mgnllms.samples.listeners.StudentLevelListener defined in /modules/lms/lms-config/listeners/student-level), 
-      that is called whenever a user complete a course and performs following actions:
+      <p>
+        The user student/student has the role std-level-1; there is an example listener
+        (net.sourceforge.openutils.mgnllms.samples.listeners.StudentLevelListener defined in
+        /modules/lms/lms-config/listeners/student-level), that is called whenever a user complete a course and performs
+        following actions:
         <ol>
           <li>check if the user has successfully completed all courses to which he has access</li>
-          <li>if true assign to user additional roles corresponding to the names of subfolders of the last completed course</li>
+          <li>if true assign to user additional roles corresponding to the names of subfolders of the last completed
+            course</li>
         </ol>
       </p>
-      <p><a href="${pageContext.request.contextPath}/sample-lms/courses.html">Go to the courses list!</a> (use student/student to access)</p>
+      <p>
+        <a href="${pageContext.request.contextPath}/sample-lms/courses.html">Go to the courses list!</a>
+        (use student/student to access)
+      </p>
     </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:[4429] magnoliamodules/trunk/magnolia-test-webapp/pom .xml

From: <fg...@us...> - 2013-10-21 12:24:30

Revision: 4429
          http://openutils.svn.sourceforge.net/openutils/?rev=4429&view=rev
Author:   fgiust
Date:     2013-10-21 12:24:28 +0000 (Mon, 21 Oct 2013)
Log Message:
-----------
downgrade to latest supported jackrabbit version

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

Modified: magnoliamodules/trunk/magnolia-test-webapp/pom.xml
===================================================================
--- magnoliamodules/trunk/magnolia-test-webapp/pom.xml	2013-10-21 12:23:58 UTC (rev 4428)
+++ magnoliamodules/trunk/magnolia-test-webapp/pom.xml	2013-10-21 12:24:28 UTC (rev 4429)
@@ -286,7 +286,7 @@
   <properties>
     <magnolia.version>4.5.11</magnolia.version>
     <stk.version>2.0.10</stk.version>
-    <jackrabbit.version>2.6.4</jackrabbit.version>
+    <jackrabbit.version>2.6.1</jackrabbit.version>
   </properties>
   <build>
     <plugins>

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

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

From: <fg...@us...> - 2013-10-21 12:24:02

Revision: 4428
          http://openutils.svn.sourceforge.net/openutils/?rev=4428&view=rev
Author:   fgiust
Date:     2013-10-21 12:23:58 +0000 (Mon, 21 Oct 2013)
Log Message:
-----------
downgrade jackrabbit version

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

Modified: magnoliamodules/trunk/openutils-mgnlcriteria/pom.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnlcriteria/pom.xml	2013-10-21 12:23:22 UTC (rev 4427)
+++ magnoliamodules/trunk/openutils-mgnlcriteria/pom.xml	2013-10-21 12:23:58 UTC (rev 4428)
@@ -178,7 +178,7 @@
   </dependencies>
   <properties>
     <magnolia.version>4.5.11</magnolia.version>
-    <jackrabbit.version>2.6.4</jackrabbit.version>
+    <jackrabbit.version>2.6.1</jackrabbit.version><!-- doesn't work properly with jackrabbit > 2.6.1 -->
     <jcr.version>2.0</jcr.version>
   </properties>
   <!-- test running maven with -Djcr.version=2.0 -Djackrabbit.version=2.0.0 -Djcr.version=2.0 -Djackrabbit.version=2.1.0 -->

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

[Openutils-svn] SF.net SVN: openutils:[4427] magnoliamodules/trunk/openutils-mgnlcriteria/ src/test/java/net/sourceforge/openutils/mgnlcriteria/advanced/ PaginationTest.java

From: <fg...@us...> - 2013-10-21 12:23:26

Revision: 4427
          http://openutils.svn.sourceforge.net/openutils/?rev=4427&view=rev
Author:   fgiust
Date:     2013-10-21 12:23:22 +0000 (Mon, 21 Oct 2013)
Log Message:
-----------
docs

Modified Paths:
--------------
    magnoliamodules/trunk/openutils-mgnlcriteria/src/test/java/net/sourceforge/openutils/mgnlcriteria/advanced/PaginationTest.java

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-10-21 10:25:15 UTC (rev 4426)
+++ magnoliamodules/trunk/openutils-mgnlcriteria/src/test/java/net/sourceforge/openutils/mgnlcriteria/advanced/PaginationTest.java	2013-10-21 12:23:22 UTC (rev 4427)
@@ -177,6 +177,15 @@
         criteria.setMaxResults(10);
         AdvancedResult advResult = criteria.execute();
 
+        // test is broken with jackrabbit > 2.6.1 due to https://issues.apache.org/jira/browse/JCR-3402
+        // starting from jackrabbit 2.6.2 size is only set if the number of fetched nodes is < total number of result,
+        // considering offset (e.g if you have 97 results and paging by 10, the total number will only be returned when
+        // asking for page 10, which is pretty useless)
+        if (advResult.getTotalSize() == -1)
+        {
+            Assert.fail("total number of results not set for query " + criteria.toXpathExpression());
+        }
+
         Assert.assertEquals(advResult.getTotalSize(), 26);
 
         ResultIterator< ? extends Node> resultIterator = advResult.getItems();
@@ -204,6 +213,11 @@
         criteria.setPaging(5, 3);
         AdvancedResult advResult = criteria.execute();
 
+        if (advResult.getTotalSize() == -1)
+        {
+            Assert.fail("total number of results not set for query " + criteria.toXpathExpression());
+        }
+
         Assert.assertEquals(advResult.getTotalSize(), 26);
 
         ResultIterator< ? extends Node> resultIterator = advResult.getItems();
@@ -253,6 +267,12 @@
         criteria.setPaging(5, 1);
 
         AdvancedResult advResult = criteria.execute();
+
+        if (advResult.getTotalSize() == -1)
+        {
+            Assert.fail("total number of results not set for query " + criteria.toXpathExpression());
+        }
+
         Assert.assertEquals(advResult.getTotalSize(), 26);
         Assert.assertEquals(advResult.getNumberOfPages(), 6);
 

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

[Openutils-svn] SF.net SVN: openutils:[4426] magnoliamodules/trunk/ openutils-mgnlcontextmenu/src/main/resources/mgnl-bootstrap-samples/ contextmenu/website.sample-contextmenu.xml

From: <luc...@us...> - 2013-10-21 10:25:18

Revision: 4426
          http://openutils.svn.sourceforge.net/openutils/?rev=4426&view=rev
Author:   lucaboati
Date:     2013-10-21 10:25:15 +0000 (Mon, 21 Oct 2013)
Log Message:
-----------
fix example

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

Modified: magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/resources/mgnl-bootstrap-samples/contextmenu/website.sample-contextmenu.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/resources/mgnl-bootstrap-samples/contextmenu/website.sample-contextmenu.xml	2013-10-21 09:51:49 UTC (rev 4425)
+++ magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/resources/mgnl-bootstrap-samples/contextmenu/website.sample-contextmenu.xml	2013-10-21 10:25:15 UTC (rev 4426)
@@ -65,135 +65,6 @@
         <sv:value>2013-10-07T23:55:31.953+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: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>6747e02e-acd1-45c7-82f8-d5ee8b9a526f</sv:value>
-      </sv:property>
-      <sv:property sv:name="jcr:createdBy" sv:type="String">
-        <sv:value>admin</sv:value>
-      </sv:property>
-      <sv:property sv:name="message" sv:type="String">
-        <sv:value>Right click here to edit</sv:value>
-      </sv:property>
-      <sv:node sv:name="MetaData">
-        <sv:property sv:name="jcr:primaryType" sv:type="Name">
-          <sv:value>mgnl:metaData</sv:value>
-        </sv:property>
-        <sv:property sv:name="jcr:createdBy" sv:type="String">
-          <sv:value>admin</sv:value>
-        </sv:property>
-        <sv:property sv:name="mgnl:authorid" sv:type="String">
-          <sv:value>superuser</sv:value>
-        </sv:property>
-        <sv:property sv:name="mgnl:creationdate" sv:type="Date">
-          <sv:value>2010-05-19T16:07:05.921+02:00</sv:value>
-        </sv:property>
-        <sv:property sv:name="mgnl:lastmodified" sv:type="Date">
-          <sv:value>2010-05-19T16:07:32.109+02:00</sv:value>
-        </sv:property>
-        <sv:property sv:name="mgnl:template" sv:type="String">
-          <sv:value>samples-contextmenu-message</sv:value>
-        </sv:property>
-      </sv:node>
-    </sv:node>
-    <sv:node sv:name="01">
-      <sv:property sv:name="jcr:primaryType" sv:type="Name">
-        <sv:value>mgnl: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>754cb04e-1eaa-4df2-917f-527f3978ed93</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>
-      <sv:property sv:name="text" sv:type="String">
-        <sv:value>&lt;p&gt;Lorem ipsum dolor sit amet, consectetur adipisici elit, sed eiusmod tempor incidunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquid ex ea commodi consequat. Quis aute iure reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint obcaecat cupiditat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.&lt;/p&gt;</sv:value>
-      </sv:property>
-      <sv:node sv:name="MetaData">
-        <sv:property sv:name="jcr:primaryType" sv:type="Name">
-          <sv:value>mgnl:metaData</sv:value>
-        </sv:property>
-        <sv:property sv:name="jcr:createdBy" sv:type="String">
-          <sv:value>admin</sv:value>
-        </sv:property>
-        <sv:property sv:name="mgnl:authorid" sv:type="String">
-          <sv:value>superuser</sv:value>
-        </sv:property>
-        <sv:property sv:name="mgnl:creationdate" sv:type="Date">
-          <sv:value>2010-05-20T14:52:38.484+02:00</sv:value>
-        </sv:property>
-        <sv:property sv:name="mgnl:lastmodified" sv:type="Date">
-          <sv:value>2010-05-20T14:57:52.140+02:00</sv:value>
-        </sv:property>
-        <sv:property sv:name="mgnl:template" sv:type="String">
-          <sv:value>samples-contextmenu-textmedia</sv:value>
-        </sv:property>
-      </sv:node>
-    </sv:node>
-    <sv:node sv:name="00">
-      <sv:property sv:name="jcr:primaryType" sv:type="Name">
-        <sv:value>mgnl: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>65405689-02c2-40df-9ea7-3a94e947ff99</sv:value>
-      </sv:property>
-      <sv:property sv:name="email.help" sv:type="String">
-        <sv:value>&lt;p&gt;The thing with the @ symbol and the dot com at the end.&lt;/p&gt;</sv:value>
-      </sv:property>
-      <sv:property sv:name="firstname.help" sv:type="String">
-        <sv:value>&lt;p&gt;This is the name your mama called you when you were little.&lt;/p&gt;</sv:value>
-      </sv:property>
-      <sv:property sv:name="jcr:createdBy" sv:type="String">
-        <sv:value>admin</sv:value>
-      </sv:property>
-      <sv:property sv:name="lastname.help" sv:type="String">
-        <sv:value>&lt;p&gt;This is the name your sergeant called you when you went through bootcamp.&lt;/p&gt;</sv:value>
-      </sv:property>
-      <sv:property sv:name="password.help" sv:type="String">
-        <sv:value>&lt;p&gt;Between 5-13 characters, but not 7. Never 7.&lt;/p&gt;</sv:value>
-      </sv:property>
-      <sv:property sv:name="username.help" sv:type="String">
-        <sv:value>&lt;p&gt;Between 4-12 characters.&lt;/p&gt;</sv:value>
-      </sv:property>
-      <sv:property sv:name="year.help" sv:type="String">
-        <sv:value>&lt;p&gt;Pick a famous year to be born in.&lt;/p&gt;</sv:value>
-      </sv:property>
-      <sv:node sv:name="MetaData">
-        <sv:property sv:name="jcr:primaryType" sv:type="Name">
-          <sv:value>mgnl:metaData</sv:value>
-        </sv:property>
-        <sv:property sv:name="jcr:createdBy" sv:type="String">
-          <sv:value>admin</sv:value>
-        </sv:property>
-        <sv:property sv:name="mgnl:authorid" sv:type="String">
-          <sv:value>superuser</sv:value>
-        </sv:property>
-        <sv:property sv:name="mgnl:creationdate" sv:type="Date">
-          <sv:value>2010-05-19T09:04:08.359+02:00</sv:value>
-        </sv:property>
-        <sv:property sv:name="mgnl:lastmodified" sv:type="Date">
-          <sv:value>2010-05-20T14:42:17.937+02:00</sv:value>
-        </sv:property>
-        <sv:property sv:name="mgnl:template" sv:type="String">
-          <sv:value>samples-contextmenu-form</sv:value>
-        </sv:property>
-      </sv:node>
-    </sv:node>
     <sv:node sv:name="03">
       <sv:property sv:name="jcr:primaryType" sv:type="Name">
         <sv:value>mgnl:component</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:[4425] magnoliamodules/trunk/openutils-mgnlcriteria/ src/test/resources/crit-repository/indexing_configuration.xml

From: <fg...@us...> - 2013-10-21 09:51:53

Revision: 4425
          http://openutils.svn.sourceforge.net/openutils/?rev=4425&view=rev
Author:   fgiust
Date:     2013-10-21 09:51:49 +0000 (Mon, 21 Oct 2013)
Log Message:
-----------
fix repository configuration for boosting

Modified Paths:
--------------
    magnoliamodules/trunk/openutils-mgnlcriteria/src/test/resources/crit-repository/indexing_configuration.xml

Modified: magnoliamodules/trunk/openutils-mgnlcriteria/src/test/resources/crit-repository/indexing_configuration.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnlcriteria/src/test/resources/crit-repository/indexing_configuration.xml	2013-10-21 09:43:26 UTC (rev 4424)
+++ magnoliamodules/trunk/openutils-mgnlcriteria/src/test/resources/crit-repository/indexing_configuration.xml	2013-10-21 09:51:49 UTC (rev 4425)
@@ -15,20 +15,18 @@
   </analyzers>
 
 
-<!--
   <index-rule nodeType="nt:hierarchyNode">
     <property boost="10" useInExcerpt="false">title</property>
     <property boost="1.0" useInExcerpt="true">text</property>
   </index-rule>
-  <index-rule nodeType="mgnl:content">
+  <index-rule nodeType="mgnl:page">
     <property boost="10" useInExcerpt="false">title</property>
     <property boost="1.0" useInExcerpt="true">text</property>
   </index-rule>
-  <index-rule nodeType="mgnl:contentNode">
+  <index-rule nodeType="mgnl:component">
     <property boost="0.5"   useInExcerpt="false">title</property>
     <property boost="1.0"   useInExcerpt="true">text</property>
   </index-rule>
-  -->
 
   <!-- index text content on paragraphs -->
   <!-- aggregates content on the main column -->

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

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

From: <fg...@us...> - 2013-10-21 09:43:31

Revision: 4424
          http://openutils.svn.sourceforge.net/openutils/?rev=4424&view=rev
Author:   fgiust
Date:     2013-10-21 09:43:26 +0000 (Mon, 21 Oct 2013)
Log Message:
-----------
cleanup warning

Modified Paths:
--------------
    magnoliamodules/trunk/openutils-mgnlcriteria/pom.xml
    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/advanced/impl/CorrectElementsWithoutMaxResults.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/EscapeSignTest.java
    magnoliamodules/trunk/openutils-mgnlcriteria/src/test/java/net/sourceforge/openutils/mgnlcriteria/jcr/query/lucene/AclSearchIndexTest.java

Modified: magnoliamodules/trunk/openutils-mgnlcriteria/pom.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnlcriteria/pom.xml	2013-10-21 09:41:48 UTC (rev 4423)
+++ magnoliamodules/trunk/openutils-mgnlcriteria/pom.xml	2013-10-21 09:43:26 UTC (rev 4424)
@@ -178,7 +178,7 @@
   </dependencies>
   <properties>
     <magnolia.version>4.5.11</magnolia.version>
-    <jackrabbit.version>2.4.4</jackrabbit.version>
+    <jackrabbit.version>2.6.4</jackrabbit.version>
     <jcr.version>2.0</jcr.version>
   </properties>
   <!-- test running maven with -Djcr.version=2.0 -Djackrabbit.version=2.0.0 -Djcr.version=2.0 -Djackrabbit.version=2.1.0 -->

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-10-21 09:41:48 UTC (rev 4423)
+++ magnoliamodules/trunk/openutils-mgnlcriteria/src/test/java/net/sourceforge/openutils/mgnlcriteria/advanced/BasePathTest.java	2013-10-21 09:43:26 UTC (rev 4424)
@@ -92,7 +92,9 @@
 
         // info.magnolia.cms.security.SecurityTest.setUp()
         final SecuritySupportImpl sec = new SecuritySupportImpl();
-        sec.addUserManager(Realm.REALM_SYSTEM.getName(), new SystemUserManager());
+        SystemUserManager systemUserManager = new SystemUserManager();
+        systemUserManager.setRealmName(Realm.REALM_SYSTEM.getName());
+        sec.addUserManager(Realm.REALM_SYSTEM.getName(), systemUserManager);
         sec.setRoleManager(new MgnlRoleManager());
         ComponentsTestUtil.setInstance(SecuritySupport.class, sec);
     }

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-10-21 09:41:48 UTC (rev 4423)
+++ magnoliamodules/trunk/openutils-mgnlcriteria/src/test/java/net/sourceforge/openutils/mgnlcriteria/advanced/BasePathWithSpacesTest.java	2013-10-21 09:43:26 UTC (rev 4424)
@@ -74,7 +74,9 @@
 
         // info.magnolia.cms.security.SecurityTest.setUp()
         final SecuritySupportImpl sec = new SecuritySupportImpl();
-        sec.addUserManager(Realm.REALM_SYSTEM.getName(), new SystemUserManager());
+        SystemUserManager systemUserManager = new SystemUserManager();
+        systemUserManager.setRealmName(Realm.REALM_SYSTEM.getName());
+        sec.addUserManager(Realm.REALM_SYSTEM.getName(), systemUserManager);
         sec.setRoleManager(new MgnlRoleManager());
         ComponentsTestUtil.setInstance(SecuritySupport.class, sec);
     }

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-10-21 09:41:48 UTC (rev 4423)
+++ magnoliamodules/trunk/openutils-mgnlcriteria/src/test/java/net/sourceforge/openutils/mgnlcriteria/advanced/Content2BeanTest.java	2013-10-21 09:43:26 UTC (rev 4424)
@@ -81,7 +81,9 @@
 
         // info.magnolia.cms.security.SecurityTest.setUp()
         final SecuritySupportImpl sec = new SecuritySupportImpl();
-        sec.addUserManager(Realm.REALM_SYSTEM.getName(), new SystemUserManager());
+        SystemUserManager systemUserManager = new SystemUserManager();
+        systemUserManager.setRealmName(Realm.REALM_SYSTEM.getName());
+        sec.addUserManager(Realm.REALM_SYSTEM.getName(), systemUserManager);
         sec.setRoleManager(new MgnlRoleManager());
         ComponentsTestUtil.setInstance(SecuritySupport.class, sec);
     }

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-10-21 09:41:48 UTC (rev 4423)
+++ magnoliamodules/trunk/openutils-mgnlcriteria/src/test/java/net/sourceforge/openutils/mgnlcriteria/advanced/FirstDigitEscapeTest.java	2013-10-21 09:43:26 UTC (rev 4424)
@@ -73,7 +73,9 @@
 
         // info.magnolia.cms.security.SecurityTest.setUp()
         final SecuritySupportImpl sec = new SecuritySupportImpl();
-        sec.addUserManager(Realm.REALM_SYSTEM.getName(), new SystemUserManager());
+        SystemUserManager systemUserManager = new SystemUserManager();
+        systemUserManager.setRealmName(Realm.REALM_SYSTEM.getName());
+        sec.addUserManager(Realm.REALM_SYSTEM.getName(), systemUserManager);
         sec.setRoleManager(new MgnlRoleManager());
         ComponentsTestUtil.setInstance(SecuritySupport.class, sec);
     }

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-10-21 09:41:48 UTC (rev 4423)
+++ magnoliamodules/trunk/openutils-mgnlcriteria/src/test/java/net/sourceforge/openutils/mgnlcriteria/advanced/JcrContainsCriteriaSearchTest.java	2013-10-21 09:43:26 UTC (rev 4424)
@@ -91,7 +91,9 @@
 
         // info.magnolia.cms.security.SecurityTest.setUp()
         final SecuritySupportImpl sec = new SecuritySupportImpl();
-        sec.addUserManager(Realm.REALM_SYSTEM.getName(), new SystemUserManager());
+        SystemUserManager systemUserManager = new SystemUserManager();
+        systemUserManager.setRealmName(Realm.REALM_SYSTEM.getName());
+        sec.addUserManager(Realm.REALM_SYSTEM.getName(), systemUserManager);
         sec.setRoleManager(new MgnlRoleManager());
         ComponentsTestUtil.setInstance(SecuritySupport.class, sec);
     }

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-10-21 09:41:48 UTC (rev 4423)
+++ magnoliamodules/trunk/openutils-mgnlcriteria/src/test/java/net/sourceforge/openutils/mgnlcriteria/advanced/JcrContainsQuestionMarkTest.java	2013-10-21 09:43:26 UTC (rev 4424)
@@ -84,7 +84,9 @@
 
         // info.magnolia.cms.security.SecurityTest.setUp()
         final SecuritySupportImpl sec = new SecuritySupportImpl();
-        sec.addUserManager(Realm.REALM_SYSTEM.getName(), new SystemUserManager());
+        SystemUserManager systemUserManager = new SystemUserManager();
+        systemUserManager.setRealmName(Realm.REALM_SYSTEM.getName());
+        sec.addUserManager(Realm.REALM_SYSTEM.getName(), systemUserManager);
         sec.setRoleManager(new MgnlRoleManager());
         ComponentsTestUtil.setInstance(SecuritySupport.class, sec);
     }

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-10-21 09:41:48 UTC (rev 4423)
+++ magnoliamodules/trunk/openutils-mgnlcriteria/src/test/java/net/sourceforge/openutils/mgnlcriteria/advanced/OrderingTest.java	2013-10-21 09:43:26 UTC (rev 4424)
@@ -115,7 +115,9 @@
 
         // info.magnolia.cms.security.SecurityTest.setUp()
         final SecuritySupportImpl sec = new SecuritySupportImpl();
-        sec.addUserManager(Realm.REALM_SYSTEM.getName(), new SystemUserManager());
+        SystemUserManager systemUserManager = new SystemUserManager();
+        systemUserManager.setRealmName(Realm.REALM_SYSTEM.getName());
+        sec.addUserManager(Realm.REALM_SYSTEM.getName(), systemUserManager);
         sec.setRoleManager(new MgnlRoleManager());
         ComponentsTestUtil.setInstance(SecuritySupport.class, sec);
     }

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-10-21 09:41:48 UTC (rev 4423)
+++ magnoliamodules/trunk/openutils-mgnlcriteria/src/test/java/net/sourceforge/openutils/mgnlcriteria/advanced/PaginationTest.java	2013-10-21 09:43:26 UTC (rev 4424)
@@ -86,7 +86,9 @@
 
         // info.magnolia.cms.security.SecurityTest.setUp()
         final SecuritySupportImpl sec = new SecuritySupportImpl();
-        sec.addUserManager(Realm.REALM_SYSTEM.getName(), new SystemUserManager());
+        SystemUserManager systemUserManager = new SystemUserManager();
+        systemUserManager.setRealmName(Realm.REALM_SYSTEM.getName());
+        sec.addUserManager(Realm.REALM_SYSTEM.getName(), systemUserManager);
         sec.setRoleManager(new MgnlRoleManager());
         ComponentsTestUtil.setInstance(SecuritySupport.class, sec);
     }

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-10-21 09:41:48 UTC (rev 4423)
+++ magnoliamodules/trunk/openutils-mgnlcriteria/src/test/java/net/sourceforge/openutils/mgnlcriteria/advanced/ScoreAnalizerAndSortTest.java	2013-10-21 09:43:26 UTC (rev 4424)
@@ -76,7 +76,9 @@
 
         // info.magnolia.cms.security.SecurityTest.setUp()
         final SecuritySupportImpl sec = new SecuritySupportImpl();
-        sec.addUserManager(Realm.REALM_SYSTEM.getName(), new SystemUserManager());
+        SystemUserManager systemUserManager = new SystemUserManager();
+        systemUserManager.setRealmName(Realm.REALM_SYSTEM.getName());
+        sec.addUserManager(Realm.REALM_SYSTEM.getName(), systemUserManager);
         sec.setRoleManager(new MgnlRoleManager());
         ComponentsTestUtil.setInstance(SecuritySupport.class, sec);
     }

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-10-21 09:41:48 UTC (rev 4423)
+++ magnoliamodules/trunk/openutils-mgnlcriteria/src/test/java/net/sourceforge/openutils/mgnlcriteria/advanced/XpathEscapeTest.java	2013-10-21 09:43:26 UTC (rev 4424)
@@ -79,7 +79,9 @@
 
         // info.magnolia.cms.security.SecurityTest.setUp()
         final SecuritySupportImpl sec = new SecuritySupportImpl();
-        sec.addUserManager(Realm.REALM_SYSTEM.getName(), new SystemUserManager());
+        SystemUserManager systemUserManager = new SystemUserManager();
+        systemUserManager.setRealmName(Realm.REALM_SYSTEM.getName());
+        sec.addUserManager(Realm.REALM_SYSTEM.getName(), systemUserManager);
         sec.setRoleManager(new MgnlRoleManager());
         ComponentsTestUtil.setInstance(SecuritySupport.class, sec);
     }

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-10-21 09:41:48 UTC (rev 4423)
+++ magnoliamodules/trunk/openutils-mgnlcriteria/src/test/java/net/sourceforge/openutils/mgnlcriteria/advanced/impl/AccessibleResultItemResultIteratorTest.java	2013-10-21 09:43:26 UTC (rev 4424)
@@ -108,7 +108,9 @@
 
         // info.magnolia.cms.security.SecurityTest.setUp()
         final SecuritySupportImpl sec = new SecuritySupportImpl();
-        sec.addUserManager(Realm.REALM_SYSTEM.getName(), new SystemUserManager());
+        SystemUserManager systemUserManager = new SystemUserManager();
+        systemUserManager.setRealmName(Realm.REALM_SYSTEM.getName());
+        sec.addUserManager(Realm.REALM_SYSTEM.getName(), systemUserManager);
         sec.setRoleManager(new MgnlRoleManager());
         ComponentsTestUtil.setInstance(SecuritySupport.class, sec);
     }

Modified: magnoliamodules/trunk/openutils-mgnlcriteria/src/test/java/net/sourceforge/openutils/mgnlcriteria/advanced/impl/CorrectElementsWithoutMaxResults.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlcriteria/src/test/java/net/sourceforge/openutils/mgnlcriteria/advanced/impl/CorrectElementsWithoutMaxResults.java	2013-10-21 09:41:48 UTC (rev 4423)
+++ magnoliamodules/trunk/openutils-mgnlcriteria/src/test/java/net/sourceforge/openutils/mgnlcriteria/advanced/impl/CorrectElementsWithoutMaxResults.java	2013-10-21 09:43:26 UTC (rev 4424)
@@ -86,7 +86,9 @@
 
         // info.magnolia.cms.security.SecurityTest.setUp()
         final SecuritySupportImpl sec = new SecuritySupportImpl();
-        sec.addUserManager(Realm.REALM_SYSTEM.getName(), new SystemUserManager());
+        SystemUserManager systemUserManager = new SystemUserManager();
+        systemUserManager.setRealmName(Realm.REALM_SYSTEM.getName());
+        sec.addUserManager(Realm.REALM_SYSTEM.getName(), systemUserManager);
         sec.setRoleManager(new MgnlRoleManager());
         ComponentsTestUtil.setInstance(SecuritySupport.class, sec);
     }

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-10-21 09:41:48 UTC (rev 4423)
+++ magnoliamodules/trunk/openutils-mgnlcriteria/src/test/java/net/sourceforge/openutils/mgnlcriteria/jcr/query/CriteriaTest.java	2013-10-21 09:43:26 UTC (rev 4424)
@@ -99,7 +99,9 @@
 
         // info.magnolia.cms.security.SecurityTest.setUp()
         final SecuritySupportImpl sec = new SecuritySupportImpl();
-        sec.addUserManager(Realm.REALM_SYSTEM.getName(), new SystemUserManager());
+        SystemUserManager systemUserManager = new SystemUserManager();
+        systemUserManager.setRealmName(Realm.REALM_SYSTEM.getName());
+        sec.addUserManager(Realm.REALM_SYSTEM.getName(), systemUserManager);
         sec.setRoleManager(new MgnlRoleManager());
         ComponentsTestUtil.setInstance(SecuritySupport.class, sec);
     }

Modified: magnoliamodules/trunk/openutils-mgnlcriteria/src/test/java/net/sourceforge/openutils/mgnlcriteria/jcr/query/EscapeSignTest.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlcriteria/src/test/java/net/sourceforge/openutils/mgnlcriteria/jcr/query/EscapeSignTest.java	2013-10-21 09:41:48 UTC (rev 4423)
+++ magnoliamodules/trunk/openutils-mgnlcriteria/src/test/java/net/sourceforge/openutils/mgnlcriteria/jcr/query/EscapeSignTest.java	2013-10-21 09:43:26 UTC (rev 4424)
@@ -76,7 +76,9 @@
 
         // info.magnolia.cms.security.SecurityTest.setUp()
         final SecuritySupportImpl sec = new SecuritySupportImpl();
-        sec.addUserManager(Realm.REALM_SYSTEM.getName(), new SystemUserManager());
+        SystemUserManager systemUserManager = new SystemUserManager();
+        systemUserManager.setRealmName(Realm.REALM_SYSTEM.getName());
+        sec.addUserManager(Realm.REALM_SYSTEM.getName(), systemUserManager);
         sec.setRoleManager(new MgnlRoleManager());
         ComponentsTestUtil.setInstance(SecuritySupport.class, sec);
     }

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-10-21 09:41:48 UTC (rev 4423)
+++ magnoliamodules/trunk/openutils-mgnlcriteria/src/test/java/net/sourceforge/openutils/mgnlcriteria/jcr/query/lucene/AclSearchIndexTest.java	2013-10-21 09:43:26 UTC (rev 4424)
@@ -103,7 +103,9 @@
 
         // info.magnolia.cms.security.SecurityTest.setUp()
         final SecuritySupportImpl sec = new SecuritySupportImpl();
-        sec.addUserManager(Realm.REALM_SYSTEM.getName(), new SystemUserManager());
+        SystemUserManager systemUserManager = new SystemUserManager();
+        systemUserManager.setRealmName(Realm.REALM_SYSTEM.getName());
+        sec.addUserManager(Realm.REALM_SYSTEM.getName(), systemUserManager);
         sec.setRoleManager(new MgnlRoleManager());
         ComponentsTestUtil.setInstance(SecuritySupport.class, sec);
     }

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

[Openutils-svn] SF.net SVN: openutils:[4423] magnoliamodules/trunk/openutils-mgnlmedia/src/ main/java/net/sourceforge/openutils/mgnlmedia/media/types/impl/ BaseTypeHandler.java

From: <luc...@us...> - 2013-10-21 09:41:53

Revision: 4423
          http://openutils.svn.sourceforge.net/openutils/?rev=4423&view=rev
Author:   lucaboati
Date:     2013-10-21 09:41:48 +0000 (Mon, 21 Oct 2013)
Log Message:
-----------
fix deprecation

Modified Paths:
--------------
    magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/types/impl/BaseTypeHandler.java

Modified: magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/types/impl/BaseTypeHandler.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/types/impl/BaseTypeHandler.java	2013-10-21 09:33:43 UTC (rev 4422)
+++ magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/types/impl/BaseTypeHandler.java	2013-10-21 09:41:48 UTC (rev 4423)
@@ -144,7 +144,7 @@
         throws AccessDeniedException, RepositoryException
     {
         Document doc = new Document(f, type + extension);
-        doc.setExtention(extension);
+        doc.setExtension(extension);
         SaveHandlerImpl.saveDocument(
             info.magnolia.cms.util.ContentUtil.asContent(media),
             doc,

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

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

From: <fg...@us...> - 2013-10-21 09:33:47

Revision: 4422
          http://openutils.svn.sourceforge.net/openutils/?rev=4422&view=rev
Author:   fgiust
Date:     2013-10-21 09:33:43 +0000 (Mon, 21 Oct 2013)
Log Message:
-----------
fix nodetypes in tests

Modified Paths:
--------------
    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/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/XpathEscapeTest.java
    magnoliamodules/trunk/openutils-mgnlcriteria/src/test/resources/log4j.xml

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-10-21 09:32:12 UTC (rev 4421)
+++ magnoliamodules/trunk/openutils-mgnlcriteria/src/test/java/net/sourceforge/openutils/mgnlcriteria/advanced/Content2BeanTest.java	2013-10-21 09:33:43 UTC (rev 4422)
@@ -104,11 +104,11 @@
         Assert.assertEquals(CriteriaTestUtils.title(item), "lorem ipsum");
         Assert.assertEquals(CriteriaTestUtils.path(item), "/contains/lorem-ipsum");
 
-        // this is also a Map!
-        Assert.assertEquals(((Map<String, Object>) item).get("title"), "lorem ipsum");
-        Assert.assertEquals(((Map<String, Object>) item).get("text"), "ohoh");
-        Assert.assertEquals(((Map<String, Object>) item).get("number").toString(), "5");
-        Assert.assertEquals(((Map<String, Object>) item).get("handle"), "/contains/lorem-ipsum");
+        // not a Map anymore, now that we implement Node and not ContentMap!
+        // Assert.assertEquals(((Map<String, Object>) item).get("title"), "lorem ipsum");
+        // Assert.assertEquals(((Map<String, Object>) item).get("text"), "ohoh");
+        // Assert.assertEquals(((Map<String, Object>) item).get("number").toString(), "5");
+        // Assert.assertEquals(((Map<String, Object>) item).get("handle"), "/contains/lorem-ipsum");
 
         ResultIterator<Page> itemsTransformed = advResult.getItems(Page.class);
         Assert.assertNotNull(itemsTransformed);

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-10-21 09:32:12 UTC (rev 4421)
+++ magnoliamodules/trunk/openutils-mgnlcriteria/src/test/java/net/sourceforge/openutils/mgnlcriteria/advanced/JcrContainsCriteriaSearchTest.java	2013-10-21 09:33:43 UTC (rev 4422)
@@ -166,7 +166,7 @@
         Criteria criteria = criteria(textEnteredByUser, true);
         Assert.assertEquals(
             StringUtils.remove(criteria.toXpathExpression(), ' '),
-            "//*[((@jcr:primaryType='mgnl:content')and(jcr:contains(@title,'test\\?')))]orderby@jcr:scoredescending");
+            "//*[((@jcr:primaryType='mgnl:page')and(jcr:contains(@title,'test\\?')))]orderby@jcr:scoredescending");
         AdvancedResult advResult = null;
         try
         {
@@ -190,7 +190,7 @@
         Criteria criteria = criteria(textEnteredByUser, true);
         Assert.assertEquals(
             StringUtils.remove(criteria.toXpathExpression(), ' '),
-            "//*[((@jcr:primaryType='mgnl:content')and(jcr:contains(@title,'te\\?st')))]orderby@jcr:scoredescending");
+            "//*[((@jcr:primaryType='mgnl:page')and(jcr:contains(@title,'te\\?st')))]orderby@jcr:scoredescending");
         AdvancedResult advResult = null;
         try
         {
@@ -215,7 +215,7 @@
         Assert
             .assertEquals(
                 StringUtils.remove(criteria.toXpathExpression(), ' '),
-                "//*[((@jcr:primaryType='mgnl:content')and(jcr:contains(@title,'\\\"Milano\\\"')))]orderby@jcr:scoredescending");
+                "//*[((@jcr:primaryType='mgnl:page')and(jcr:contains(@title,'\\\"Milano\\\"')))]orderby@jcr:scoredescending");
         AdvancedResult advResult = null;
         try
         {
@@ -239,7 +239,7 @@
         Criteria criteria = criteria(textEnteredByUser, true);
         Assert.assertEquals(
             StringUtils.remove(criteria.toXpathExpression(), ' '),
-            "//*[((@jcr:primaryType='mgnl:content')and(jcr:contains(@title,'l\\:u')))]orderby@jcr:scoredescending");
+            "//*[((@jcr:primaryType='mgnl:page')and(jcr:contains(@title,'l\\:u')))]orderby@jcr:scoredescending");
         AdvancedResult advResult = null;
         try
         {

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-10-21 09:32:12 UTC (rev 4421)
+++ magnoliamodules/trunk/openutils-mgnlcriteria/src/test/java/net/sourceforge/openutils/mgnlcriteria/advanced/JcrContainsQuestionMarkTest.java	2013-10-21 09:33:43 UTC (rev 4422)
@@ -98,7 +98,7 @@
         AdvancedResultImpl advResult = null;
         try
         {
-            String stmt = "//*[((@jcr:primaryType='mgnl:content') and (jcr:contains(@title,'test?')))] order by @jcr:score";
+            String stmt = "//*[((@jcr:primaryType='mgnl:page') and (jcr:contains(@title,'test?')))] order by @jcr:score";
             advResult = QueryExecutorHelper.execute(stmt, Query.XPATH, hm, 10, 0, null, false);
         }
         catch (JCRQueryException e)
@@ -120,7 +120,7 @@
     {
         Session hm = MgnlContext.getJCRSession(RepositoryConstants.WEBSITE);
 
-        String stmt = "//*[((@jcr:primaryType='mgnl:content') and (jcr:contains(@title,'test\\?')))] order by @jcr:score";
+        String stmt = "//*[((@jcr:primaryType='mgnl:page') and (jcr:contains(@title,'test\\?')))] order by @jcr:score";
         AdvancedResultImpl advResult = QueryExecutorHelper.execute(stmt, Query.XPATH, hm, -1, 0, null, false);
 
         Assert.assertEquals(advResult.getTotalSize(), 1);
@@ -135,11 +135,11 @@
         String stmt;
         AdvancedResultImpl advResult;
 
-        stmt = "//*[((@jcr:primaryType='mgnl:content') and (jcr:contains(@title,'te?st')))] order by @jcr:score";
+        stmt = "//*[((@jcr:primaryType='mgnl:page') 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(), 0);
 
-        stmt = "//*[((@jcr:primaryType='mgnl:content') and (jcr:contains(@title,'te\\?st')))] order by @jcr:score";
+        stmt = "//*[((@jcr:primaryType='mgnl:page') 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(CriteriaTestUtils.title(advResult.getItems().next()), "hello te?st world");

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-10-21 09:32:12 UTC (rev 4421)
+++ magnoliamodules/trunk/openutils-mgnlcriteria/src/test/java/net/sourceforge/openutils/mgnlcriteria/advanced/XpathEscapeTest.java	2013-10-21 09:33:43 UTC (rev 4422)
@@ -262,7 +262,7 @@
 
         Assert.assertEquals(
             criteria.toXpathExpression(),
-            "//*[( (@jcr:primaryType='mgnl:content')  and  ( jcr:contains(@title, '\\(ai\\)\\(n\\)\\(uk\\)') )  )] ");
+            "//*[( (@jcr:primaryType='mgnl:page')  and  ( jcr:contains(@title, '\\(ai\\)\\(n\\)\\(uk\\)') )  )] ");
 
         try
         {
@@ -323,7 +323,7 @@
 
         Assert.assertEquals(
             criteria.toXpathExpression(),
-            "//*[( (@jcr:primaryType='mgnl:content')  and  ( jcr:contains(@title, '\\:') )  )] ");
+            "//*[( (@jcr:primaryType='mgnl:page')  and  ( jcr:contains(@title, '\\:') )  )] ");
 
         AdvancedResult advResult = criteria.execute();
         Collection<Node> result = CriteriaTestUtils.collectCollectionFromResult(advResult);
@@ -379,7 +379,7 @@
 
         Assert.assertEquals(
             criteria.toXpathExpression(),
-            "//*[( (@jcr:primaryType='mgnl:content')  and  ( jcr:contains(@title, '\"OR\" SONO') )  )] ");
+            "//*[( (@jcr:primaryType='mgnl:page')  and  ( jcr:contains(@title, '\"OR\" SONO') )  )] ");
 
         AdvancedResult advResult = criteria.execute();
         CriteriaTestUtils.assertNumOfResults(1, CriteriaTestUtils.collectCollectionFromResult(advResult), searchText);
@@ -397,7 +397,7 @@
 
         Assert.assertEquals(
             criteria.toXpathExpression(),
-            "//*[( (@jcr:primaryType='mgnl:content')  and  (@title='OR SONO')  )] ");
+            "//*[( (@jcr:primaryType='mgnl:page')  and  (@title='OR SONO')  )] ");
 
         AdvancedResult advResult = criteria.execute();
         CriteriaTestUtils.assertNumOfResults(1, CriteriaTestUtils.collectCollectionFromResult(advResult), searchText);
@@ -415,7 +415,7 @@
 
         Assert.assertEquals(
             criteria.toXpathExpression(),
-            "//*[( (@jcr:primaryType='mgnl:content')  and  ( jcr:contains(@title, 'AND ME') )  )] ");
+            "//*[( (@jcr:primaryType='mgnl:page')  and  ( jcr:contains(@title, 'AND ME') )  )] ");
 
         AdvancedResult advResult = criteria.execute();
         CriteriaTestUtils.assertNumOfResults(0, CriteriaTestUtils.collectCollectionFromResult(advResult), searchText);

Modified: magnoliamodules/trunk/openutils-mgnlcriteria/src/test/resources/log4j.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnlcriteria/src/test/resources/log4j.xml	2013-10-21 09:32:12 UTC (rev 4421)
+++ magnoliamodules/trunk/openutils-mgnlcriteria/src/test/resources/log4j.xml	2013-10-21 09:33:43 UTC (rev 4422)
@@ -34,6 +34,12 @@
   <category name="info.magnolia.objectfactory.ObservedComponentFactory">
     <priority value="WARN" />
   </category>
+  <category name="info.magnolia.cms.security.PermissionUtil">
+    <priority value="ERROR" />
+  </category>
+  <!-- <category name="org.apache.jackrabbit.core.session.SessionState">
+    <priority value="ERROR" />
+  </category> -->
   <root>
     <priority value="ALL" />
     <appender-ref ref="test-appender" />

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

[Openutils-svn] SF.net SVN: openutils:[4421] magnoliamodules/trunk/openutils-mgnltests/src/ main/java/it/openutils/mgnlutils/test/AbstractRepositoryTestcase.java

From: <fg...@us...> - 2013-10-21 09:32:16

Revision: 4421
          http://openutils.svn.sourceforge.net/openutils/?rev=4421&view=rev
Author:   fgiust
Date:     2013-10-21 09:32:12 +0000 (Mon, 21 Oct 2013)
Log Message:
-----------
cleanup sessions in order to avoid annoying logs

Modified Paths:
--------------
    magnoliamodules/trunk/openutils-mgnltests/src/main/java/it/openutils/mgnlutils/test/AbstractRepositoryTestcase.java

Modified: magnoliamodules/trunk/openutils-mgnltests/src/main/java/it/openutils/mgnlutils/test/AbstractRepositoryTestcase.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnltests/src/main/java/it/openutils/mgnlutils/test/AbstractRepositoryTestcase.java	2013-10-21 08:10:04 UTC (rev 4420)
+++ magnoliamodules/trunk/openutils-mgnltests/src/main/java/it/openutils/mgnlutils/test/AbstractRepositoryTestcase.java	2013-10-21 09:32:12 UTC (rev 4421)
@@ -46,6 +46,7 @@
 import info.magnolia.init.properties.InitPathsPropertySource;
 import info.magnolia.init.properties.ModulePropertiesSource;
 import info.magnolia.jcr.wrapper.DelegateSessionWrapper;
+import info.magnolia.jcr.wrapper.DelegateWorkspaceWrapper;
 import info.magnolia.module.ModuleLifecycle;
 import info.magnolia.module.ModuleManagementException;
 import info.magnolia.module.ModuleManager;
@@ -80,6 +81,7 @@
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Collections;
+import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
 
@@ -88,6 +90,7 @@
 import javax.jcr.Repository;
 import javax.jcr.RepositoryException;
 import javax.jcr.Session;
+import javax.jcr.Workspace;
 import javax.jcr.observation.EventListenerIterator;
 import javax.jcr.observation.ObservationManager;
 
@@ -96,6 +99,7 @@
 import org.apache.commons.lang.StringUtils;
 import org.apache.jackrabbit.core.RepositoryImpl;
 import org.apache.jackrabbit.core.SessionImpl;
+import org.apache.jackrabbit.core.WorkspaceImpl;
 import org.apache.jackrabbit.core.jndi.BindableRepository;
 import org.apache.log4j.Level;
 import org.slf4j.Logger;
@@ -226,9 +230,10 @@
 
             Collection<String> workspaceNames = repositoryManager.getWorkspaceNames();
 
-            for (String workspace : workspaceNames)
+            // manually cleanup active sessions to avoid duplicate closures()
+            for (String workspaceName : workspaceNames)
             {
-                Session session = systemContext.getJCRSession(workspace);
+                Session session = systemContext.getJCRSession(workspaceName);
 
                 final ObservationManager observationManager = session.getWorkspace().getObservationManager();
                 final EventListenerIterator listeners = observationManager.getRegisteredEventListeners();
@@ -237,21 +242,29 @@
                     observationManager.removeEventListener(listeners.nextEventListener());
                 }
 
-                // BindableRepository br = ((BindableRepository) repositoryManager.getRepository(repositoryManager
-                // .getWorkspaceMapping(workspace)
-                // .getRepositoryName()));
-                //
-                // final Field repoField = BindableRepository.class.getDeclaredField("repository");
-                // repoField.setAccessible(true);
-                // Repository repository = (Repository) repoField.get(br);
-                //
-                // while (session instanceof DelegateSessionWrapper)
-                // {
-                // session = ((DelegateSessionWrapper) session).getWrappedSession();
-                // }
-                //
-                // ((RepositoryImpl) repository).loggedOut((SessionImpl) session);
+                BindableRepository br = ((BindableRepository) repositoryManager.getRepository(repositoryManager
+                    .getWorkspaceMapping(workspaceName)
+                    .getRepositoryName()));
 
+                final Field repoField = BindableRepository.class.getDeclaredField("repository");
+                repoField.setAccessible(true);
+                Repository repository = (Repository) repoField.get(br);
+
+                while (session instanceof DelegateSessionWrapper)
+                {
+                    session = ((DelegateSessionWrapper) session).getWrappedSession();
+                }
+
+                final Field asclass = RepositoryImpl.class.getDeclaredField("activeSessions");
+                asclass.setAccessible(true);
+                Map<Session, Session> activesessions = (Map<Session, Session>) asclass.get(repository);
+
+                for (Session as : new HashSet<Session>(activesessions.keySet()))
+                {
+                    ((RepositoryImpl) repository).loggedOut((SessionImpl) as);
+                    // as.logout();
+                }
+
             }
 
             systemContext.release();

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

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

From: <fg...@us...> - 2013-10-21 08:10:08

Revision: 4420
          http://openutils.svn.sourceforge.net/openutils/?rev=4420&view=rev
Author:   fgiust
Date:     2013-10-21 08:10:04 +0000 (Mon, 21 Oct 2013)
Log Message:
-----------
make security work in unit test. Mostly

Modified Paths:
--------------
    magnoliamodules/trunk/openutils-mgnlcriteria/pom.xml
    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/jcr/query/lucene/AclSearchIndexTest.java
    magnoliamodules/trunk/openutils-mgnlcriteria/src/test/resources/crit-bootstrap/users.system.anonymous.xml
    magnoliamodules/trunk/openutils-mgnlcriteria/src/test/resources/crit-repository/jackrabbit-acl-search-index-test-configuration.xml
    magnoliamodules/trunk/openutils-mgnlcriteria/src/test/resources/crit-repository/jackrabbit-test-configuration.xml
    magnoliamodules/trunk/openutils-mgnltests/src/main/java/it/openutils/mgnlutils/test/AbstractRepositoryTestcase.java
    magnoliamodules/trunk/openutils-mgnltests/src/test/java/it/openutils/mgnlutils/test/testng/TestNgRepositoryTestcaseTest.java

Added Paths:
-----------
    magnoliamodules/trunk/openutils-mgnltests/src/test/resources/log4j.dtd
    magnoliamodules/trunk/openutils-mgnltests/src/test/resources/log4j.xml
    magnoliamodules/trunk/openutils-mgnltests/src/test/resources/utils-bootstrap/userroles.anonymous.xml
    magnoliamodules/trunk/openutils-mgnltests/src/test/resources/utils-bootstrap/users.system.anonymous.xml

Modified: magnoliamodules/trunk/openutils-mgnlcriteria/pom.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnlcriteria/pom.xml	2013-10-20 19:21:59 UTC (rev 4419)
+++ magnoliamodules/trunk/openutils-mgnlcriteria/pom.xml	2013-10-21 08:10:04 UTC (rev 4420)
@@ -178,7 +178,7 @@
   </dependencies>
   <properties>
     <magnolia.version>4.5.11</magnolia.version>
-    <jackrabbit.version>2.6.4</jackrabbit.version>
+    <jackrabbit.version>2.4.4</jackrabbit.version>
     <jcr.version>2.0</jcr.version>
   </properties>
   <!-- test running maven with -Djcr.version=2.0 -Djackrabbit.version=2.0.0 -Djcr.version=2.0 -Djackrabbit.version=2.1.0 -->

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-10-20 19:21:59 UTC (rev 4419)
+++ magnoliamodules/trunk/openutils-mgnlcriteria/src/test/java/net/sourceforge/openutils/mgnlcriteria/advanced/FirstDigitEscapeTest.java	2013-10-21 08:10:04 UTC (rev 4420)
@@ -19,6 +19,7 @@
 
 package net.sourceforge.openutils.mgnlcriteria.advanced;
 
+import info.magnolia.cms.core.MgnlNodeType;
 import info.magnolia.cms.security.MgnlRoleManager;
 import info.magnolia.cms.security.Realm;
 import info.magnolia.cms.security.SecuritySupport;
@@ -82,7 +83,7 @@
     {
         Criteria criteria = JCRCriteriaFactory.createCriteria().setWorkspace(RepositoryConstants.WEBSITE);
         criteria.setBasePath("//myproject/Sport/F1/0a67369b-8cc6-43d8-b2d3-c07b12a2ed5f/versions/*");
-        criteria.add(Restrictions.eq("@jcr:primaryType", "mgnl:contentNode"));
+        criteria.add(Restrictions.eq("@jcr:primaryType", MgnlNodeType.NT_COMPONENT));
         criteria.addOrder(Order.desc("@jcr:created"));
 
         AdvancedResult advResult = criteria.execute();
@@ -97,7 +98,7 @@
     {
         Criteria criteria = JCRCriteriaFactory.createCriteria().setWorkspace(RepositoryConstants.WEBSITE);
         criteria.setBasePath("//myproject/Sport/F1/-0a67369b-8cc6-43d8-b2d3-c07b12a2ed5f/versions/*");
-        criteria.add(Restrictions.eq("@jcr:primaryType", "mgnl:contentNode"));
+        criteria.add(Restrictions.eq("@jcr:primaryType", MgnlNodeType.NT_COMPONENT));
         criteria.addOrder(Order.desc("@jcr:created"));
 
         AdvancedResult advResult = criteria.execute();
@@ -111,7 +112,7 @@
     {
         Criteria criteria = JCRCriteriaFactory.createCriteria().setWorkspace(RepositoryConstants.WEBSITE);
         criteria.setBasePath("/myproject/Sport/F1/0a67369b-8cc6-43d8-b2d3-(c07b12a2ed5f)");
-        criteria.add(Restrictions.eq("@jcr:primaryType", "mgnl:contentNode"));
+        criteria.add(Restrictions.eq("@jcr:primaryType", MgnlNodeType.NT_COMPONENT));
         criteria.addOrder(Order.desc("@jcr:created"));
 
         AdvancedResult advResult = criteria.execute();

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-10-20 19:21:59 UTC (rev 4419)
+++ magnoliamodules/trunk/openutils-mgnlcriteria/src/test/java/net/sourceforge/openutils/mgnlcriteria/jcr/query/lucene/AclSearchIndexTest.java	2013-10-21 08:10:04 UTC (rev 4420)
@@ -26,6 +26,7 @@
 import info.magnolia.cms.security.SecuritySupport;
 import info.magnolia.cms.security.SecuritySupportImpl;
 import info.magnolia.cms.security.SystemUserManager;
+import info.magnolia.context.Context;
 import info.magnolia.context.ContextDecorator;
 import info.magnolia.context.MgnlContext;
 import info.magnolia.repository.RepositoryConstants;
@@ -114,7 +115,8 @@
     @Test
     public void testDogsOnly() throws Exception
     {
-        final AccessManager wrappedAM = MgnlContext.getAccessManager(RepositoryConstants.WEBSITE);
+        Context ctx = MgnlContext.getInstance();
+        final AccessManager wrappedAM = ctx.getAccessManager(RepositoryConstants.WEBSITE);
 
         Assert.assertNotNull(wrappedAM, "AccessManager is null");
 

Modified: magnoliamodules/trunk/openutils-mgnlcriteria/src/test/resources/crit-bootstrap/users.system.anonymous.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnlcriteria/src/test/resources/crit-bootstrap/users.system.anonymous.xml	2013-10-20 19:21:59 UTC (rev 4419)
+++ magnoliamodules/trunk/openutils-mgnlcriteria/src/test/resources/crit-bootstrap/users.system.anonymous.xml	2013-10-21 08:10:04 UTC (rev 4420)
@@ -79,15 +79,6 @@
     <sv:property sv:name="0" sv:type="String">
       <sv:value>d98728c7-b80f-444d-bfda-b54b28dc240c</sv:value>
     </sv:property>
-    <sv:property sv:name="00" sv:type="String">
-      <sv:value>a106b4cf-d205-418c-acf3-27263612f5a4</sv:value>
-    </sv:property>
-    <sv:property sv:name="01" sv:type="String">
-      <sv:value>0e008dcd-3412-47fe-ab91-a1a1b3c38baa</sv:value>
-    </sv:property>
-    <sv:property sv:name="02" sv:type="String">
-      <sv:value>cf760801-f21e-4548-af47-e21cf9c4317a</sv:value>
-    </sv:property>
     <sv:property sv:name="jcr:createdBy" sv:type="String">
       <sv:value>admin</sv:value>
     </sv:property>

Modified: magnoliamodules/trunk/openutils-mgnlcriteria/src/test/resources/crit-repository/jackrabbit-acl-search-index-test-configuration.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnlcriteria/src/test/resources/crit-repository/jackrabbit-acl-search-index-test-configuration.xml	2013-10-20 19:21:59 UTC (rev 4419)
+++ magnoliamodules/trunk/openutils-mgnlcriteria/src/test/resources/crit-repository/jackrabbit-acl-search-index-test-configuration.xml	2013-10-21 08:10:04 UTC (rev 4420)
@@ -5,10 +5,11 @@
 <Repository>
   <FileSystem class="org.apache.jackrabbit.core.fs.mem.MemoryFileSystem">
   </FileSystem>
-  <Security appName="Jackrabbit">
-    <AccessManager class="org.apache.jackrabbit.core.security.SimpleAccessManager"></AccessManager>
-    <LoginModule class="org.apache.jackrabbit.core.security.SimpleLoginModule">
-      <param name="anonymousId" value="anonymous" />
+  <Security appName="magnolia">
+    <SecurityManager class="org.apache.jackrabbit.core.DefaultSecurityManager" />
+    <AccessManager class="org.apache.jackrabbit.core.security.DefaultAccessManager">
+    </AccessManager>
+    <LoginModule class="info.magnolia.jaas.sp.jcr.JackrabbitAuthenticationModule">
     </LoginModule>
   </Security>
   <Workspaces rootPath="${rep.home}" defaultWorkspace="defaultworkspace" />
@@ -35,6 +36,9 @@
       </FileSystem>
     </SearchIndex>
     <ISMLocking class="org.apache.jackrabbit.core.state.FineGrainedISMLocking" />
+    <WorkspaceSecurity>
+      <AccessControlProvider class="info.magnolia.cms.core.MagnoliaAccessProvider" />
+    </WorkspaceSecurity>
   </Workspace>
   <Versioning rootPath="${rep.home}/version">
     <FileSystem class="org.apache.jackrabbit.core.fs.mem.MemoryFileSystem">

Modified: magnoliamodules/trunk/openutils-mgnlcriteria/src/test/resources/crit-repository/jackrabbit-test-configuration.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnlcriteria/src/test/resources/crit-repository/jackrabbit-test-configuration.xml	2013-10-20 19:21:59 UTC (rev 4419)
+++ magnoliamodules/trunk/openutils-mgnlcriteria/src/test/resources/crit-repository/jackrabbit-test-configuration.xml	2013-10-21 08:10:04 UTC (rev 4420)
@@ -5,10 +5,11 @@
 <Repository>
   <FileSystem class="org.apache.jackrabbit.core.fs.mem.MemoryFileSystem">
   </FileSystem>
-  <Security appName="Jackrabbit">
-    <AccessManager class="org.apache.jackrabbit.core.security.SimpleAccessManager"></AccessManager>
-    <LoginModule class="org.apache.jackrabbit.core.security.SimpleLoginModule">
-      <param name="anonymousId" value="anonymous" />
+  <Security appName="magnolia">
+    <SecurityManager class="org.apache.jackrabbit.core.DefaultSecurityManager" />
+    <AccessManager class="org.apache.jackrabbit.core.security.DefaultAccessManager">
+    </AccessManager>
+    <LoginModule class="info.magnolia.jaas.sp.jcr.JackrabbitAuthenticationModule">
     </LoginModule>
   </Security>
   <Workspaces rootPath="${rep.home}" defaultWorkspace="defaultworkspace" />
@@ -35,6 +36,9 @@
       </FileSystem>
     </SearchIndex>
     <ISMLocking class="org.apache.jackrabbit.core.state.FineGrainedISMLocking" />
+    <WorkspaceSecurity>
+      <AccessControlProvider class="info.magnolia.cms.core.MagnoliaAccessProvider" />
+    </WorkspaceSecurity>
   </Workspace>
   <Versioning rootPath="${rep.home}/version">
     <FileSystem class="org.apache.jackrabbit.core.fs.mem.MemoryFileSystem">

Modified: magnoliamodules/trunk/openutils-mgnltests/src/main/java/it/openutils/mgnlutils/test/AbstractRepositoryTestcase.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnltests/src/main/java/it/openutils/mgnlutils/test/AbstractRepositoryTestcase.java	2013-10-20 19:21:59 UTC (rev 4419)
+++ magnoliamodules/trunk/openutils-mgnltests/src/main/java/it/openutils/mgnlutils/test/AbstractRepositoryTestcase.java	2013-10-21 08:10:04 UTC (rev 4420)
@@ -21,6 +21,14 @@
 
 import info.magnolia.cms.core.Path;
 import info.magnolia.cms.core.SystemProperty;
+import info.magnolia.cms.security.AccessManager;
+import info.magnolia.cms.security.MgnlGroupManager;
+import info.magnolia.cms.security.MgnlRoleManager;
+import info.magnolia.cms.security.PermissionUtil;
+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.cms.util.ClasspathResourcesUtil;
 import info.magnolia.cms.util.ContentUtil;
 import info.magnolia.content2bean.Content2BeanException;
@@ -37,6 +45,7 @@
 import info.magnolia.init.properties.ClasspathPropertySource;
 import info.magnolia.init.properties.InitPathsPropertySource;
 import info.magnolia.init.properties.ModulePropertiesSource;
+import info.magnolia.jcr.wrapper.DelegateSessionWrapper;
 import info.magnolia.module.ModuleLifecycle;
 import info.magnolia.module.ModuleManagementException;
 import info.magnolia.module.ModuleManager;
@@ -55,14 +64,13 @@
 import info.magnolia.objectfactory.configuration.InstanceConfiguration;
 import info.magnolia.objectfactory.configuration.ProviderConfiguration;
 import info.magnolia.repository.DefaultRepositoryManager;
-import info.magnolia.repository.RepositoryConstants;
 import info.magnolia.repository.RepositoryManager;
 import info.magnolia.test.ComponentsTestUtil;
 import info.magnolia.test.FixedModuleDefinitionReader;
 import info.magnolia.test.TestMagnoliaConfigurationProperties;
 import info.magnolia.test.TestMagnoliaInitPaths;
 import info.magnolia.test.mock.MockContext;
-import info.magnolia.test.mock.MockUtil;
+import info.magnolia.test.mock.MockWebContext;
 
 import java.io.File;
 import java.io.FileOutputStream;
@@ -77,14 +85,18 @@
 
 import javax.jcr.ImportUUIDBehavior;
 import javax.jcr.Node;
+import javax.jcr.Repository;
 import javax.jcr.RepositoryException;
+import javax.jcr.Session;
 import javax.jcr.observation.EventListenerIterator;
 import javax.jcr.observation.ObservationManager;
 
 import org.apache.commons.io.FileUtils;
 import org.apache.commons.io.IOUtils;
 import org.apache.commons.lang.StringUtils;
-import org.apache.jackrabbit.core.jndi.BindableRepositoryFactory;
+import org.apache.jackrabbit.core.RepositoryImpl;
+import org.apache.jackrabbit.core.SessionImpl;
+import org.apache.jackrabbit.core.jndi.BindableRepository;
 import org.apache.log4j.Level;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -132,9 +144,21 @@
 
         initDefaultImplementations();
         SystemProperty.getProperties().load(this.getClass().getResourceAsStream(magnoliaProperties));
-        MockUtil.initMockContext();
-        workaroundJCR1778();
 
+        // MockUtil.initMockContext();
+
+        final MockContext ctx = new MockWebContext()
+        {
+
+            @Override
+            public AccessManager getAccessManager(String workspace)
+            {
+                return PermissionUtil.getAccessManager(workspace, getSubject());
+            }
+        };
+        MgnlContext.setInstance(ctx);
+        ComponentsTestUtil.setImplementation(SystemContext.class, MockContext.class);
+
         if (autoStart)
         {
             cleanUp();
@@ -159,6 +183,14 @@
 
         }
 
+        final SecuritySupportImpl sec = new SecuritySupportImpl();
+        sec.setGroupManager(new MgnlGroupManager());
+        sec.setRoleManager(new MgnlRoleManager());
+        SystemUserManager systemUserManager = new SystemUserManager();
+        systemUserManager.setRealmName(Realm.REALM_SYSTEM.getName());
+        sec.addUserManager(Realm.REALM_SYSTEM.getName(), systemUserManager);
+        ComponentsTestUtil.setInstance(SecuritySupport.class, sec);
+
     }
 
     /**
@@ -189,26 +221,39 @@
             MgnlContext.release();
 
             SystemContext systemContext = Components.getComponent(SystemContext.class);
-            
+
             RepositoryManager repositoryManager = Components.getComponent(RepositoryManager.class);
-            
+
             Collection<String> workspaceNames = repositoryManager.getWorkspaceNames();
-            
+
             for (String workspace : workspaceNames)
             {
-                final ObservationManager observationManager = systemContext
-                    .getJCRSession(workspace)
-                    .getWorkspace()
-                    .getObservationManager();
+                Session session = systemContext.getJCRSession(workspace);
+
+                final ObservationManager observationManager = session.getWorkspace().getObservationManager();
                 final EventListenerIterator listeners = observationManager.getRegisteredEventListeners();
                 while (listeners.hasNext())
                 {
                     observationManager.removeEventListener(listeners.nextEventListener());
                 }
+
+                // BindableRepository br = ((BindableRepository) repositoryManager.getRepository(repositoryManager
+                // .getWorkspaceMapping(workspace)
+                // .getRepositoryName()));
+                //
+                // final Field repoField = BindableRepository.class.getDeclaredField("repository");
+                // repoField.setAccessible(true);
+                // Repository repository = (Repository) repoField.get(br);
+                //
+                // while (session instanceof DelegateSessionWrapper)
+                // {
+                // session = ((DelegateSessionWrapper) session).getWrappedSession();
+                // }
+                //
+                // ((RepositoryImpl) repository).loggedOut((SessionImpl) session);
+
             }
 
-           
-
             systemContext.release();
 
             repositoryManager.shutdown();
@@ -254,8 +299,7 @@
         configuration.combine(configurationBuilder.getComponentsFromModules("main", mr.getModuleDefinitions()));
 
         // Content2BeanProcessorImpl uses dependency injection and since we don't have that with MockComponentProvider
-        // we
-        // need to manually create this object and replace the component configuration read from core.xml
+        // we need to manually create this object and replace the component configuration read from core.xml
         final TypeMappingImpl typeMapping = new TypeMappingImpl();
         configuration.registerInstance(TypeMapping.class, typeMapping);
         configuration.registerInstance(Content2BeanProcessor.class, new Content2BeanProcessorImpl(typeMapping));
@@ -306,45 +350,15 @@
         return Collections.singletonList(core);
     }
 
-    /**
-     * Workaround for JCR-1778.
-     */
-    @SuppressWarnings("unchecked")
-    static void workaroundJCR1778()
-    {
-        try
-        {
-            Field cacheField = BindableRepositoryFactory.class.getDeclaredField("cache");
-            cacheField.setAccessible(true);
-            final Map<String, String> cache = (Map<String, String>) cacheField.get(null);
-            cache.clear();
-        }
-        catch (SecurityException e)
-        {
-            // ignore
-        }
-        catch (NoSuchFieldException e)
-        {
-            // ignore
-        }
-        catch (IllegalArgumentException e)
-        {
-            // ignore
-        }
-        catch (IllegalAccessException e)
-        {
-            // ignore
-        }
-    }
-
     protected void modifyContextesToUseRealRepository()
     {
-        SystemContext systemContext = Components.getComponent(SystemContext.class);
-        RepositoryManager repositoryManager = Components.getComponent(RepositoryManager.class);
-        SystemRepositoryStrategy repositoryStrategy = new SystemRepositoryStrategy(repositoryManager);
+        // create a mock web context with same repository acquiring strategy as the system context
+        MockContext systemContext = (MockContext) MgnlContext.getSystemContext();
+        SystemRepositoryStrategy repositoryStrategy = Components.newInstance(SystemRepositoryStrategy.class);
 
-        ((MockContext) systemContext).setRepositoryStrategy(repositoryStrategy);
-        ((MockContext) MgnlContext.getInstance()).setRepositoryStrategy(repositoryStrategy);
+        systemContext.setRepositoryStrategy(repositoryStrategy);
+        MockContext ctx = (MockContext) MgnlContext.getInstance();
+        ctx.setRepositoryStrategy(repositoryStrategy);
     }
 
     protected void startRepository(String repositoryConfigFileName, String jackrabbitRepositoryConfigFileName,

Modified: magnoliamodules/trunk/openutils-mgnltests/src/test/java/it/openutils/mgnlutils/test/testng/TestNgRepositoryTestcaseTest.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnltests/src/test/java/it/openutils/mgnlutils/test/testng/TestNgRepositoryTestcaseTest.java	2013-10-20 19:21:59 UTC (rev 4419)
+++ magnoliamodules/trunk/openutils-mgnltests/src/test/java/it/openutils/mgnlutils/test/testng/TestNgRepositoryTestcaseTest.java	2013-10-21 08:10:04 UTC (rev 4420)
@@ -19,6 +19,7 @@
 
 package it.openutils.mgnlutils.test.testng;
 
+import info.magnolia.cms.security.AccessManager;
 import info.magnolia.context.MgnlContext;
 import info.magnolia.jcr.util.NodeUtil;
 import info.magnolia.module.ModuleRegistry;
@@ -39,6 +40,8 @@
 
 @RepositoryTestConfiguration(repositoryConfig = "/utils-repository/test-repositories.xml", jackrabbitRepositoryConfig = "/utils-repository/jackrabbit-test-configuration.xml", bootstrapFiles = {
     "/utils-bootstrap/website.pets.xml",
+    "/utils-bootstrap/users.system.anonymous.xml",
+    "/utils-bootstrap/userroles.anonymous.xml",
     "/utils-bootstrap/website.letters.xml",
     "/utils-bootstrap/config.modules.testmodule.xml" }, magnoliaProperties = "/test-magnolia.properties", startModules = {@ModuleConfiguration(name = "testmodule", moduleclass = TestModule.class) })
 public class TestNgRepositoryTestcaseTest extends TestNgRepositoryTestcase
@@ -50,6 +53,9 @@
         Session session = MgnlContext.getJCRSession(RepositoryConstants.WEBSITE);
         Assert.assertNotNull(session);
 
+        AccessManager accessManager = MgnlContext.getAccessManager(RepositoryConstants.WEBSITE);
+        Assert.assertNotNull(accessManager);
+
         Node pets = session.getNode("/pets");
         Assert.assertNotNull(pets);
 

Added: magnoliamodules/trunk/openutils-mgnltests/src/test/resources/log4j.dtd
===================================================================
--- magnoliamodules/trunk/openutils-mgnltests/src/test/resources/log4j.dtd	                        (rev 0)
+++ magnoliamodules/trunk/openutils-mgnltests/src/test/resources/log4j.dtd	2013-10-21 08:10:04 UTC (rev 4420)
@@ -0,0 +1,166 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+
+<!-- Authors: Chris Taylor, Ceki Gulcu. -->
+
+<!-- Version: 1.2 -->
+
+<!-- A configuration element consists of optional renderer
+elements,appender elements, categories and an optional root
+element. -->
+
+<!ELEMENT log4j:configuration (renderer*, appender*,(category|logger)*,root?,
+                               categoryFactory?)>
+
+<!-- The "threshold" attribute takes a level value such that all -->
+<!-- logging statements with a level equal or below this value are -->
+<!-- disabled. -->
+
+<!-- Setting the "debug" enable the printing of internal log4j logging   -->
+<!-- statements.                                                         -->
+
+<!-- By default, debug attribute is "null", meaning that we not do touch -->
+<!-- internal log4j logging settings. The "null" value for the threshold -->
+<!-- attribute can be misleading. The threshold field of a repository	 -->
+<!-- cannot be set to null. The "null" value for the threshold attribute -->
+<!-- simply means don't touch the threshold field, the threshold field   --> 
+<!-- keeps its old value.                                                -->
+     
+<!ATTLIST log4j:configuration
+  xmlns:log4j              CDATA #FIXED "http://jakarta.apache.org/log4j/" 
+  threshold                (all|debug|info|warn|error|fatal|off|null) "null"
+  debug                    (true|false|null)  "null"
+>
+
+<!-- renderer elements allow the user to customize the conversion of  -->
+<!-- message objects to String.                                       -->
+
+<!ELEMENT renderer EMPTY>
+<!ATTLIST renderer
+  renderedClass  CDATA #REQUIRED
+  renderingClass CDATA #REQUIRED
+>
+
+<!-- Appenders must have a name and a class. -->
+<!-- Appenders may contain an error handler, a layout, optional parameters -->
+<!-- and filters. They may also reference (or include) other appenders. -->
+<!ELEMENT appender (errorHandler?, param*, layout?, filter*, appender-ref*)>
+<!ATTLIST appender
+  name 		ID 	#REQUIRED
+  class 	CDATA	#REQUIRED
+>
+
+<!ELEMENT layout (param*)>
+<!ATTLIST layout
+  class		CDATA	#REQUIRED
+>
+
+<!ELEMENT filter (param*)>
+<!ATTLIST filter
+  class		CDATA	#REQUIRED
+>
+
+<!-- ErrorHandlers can be of any class. They can admit any number of -->
+<!-- parameters. -->
+
+<!ELEMENT errorHandler (param*, root-ref?, logger-ref*,  appender-ref?)> 
+<!ATTLIST errorHandler
+   class        CDATA   #REQUIRED 
+>
+
+<!ELEMENT root-ref EMPTY>
+
+<!ELEMENT logger-ref EMPTY>
+<!ATTLIST logger-ref
+  ref IDREF #REQUIRED
+>
+
+<!ELEMENT param EMPTY>
+<!ATTLIST param
+  name		CDATA   #REQUIRED
+  value		CDATA	#REQUIRED
+>
+
+
+<!-- The priority class is org.apache.log4j.Level by default -->
+<!ELEMENT priority (param*)>
+<!ATTLIST priority
+  class   CDATA	#IMPLIED
+  value	  CDATA #REQUIRED
+>
+
+<!-- The level class is org.apache.log4j.Level by default -->
+<!ELEMENT level (param*)>
+<!ATTLIST level
+  class   CDATA	#IMPLIED
+  value	  CDATA #REQUIRED
+>
+
+
+<!-- If no level element is specified, then the configurator MUST not -->
+<!-- touch the level of the named category. -->
+<!ELEMENT category (param*,(priority|level)?,appender-ref*)>
+<!ATTLIST category
+  class         CDATA   #IMPLIED
+  name		CDATA	#REQUIRED
+  additivity	(true|false) "true"  
+>
+
+<!-- If no level element is specified, then the configurator MUST not -->
+<!-- touch the level of the named logger. -->
+<!ELEMENT logger (level?,appender-ref*)>
+<!ATTLIST logger
+  name		ID	#REQUIRED
+  additivity	(true|false) "true"  
+>
+
+
+<!ELEMENT categoryFactory (param*)>
+<!ATTLIST categoryFactory 
+   class        CDATA #REQUIRED>
+
+<!ELEMENT appender-ref EMPTY>
+<!ATTLIST appender-ref
+  ref IDREF #REQUIRED
+>
+
+<!-- If no priority element is specified, then the configurator MUST not -->
+<!-- touch the priority of root. -->
+<!-- The root category always exists and cannot be subclassed. -->
+<!ELEMENT root (param*, (priority|level)?, appender-ref*)>
+
+
+<!-- ==================================================================== -->
+<!--                       A logging event                                -->
+<!-- ==================================================================== -->
+<!ELEMENT log4j:eventSet (log4j:event*)>
+<!ATTLIST log4j:eventSet
+  xmlns:log4j             CDATA #FIXED "http://jakarta.apache.org/log4j/" 
+  version                (1.1|1.2) "1.2" 
+  includesLocationInfo   (true|false) "true"
+>
+
+
+
+<!ELEMENT log4j:event (log4j:message, log4j:NDC?, log4j:throwable?, 
+                       log4j:locationInfo?) >
+
+<!-- The timestamp format is application dependent. -->
+<!ATTLIST log4j:event
+    logger     CDATA #REQUIRED
+    level      CDATA #REQUIRED
+    thread     CDATA #REQUIRED
+    timestamp  CDATA #REQUIRED
+>
+
+<!ELEMENT log4j:message (#PCDATA)>
+<!ELEMENT log4j:NDC (#PCDATA)>
+
+<!ELEMENT log4j:throwable (#PCDATA)>
+
+<!ELEMENT log4j:locationInfo EMPTY>
+<!ATTLIST log4j:locationInfo
+  class  CDATA	#REQUIRED
+  method CDATA	#REQUIRED
+  file   CDATA	#REQUIRED
+  line   CDATA	#REQUIRED
+>


Property changes on: magnoliamodules/trunk/openutils-mgnltests/src/test/resources/log4j.dtd
___________________________________________________________________
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-mgnltests/src/test/resources/log4j.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnltests/src/test/resources/log4j.xml	                        (rev 0)
+++ magnoliamodules/trunk/openutils-mgnltests/src/test/resources/log4j.xml	2013-10-21 08:10:04 UTC (rev 4420)
@@ -0,0 +1,44 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE log4j:configuration SYSTEM "log4j.dtd">
+<log4j:configuration>
+      <!-- log4j test configuration -->
+  <appender name="test-appender" class="org.apache.log4j.ConsoleAppender">
+    <layout class="org.apache.log4j.PatternLayout">
+      <param name="ConversionPattern" value="%-5p %c.%M(%C{1}.java:%L)   %m%n" />
+    </layout>
+  </appender>
+  <category name="jdbc">
+    <priority value="WARN" />
+  </category>
+  <category name="it">
+    <priority value="INFO" />
+  </category>
+  <category name="info">
+    <priority value="INFO" />
+  </category>
+  <category name="org">
+    <priority value="WARN" />
+  </category>
+  <category name="com">
+    <priority value="WARN" />
+  </category>
+  <category name="net">
+    <priority value="WARN" />
+  </category>
+  <category name="org.dbunit">
+    <priority value="WARN" />
+  </category>
+  <category name="score">
+    <priority value="INFO" />
+  </category>
+  <category name="it">
+    <priority value="INFO" />
+  </category>
+  <category name="info.magnolia.repository.DefaultRepositoryManager">
+    <priority value="INFO" />
+  </category>
+  <root>
+    <priority value="ALL" />
+    <appender-ref ref="test-appender" />
+  </root>
+</log4j:configuration>
\ No newline at end of file


Property changes on: magnoliamodules/trunk/openutils-mgnltests/src/test/resources/log4j.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-mgnltests/src/test/resources/utils-bootstrap/userroles.anonymous.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnltests/src/test/resources/utils-bootstrap/userroles.anonymous.xml	                        (rev 0)
+++ magnoliamodules/trunk/openutils-mgnltests/src/test/resources/utils-bootstrap/userroles.anonymous.xml	2013-10-21 08:10:04 UTC (rev 4420)
@@ -0,0 +1,721 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<sv:node sv:name="anonymous" xmlns:sv="http://www.jcp.org/jcr/sv/1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <sv:property sv:name="jcr:primaryType" sv:type="Name">
+    <sv:value>mgnl:role</sv:value>
+  </sv:property>
+  <sv:property sv:name="jcr:uuid" sv:type="String">
+    <sv:value>d98728c7-b80f-444d-bfda-b54b28dc240c</sv:value>
+  </sv:property>
+  <sv:property sv:name="jcr:createdBy" sv:type="String">
+    <sv:value>admin</sv:value>
+  </sv:property>
+  <sv:node sv:name="MetaData">
+    <sv:property sv:name="jcr:primaryType" sv:type="Name">
+      <sv:value>mgnl:metaData</sv:value>
+    </sv:property>
+    <sv:property sv:name="jcr:createdBy" sv:type="String">
+      <sv:value>admin</sv:value>
+    </sv:property>
+    <sv:property sv:name="mgnl:activated" sv:type="Boolean">
+      <sv:value>false</sv:value>
+    </sv:property>
+    <sv:property sv:name="mgnl:activatorid" sv:type="String">
+      <sv:value>superuser</sv:value>
+    </sv:property>
+    <sv:property sv:name="mgnl:authorid" sv:type="String">
+      <sv:value>superuser</sv:value>
+    </sv:property>
+    <sv:property sv:name="mgnl:creationdate" sv:type="Date">
+      <sv:value>2006-05-04T17:05:39.645+02:00</sv:value>
+    </sv:property>
+    <sv:property sv:name="mgnl:lastaction" sv:type="Date">
+      <sv:value>2006-05-04T17:05:45.177+02:00</sv:value>
+    </sv:property>
+    <sv:property sv:name="mgnl:lastmodified" sv:type="Date">
+      <sv:value>2012-04-06T16:06:24.003+02:00</sv:value>
+    </sv:property>
+    <sv:property sv:name="mgnl:template" sv:type="String">
+      <sv:value/>
+    </sv:property>
+  </sv:node>
+  <sv:node sv:name="acl_Store">
+    <sv:property sv:name="jcr:primaryType" sv:type="Name">
+      <sv:value>mgnl:contentNode</sv:value>
+    </sv:property>
+    <sv:property sv:name="jcr:uuid" sv:type="String">
+      <sv:value>f1c63218-b05d-41c4-a699-5a15b0f68317</sv:value>
+    </sv:property>
+    <sv: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>2007-04-27T15:30:37.283+02:00</sv:value>
+      </sv:property>
+    </sv:node>
+    <sv:node sv:name="0">
+      <sv:property sv:name="jcr:primaryType" sv:type="Name">
+        <sv:value>mgnl:contentNode</sv:value>
+      </sv:property>
+      <sv:property sv:name="jcr:uuid" sv:type="String">
+        <sv:value>6c1b4e6f-179a-498f-ab89-81fea9207b04</sv:value>
+      </sv:property>
+      <sv:property sv:name="jcr:createdBy" sv:type="String">
+        <sv:value>admin</sv:value>
+      </sv:property>
+      <sv:property sv:name="path" sv:type="String">
+        <sv:value>/*</sv:value>
+      </sv:property>
+      <sv:property sv:name="permissions" sv:type="Long">
+        <sv:value>8</sv:value>
+      </sv:property>
+      <sv:node sv:name="MetaData">
+        <sv:property sv:name="jcr:primaryType" sv:type="Name">
+          <sv:value>mgnl:metaData</sv:value>
+        </sv:property>
+        <sv:property sv:name="jcr:createdBy" sv:type="String">
+          <sv:value>admin</sv:value>
+        </sv:property>
+        <sv:property sv:name="mgnl:creationdate" sv:type="Date">
+          <sv:value>2007-04-27T15:30:37.284+02:00</sv:value>
+        </sv:property>
+      </sv:node>
+    </sv:node>
+  </sv:node>
+  <sv:node sv:name="acl_Expressions">
+    <sv:property sv:name="jcr:primaryType" sv:type="Name">
+      <sv:value>mgnl:contentNode</sv:value>
+    </sv:property>
+    <sv:property sv:name="jcr:uuid" sv:type="String">
+      <sv:value>fc6d875a-13d8-4551-b667-86db6cd486e8</sv:value>
+    </sv:property>
+    <sv: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>2007-04-27T15:30:37.543+02:00</sv:value>
+      </sv:property>
+    </sv:node>
+    <sv:node sv:name="0">
+      <sv:property sv:name="jcr:primaryType" sv:type="Name">
+        <sv:value>mgnl:contentNode</sv:value>
+      </sv:property>
+      <sv:property sv:name="jcr:uuid" sv:type="String">
+        <sv:value>1c8ca47b-5112-445a-b7b8-4aacdebfc59c</sv:value>
+      </sv:property>
+      <sv:property sv:name="jcr:createdBy" sv:type="String">
+        <sv:value>admin</sv:value>
+      </sv:property>
+      <sv:property sv:name="path" sv:type="String">
+        <sv:value>/*</sv:value>
+      </sv:property>
+      <sv:property sv:name="permissions" sv:type="Long">
+        <sv:value>8</sv:value>
+      </sv:property>
+      <sv:node sv:name="MetaData">
+        <sv:property sv:name="jcr:primaryType" sv:type="Name">
+          <sv:value>mgnl:metaData</sv:value>
+        </sv:property>
+        <sv:property sv:name="jcr:createdBy" sv:type="String">
+          <sv:value>admin</sv:value>
+        </sv:property>
+        <sv:property sv:name="mgnl:creationdate" sv:type="Date">
+          <sv:value>2007-04-27T15:30:37.544+02:00</sv:value>
+        </sv:property>
+      </sv:node>
+    </sv:node>
+  </sv:node>
+  <sv:node sv:name="acl_uri">
+    <sv:property sv:name="jcr:primaryType" sv:type="Name">
+      <sv:value>mgnl:contentNode</sv:value>
+    </sv:property>
+    <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
+      <sv:value>mix:lockable</sv:value>
+    </sv:property>
+    <sv:property sv:name="jcr:uuid" sv:type="String">
+      <sv:value>d888a667-2b90-4040-9f9d-6f322f0664fc</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:creationdate" sv:type="Date">
+        <sv:value>2012-04-06T16:06:24.009+02:00</sv:value>
+      </sv:property>
+    </sv:node>
+    <sv:node sv:name="0">
+      <sv:property sv:name="jcr:primaryType" sv:type="Name">
+        <sv:value>mgnl:contentNode</sv:value>
+      </sv:property>
+      <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
+        <sv:value>mix:lockable</sv:value>
+      </sv:property>
+      <sv:property sv:name="jcr:uuid" sv:type="String">
+        <sv:value>df4f0cee-01c7-4869-be8d-c63b43d5cd48</sv:value>
+      </sv:property>
+      <sv:property sv:name="jcr:createdBy" sv:type="String">
+        <sv:value>superuser</sv:value>
+      </sv:property>
+      <sv:property sv:name="path" sv:type="String">
+        <sv:value>/*</sv:value>
+      </sv:property>
+      <sv:property sv:name="permissions" sv:type="Long">
+        <sv:value>0</sv:value>
+      </sv:property>
+      <sv:node sv:name="MetaData">
+        <sv:property sv:name="jcr:primaryType" sv:type="Name">
+          <sv:value>mgnl:metaData</sv:value>
+        </sv:property>
+        <sv:property sv:name="jcr:createdBy" sv:type="String">
+          <sv:value>superuser</sv:value>
+        </sv:property>
+        <sv:property sv:name="mgnl:creationdate" sv:type="Date">
+          <sv:value>2012-04-06T16:06:24.010+02:00</sv:value>
+        </sv:property>
+      </sv:node>
+    </sv:node>
+    <sv:node sv:name="00">
+      <sv:property sv:name="jcr:primaryType" sv:type="Name">
+        <sv:value>mgnl:contentNode</sv:value>
+      </sv:property>
+      <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
+        <sv:value>mix:lockable</sv:value>
+      </sv:property>
+      <sv:property sv:name="jcr:uuid" sv:type="String">
+        <sv:value>e11cc36b-190b-41f1-badb-3fba28ddb0f1</sv:value>
+      </sv:property>
+      <sv:property sv:name="jcr:createdBy" sv:type="String">
+        <sv:value>superuser</sv:value>
+      </sv:property>
+      <sv:property sv:name="path" sv:type="String">
+        <sv:value>/.magnolia*</sv:value>
+      </sv:property>
+      <sv:property sv:name="permissions" sv:type="Long">
+        <sv:value>0</sv:value>
+      </sv:property>
+      <sv:node sv:name="MetaData">
+        <sv:property sv:name="jcr:primaryType" sv:type="Name">
+          <sv:value>mgnl:metaData</sv:value>
+        </sv:property>
+        <sv:property sv:name="jcr:createdBy" sv:type="String">
+          <sv:value>superuser</sv:value>
+        </sv:property>
+        <sv:property sv:name="mgnl:creationdate" sv:type="Date">
+          <sv:value>2012-04-06T16:06:24.012+02:00</sv:value>
+        </sv:property>
+      </sv:node>
+    </sv:node>
+  </sv:node>
+  <sv:node sv:name="acl_imaging">
+    <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>85557ec5-c2f0-47e9-ab37-2b6110cd0e5d</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:creationdate" sv:type="Date">
+        <sv:value>2012-04-06T16:06:24.013+02:00</sv:value>
+      </sv:property>
+    </sv:node>
+  </sv:node>
+  <sv:node sv:name="acl_website">
+    <sv:property sv:name="jcr:primaryType" sv:type="Name">
+      <sv:value>mgnl:contentNode</sv:value>
+    </sv:property>
+    <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
+      <sv:value>mix:lockable</sv:value>
+    </sv:property>
+    <sv:property sv:name="jcr:uuid" sv:type="String">
+      <sv:value>705a827c-639d-41fb-8e02-1ebe02812664</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:creationdate" sv:type="Date">
+        <sv:value>2012-04-06T16:06:24.015+02:00</sv:value>
+      </sv:property>
+    </sv:node>
+    <sv:node sv:name="0">
+      <sv:property sv:name="jcr:primaryType" sv:type="Name">
+        <sv:value>mgnl:contentNode</sv:value>
+      </sv:property>
+      <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
+        <sv:value>mix:lockable</sv:value>
+      </sv:property>
+      <sv:property sv:name="jcr:uuid" sv:type="String">
+        <sv:value>a5db2d45-7854-4a35-bae1-45fa9021bfdb</sv:value>
+      </sv:property>
+      <sv:property sv:name="jcr:createdBy" sv:type="String">
+        <sv:value>superuser</sv:value>
+      </sv:property>
+      <sv:property sv:name="path" sv:type="String">
+        <sv:value>/*</sv:value>
+      </sv:property>
+      <sv:property sv:name="permissions" sv:type="Long">
+        <sv:value>8</sv:value>
+      </sv:property>
+      <sv:node sv:name="MetaData">
+        <sv:property sv:name="jcr:primaryType" sv:type="Name">
+          <sv:value>mgnl:metaData</sv:value>
+        </sv:property>
+        <sv:property sv:name="jcr:createdBy" sv:type="String">
+          <sv:value>superuser</sv:value>
+        </sv:property>
+        <sv:property sv:name="mgnl:creationdate" sv:type="Date">
+          <sv:value>2012-04-06T16:06:24.015+02:00</sv:value>
+        </sv:property>
+      </sv:node>
+    </sv:node>
+  </sv:node>
+  <sv:node sv:name="acl_users">
+    <sv:property sv:name="jcr:primaryType" sv:type="Name">
+      <sv:value>mgnl:contentNode</sv:value>
+    </sv:property>
+    <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
+      <sv:value>mix:lockable</sv:value>
+    </sv:property>
+    <sv:property sv:name="jcr:uuid" sv:type="String">
+      <sv:value>5823bedf-49ad-4121-81b8-e4fc86489f12</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:creationdate" sv:type="Date">
+        <sv:value>2012-04-06T16:06:24.017+02:00</sv:value>
+      </sv:property>
+    </sv:node>
+  </sv:node>
+  <sv:node sv:name="acl_media">
+    <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>3ed47dd1-c076-4962-87b6-54d7089b4e51</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:creationdate" sv:type="Date">
+        <sv:value>2012-04-06T16:06:24.018+02:00</sv:value>
+      </sv:property>
+    </sv:node>
+  </sv:node>
+  <sv:node sv:name="acl_mgnlVersion">
+    <sv:property sv:name="jcr:primaryType" sv:type="Name">
+      <sv:value>mgnl:contentNode</sv:value>
+    </sv:property>
+    <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
+      <sv:value>mix:lockable</sv:value>
+    </sv:property>
+    <sv:property sv:name="jcr:uuid" sv:type="String">
+      <sv:value>412438c8-0401-4c75-b9d1-329f862a066c</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:creationdate" sv:type="Date">
+        <sv:value>2012-04-06T16:06:24.019+02:00</sv:value>
+      </sv:property>
+    </sv:node>
+  </sv:node>
+  <sv:node sv:name="acl_resources">
+    <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>e6305fc5-6b49-4b55-a2eb-cf6106bee53c</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:creationdate" sv:type="Date">
+        <sv:value>2012-04-06T16:06:24.021+02:00</sv:value>
+      </sv:property>
+    </sv:node>
+    <sv:node sv:name="0">
+      <sv:property sv:name="jcr:primaryType" sv:type="Name">
+        <sv:value>mgnl:contentNode</sv:value>
+      </sv:property>
+      <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
+        <sv:value>mix:lockable</sv:value>
+      </sv:property>
+      <sv:property sv:name="jcr:uuid" sv:type="String">
+        <sv:value>babded40-2e91-4eb5-8703-c5da59c51963</sv:value>
+      </sv:property>
+      <sv:property sv:name="jcr:createdBy" sv:type="String">
+        <sv:value>superuser</sv:value>
+      </sv:property>
+      <sv:property sv:name="path" sv:type="String">
+        <sv:value>/*</sv:value>
+      </sv:property>
+      <sv:property sv:name="permissions" sv:type="Long">
+        <sv:value>8</sv:value>
+      </sv:property>
+      <sv:node sv:name="MetaData">
+        <sv:property sv:name="jcr:primaryType" sv:type="Name">
+          <sv:value>mgnl:metaData</sv:value>
+        </sv:property>
+        <sv:property sv:name="jcr:createdBy" sv:type="String">
+          <sv:value>superuser</sv:value>
+        </sv:property>
+        <sv:property sv:name="mgnl:creationdate" sv:type="Date">
+          <sv:value>2012-04-06T16:06:24.021+02:00</sv:value>
+        </sv:property>
+      </sv:node>
+    </sv:node>
+  </sv:node>
+  <sv:node sv:name="acl_config">
+    <sv:property sv:name="jcr:primaryType" sv:type="Name">
+      <sv:value>mgnl:contentNode</sv:value>
+    </sv:property>
+    <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
+      <sv:value>mix:lockable</sv:value>
+    </sv:property>
+    <sv:property sv:name="jcr:uuid" sv:type="String">
+      <sv:value>1d251269-986e-4b59-942e-490c387dc322</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:creationdate" sv:type="Date">
+        <sv:value>2012-04-06T16:06:24.023+02:00</sv:value>
+      </sv:property>
+    </sv:node>
+  </sv:node>
+  <sv:node sv:name="acl_userroles">
+    <sv:property sv:name="jcr:primaryType" sv:type="Name">
+      <sv:value>mgnl:contentNode</sv:value>
+    </sv:property>
+    <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
+      <sv:value>mix:lockable</sv:value>
+    </sv:property>
+    <sv:property sv:name="jcr:uuid" sv:type="String">
+      <sv:value>8b1bbe83-1e9c-43fe-ab6d-5d3d9391c9bf</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:creationdate" sv:type="Date">
+        <sv:value>2012-04-06T16:06:24.024+02:00</sv:value>
+      </sv:property>
+    </sv:node>
+  </sv:node>
+  <sv:node sv:name="acl_messages">
+    <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>9bd3cf2c-1fe4-4dba-9459-119b9a34ec3d</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:creationdate" sv:type="Date">
+        <sv:value>2012-04-06T16:06:24.025+02:00</sv:value>
+      </sv:property>
+    </sv:node>
+  </sv:node>
+  <sv:node sv:name="acl_data">
+    <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>85710131-1c71-4a5c-818e-9cd91b83ca56</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:creationdate" sv:type="Date">
+        <sv:value>2012-04-06T16:06:24.026+02:00</sv:value>
+      </sv:property>
+    </sv:node>
+  </sv:node>
+  <sv:node sv:name="acl_mgnlSystem">
+    <sv:property sv:name="jcr:primaryType" sv:type="Name">
+      <sv:value>mgnl:contentNode</sv:value>
+    </sv:property>
+    <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
+      <sv:value>mix:lockable</sv:value>
+    </sv:property>
+    <sv:property sv:name="jcr:uuid" sv:type="String">
+      <sv:value>356eec7b-5418-4a09-bc79-9b059e67de31</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:creationdate" sv:type="Date">
+        <sv:value>2012-04-06T16:06:24.028+02:00</sv:value>
+      </sv:property>
+    </sv:node>
+  </sv:node>
+  <sv:node sv:name="acl_lms">
+    <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>56364942-3db9-4ab8-99df-00ec7cad4cfa</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:creationdate" sv:type="Date">
+        <sv:value>2012-04-06T16:06:24.029+02:00</sv:value>
+      </sv:property>
+    </sv:node>
+  </sv:node>
+  <sv:node sv:name="acl_playlists">
+    <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>7eaf5d7e-62a6-4301-bf59-f051394159bf</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:creationdate" sv:type="Date">
+        <sv:value>2012-04-06T16:06:24.030+02:00</sv:value>
+      </sv:property>
+    </sv:node>
+  </sv:node>
+  <sv:node sv:name="acl_templates">
+    <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>14ae319a-add2-4fdf-819a-cd8e92506bcf</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:creationdate" sv:type="Date">
+        <sv:value>2012-04-06T16:06:24.031+02:00</sv:value>
+      </sv:property>
+    </sv:node>
+  </sv:node>
+  <sv:node sv:name="acl_dms">
+    <sv:property sv:name="jcr:primaryType" sv:type="Name">
+      <sv:value>mgnl:contentNode</sv:value>
+    </sv:property>
+    <sv:property sv:name="jcr: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>60583cde-0a0e-4b74-b0bb-a31c39de8e05</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:creationdate" sv:type="Date">
+        <sv:value>2012-04-06T16:06:24.033+02:00</sv:value>
+      </sv:property>
+    </sv:node>
+    <sv:node sv:name="0">
+      <sv:property sv:name="jcr:primaryType" sv:type="Name">
+        <sv:value>mgnl:contentNode</sv:value>
+      </sv:property>
+      <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
+        <sv:value>mix:lockable</sv:value>
+      </sv:property>
+      <sv:property sv:name="jcr:uuid" sv:type="String">
+        <sv:value>54ff16e9-b523-447e-a659-9313b3a24fb9</sv:value>
+      </sv:property>
+      <sv:property sv:name="jcr:createdBy" sv:type="String">
+        <sv:value>superuser</sv:value>
+      </sv:property>
+      <sv:property sv:name="path" sv:type="String">
+        <sv:value>/*</sv:value>
+      </sv:property>
+      <sv:property sv:name="permissions" sv:type="Long">
+        <sv:value>8</sv:value>
+      </sv:property>
+      <sv:node sv:name="MetaData">
+        <sv:property sv:name="jcr:primaryType" sv:type="Name">
+          <sv:value>mgnl:metaData</sv:value>
+        </sv:property>
+        <sv:property sv:name="jcr:createdBy" sv:type="String">
+          <sv:value>superuser</sv:value>
+        </sv:property>
+        <sv:property sv:name="mgnl:creationdate" sv:type="Date">
+          <sv:value>2012-04-06T16:06:24.033+02:00</sv:value>
+        </sv:property>
+      </sv:node>
+    </sv:node>
+  </sv:node>
+  <sv:node sv:name="acl_usergroups">
+    <sv:property sv:name="jcr:primaryType" sv:type="Name">
+      <sv:value>mgnl:contentNode</sv:value>
+    </sv:property>
+    <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
+      <sv:value>mix:lockable</sv:value>
+    </sv:property>
+    <sv:property sv:name="jcr:uuid" sv:type="String">
+      <sv:value>60c6a1ef-8ab2-4365-b5d2-183def11b950</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:creationdate" sv:type="Date">
+        <sv:value>2012-04-06T16:06:24.034+02:00</sv:value>
+      </sv:property>
+    </sv:node>
+  </sv:node>
+</sv:node>


Property changes on: magnoliamodules/trunk/openutils-mgnltests/src/test/resources/utils-bootstrap/userroles.anonymous.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-mgnltests/src/test/resources/utils-bootstrap/users.system.anonymous.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnltests/src/test/resources/utils-bootstrap/users.system.anonymous.xml	                        (rev 0)
+++ magnoliamodules/trunk/openutils-mgnltests/src/test/resources/utils-bootstrap/users.system.anonymous.xml	2013-10-21 08:10:04 UTC (rev 4420)
@@ -0,0 +1,222 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<sv:node sv:name="anonymous" xmlns:sv="http://www.jcp.org/jcr/sv/1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <sv:property sv:name="jcr:primaryType" sv:type="Name">
+    <sv:value>mgnl:user</sv:value>
+  </sv:property>
+  <sv:property sv:name="jcr:uuid" sv:type="String">
+    <sv:value>2d78094b-8f7e-4c95-8b1d-22e3dc417c34</sv:value>
+  </sv:property>
+  <sv:property sv:name="jcr:createdBy" sv:type="String...
 
[truncated message content]

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

From: <fg...@us...> - 2013-10-20 19:22:04

Revision: 4419
          http://openutils.svn.sourceforge.net/openutils/?rev=4419&view=rev
Author:   fgiust
Date:     2013-10-20 19:21:59 +0000 (Sun, 20 Oct 2013)
Log Message:
-----------
update repository configuration

Modified Paths:
--------------
    magnoliamodules/trunk/openutils-mgnltests/pom.xml
    magnoliamodules/trunk/openutils-mgnltests/src/test/resources/utils-repository/jackrabbit-test-configuration.xml

Modified: magnoliamodules/trunk/openutils-mgnltests/pom.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnltests/pom.xml	2013-10-20 19:15:35 UTC (rev 4418)
+++ magnoliamodules/trunk/openutils-mgnltests/pom.xml	2013-10-20 19:21:59 UTC (rev 4419)
@@ -121,6 +121,11 @@
     </dependency>
     <dependency>
       <groupId>info.magnolia</groupId>
+      <artifactId>magnolia-jaas</artifactId>
+      <version>${magnolia.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>info.magnolia</groupId>
       <artifactId>magnolia-core</artifactId>
       <version>${magnolia.version}</version>
       <classifier>tests</classifier>

Modified: magnoliamodules/trunk/openutils-mgnltests/src/test/resources/utils-repository/jackrabbit-test-configuration.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnltests/src/test/resources/utils-repository/jackrabbit-test-configuration.xml	2013-10-20 19:15:35 UTC (rev 4418)
+++ magnoliamodules/trunk/openutils-mgnltests/src/test/resources/utils-repository/jackrabbit-test-configuration.xml	2013-10-20 19:21:59 UTC (rev 4419)
@@ -5,10 +5,11 @@
 <Repository>
   <FileSystem class="org.apache.jackrabbit.core.fs.mem.MemoryFileSystem">
   </FileSystem>
-  <Security appName="Jackrabbit">
-    <AccessManager class="org.apache.jackrabbit.core.security.SimpleAccessManager"></AccessManager>
-    <LoginModule class="org.apache.jackrabbit.core.security.SimpleLoginModule">
-      <param name="anonymousId" value="anonymous" />
+  <Security appName="magnolia">
+    <SecurityManager class="org.apache.jackrabbit.core.DefaultSecurityManager" />
+    <AccessManager class="org.apache.jackrabbit.core.security.DefaultAccessManager">
+    </AccessManager>
+    <LoginModule class="info.magnolia.jaas.sp.jcr.JackrabbitAuthenticationModule">
     </LoginModule>
   </Security>
   <Workspaces rootPath="${rep.home}" defaultWorkspace="defaultworkspace" />
@@ -34,6 +35,9 @@
       </FileSystem>
     </SearchIndex>
     <ISMLocking class="org.apache.jackrabbit.core.state.FineGrainedISMLocking" />
+    <WorkspaceSecurity>
+      <AccessControlProvider class="info.magnolia.cms.core.MagnoliaAccessProvider" />
+    </WorkspaceSecurity>
   </Workspace>
   <Versioning rootPath="${rep.home}/version">
     <FileSystem class="org.apache.jackrabbit.core.fs.mem.MemoryFileSystem">

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

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

From: <fg...@us...> - 2013-10-20 19:15:39

Revision: 4418
          http://openutils.svn.sourceforge.net/openutils/?rev=4418&view=rev
Author:   fgiust
Date:     2013-10-20 19:15:35 +0000 (Sun, 20 Oct 2013)
Log Message:
-----------
Adds assertions

Modified Paths:
--------------
    magnoliamodules/trunk/openutils-mgnlcriteria/src/test/java/net/sourceforge/openutils/mgnlcriteria/jcr/query/lucene/AclSearchIndexTest.java

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-10-20 19:08:45 UTC (rev 4417)
+++ magnoliamodules/trunk/openutils-mgnlcriteria/src/test/java/net/sourceforge/openutils/mgnlcriteria/jcr/query/lucene/AclSearchIndexTest.java	2013-10-20 19:15:35 UTC (rev 4418)
@@ -115,6 +115,9 @@
     public void testDogsOnly() throws Exception
     {
         final AccessManager wrappedAM = MgnlContext.getAccessManager(RepositoryConstants.WEBSITE);
+
+        Assert.assertNotNull(wrappedAM, "AccessManager is null");
+
         final AccessManager wrapperAM = new AccessManager()
         {
 
@@ -213,6 +216,9 @@
     public void testDogsExcluded() throws Exception
     {
         final AccessManager wrappedAM = MgnlContext.getAccessManager(RepositoryConstants.WEBSITE);
+
+        Assert.assertNotNull(wrappedAM, "AccessManager is null");
+
         final AccessManager wrapperAM = new AccessManager()
         {
 

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

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

From: <fg...@us...> - 2013-10-20 19:08:53

Revision: 4417
          http://openutils.svn.sourceforge.net/openutils/?rev=4417&view=rev
Author:   fgiust
Date:     2013-10-20 19:08:45 +0000 (Sun, 20 Oct 2013)
Log Message:
-----------
reduce logging

Modified Paths:
--------------
    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/advanced/impl/CorrectElementsWithoutMaxResults.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/EscapeSignTest.java
    magnoliamodules/trunk/openutils-mgnlcriteria/src/test/java/net/sourceforge/openutils/mgnlcriteria/jcr/query/lucene/AclSearchIndexTest.java
    magnoliamodules/trunk/openutils-mgnlcriteria/src/test/resources/log4j.xml

Added Paths:
-----------
    magnoliamodules/trunk/openutils-mgnlcriteria/src/test/resources/crit-bootstrap/config.server.auditLogging.xml
    magnoliamodules/trunk/openutils-mgnlcriteria/src/test/resources/crit-bootstrap/config.server.i18n.content.xml

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-10-20 19:03:16 UTC (rev 4416)
+++ magnoliamodules/trunk/openutils-mgnlcriteria/src/test/java/net/sourceforge/openutils/mgnlcriteria/advanced/BasePathTest.java	2013-10-20 19:08:45 UTC (rev 4417)
@@ -59,7 +59,9 @@
 @RepositoryTestConfiguration(jackrabbitRepositoryConfig = "/crit-repository/jackrabbit-test-configuration.xml", repositoryConfig = "/crit-repository/test-repositories.xml", bootstrapFiles = {
     "/crit-bootstrap/website.Criteria.xml",
     "/crit-bootstrap/userroles.anonymous.xml",
-    "/crit-bootstrap/users.system.anonymous.xml" })
+    "/crit-bootstrap/users.system.anonymous.xml",
+    "/crit-bootstrap/config.server.auditLogging.xml",
+    "/crit-bootstrap/config.server.i18n.content.xml" })
 public class BasePathTest extends TestNgRepositoryTestcase
 {
 
@@ -189,7 +191,7 @@
             criteria.add(Restrictions.eq("@title", title));
         }
         AdvancedResult advResult = criteria.execute();
-        ResultIterator<? extends Node> 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-10-20 19:03:16 UTC (rev 4416)
+++ magnoliamodules/trunk/openutils-mgnlcriteria/src/test/java/net/sourceforge/openutils/mgnlcriteria/advanced/BasePathWithSpacesTest.java	2013-10-20 19:08:45 UTC (rev 4417)
@@ -52,7 +52,9 @@
 @RepositoryTestConfiguration(jackrabbitRepositoryConfig = "/crit-repository/jackrabbit-test-configuration.xml", repositoryConfig = "/crit-repository/test-repositories.xml", bootstrapFiles = {
     "/crit-bootstrap/website.Lorem ipsum dolor sit amet.xml",
     "/crit-bootstrap/userroles.anonymous.xml",
-    "/crit-bootstrap/users.system.anonymous.xml" })
+    "/crit-bootstrap/users.system.anonymous.xml",
+    "/crit-bootstrap/config.server.auditLogging.xml",
+    "/crit-bootstrap/config.server.i18n.content.xml" })
 public class BasePathWithSpacesTest extends TestNgRepositoryTestcase
 {
 
@@ -85,9 +87,9 @@
     {
         Criteria criteria = JCRCriteriaFactory.createCriteria().setWorkspace(RepositoryConstants.WEBSITE);
         criteria.setBasePath("/Lorem ipsum dolor sit amet");
-        criteria.add(Restrictions.eq(Criterion.JCR_PRIMARYTYPE, MgnlNodeType.NT_PAGE  ));
+        criteria.add(Restrictions.eq(Criterion.JCR_PRIMARYTYPE, MgnlNodeType.NT_PAGE));
         AdvancedResult advResult = criteria.execute();
-        ResultIterator<? extends Node> 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-10-20 19:03:16 UTC (rev 4416)
+++ magnoliamodules/trunk/openutils-mgnlcriteria/src/test/java/net/sourceforge/openutils/mgnlcriteria/advanced/Content2BeanTest.java	2013-10-20 19:08:45 UTC (rev 4417)
@@ -59,7 +59,9 @@
 @RepositoryTestConfiguration(jackrabbitRepositoryConfig = "/crit-repository/jackrabbit-test-configuration.xml", repositoryConfig = "/crit-repository/test-repositories.xml", bootstrapFiles = {
     "/crit-bootstrap/website.contains.xml",
     "/crit-bootstrap/userroles.anonymous.xml",
-    "/crit-bootstrap/users.system.anonymous.xml" })
+    "/crit-bootstrap/users.system.anonymous.xml",
+    "/crit-bootstrap/config.server.auditLogging.xml",
+    "/crit-bootstrap/config.server.i18n.content.xml" })
 public class Content2BeanTest extends TestNgRepositoryTestcase
 {
 
@@ -97,7 +99,7 @@
         AdvancedResult advResult = criteria.execute();
         Assert.assertNotNull(advResult);
         Assert.assertEquals(advResult.getTotalSize(), 1);
-        ResultIterator<? extends Node> items = advResult.getItems();
+        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-10-20 19:03:16 UTC (rev 4416)
+++ magnoliamodules/trunk/openutils-mgnlcriteria/src/test/java/net/sourceforge/openutils/mgnlcriteria/advanced/FirstDigitEscapeTest.java	2013-10-20 19:08:45 UTC (rev 4417)
@@ -52,7 +52,9 @@
 @RepositoryTestConfiguration(jackrabbitRepositoryConfig = "/crit-repository/jackrabbit-test-configuration.xml", repositoryConfig = "/crit-repository/test-repositories.xml", bootstrapFiles = {
     "/crit-bootstrap/website.myproject.xml",
     "/crit-bootstrap/userroles.anonymous.xml",
-    "/crit-bootstrap/users.system.anonymous.xml" })
+    "/crit-bootstrap/users.system.anonymous.xml",
+    "/crit-bootstrap/config.server.auditLogging.xml",
+    "/crit-bootstrap/config.server.i18n.content.xml" })
 public class FirstDigitEscapeTest extends TestNgRepositoryTestcase
 {
 
@@ -85,7 +87,7 @@
 
         AdvancedResult advResult = criteria.execute();
 
-        ResultIterator<? extends Node> resultIterator = advResult.getItems();
+        ResultIterator< ? extends Node> resultIterator = advResult.getItems();
         Assert.assertTrue(resultIterator.hasNext());
         Assert.assertEquals(CriteriaTestUtils.name(resultIterator.next()), "ceb55065-e6cd-451a-8ce0-7e495e7e8fbc");
     }
@@ -100,7 +102,7 @@
 
         AdvancedResult advResult = criteria.execute();
 
-        ResultIterator<? extends Node> resultIterator = advResult.getItems();
+        ResultIterator< ? extends Node> resultIterator = advResult.getItems();
         Assert.assertFalse(resultIterator.hasNext());
     }
 
@@ -114,7 +116,7 @@
 
         AdvancedResult advResult = criteria.execute();
 
-        ResultIterator<? extends Node> 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-10-20 19:03:16 UTC (rev 4416)
+++ magnoliamodules/trunk/openutils-mgnlcriteria/src/test/java/net/sourceforge/openutils/mgnlcriteria/advanced/JcrContainsCriteriaSearchTest.java	2013-10-20 19:08:45 UTC (rev 4417)
@@ -61,7 +61,9 @@
 @RepositoryTestConfiguration(jackrabbitRepositoryConfig = "/crit-repository/jackrabbit-test-configuration.xml", repositoryConfig = "/crit-repository/test-repositories.xml", bootstrapFiles = {
     "/crit-bootstrap/website.contains.xml",
     "/crit-bootstrap/userroles.anonymous.xml",
-    "/crit-bootstrap/users.system.anonymous.xml" })
+    "/crit-bootstrap/users.system.anonymous.xml",
+    "/crit-bootstrap/config.server.auditLogging.xml",
+    "/crit-bootstrap/config.server.i18n.content.xml" })
 public class JcrContainsCriteriaSearchTest extends TestNgRepositoryTestcase
 {
 
@@ -101,7 +103,7 @@
         AdvancedResult advResult = criteria.execute();
         Assert.assertNotNull(advResult);
         Assert.assertEquals(advResult.getTotalSize(), 1);
-        ResultIterator<? extends Node> items = advResult.getItems();
+        ResultIterator< ? extends Node> items = advResult.getItems();
         Node item = items.next();
         Assert.assertEquals(CriteriaTestUtils.title(item), "lorem ipsum");
     }
@@ -113,7 +115,7 @@
         AdvancedResult advResult = criteria.execute();
         Assert.assertNotNull(advResult);
         Assert.assertEquals(advResult.getTotalSize(), 1);
-        ResultIterator<? extends Node> items = advResult.getItems();
+        ResultIterator< ? extends Node> items = advResult.getItems();
         Node item = items.next();
         Assert.assertEquals(CriteriaTestUtils.title(item), "lorem");
     }
@@ -125,7 +127,7 @@
         AdvancedResult advResult = criteria.execute();
         Assert.assertNotNull(advResult);
         Assert.assertEquals(advResult.getTotalSize(), 2);
-        ResultIterator<? extends Node> items = advResult.getItems();
+        ResultIterator< ? extends Node> items = advResult.getItems();
         List<String> titles = new ArrayList<String>();
         while (items.hasNext())
         {
@@ -146,7 +148,7 @@
         AdvancedResult advResult = criteria.execute();
         Assert.assertNotNull(advResult);
         Assert.assertEquals(advResult.getTotalSize(), 2);
-        ResultIterator<? extends Node> items = advResult.getItems();
+        ResultIterator< ? extends Node> items = advResult.getItems();
         List<String> titles = new ArrayList<String>();
         while (items.hasNext())
         {
@@ -176,7 +178,7 @@
         }
         Assert.assertNotNull(advResult);
         Assert.assertEquals(advResult.getTotalSize(), 1);
-        ResultIterator<? extends Node> items = advResult.getItems();
+        ResultIterator< ? extends Node> items = advResult.getItems();
         Node item = items.next();
         Assert.assertEquals(CriteriaTestUtils.title(item), "hello test? world");
     }
@@ -200,7 +202,7 @@
         }
         Assert.assertNotNull(advResult);
         Assert.assertEquals(advResult.getTotalSize(), 1);
-        ResultIterator<? extends Node> items = advResult.getItems();
+        ResultIterator< ? extends Node> items = advResult.getItems();
         Node item = items.next();
         Assert.assertEquals(CriteriaTestUtils.title(item), "hello te?st world");
     }
@@ -225,7 +227,7 @@
         }
         Assert.assertNotNull(advResult);
         Assert.assertEquals(advResult.getTotalSize(), 1);
-        ResultIterator<? extends Node> items = advResult.getItems();
+        ResultIterator< ? extends Node> items = advResult.getItems();
         Node item = items.next();
         Assert.assertEquals(CriteriaTestUtils.title(item), "hello \"Milano\" world");
     }
@@ -249,7 +251,7 @@
         }
         Assert.assertNotNull(advResult);
         Assert.assertEquals(advResult.getTotalSize(), 1);
-        ResultIterator<? extends Node> items = advResult.getItems();
+        ResultIterator< ? extends Node> items = advResult.getItems();
         Node item = items.next();
         Assert.assertEquals(CriteriaTestUtils.title(item), "hello l:u");
     }

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-10-20 19:03:16 UTC (rev 4416)
+++ magnoliamodules/trunk/openutils-mgnlcriteria/src/test/java/net/sourceforge/openutils/mgnlcriteria/advanced/JcrContainsQuestionMarkTest.java	2013-10-20 19:08:45 UTC (rev 4417)
@@ -54,7 +54,9 @@
 @RepositoryTestConfiguration(jackrabbitRepositoryConfig = "/crit-repository/jackrabbit-test-configuration.xml", repositoryConfig = "/crit-repository/test-repositories.xml", bootstrapFiles = {
     "/crit-bootstrap/website.contains.xml",
     "/crit-bootstrap/userroles.anonymous.xml",
-    "/crit-bootstrap/users.system.anonymous.xml" })
+    "/crit-bootstrap/users.system.anonymous.xml",
+    "/crit-bootstrap/config.server.auditLogging.xml",
+    "/crit-bootstrap/config.server.i18n.content.xml" })
 public class JcrContainsQuestionMarkTest extends TestNgRepositoryTestcase
 {
 

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-10-20 19:03:16 UTC (rev 4416)
+++ magnoliamodules/trunk/openutils-mgnlcriteria/src/test/java/net/sourceforge/openutils/mgnlcriteria/advanced/OrderingTest.java	2013-10-20 19:08:45 UTC (rev 4417)
@@ -54,7 +54,9 @@
 @RepositoryTestConfiguration(jackrabbitRepositoryConfig = "/crit-repository/jackrabbit-test-configuration.xml", repositoryConfig = "/crit-repository/test-repositories.xml", bootstrapFiles = {
     "/crit-bootstrap/website.letters.xml",
     "/crit-bootstrap/userroles.anonymous.xml",
-    "/crit-bootstrap/users.system.anonymous.xml" })
+    "/crit-bootstrap/users.system.anonymous.xml",
+    "/crit-bootstrap/config.server.auditLogging.xml",
+    "/crit-bootstrap/config.server.i18n.content.xml" })
 public class OrderingTest extends TestNgRepositoryTestcase
 {
 
@@ -133,7 +135,7 @@
 
         Assert.assertEquals(advResult.getTotalSize(), LETTERS_ARRAY.length);
 
-        ResultIterator<? extends Node> resultIterator = advResult.getItems();
+        ResultIterator< ? extends Node> resultIterator = advResult.getItems();
         Assert.assertEquals(resultIterator.getSize(), LETTERS_ARRAY.length);
 
         int i = 0;
@@ -164,7 +166,7 @@
 
         Assert.assertEquals(advResult.getTotalSize(), LETTERS_ARRAY.length, "Unset total size.");
 
-        ResultIterator<? extends Node> resultIterator = advResult.getItems();
+        ResultIterator< ? extends Node> resultIterator = advResult.getItems();
         Assert.assertEquals(resultIterator.getSize(), PAGINATION_LENGTH, "Wrong iterator size.");
 
         int i = 0;
@@ -263,7 +265,7 @@
 
         Assert.assertEquals(advResult.getTotalSize(), LETTERS_ARRAY.length, "Unset total size.");
 
-        ResultIterator<? extends Node> resultIterator = advResult.getItems();
+        ResultIterator< ? extends Node> resultIterator = advResult.getItems();
         Assert.assertEquals(resultIterator.getSize(), LETTERS_ARRAY.length - offset, "Wrong iterator size.");
 
         int i = 0;

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-10-20 19:03:16 UTC (rev 4416)
+++ magnoliamodules/trunk/openutils-mgnlcriteria/src/test/java/net/sourceforge/openutils/mgnlcriteria/advanced/PaginationTest.java	2013-10-20 19:08:45 UTC (rev 4417)
@@ -55,7 +55,9 @@
 @RepositoryTestConfiguration(jackrabbitRepositoryConfig = "/crit-repository/jackrabbit-test-configuration.xml", repositoryConfig = "/crit-repository/test-repositories.xml", bootstrapFiles = {
     "/crit-bootstrap/website.letters.xml",
     "/crit-bootstrap/userroles.anonymous.xml",
-    "/crit-bootstrap/users.system.anonymous.xml" })
+    "/crit-bootstrap/users.system.anonymous.xml",
+    "/crit-bootstrap/config.server.auditLogging.xml",
+    "/crit-bootstrap/config.server.i18n.content.xml" })
 public class PaginationTest extends TestNgRepositoryTestcase
 {
 
@@ -104,7 +106,7 @@
 
         Assert.assertEquals(advResult.getTotalSize(), 26);
 
-        ResultIterator<? extends Node> resultIterator = advResult.getItems();
+        ResultIterator< ? extends Node> resultIterator = advResult.getItems();
         Assert.assertEquals(resultIterator.getSize(), 26);
 
         Assert.assertEquals(CriteriaTestUtils.title(resultIterator.next()), "A");
@@ -153,7 +155,7 @@
 
         Assert.assertEquals(advResult.getTotalSize(), 26);
 
-        ResultIterator<? extends Node> resultIterator = advResult.getItems();
+        ResultIterator< ? extends Node> resultIterator = advResult.getItems();
 
         Assert.assertEquals(CriteriaTestUtils.title(resultIterator.next()), "J");
         Assert.assertEquals(resultIterator.getSize(), 17);
@@ -175,7 +177,7 @@
 
         Assert.assertEquals(advResult.getTotalSize(), 26);
 
-        ResultIterator<? extends Node> resultIterator = advResult.getItems();
+        ResultIterator< ? extends Node> resultIterator = advResult.getItems();
         Assert.assertEquals(resultIterator.getSize(), 10);
 
         Node content = null;
@@ -202,7 +204,7 @@
 
         Assert.assertEquals(advResult.getTotalSize(), 26);
 
-        ResultIterator<? extends Node> resultIterator = advResult.getItems();
+        ResultIterator< ? extends Node> resultIterator = advResult.getItems();
 
         Assert.assertEquals(resultIterator.getSize(), 5);
         Assert.assertEquals(CriteriaTestUtils.title(resultIterator.next()), "K");
@@ -228,7 +230,7 @@
 
         Assert.assertEquals(advResult.getTotalSize(), 26);
 
-        ResultIterator<? extends Node> resultIterator = advResult.getItems();
+        ResultIterator< ? extends Node> resultIterator = advResult.getItems();
 
         Assert.assertEquals(resultIterator.getSize(), 2);
         Assert.assertEquals(CriteriaTestUtils.title(resultIterator.next()), "Y");
@@ -252,7 +254,7 @@
         Assert.assertEquals(advResult.getTotalSize(), 26);
         Assert.assertEquals(advResult.getNumberOfPages(), 6);
 
-        ResultIterator<? extends Node> 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-10-20 19:03:16 UTC (rev 4416)
+++ magnoliamodules/trunk/openutils-mgnlcriteria/src/test/java/net/sourceforge/openutils/mgnlcriteria/advanced/ScoreAnalizerAndSortTest.java	2013-10-20 19:08:45 UTC (rev 4417)
@@ -54,7 +54,9 @@
 @RepositoryTestConfiguration(jackrabbitRepositoryConfig = "/crit-repository/jackrabbit-test-configuration.xml", repositoryConfig = "/crit-repository/test-repositories.xml", bootstrapFiles = {
     "/crit-bootstrap/website.00000.xml",
     "/crit-bootstrap/userroles.anonymous.xml",
-    "/crit-bootstrap/users.system.anonymous.xml" })
+    "/crit-bootstrap/users.system.anonymous.xml",
+    "/crit-bootstrap/config.server.auditLogging.xml",
+    "/crit-bootstrap/config.server.i18n.content.xml" })
 public class ScoreAnalizerAndSortTest extends TestNgRepositoryTestcase
 {
 
@@ -103,7 +105,7 @@
 
         CriteriaTestUtils.assertNumOfResults(3, result, "fagiano");
 
-        ResultIterator<? extends Node> iterator = advResult.getItems();
+        ResultIterator< ? extends Node> iterator = advResult.getItems();
 
         Assert.assertTrue(((AdvancedResultItem) iterator.next()).getScore() > ((AdvancedResultItem) iterator.next())
             .getScore());

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-10-20 19:03:16 UTC (rev 4416)
+++ magnoliamodules/trunk/openutils-mgnlcriteria/src/test/java/net/sourceforge/openutils/mgnlcriteria/advanced/XpathEscapeTest.java	2013-10-20 19:08:45 UTC (rev 4417)
@@ -58,7 +58,9 @@
 @RepositoryTestConfiguration(jackrabbitRepositoryConfig = "/crit-repository/jackrabbit-test-configuration.xml", repositoryConfig = "/crit-repository/test-repositories.xml", bootstrapFiles = {
     "/crit-bootstrap/website.00000.xml",
     "/crit-bootstrap/userroles.anonymous.xml",
-    "/crit-bootstrap/users.system.anonymous.xml" })
+    "/crit-bootstrap/users.system.anonymous.xml",
+    "/crit-bootstrap/config.server.auditLogging.xml",
+    "/crit-bootstrap/config.server.i18n.content.xml" })
 public class XpathEscapeTest extends TestNgRepositoryTestcase
 {
 

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-10-20 19:03:16 UTC (rev 4416)
+++ magnoliamodules/trunk/openutils-mgnlcriteria/src/test/java/net/sourceforge/openutils/mgnlcriteria/advanced/impl/AccessibleResultItemResultIteratorTest.java	2013-10-20 19:08:45 UTC (rev 4417)
@@ -61,7 +61,9 @@
 @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" })
+    "/crit-bootstrap/users.system.anonymous.xml",
+    "/crit-bootstrap/config.server.auditLogging.xml",
+    "/crit-bootstrap/config.server.i18n.content.xml" })
 public class AccessibleResultItemResultIteratorTest extends TestNgRepositoryTestcase
 {
 

Modified: magnoliamodules/trunk/openutils-mgnlcriteria/src/test/java/net/sourceforge/openutils/mgnlcriteria/advanced/impl/CorrectElementsWithoutMaxResults.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlcriteria/src/test/java/net/sourceforge/openutils/mgnlcriteria/advanced/impl/CorrectElementsWithoutMaxResults.java	2013-10-20 19:03:16 UTC (rev 4416)
+++ magnoliamodules/trunk/openutils-mgnlcriteria/src/test/java/net/sourceforge/openutils/mgnlcriteria/advanced/impl/CorrectElementsWithoutMaxResults.java	2013-10-20 19:08:45 UTC (rev 4417)
@@ -48,7 +48,9 @@
 @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" })
+    "/crit-bootstrap/users.system.anonymous.xml",
+    "/crit-bootstrap/config.server.auditLogging.xml",
+    "/crit-bootstrap/config.server.i18n.content.xml" })
 public class CorrectElementsWithoutMaxResults extends TestNgRepositoryTestcase
 {
 

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-10-20 19:03:16 UTC (rev 4416)
+++ magnoliamodules/trunk/openutils-mgnlcriteria/src/test/java/net/sourceforge/openutils/mgnlcriteria/jcr/query/CriteriaTest.java	2013-10-20 19:08:45 UTC (rev 4417)
@@ -57,7 +57,9 @@
 @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" })
+    "/crit-bootstrap/users.system.anonymous.xml",
+    "/crit-bootstrap/config.server.auditLogging.xml",
+    "/crit-bootstrap/config.server.i18n.content.xml" })
 public class CriteriaTest extends TestNgRepositoryTestcase
 {
 
@@ -164,7 +166,7 @@
             .add(Restrictions.eq("@jcr:primaryType", MgnlNodeType.NT_PAGE))
             .add(Restrictions.eq("@title", "Pets"));
         AdvancedResult result = criteria.execute();
-        ResultIterator<? extends Node> iterator = result.getItems();
+        ResultIterator< ? extends Node> iterator = result.getItems();
         Assert.assertTrue(iterator.hasNext());
         Node resultNode = iterator.next();
         Assert.assertEquals(CriteriaTestUtils.title(resultNode), "Pets");
@@ -182,7 +184,7 @@
         AdvancedResult result = criteria.execute();
         Assert.assertEquals(result.getTotalSize(), 1);
 
-        ResultIterator<? extends Node> iterator = result.getItems();
+        ResultIterator< ? extends Node> iterator = result.getItems();
         Assert.assertEquals(iterator.getSize(), 1);
         Assert.assertEquals(CriteriaTestUtils.name(iterator.next()), "12");
     }
@@ -242,7 +244,7 @@
         // --- 3 (title=Rosy, petType=dog, birthDate=2001-04-17)
         Assert.assertEquals(result.getTotalSize(), 8);
 
-        ResultIterator<? extends Node> 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 +284,7 @@
         // --- 3 (title=Rosy, petType=dog, birthDate=2001-04-17)
         Assert.assertEquals(result.getTotalSize(), 8);
 
-        ResultIterator<? extends Node> 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 +299,7 @@
     public void testAddOrder() throws Exception
     {
         Criteria criteria;
-        ResultIterator<? extends Node> iterator;
+        ResultIterator< ? extends Node> iterator;
         Calendar birthDate;
 
         // gets the oldest pet (ascending order)
@@ -342,7 +344,7 @@
     public void testAddOrderMultiple() throws Exception
     {
         Criteria criteria;
-        ResultIterator<? extends Node> iterator;
+        ResultIterator< ? extends Node> iterator;
 
         // order by @birthDate ascending, @title ascending
         criteria = JCRCriteriaFactory
@@ -381,7 +383,7 @@
     public void testDateComparison() throws Exception
     {
         Criteria criteria;
-        ResultIterator<? extends Node> iterator;
+        ResultIterator< ? extends Node> iterator;
         Node node;
         Calendar date;
 

Modified: magnoliamodules/trunk/openutils-mgnlcriteria/src/test/java/net/sourceforge/openutils/mgnlcriteria/jcr/query/EscapeSignTest.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlcriteria/src/test/java/net/sourceforge/openutils/mgnlcriteria/jcr/query/EscapeSignTest.java	2013-10-20 19:03:16 UTC (rev 4416)
+++ magnoliamodules/trunk/openutils-mgnlcriteria/src/test/java/net/sourceforge/openutils/mgnlcriteria/jcr/query/EscapeSignTest.java	2013-10-20 19:08:45 UTC (rev 4417)
@@ -49,7 +49,9 @@
 @RepositoryTestConfiguration(jackrabbitRepositoryConfig = "/crit-repository/jackrabbit-test-configuration.xml", repositoryConfig = "/crit-repository/test-repositories.xml", bootstrapFiles = {
     "/crit-bootstrap/website.escape-sign.xml",
     "/crit-bootstrap/userroles.anonymous.xml",
-    "/crit-bootstrap/users.system.anonymous.xml" })
+    "/crit-bootstrap/users.system.anonymous.xml",
+    "/crit-bootstrap/config.server.auditLogging.xml",
+    "/crit-bootstrap/config.server.i18n.content.xml" })
 public class EscapeSignTest extends TestNgRepositoryTestcase
 {
 

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-10-20 19:03:16 UTC (rev 4416)
+++ magnoliamodules/trunk/openutils-mgnlcriteria/src/test/java/net/sourceforge/openutils/mgnlcriteria/jcr/query/lucene/AclSearchIndexTest.java	2013-10-20 19:08:45 UTC (rev 4417)
@@ -60,7 +60,9 @@
 @RepositoryTestConfiguration(jackrabbitRepositoryConfig = "/crit-repository/jackrabbit-acl-search-index-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" })
+    "/crit-bootstrap/users.system.anonymous.xml",
+    "/crit-bootstrap/config.server.auditLogging.xml",
+    "/crit-bootstrap/config.server.i18n.content.xml" })
 public class AclSearchIndexTest extends TestNgRepositoryTestcase
 {
 
@@ -187,7 +189,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<? extends Node> iterator = result.getItems();
+            ResultIterator< ? extends Node> iterator = result.getItems();
 
             Assert.assertTrue(iterator.hasNext());
             Assert.assertEquals(CriteriaTestUtils.name(iterator.next()), "4");
@@ -278,7 +280,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<? extends Node> iterator = result.getItems();
+            ResultIterator< ? extends Node> iterator = result.getItems();
 
             Assert.assertTrue(iterator.hasNext());
             Assert.assertEquals(CriteriaTestUtils.name(iterator.next()), "9");

Added: magnoliamodules/trunk/openutils-mgnlcriteria/src/test/resources/crit-bootstrap/config.server.auditLogging.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnlcriteria/src/test/resources/crit-bootstrap/config.server.auditLogging.xml	                        (rev 0)
+++ magnoliamodules/trunk/openutils-mgnlcriteria/src/test/resources/crit-bootstrap/config.server.auditLogging.xml	2013-10-20 19:08:45 UTC (rev 4417)
@@ -0,0 +1,426 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<sv:node sv:name="auditLogging" xmlns:sv="http://www.jcp.org/jcr/sv/1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <sv:property sv:name="jcr:primaryType" sv:type="Name">
+    <sv:value>mgnl:content</sv:value>
+  </sv:property>
+  <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
+    <sv:value>mix:lockable</sv:value>
+  </sv:property>
+  <sv:property sv:name="jcr:uuid" sv:type="String">
+    <sv:value>01cef968-f344-4fb0-a67c-df0958489edc</sv:value>
+  </sv:property>
+  <sv:property sv:name="class" sv:type="String">
+    <sv:value>info.magnolia.audit.AuditLoggingManager</sv:value>
+  </sv:property>
+  <sv:property sv:name="defaultSeparator" sv:type="String">
+    <sv:value>, </sv:value>
+  </sv:property>
+  <sv:property sv:name="jcr:createdBy" sv:type="String">
+    <sv:value>admin</sv:value>
+  </sv:property>
+  <sv:node sv:name="MetaData">
+    <sv:property sv:name="jcr:primaryType" sv:type="Name">
+      <sv:value>mgnl:metaData</sv:value>
+    </sv:property>
+    <sv:property sv:name="jcr:createdBy" sv:type="String">
+      <sv:value>admin</sv:value>
+    </sv:property>
+    <sv:property sv:name="mgnl:authorid" sv:type="String">
+      <sv:value>superuser</sv:value>
+    </sv:property>
+    <sv:property sv:name="mgnl:creationdate" sv:type="Date">
+      <sv:value>2008-10-15T12:27:54.471+02:00</sv:value>
+    </sv:property>
+    <sv:property sv:name="mgnl:lastmodified" sv:type="Date">
+      <sv:value>2008-10-21T12:07:46.661+02:00</sv:value>
+    </sv:property>
+  </sv:node>
+  <sv:node sv:name="logConfigurations">
+    <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:multiple="true">
+      <sv:value>mix:lockable</sv:value>
+    </sv:property>
+    <sv:property sv:name="jcr:uuid" sv:type="String">
+      <sv:value>959d6c02-9db7-4b76-861d-55206bd39b21</sv:value>
+    </sv:property>
+    <sv:property sv:name="jcr:createdBy" sv:type="String">
+      <sv:value>admin</sv:value>
+    </sv:property>
+    <sv:node sv:name="MetaData">
+      <sv:property sv:name="jcr:primaryType" sv:type="Name">
+        <sv:value>mgnl:metaData</sv:value>
+      </sv:property>
+      <sv:property sv:name="jcr:createdBy" sv:type="String">
+        <sv:value>admin</sv:value>
+      </sv:property>
+      <sv:property sv:name="mgnl:authorid" sv:type="String">
+        <sv:value>superuser</sv:value>
+      </sv:property>
+      <sv:property sv:name="mgnl:creationdate" sv:type="Date">
+        <sv:value>2008-10-15T12:34:33.049+02:00</sv:value>
+      </sv:property>
+      <sv:property sv:name="mgnl:lastmodified" sv:type="Date">
+        <sv:value>2008-10-16T09:08:06.433+02:00</sv:value>
+      </sv:property>
+    </sv:node>
+    <sv:node sv:name="deactivate">
+      <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>123c0349-a816-4dc5-9bff-cafca97a6be5</sv:value>
+      </sv:property>
+      <sv:property sv:name="active" sv:type="String">
+        <sv:value>false</sv:value>
+      </sv:property>
+      <sv:property sv:name="jcr:createdBy" sv:type="String">
+        <sv:value>admin</sv:value>
+      </sv:property>
+      <sv:property sv:name="logName" sv:type="String">
+        <sv:value>log-audit</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-10-15T12:29:20.914+02:00</sv:value>
+        </sv:property>
+        <sv:property sv:name="mgnl:lastmodified" sv:type="Date">
+          <sv:value>2008-10-21T12:05:01.053+02:00</sv:value>
+        </sv:property>
+      </sv:node>
+    </sv:node>
+    <sv:node sv:name="activate">
+      <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>648852be-a73d-4fac-ae84-f7d48b24bfe2</sv:value>
+      </sv:property>
+      <sv:property sv:name="active" sv:type="String">
+        <sv:value>false</sv:value>
+      </sv:property>
+      <sv:property sv:name="jcr:createdBy" sv:type="String">
+        <sv:value>admin</sv:value>
+      </sv:property>
+      <sv:property sv:name="logName" sv:type="String">
+        <sv:value>log-audit</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-10-15T12:29:20.914+02:00</sv:value>
+        </sv:property>
+        <sv:property sv:name="mgnl:lastmodified" sv:type="Date">
+          <sv:value>2008-10-21T12:05:06.078+02:00</sv:value>
+        </sv:property>
+      </sv:node>
+    </sv:node>
+    <sv:node sv:name="copy">
+      <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>6ea16c97-62f3-4a76-ae71-853cbaebe466</sv:value>
+      </sv:property>
+      <sv:property sv:name="active" sv:type="String">
+        <sv:value>false</sv:value>
+      </sv:property>
+      <sv:property sv:name="jcr:createdBy" sv:type="String">
+        <sv:value>admin</sv:value>
+      </sv:property>
+      <sv:property sv:name="logName" sv:type="String">
+        <sv:value>log-audit</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-10-15T12:29:20.914+02:00</sv:value>
+        </sv:property>
+        <sv:property sv:name="mgnl:lastmodified" sv:type="Date">
+          <sv:value>2008-10-21T12:05:14.606+02:00</sv:value>
+        </sv:property>
+      </sv:node>
+    </sv:node>
+    <sv:node sv:name="login">
+      <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>e784ef33-c32f-4dd4-8389-7884368e4184</sv:value>
+      </sv:property>
+      <sv:property sv:name="active" sv:type="String">
+        <sv:value>false</sv:value>
+      </sv:property>
+      <sv:property sv:name="jcr:createdBy" sv:type="String">
+        <sv:value>admin</sv:value>
+      </sv:property>
+      <sv:property sv:name="logName" sv:type="String">
+        <sv:value>log-access</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-10-15T12:29:20.914+02:00</sv:value>
+        </sv:property>
+        <sv:property sv:name="mgnl:lastmodified" sv:type="Date">
+          <sv:value>2008-10-21T12:05:25.452+02:00</sv:value>
+        </sv:property>
+      </sv:node>
+    </sv:node>
+    <sv:node sv:name="logout">
+      <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>a0769682-e686-4208-820e-cc299229b4a2</sv:value>
+      </sv:property>
+      <sv:property sv:name="active" sv:type="String">
+        <sv:value>false</sv:value>
+      </sv:property>
+      <sv:property sv:name="jcr:createdBy" sv:type="String">
+        <sv:value>admin</sv:value>
+      </sv:property>
+      <sv:property sv:name="logName" sv:type="String">
+        <sv:value>log-access</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-10-15T12:29:20.914+02:00</sv:value>
+        </sv:property>
+        <sv:property sv:name="mgnl:lastmodified" sv:type="Date">
+          <sv:value>2008-10-21T12:05:31.179+02:00</sv:value>
+        </sv:property>
+      </sv:node>
+    </sv:node>
+    <sv:node sv:name="move">
+      <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>ff5c320a-cddf-4334-b88d-792629b15343</sv:value>
+      </sv:property>
+      <sv:property sv:name="active" sv:type="String">
+        <sv:value>false</sv:value>
+      </sv:property>
+      <sv:property sv:name="jcr:createdBy" sv:type="String">
+        <sv:value>admin</sv:value>
+      </sv:property>
+      <sv:property sv:name="logName" sv:type="String">
+        <sv:value>log-audit</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-10-15T12:29:20.914+02:00</sv:value>
+        </sv:property>
+        <sv:property sv:name="mgnl:lastmodified" sv:type="Date">
+          <sv:value>2008-10-21T12:05:34.803+02:00</sv:value>
+        </sv:property>
+      </sv:node>
+    </sv:node>
+    <sv:node sv:name="modify">
+      <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>5fc37bce-e721-45c4-9bbe-8bea2f1f14b3</sv:value>
+      </sv:property>
+      <sv:property sv:name="active" sv:type="String">
+        <sv:value>false</sv:value>
+      </sv:property>
+      <sv:property sv:name="jcr:createdBy" sv:type="String">
+        <sv:value>admin</sv:value>
+      </sv:property>
+      <sv:property sv:name="logName" sv:type="String">
+        <sv:value>log-audit</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-10-15T12:29:20.914+02:00</sv:value>
+        </sv:property>
+        <sv:property sv:name="mgnl:lastmodified" sv:type="Date">
+          <sv:value>2008-10-21T12:05:40.869+02:00</sv:value>
+        </sv:property>
+      </sv:node>
+    </sv:node>
+    <sv:node sv:name="create">
+      <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>f58b6794-dbce-482d-84b8-8970d30a5302</sv:value>
+      </sv:property>
+      <sv:property sv:name="active" sv:type="String">
+        <sv:value>false</sv:value>
+      </sv:property>
+      <sv:property sv:name="jcr:createdBy" sv:type="String">
+        <sv:value>admin</sv:value>
+      </sv:property>
+      <sv:property sv:name="logName" sv:type="String">
+        <sv:value>log-audit</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-10-15T12:29:20.914+02:00</sv:value>
+        </sv:property>
+        <sv:property sv:name="mgnl:lastmodified" sv:type="Date">
+          <sv:value>2008-10-21T12:05:46.550+02:00</sv:value>
+        </sv:property>
+      </sv:node>
+    </sv:node>
+    <sv:node sv:name="delete">
+      <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>5e80aeb6-4387-437a-b3a3-6ec4c28d93ac</sv:value>
+      </sv:property>
+      <sv:property sv:name="active" sv:type="String">
+        <sv:value>false</sv:value>
+      </sv:property>
+      <sv:property sv:name="jcr:createdBy" sv:type="String">
+        <sv:value>admin</sv:value>
+      </sv:property>
+      <sv:property sv:name="logName" sv:type="String">
+        <sv:value>log-audit</sv:value>
+      </sv:property>
+      <sv:node sv:name="MetaData">
+        <sv:property sv:name="jcr:primaryType" sv:type="Name">
+          <sv:value>mgnl:metaData</sv:value>
+        </sv:property>
+        <sv:property sv:name="jcr:createdBy" sv:type="String">
+          <sv:value>admin</sv:value>
+        </sv:property>
+        <sv:property sv:name="mgnl:authorid" sv:type="String">
+          <sv:value>superuser</sv:value>
+        </sv:property>
+        <sv:property sv:name="mgnl:creationdate" sv:type="Date">
+          <sv:value>2013-05-07T13:44:16.499+02:00</sv:value>
+        </sv:property>
+        <sv:property sv:name="mgnl:lastmodified" sv:type="Date">
+          <sv:value>2013-05-07T13:44:48.319+02:00</sv:value>
+        </sv:property>
+      </sv:node>
+    </sv:node>
+  </sv:node>
+</sv:node>


Property changes on: magnoliamodules/trunk/openutils-mgnlcriteria/src/test/resources/crit-bootstrap/config.server.auditLogging.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-mgnlcriteria/src/test/resources/crit-bootstrap/config.server.i18n.content.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnlcriteria/src/test/resources/crit-bootstrap/config.server.i18n.content.xml	                        (rev 0)
+++ magnoliamodules/trunk/openutils-mgnlcriteria/src/test/resources/crit-bootstrap/config.server.i18n.content.xml	2013-10-20 19:08:45 UTC (rev 4417)
@@ -0,0 +1,176 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<sv:node sv:name="content" 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>bce8770b-d32b-4797-bde5-741d672dac70</sv:value>
+  </sv:property>
+  <sv:property sv:name="class" sv:type="String">
+    <sv:value>info.magnolia.cms.i18n.DefaultI18nContentSupport</sv:value>
+  </sv:property>
+  <sv:property sv:name="enabled" sv:type="Boolean">
+    <sv:value>true</sv:value>
+  </sv:property>
+  <sv:property sv:name="fallbackLocale" sv:type="String">
+    <sv:value>en</sv:value>
+  </sv:property>
+  <sv:property sv:name="jcr:createdBy" sv:type="String">
+    <sv:value>admin</sv:value>
+  </sv:property>
+  <sv:node sv:name="MetaData">
+    <sv:property sv:name="jcr:primaryType" sv:type="Name">
+      <sv:value>mgnl:metaData</sv:value>
+    </sv:property>
+    <sv:property sv:name="jcr:createdBy" sv:type="String">
+      <sv:value>admin</sv:value>
+    </sv:property>
+    <sv:property sv:name="mgnl:activated" sv:type="Boolean">
+      <sv:value>false</sv:value>
+    </sv:property>
+    <sv:property sv:name="mgnl:activatorid" sv:type="String">
+      <sv:value>superuser</sv:value>
+    </sv:property>
+    <sv:property sv:name="mgnl:authorid" sv:type="String">
+      <sv:value>superuser</sv:value>
+    </sv:property>
+    <sv:property sv:name="mgnl:creationdate" sv:type="Date">
+      <sv:value>2007-05-10T15:20:44.119+02:00</sv:value>
+    </sv:property>
+    <sv:property sv:name="mgnl:lastaction" sv:type="Date">
+      <sv:value>2007-05-10T15:26:06.979+02:00</sv:value>
+    </sv:property>
+    <sv:property sv:name="mgnl:lastmodified" sv:type="Date">
+      <sv:value>2013-10-20T21:02:26.289+02:00</sv:value>
+    </sv:property>
+  </sv:node>
+  <sv:node sv:name="locales">
+    <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>5fefbc4f-013f-4228-a9ff-e9d390626794</sv:value>
+    </sv:property>
+    <sv:property sv:name="jcr:createdBy" sv:type="String">
+      <sv:value>admin</sv:value>
+    </sv:property>
+    <sv:node sv:name="MetaData">
+      <sv:property sv:name="jcr:primaryType" sv:type="Name">
+        <sv:value>mgnl:metaData</sv:value>
+      </sv:property>
+      <sv:property sv:name="jcr:createdBy" sv:type="String">
+        <sv:value>admin</sv:value>
+      </sv:property>
+      <sv:property sv:name="mgnl:activated" sv:type="Boolean">
+        <sv:value>false</sv:value>
+      </sv:property>
+      <sv:property sv:name="mgnl:activatorid" sv:type="String">
+        <sv:value>superuser</sv:value>
+      </sv:property>
+      <sv:property sv:name="mgnl:authorid" sv:type="String">
+        <sv:value>superuser</sv:value>
+      </sv:property>
+      <sv:property sv:name="mgnl:creationdate" sv:type="Date">
+        <sv:value>2007-05-10T15:45:28.556+02:00</sv:value>
+      </sv:property>
+      <sv:property sv:name="mgnl:lastaction" sv:type="Date">
+        <sv:value>2007-05-10T15:45:34.468+02:00</sv:value>
+      </sv:property>
+      <sv:property sv:name="mgnl:lastmodified" sv:type="Date">
+        <sv:value>2007-05-10T15:45:34.495+02:00</sv:value>
+      </sv:property>
+    </sv:node>
+    <sv:node sv:name="en">
+      <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>46fb7d84-a2d7-410e-a8cd-d338aecbf663</sv:value>
+      </sv:property>
+      <sv:property sv:name="country" sv:type="String">
+        <sv:value/>
+      </sv:property>
+      <sv:property sv:name="enabled" sv:type="Boolean">
+        <sv:value>true</sv:value>
+      </sv:property>
+      <sv:property sv:name="jcr:createdBy" sv:type="String">
+        <sv:value>admin</sv:value>
+      </sv:property>
+      <sv:property sv:name="language" sv:type="String">
+        <sv:value>en</sv:value>
+      </sv:property>
+      <sv:node sv:name="MetaData">
+        <sv:property sv:name="jcr:primaryType" sv:type="Name">
+          <sv:value>mgnl:metaData</sv:value>
+        </sv:property>
+        <sv:property sv:name="jcr:createdBy" sv:type="String">
+          <sv:value>admin</sv:value>
+        </sv:property>
+        <sv:property sv:name="mgnl:activated" sv:type="Boolean">
+          <sv:value>false</sv:value>
+        </sv:property>
+        <sv:property sv:name="mgnl:activatorid" sv:type="String">
+          <sv:value>superuser</sv:value>
+        </sv:property>
+        <sv:property sv:name="mgnl:authorid" sv:type="String">
+          <sv:value>superuser</sv:value>
+        </sv:property>
+        <sv:property sv:name="mgnl:creationdate" sv:type="Date">
+          <sv:value>2007-05-10T15:48:13.818+02:00</sv:value>
+        </sv:property>
+        <sv:property sv:name="mgnl:lastaction" sv:type="Date">
+          <sv:value>2007-05-10T15:48:19.887+02:00</sv:value>
+        </sv:property>
+        <sv:property sv:name="mgnl:lastmodified" sv:type="Date">
+          <sv:value>2007-05-10T17:22:41.661+02:00</sv:value>
+        </sv:property>
+      </sv:node>
+    </sv:node>
+    <sv:node sv:name="de">
+      <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>f8200ec4-018d-42bf-bb7f-fad31f43b84a</sv:value>
+      </sv:property>
+      <sv:property sv:name="country" sv:type="String">
+        <sv:value/>
+      </sv:property>
+      <sv:property sv:name="enabled" sv:type="Boolean">
+        <sv:value>true</sv:value>
+      </sv:property>
+      <sv:property sv:name="jcr:createdBy" sv:type="String">
+        <sv:value>admin</sv:value>
+      </sv:property>
+      <sv:property sv:name="language" sv:type="String">
+        <sv:value>de</sv:value>
+      </sv:property>
+      <sv:node sv:name="MetaData">
+        <sv:property sv:name="jcr:primaryType" sv:type="Name">
+          <sv:value>mgnl:metaData</sv:value>
+        </sv:property>
+        <sv:property sv:name="jcr:createdBy" sv:type="String">
+          <sv:value>admin</sv:value>
+        </sv:property>
+        <sv:property sv:name="mgnl:activated" sv:type="Boolean">
+          <sv:value>false</sv:value>
+        </sv:property>
+        <sv:property sv:name="mgnl:activatorid" sv:type="String">
+          <sv:value>superuser</sv:value>
+        </sv:property>
+        <sv:property sv:name="mgnl:authorid" sv:type="String">
+          <sv:value>superuser</sv:value>
+        </sv:property>
+        <sv:property sv:name="mgnl:creationdate" sv:type="Date">
+          <sv:value>2007-05-10T15:48:13.818+02:00</sv:value>
+        </sv:property>
+        <sv:property sv:name="mgnl:lastaction" sv:type="Date">
+          <sv:value>2007-05-10T15:49:05.159+02:00</sv:value>
+        </sv:property>
+        <sv:property sv:name="mgnl:lastmodified" sv:type="Date">
+          <sv:value>2007-05-11T14:49:26.403+02:00</sv:value>
+        </sv:property>
+      </sv:node>
+    </sv:node>
+  </sv:node>
+</sv:node>


Property changes on: magnoliamodules/trunk/openutils-mgnlcriteria/src/test/resources/crit-bootstrap/config.server.i18n.content.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 newl...
 
[truncated message content]

[Openutils-svn] SF.net SVN: openutils:[4416] magnoliamodules/trunk/openutils-mgnltests/src/ main/java/it/openutils/mgnlutils/test/AbstractRepositoryTestcase.java

From: <fg...@us...> - 2013-10-20 19:03:19

Revision: 4416
          http://openutils.svn.sourceforge.net/openutils/?rev=4416&view=rev
Author:   fgiust
Date:     2013-10-20 19:03:16 +0000 (Sun, 20 Oct 2013)
Log Message:
-----------
cleanup listeners in any repository

Modified Paths:
--------------
    magnoliamodules/trunk/openutils-mgnltests/src/main/java/it/openutils/mgnlutils/test/AbstractRepositoryTestcase.java

Modified: magnoliamodules/trunk/openutils-mgnltests/src/main/java/it/openutils/mgnlutils/test/AbstractRepositoryTestcase.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnltests/src/main/java/it/openutils/mgnlutils/test/AbstractRepositoryTestcase.java	2013-10-20 19:02:14 UTC (rev 4415)
+++ magnoliamodules/trunk/openutils-mgnltests/src/main/java/it/openutils/mgnlutils/test/AbstractRepositoryTestcase.java	2013-10-20 19:03:16 UTC (rev 4416)
@@ -70,6 +70,7 @@
 import java.io.InputStream;
 import java.lang.reflect.Field;
 import java.util.ArrayList;
+import java.util.Collection;
 import java.util.Collections;
 import java.util.List;
 import java.util.Map;
@@ -188,20 +189,29 @@
             MgnlContext.release();
 
             SystemContext systemContext = Components.getComponent(SystemContext.class);
-
-            final ObservationManager observationManager = systemContext
-                .getJCRSession(RepositoryConstants.CONFIG)
-                .getWorkspace()
-                .getObservationManager();
-            final EventListenerIterator listeners = observationManager.getRegisteredEventListeners();
-            while (listeners.hasNext())
+            
+            RepositoryManager repositoryManager = Components.getComponent(RepositoryManager.class);
+            
+            Collection<String> workspaceNames = repositoryManager.getWorkspaceNames();
+            
+            for (String workspace : workspaceNames)
             {
-                observationManager.removeEventListener(listeners.nextEventListener());
+                final ObservationManager observationManager = systemContext
+                    .getJCRSession(workspace)
+                    .getWorkspace()
+                    .getObservationManager();
+                final EventListenerIterator listeners = observationManager.getRegisteredEventListeners();
+                while (listeners.hasNext())
+                {
+                    observationManager.removeEventListener(listeners.nextEventListener());
+                }
             }
 
+           
+
             systemContext.release();
 
-            Components.getComponent(RepositoryManager.class).shutdown();
+            repositoryManager.shutdown();
             if (true)
             {
                 cleanUp();

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

Flat | Threaded

<< < 1 .. 7 8 9 10 11 .. 227 > >> (Page 9 of 227)