openutils-svn — developer list with svn commits

[Openutils-svn] SF.net SVN: openutils:[3803] magnoliamodules/trunk/openutils-mgnllms/src/ main/java/net/sourceforge/openutils/mgnllms/samples/listeners/ StudentLevelListener.java

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

Revision: 3803
          http://openutils.svn.sourceforge.net/openutils/?rev=3803&view=rev
Author:   diego_schivo
Date:     2012-03-15 10:46:43 +0000 (Thu, 15 Mar 2012)
Log Message:
-----------
StudentLevelListener: MgnlContext.getSubject()

Modified Paths:
--------------
    magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/samples/listeners/StudentLevelListener.java

Modified: magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/samples/listeners/StudentLevelListener.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/samples/listeners/StudentLevelListener.java	2012-03-15 10:34:51 UTC (rev 3802)
+++ magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/samples/listeners/StudentLevelListener.java	2012-03-15 10:46:43 UTC (rev 3803)
@@ -130,7 +130,7 @@
     {
         PrincipalCollection principalList = null;
 
-        for (Principal p : MgnlContext.getUser().getSubject().getPrincipals())
+        for (Principal p : MgnlContext.getSubject().getPrincipals())
         {
             if (p instanceof PrincipalCollection)
             {

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

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

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

Revision: 3802
          http://openutils.svn.sourceforge.net/openutils/?rev=3802&view=rev
Author:   diego_schivo
Date:     2012-03-15 10:34:51 +0000 (Thu, 15 Mar 2012)
Log Message:
-----------
openutils-mgnlmessages: MagnoliaTemplatingUtilities

Modified Paths:
--------------
    magnoliamodules/trunk/openutils-mgnlmessages/pom.xml
    magnoliamodules/trunk/openutils-mgnlmessages/src/main/java/net/sourceforge/openutils/mgnlmessages/el/MessagesEl.java

Modified: magnoliamodules/trunk/openutils-mgnlmessages/pom.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnlmessages/pom.xml	2012-03-15 10:32:49 UTC (rev 3801)
+++ magnoliamodules/trunk/openutils-mgnlmessages/pom.xml	2012-03-15 10:34:51 UTC (rev 3802)
@@ -83,6 +83,11 @@
       <version>5.0.0-SNAPSHOT</version>
     </dependency>
     <dependency>
+      <groupId>info.magnolia</groupId>
+      <artifactId>magnolia-templating-compatibility</artifactId>
+      <version>${magnolia.version}</version>
+    </dependency>
+    <dependency>
       <groupId>net.sourceforge.openutils</groupId>
       <artifactId>openutils-mgnlext</artifactId>
       <version>2.1</version>

Modified: magnoliamodules/trunk/openutils-mgnlmessages/src/main/java/net/sourceforge/openutils/mgnlmessages/el/MessagesEl.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlmessages/src/main/java/net/sourceforge/openutils/mgnlmessages/el/MessagesEl.java	2012-03-15 10:32:49 UTC (rev 3801)
+++ magnoliamodules/trunk/openutils-mgnlmessages/src/main/java/net/sourceforge/openutils/mgnlmessages/el/MessagesEl.java	2012-03-15 10:34:51 UTC (rev 3802)
@@ -23,6 +23,7 @@
 import info.magnolia.cms.i18n.MessagesManager;
 import info.magnolia.cms.security.Permission;
 import info.magnolia.context.MgnlContext;
+import info.magnolia.module.templating.MagnoliaTemplatingUtilities;
 
 import java.text.MessageFormat;
 

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

[Openutils-svn] SF.net SVN: openutils:[3801] magnoliamodules/trunk/openutils-mgnlmail/src/ main/java/net/sourceforge/openutils/mgnlmail/EmailFromPage.java

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

Revision: 3801
          http://openutils.svn.sourceforge.net/openutils/?rev=3801&view=rev
Author:   diego_schivo
Date:     2012-03-15 10:32:49 +0000 (Thu, 15 Mar 2012)
Log Message:
-----------
EmailFromPage.java: revert

Modified Paths:
--------------
    magnoliamodules/trunk/openutils-mgnlmail/src/main/java/net/sourceforge/openutils/mgnlmail/EmailFromPage.java

Modified: magnoliamodules/trunk/openutils-mgnlmail/src/main/java/net/sourceforge/openutils/mgnlmail/EmailFromPage.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlmail/src/main/java/net/sourceforge/openutils/mgnlmail/EmailFromPage.java	2012-03-15 10:32:22 UTC (rev 3800)
+++ magnoliamodules/trunk/openutils-mgnlmail/src/main/java/net/sourceforge/openutils/mgnlmail/EmailFromPage.java	2012-03-15 10:32:49 UTC (rev 3801)
@@ -20,19 +20,16 @@
 package net.sourceforge.openutils.mgnlmail;
 
 import freemarker.template.Template;
+import info.magnolia.cms.core.Content;
 import info.magnolia.context.MgnlContext;
 import info.magnolia.module.mail.MailTemplate;
 import info.magnolia.module.mail.templates.impl.FreemarkerEmail;
-import info.magnolia.objectfactory.Components;
-import info.magnolia.rendering.engine.AppendableOnlyOutputProvider;
-import info.magnolia.rendering.engine.RenderingEngine;
+import info.magnolia.module.templating.MagnoliaTemplatingUtilities;
 
 import java.io.StringWriter;
 import java.io.Writer;
 import java.util.Map;
 
-import javax.jcr.Node;
-
 import org.apache.commons.lang.StringUtils;
 
 
@@ -56,8 +53,8 @@
 
         final String pageUrl = this.getTemplate().getTemplateFile();
 
-        Node mailNode = MgnlContext.getJCRSession("email").getNode(pageUrl);
-        Components.getSingleton(RenderingEngine.class).render(mailNode, new AppendableOnlyOutputProvider(writer));
+        Content mailNode = MgnlContext.getHierarchyManager("email").getContent(pageUrl);
+        MagnoliaTemplatingUtilities.getInstance().renderTemplate(mailNode, writer);
 
         String pageContent = writer.toString();
 

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

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

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

Revision: 3800
          http://openutils.svn.sourceforge.net/openutils/?rev=3800&view=rev
Author:   diego_schivo
Date:     2012-03-15 10:32:22 +0000 (Thu, 15 Mar 2012)
Log Message:
-----------
dependency: magnolia-templating-compatibility

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

Modified: magnoliamodules/trunk/openutils-mgnlmail/pom.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnlmail/pom.xml	2012-03-15 10:21:48 UTC (rev 3799)
+++ magnoliamodules/trunk/openutils-mgnlmail/pom.xml	2012-03-15 10:32:22 UTC (rev 3800)
@@ -96,6 +96,11 @@
       <version>${magnolia.version}</version>
     </dependency>
     <dependency>
+      <groupId>info.magnolia</groupId>
+      <artifactId>magnolia-templating-compatibility</artifactId>
+      <version>${magnolia.version}</version>
+    </dependency>
+    <dependency>
       <groupId>net.sourceforge.openutils</groupId>
       <artifactId>openutils-mgnltasks</artifactId>
       <version>5.0.0-SNAPSHOT</version>

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

[Openutils-svn] SF.net SVN: openutils:[3799] magnoliamodules/trunk/openutils-mgnlmail/src/ main/java/net/sourceforge/openutils/mgnlmail/EmailFromPage.java

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

Revision: 3799
          http://openutils.svn.sourceforge.net/openutils/?rev=3799&view=rev
Author:   diego_schivo
Date:     2012-03-15 10:21:48 +0000 (Thu, 15 Mar 2012)
Log Message:
-----------
openutils-mgnlmail: EmailFromPage

Modified Paths:
--------------
    magnoliamodules/trunk/openutils-mgnlmail/src/main/java/net/sourceforge/openutils/mgnlmail/EmailFromPage.java

Modified: magnoliamodules/trunk/openutils-mgnlmail/src/main/java/net/sourceforge/openutils/mgnlmail/EmailFromPage.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlmail/src/main/java/net/sourceforge/openutils/mgnlmail/EmailFromPage.java	2012-03-15 10:04:44 UTC (rev 3798)
+++ magnoliamodules/trunk/openutils-mgnlmail/src/main/java/net/sourceforge/openutils/mgnlmail/EmailFromPage.java	2012-03-15 10:21:48 UTC (rev 3799)
@@ -20,15 +20,19 @@
 package net.sourceforge.openutils.mgnlmail;
 
 import freemarker.template.Template;
-import info.magnolia.cms.core.Content;
 import info.magnolia.context.MgnlContext;
 import info.magnolia.module.mail.MailTemplate;
 import info.magnolia.module.mail.templates.impl.FreemarkerEmail;
+import info.magnolia.objectfactory.Components;
+import info.magnolia.rendering.engine.AppendableOnlyOutputProvider;
+import info.magnolia.rendering.engine.RenderingEngine;
 
 import java.io.StringWriter;
 import java.io.Writer;
 import java.util.Map;
 
+import javax.jcr.Node;
+
 import org.apache.commons.lang.StringUtils;
 
 
@@ -52,8 +56,8 @@
 
         final String pageUrl = this.getTemplate().getTemplateFile();
 
-        Content mailNode = MgnlContext.getHierarchyManager("email").getContent(pageUrl);
-        MagnoliaTemplatingUtilities.getInstance().renderTemplate(mailNode, writer);
+        Node mailNode = MgnlContext.getJCRSession("email").getNode(pageUrl);
+        Components.getSingleton(RenderingEngine.class).render(mailNode, new AppendableOnlyOutputProvider(writer));
 
         String pageContent = writer.toString();
 

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

[Openutils-svn] SF.net SVN: openutils:[3798] magnoliamodules/trunk/openutils-mgnlutils/src/ main/java/it/openutils/mgnlutils/templating/AutoGenerateTemplateModel.java

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

Revision: 3798
          http://openutils.svn.sourceforge.net/openutils/?rev=3798&view=rev
Author:   diego_schivo
Date:     2012-03-15 10:04:44 +0000 (Thu, 15 Mar 2012)
Log Message:
-----------
openutils-mgnlutils: AutoGenerateTemplateModel

Modified Paths:
--------------
    magnoliamodules/trunk/openutils-mgnlutils/src/main/java/it/openutils/mgnlutils/templating/AutoGenerateTemplateModel.java

Modified: magnoliamodules/trunk/openutils-mgnlutils/src/main/java/it/openutils/mgnlutils/templating/AutoGenerateTemplateModel.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlutils/src/main/java/it/openutils/mgnlutils/templating/AutoGenerateTemplateModel.java	2012-03-15 10:02:47 UTC (rev 3797)
+++ magnoliamodules/trunk/openutils-mgnlutils/src/main/java/it/openutils/mgnlutils/templating/AutoGenerateTemplateModel.java	2012-03-15 10:04:44 UTC (rev 3798)
@@ -26,6 +26,7 @@
 import info.magnolia.rendering.model.RenderingModel;
 import info.magnolia.rendering.model.RenderingModelImpl;
 
+import javax.jcr.Node;
 import javax.jcr.RepositoryException;
 
 import org.apache.commons.lang.StringUtils;
@@ -48,7 +49,7 @@
      * @param definition
      * @param parent
      */
-    public AutoGenerateTemplateModel(Content content, ExtendedTemplate definition, RenderingModel parent)
+    public AutoGenerateTemplateModel(Node content, ExtendedTemplate definition, RenderingModel parent)
     {
         super(content, definition, parent);
     }
@@ -86,7 +87,7 @@
                 Content paragraph;
                 try
                 {
-                    paragraph = ContentUtil.createPath(content, parDef[0], ItemType.CONTENTNODE, true);
+                    paragraph = ContentUtil.createPath(ContentUtil.asContent(content), parDef[0], ItemType.CONTENTNODE, true);
                     if (StringUtils.isEmpty(paragraph.getTemplate()))
                     {
                         paragraph.getMetaData().setTemplate(parDef[1]);

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

[Openutils-svn] SF.net SVN: openutils:[3797] magnoliamodules/trunk/openutils-mgnlutils/src/ main/java/it/openutils/mgnlutils/templating/ExtendedTemplate.java

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

Revision: 3797
          http://openutils.svn.sourceforge.net/openutils/?rev=3797&view=rev
Author:   diego_schivo
Date:     2012-03-15 10:02:47 +0000 (Thu, 15 Mar 2012)
Log Message:
-----------
openutils-mgnlutils: ExtendedTemplate.getTemplateAvailability()

Modified Paths:
--------------
    magnoliamodules/trunk/openutils-mgnlutils/src/main/java/it/openutils/mgnlutils/templating/ExtendedTemplate.java

Modified: magnoliamodules/trunk/openutils-mgnlutils/src/main/java/it/openutils/mgnlutils/templating/ExtendedTemplate.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlutils/src/main/java/it/openutils/mgnlutils/templating/ExtendedTemplate.java	2012-03-15 06:53:34 UTC (rev 3796)
+++ magnoliamodules/trunk/openutils-mgnlutils/src/main/java/it/openutils/mgnlutils/templating/ExtendedTemplate.java	2012-03-15 10:02:47 UTC (rev 3797)
@@ -20,11 +20,15 @@
 package it.openutils.mgnlutils.templating;
 
 import info.magnolia.cms.core.Content;
+import info.magnolia.cms.util.ContentUtil;
+import info.magnolia.rendering.template.TemplateAvailability;
+import info.magnolia.rendering.template.TemplateDefinition;
 import info.magnolia.rendering.template.configured.ConfiguredTemplateDefinition;
 
 import java.util.HashSet;
 import java.util.Set;
 
+import javax.jcr.Node;
 import javax.jcr.RepositoryException;
 
 import org.apache.commons.lang.StringUtils;
@@ -155,76 +159,85 @@
      * {@inheritDoc}
      */
     @Override
-    public boolean isAvailable(Content node)
+    public TemplateAvailability getTemplateAvailability()
     {
-        boolean available = super.isAvailable(node);
-
-        if (!available)
+        final TemplateAvailability x = super.getTemplateAvailability();
+        return new TemplateAvailability()
         {
-            return false;
-        }
+            
+            public boolean isAvailable(Node content, TemplateDefinition templateDefinition)
+            {
+                boolean available = x != null ? !x.isAvailable(content, templateDefinition) : true;
 
-        if (repositories != null && !repositories.isEmpty())
-        {
-            try
-            {
-                if (!repositories.contains(node.getWorkspace().getName()))
+                if (!available)
                 {
                     return false;
                 }
-            }
-            catch (RepositoryException e)
-            {
-                // ignore, should never happen
-            }
-        }
 
-        if (available && (levels != null && !levels.isEmpty()))
-        {
-            try
-            {
-                int currentLevel = node.getLevel();
-                if (!levels.contains(currentLevel))
+                Content node = ContentUtil.asContent(content);
+                if (repositories != null && !repositories.isEmpty())
                 {
-                    return false;
+                    try
+                    {
+                        if (!repositories.contains(node.getWorkspace().getName()))
+                        {
+                            return false;
+                        }
+                    }
+                    catch (RepositoryException e)
+                    {
+                        // ignore, should never happen
+                    }
                 }
-            }
-            catch (RepositoryException e)
-            {
-                // ignore, should never happen
-            }
-        }
 
-        if (available && StringUtils.isNotBlank(parentPath))
-        {
-            if (!StringUtils.contains(node.getHandle(), parentPath))
-            {
-                return false;
-            }
-        }
+                if (available && (levels != null && !levels.isEmpty()))
+                {
+                    try
+                    {
+                        int currentLevel = node.getLevel();
+                        if (!levels.contains(currentLevel))
+                        {
+                            return false;
+                        }
+                    }
+                    catch (RepositoryException e)
+                    {
+                        // ignore, should never happen
+                    }
+                }
 
-        if (available && (parentTemplates != null && !parentTemplates.isEmpty()))
-        {
-            try
-            {
-                Content parent = node.getParent();
-                while (parent.getLevel() > 0)
+                if (available && StringUtils.isNotBlank(parentPath))
                 {
-                    if (parentTemplates.contains(parent.getTemplate()))
+                    if (!StringUtils.contains(node.getHandle(), parentPath))
                     {
-                        return true;
+                        return false;
                     }
-                    parent = parent.getParent();
                 }
+
+                if (available && (parentTemplates != null && !parentTemplates.isEmpty()))
+                {
+                    try
+                    {
+                        Content parent = node.getParent();
+                        while (parent.getLevel() > 0)
+                        {
+                            if (parentTemplates.contains(parent.getTemplate()))
+                            {
+                                return true;
+                            }
+                            parent = parent.getParent();
+                        }
+                    }
+                    catch (RepositoryException e)
+                    {
+                        log.warn("Error checking parent: " + e.getMessage(), e);
+                    }
+                    return false;
+                }
+
+                return true;
             }
-            catch (RepositoryException e)
-            {
-                log.warn("Error checking parent: " + e.getMessage(), e);
-            }
-            return false;
-        }
-
-        return true;
+        };
     }
 
 }

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

[Openutils-svn] SF.net SVN: openutils:[3796] magnoliamodules/trunk/openutils-mgnltagcloud/ src/test/java/net/sourceforge/openutils/mgnltagcloud/manager/ TagCloudManagerTest.java

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

Revision: 3796
          http://openutils.svn.sourceforge.net/openutils/?rev=3796&view=rev
Author:   diego_schivo
Date:     2012-03-15 06:53:34 +0000 (Thu, 15 Mar 2012)
Log Message:
-----------
TagCloudManagerTest: import static

Modified Paths:
--------------
    magnoliamodules/trunk/openutils-mgnltagcloud/src/test/java/net/sourceforge/openutils/mgnltagcloud/manager/TagCloudManagerTest.java

Modified: magnoliamodules/trunk/openutils-mgnltagcloud/src/test/java/net/sourceforge/openutils/mgnltagcloud/manager/TagCloudManagerTest.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnltagcloud/src/test/java/net/sourceforge/openutils/mgnltagcloud/manager/TagCloudManagerTest.java	2012-03-15 06:51:47 UTC (rev 3795)
+++ magnoliamodules/trunk/openutils-mgnltagcloud/src/test/java/net/sourceforge/openutils/mgnltagcloud/manager/TagCloudManagerTest.java	2012-03-15 06:53:34 UTC (rev 3796)
@@ -44,6 +44,9 @@
 import org.junit.Test;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotSame;
+import static org.junit.Assert.fail;
 
 
 /**

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

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

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

Revision: 3795
          http://openutils.svn.sourceforge.net/openutils/?rev=3795&view=rev
Author:   diego_schivo
Date:     2012-03-15 06:51:47 +0000 (Thu, 15 Mar 2012)
Log Message:
-----------
openutils-mgnlcas: fix compile errors

Modified Paths:
--------------
    magnoliamodules/trunk/openutils-mgnlcas/src/main/java/net/sourceforge/openutils/mgnlcas/CASAuthenticationModule.java
    magnoliamodules/trunk/openutils-mgnlcas/src/main/java/net/sourceforge/openutils/mgnlcas/CasLogin.java
    magnoliamodules/trunk/openutils-mgnlcas/src/main/java/net/sourceforge/openutils/mgnlcas/CasMagnoliaUser.java

Modified: magnoliamodules/trunk/openutils-mgnlcas/src/main/java/net/sourceforge/openutils/mgnlcas/CASAuthenticationModule.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlcas/src/main/java/net/sourceforge/openutils/mgnlcas/CASAuthenticationModule.java	2012-03-15 06:50:32 UTC (rev 3794)
+++ magnoliamodules/trunk/openutils-mgnlcas/src/main/java/net/sourceforge/openutils/mgnlcas/CASAuthenticationModule.java	2012-03-15 06:51:47 UTC (rev 3795)
@@ -19,6 +19,7 @@
 
 package net.sourceforge.openutils.mgnlcas;
 
+import info.magnolia.cms.security.Realm;
 import info.magnolia.cms.security.User;
 import info.magnolia.cms.security.auth.Entity;
 import info.magnolia.cms.security.auth.GroupList;
@@ -226,7 +227,8 @@
         // this.pswd = ((PasswordCallback) callbacks[1]).getPassword();
         if (this.useRealmCallback)
         {
-            this.realm = StringUtils.defaultIfEmpty(realmCallback.getRealm(), this.realm);
+            this.realm = StringUtils.isBlank(realmCallback.getRealm()) ? this.realm : Realm.Factory
+                .newRealm(realmCallback.getRealm());
         }
 
         String ticket = ticketCallback.getText();

Modified: magnoliamodules/trunk/openutils-mgnlcas/src/main/java/net/sourceforge/openutils/mgnlcas/CasLogin.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlcas/src/main/java/net/sourceforge/openutils/mgnlcas/CasLogin.java	2012-03-15 06:50:32 UTC (rev 3794)
+++ magnoliamodules/trunk/openutils-mgnlcas/src/main/java/net/sourceforge/openutils/mgnlcas/CasLogin.java	2012-03-15 06:51:47 UTC (rev 3795)
@@ -165,7 +165,6 @@
 
             if (user != null)
             {
-                user.setSubject(subject);
             }
             else
             {
@@ -173,7 +172,7 @@
                     .error("Unable to obtain a user from userManager, maybe the external user manager is not configured for the cas realm?");
             }
 
-            return new LoginResult(LoginResult.STATUS_SUCCEEDED, user);
+            return new LoginResult(LoginResult.STATUS_SUCCEEDED, subject);
         }
         catch (LoginException e)
         {

Modified: magnoliamodules/trunk/openutils-mgnlcas/src/main/java/net/sourceforge/openutils/mgnlcas/CasMagnoliaUser.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlcas/src/main/java/net/sourceforge/openutils/mgnlcas/CasMagnoliaUser.java	2012-03-15 06:50:32 UTC (rev 3794)
+++ magnoliamodules/trunk/openutils-mgnlcas/src/main/java/net/sourceforge/openutils/mgnlcas/CasMagnoliaUser.java	2012-03-15 06:51:47 UTC (rev 3795)
@@ -55,7 +55,6 @@
         final Set<Entity> principalDetails = subject.getPrincipals(Entity.class);
         final Iterator<Entity> entityIterator = principalDetails.iterator();
         this.userDetails = entityIterator.next();
-        setSubject(subject);
     }
 
     /**

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

[Openutils-svn] SF.net SVN: openutils:[3794] magnoliamodules/trunk/openutils-mgnlutils/src/ main/java/it/openutils/mgnlutils/el/MgnlUtilsElFunctions.java

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

Revision: 3794
          http://openutils.svn.sourceforge.net/openutils/?rev=3794&view=rev
Author:   diego_schivo
Date:     2012-03-15 06:50:32 +0000 (Thu, 15 Mar 2012)
Log Message:
-----------
MgnlUtilsElFunctions: MgnlContext.getSubject()

Modified Paths:
--------------
    magnoliamodules/trunk/openutils-mgnlutils/src/main/java/it/openutils/mgnlutils/el/MgnlUtilsElFunctions.java

Modified: magnoliamodules/trunk/openutils-mgnlutils/src/main/java/it/openutils/mgnlutils/el/MgnlUtilsElFunctions.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlutils/src/main/java/it/openutils/mgnlutils/el/MgnlUtilsElFunctions.java	2012-03-14 16:07:32 UTC (rev 3793)
+++ magnoliamodules/trunk/openutils-mgnlutils/src/main/java/it/openutils/mgnlutils/el/MgnlUtilsElFunctions.java	2012-03-15 06:50:32 UTC (rev 3794)
@@ -912,7 +912,7 @@
     @SuppressWarnings("unchecked")
     public static Map<String, Object> userProperties()
     {
-        Subject subject = MgnlContext.getUser().getSubject();
+        Subject subject = MgnlContext.getSubject();
 
         Set<Entity> principalDetails = subject.getPrincipals(Entity.class);
         Iterator<Entity> entityIterator = principalDetails.iterator();

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

[Openutils-svn] SF.net SVN: openutils:[3793] magnoliamodules/trunk/openutils-mgnlutils/src/ test/java/it/openutils/mgnlutils/el/MgnlUtilsElFunctionsTest.java

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

Revision: 3793
          http://openutils.svn.sourceforge.net/openutils/?rev=3793&view=rev
Author:   diego_schivo
Date:     2012-03-14 16:07:32 +0000 (Wed, 14 Mar 2012)
Log Message:
-----------
fix MgnlUtilsElFunctionsTest

Modified Paths:
--------------
    magnoliamodules/trunk/openutils-mgnlutils/src/test/java/it/openutils/mgnlutils/el/MgnlUtilsElFunctionsTest.java

Modified: magnoliamodules/trunk/openutils-mgnlutils/src/test/java/it/openutils/mgnlutils/el/MgnlUtilsElFunctionsTest.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlutils/src/test/java/it/openutils/mgnlutils/el/MgnlUtilsElFunctionsTest.java	2012-03-14 15:48:06 UTC (rev 3792)
+++ magnoliamodules/trunk/openutils-mgnlutils/src/test/java/it/openutils/mgnlutils/el/MgnlUtilsElFunctionsTest.java	2012-03-14 16:07:32 UTC (rev 3793)
@@ -20,10 +20,13 @@
 package it.openutils.mgnlutils.el;
 
 import info.magnolia.cms.beans.config.ServerConfiguration;
+import info.magnolia.cms.beans.config.URI2RepositoryManager;
 import info.magnolia.cms.i18n.DefaultI18nContentSupport;
 import info.magnolia.cms.i18n.I18nContentSupportFactory;
 import info.magnolia.cms.i18n.LocaleDefinition;
 import info.magnolia.context.MgnlContext;
+import info.magnolia.link.LinkTransformerManager;
+import info.magnolia.test.ComponentsTestUtil;
 import info.magnolia.test.mock.MockWebContext;
 import it.openutils.mgnlutils.test.ModuleConfiguration;
 import it.openutils.mgnlutils.test.RepositoryTestConfiguration;
@@ -128,6 +131,10 @@
             MgnlContext.getInstance().setLocale(new Locale(""));
         }
 
+        // info.magnolia.link.BaseLinkTest.setUp()
+        // not configured in the repository
+        ComponentsTestUtil.setImplementation(URI2RepositoryManager.class, URI2RepositoryManager.class);
+        ComponentsTestUtil.setInstance(LinkTransformerManager.class, new LinkTransformerManager());
+
     }
-
 }
\ 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:[3792] magnoliamodules/trunk

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

Revision: 3792
          http://openutils.svn.sourceforge.net/openutils/?rev=3792&view=rev
Author:   diego_schivo
Date:     2012-03-14 15:48:06 +0000 (Wed, 14 Mar 2012)
Log Message:
-----------
magnolia.version=4.5.1

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

Modified: magnoliamodules/trunk/magnolia-test-webapp/pom.xml
===================================================================
--- magnoliamodules/trunk/magnolia-test-webapp/pom.xml	2012-03-14 13:41:25 UTC (rev 3791)
+++ magnoliamodules/trunk/magnolia-test-webapp/pom.xml	2012-03-14 15:48:06 UTC (rev 3792)
@@ -271,7 +271,7 @@
     </dependencies>
   </dependencyManagement>
   <properties>
-    <magnolia.version>4.5</magnolia.version>
+    <magnolia.version>4.5.1</magnolia.version>
     <stk.version>1.3.1</stk.version>
     <jackrabbit.version>2.4.0</jackrabbit.version>
   </properties>

Modified: magnoliamodules/trunk/openutils-mgnlbootstrapsync/pom.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnlbootstrapsync/pom.xml	2012-03-14 13:41:25 UTC (rev 3791)
+++ magnoliamodules/trunk/openutils-mgnlbootstrapsync/pom.xml	2012-03-14 15:48:06 UTC (rev 3792)
@@ -92,6 +92,6 @@
     </dependency>
   </dependencies>
   <properties>
-    <magnolia.version>4.5</magnolia.version>
+    <magnolia.version>4.5.1</magnolia.version>
   </properties>
 </project>
\ No newline at end of file

Modified: magnoliamodules/trunk/openutils-mgnlcache/pom.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnlcache/pom.xml	2012-03-14 13:41:25 UTC (rev 3791)
+++ magnoliamodules/trunk/openutils-mgnlcache/pom.xml	2012-03-14 15:48:06 UTC (rev 3792)
@@ -85,6 +85,6 @@
     </dependency>
   </dependencies>
   <properties>
-    <magnolia.version>4.5</magnolia.version>
+    <magnolia.version>4.5.1</magnolia.version>
   </properties>
 </project>
\ No newline at end of file

Modified: magnoliamodules/trunk/openutils-mgnlcas/pom.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnlcas/pom.xml	2012-03-14 13:41:25 UTC (rev 3791)
+++ magnoliamodules/trunk/openutils-mgnlcas/pom.xml	2012-03-14 15:48:06 UTC (rev 3792)
@@ -95,6 +95,6 @@
     </repository>
   </repositories>
   <properties>
-    <magnolia.version>4.5</magnolia.version>
+    <magnolia.version>4.5.1</magnolia.version>
   </properties>
 </project>
\ No newline at end of file

Modified: magnoliamodules/trunk/openutils-mgnlcontextmenu/pom.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnlcontextmenu/pom.xml	2012-03-14 13:41:25 UTC (rev 3791)
+++ magnoliamodules/trunk/openutils-mgnlcontextmenu/pom.xml	2012-03-14 15:48:06 UTC (rev 3792)
@@ -170,6 +170,6 @@
     </repository>
   </repositories>
   <properties>
-    <magnolia.version>4.5</magnolia.version>
+    <magnolia.version>4.5.1</magnolia.version>
   </properties>
 </project>
\ No newline at end of file

Modified: magnoliamodules/trunk/openutils-mgnlcontrols/pom.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnlcontrols/pom.xml	2012-03-14 13:41:25 UTC (rev 3791)
+++ magnoliamodules/trunk/openutils-mgnlcontrols/pom.xml	2012-03-14 15:48:06 UTC (rev 3792)
@@ -120,6 +120,6 @@
     </dependency>
   </dependencies>
   <properties>
-    <magnolia.version>4.5</magnolia.version>
+    <magnolia.version>4.5.1</magnolia.version>
   </properties>
 </project>
\ No newline at end of file

Modified: magnoliamodules/trunk/openutils-mgnlcriteria/pom.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnlcriteria/pom.xml	2012-03-14 13:41:25 UTC (rev 3791)
+++ magnoliamodules/trunk/openutils-mgnlcriteria/pom.xml	2012-03-14 15:48:06 UTC (rev 3792)
@@ -184,7 +184,7 @@
     </dependency>
   </dependencies>
   <properties>
-    <magnolia.version>4.5</magnolia.version>
+    <magnolia.version>4.5.1</magnolia.version>
     <jackrabbit.version>2.4.0</jackrabbit.version>
     <jcr.version>2.0</jcr.version>
   </properties>

Modified: magnoliamodules/trunk/openutils-mgnlgroovy/pom.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnlgroovy/pom.xml	2012-03-14 13:41:25 UTC (rev 3791)
+++ magnoliamodules/trunk/openutils-mgnlgroovy/pom.xml	2012-03-14 15:48:06 UTC (rev 3792)
@@ -101,6 +101,6 @@
     </dependency>
   </dependencies>
   <properties>
-    <magnolia.version>4.5</magnolia.version>
+    <magnolia.version>4.5.1</magnolia.version>
   </properties>
 </project>
\ No newline at end of file

Modified: magnoliamodules/trunk/openutils-mgnllms/pom.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnllms/pom.xml	2012-03-14 13:41:25 UTC (rev 3791)
+++ magnoliamodules/trunk/openutils-mgnllms/pom.xml	2012-03-14 15:48:06 UTC (rev 3792)
@@ -201,6 +201,6 @@
     </dependency>
   </dependencies>
   <properties>
-    <magnolia.version>4.5</magnolia.version>
+    <magnolia.version>4.5.1</magnolia.version>
   </properties>
 </project>
\ No newline at end of file

Modified: magnoliamodules/trunk/openutils-mgnlmail/pom.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnlmail/pom.xml	2012-03-14 13:41:25 UTC (rev 3791)
+++ magnoliamodules/trunk/openutils-mgnlmail/pom.xml	2012-03-14 15:48:06 UTC (rev 3792)
@@ -108,6 +108,6 @@
     </dependency>
   </dependencies>
   <properties>
-    <magnolia.version>4.5</magnolia.version>
+    <magnolia.version>4.5.1</magnolia.version>
   </properties>
 </project>
\ No newline at end of file

Modified: magnoliamodules/trunk/openutils-mgnlmedia/pom.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnlmedia/pom.xml	2012-03-14 13:41:25 UTC (rev 3791)
+++ magnoliamodules/trunk/openutils-mgnlmedia/pom.xml	2012-03-14 15:48:06 UTC (rev 3792)
@@ -255,6 +255,6 @@
     </dependency>
   </dependencies>
   <properties>
-    <magnolia.version>4.5</magnolia.version>
+    <magnolia.version>4.5.1</magnolia.version>
   </properties>
 </project>
\ No newline at end of file

Modified: magnoliamodules/trunk/openutils-mgnlmessages/pom.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnlmessages/pom.xml	2012-03-14 13:41:25 UTC (rev 3791)
+++ magnoliamodules/trunk/openutils-mgnlmessages/pom.xml	2012-03-14 15:48:06 UTC (rev 3792)
@@ -128,6 +128,6 @@
     </dependency>
   </dependencies>
   <properties>
-    <magnolia.version>4.5</magnolia.version>
+    <magnolia.version>4.5.1</magnolia.version>
   </properties>
 </project>
\ No newline at end of file

Modified: magnoliamodules/trunk/openutils-mgnlmobile/pom.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnlmobile/pom.xml	2012-03-14 13:41:25 UTC (rev 3791)
+++ magnoliamodules/trunk/openutils-mgnlmobile/pom.xml	2012-03-14 15:48:06 UTC (rev 3792)
@@ -131,6 +131,6 @@
     </dependency>
   </dependencies>
   <properties>
-    <magnolia.version>4.5</magnolia.version>
+    <magnolia.version>4.5.1</magnolia.version>
   </properties>
 </project>
\ No newline at end of file

Modified: magnoliamodules/trunk/openutils-mgnlrepoutils/pom.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnlrepoutils/pom.xml	2012-03-14 13:41:25 UTC (rev 3791)
+++ magnoliamodules/trunk/openutils-mgnlrepoutils/pom.xml	2012-03-14 15:48:06 UTC (rev 3792)
@@ -99,6 +99,6 @@
     </dependency>
   </dependencies>
   <properties>
-    <magnolia.version>4.5</magnolia.version>
+    <magnolia.version>4.5.1</magnolia.version>
   </properties>
 </project>
\ No newline at end of file

Modified: magnoliamodules/trunk/openutils-mgnlrules/pom.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnlrules/pom.xml	2012-03-14 13:41:25 UTC (rev 3791)
+++ magnoliamodules/trunk/openutils-mgnlrules/pom.xml	2012-03-14 15:48:06 UTC (rev 3792)
@@ -147,6 +147,6 @@
     </repository>
   </repositories>
   <properties>
-    <magnolia.version>4.5</magnolia.version>
+    <magnolia.version>4.5.1</magnolia.version>
   </properties>
 </project>
\ No newline at end of file

Modified: magnoliamodules/trunk/openutils-mgnlstripes/pom.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnlstripes/pom.xml	2012-03-14 13:41:25 UTC (rev 3791)
+++ magnoliamodules/trunk/openutils-mgnlstripes/pom.xml	2012-03-14 15:48:06 UTC (rev 3792)
@@ -106,6 +106,6 @@
     </dependency>
   </dependencies>
   <properties>
-    <magnolia.version>4.5</magnolia.version>
+    <magnolia.version>4.5.1</magnolia.version>
   </properties>
 </project>
\ No newline at end of file

Modified: magnoliamodules/trunk/openutils-mgnlstruts11/pom.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnlstruts11/pom.xml	2012-03-14 13:41:25 UTC (rev 3791)
+++ magnoliamodules/trunk/openutils-mgnlstruts11/pom.xml	2012-03-14 15:48:06 UTC (rev 3792)
@@ -115,6 +115,6 @@
     </dependency>
   </dependencies>
   <properties>
-    <magnolia.version>4.5</magnolia.version>
+    <magnolia.version>4.5.1</magnolia.version>
   </properties>
 </project>
\ No newline at end of file

Modified: magnoliamodules/trunk/openutils-mgnltagcloud/pom.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnltagcloud/pom.xml	2012-03-14 13:41:25 UTC (rev 3791)
+++ magnoliamodules/trunk/openutils-mgnltagcloud/pom.xml	2012-03-14 15:48:06 UTC (rev 3792)
@@ -171,7 +171,7 @@
     </dependency>
   </dependencies>
   <properties>
-    <magnolia.version>4.5</magnolia.version>
+    <magnolia.version>4.5.1</magnolia.version>
     <jackrabbit.version>2.4.0</jackrabbit.version>
   </properties>
 </project>
\ No newline at end of file

Modified: magnoliamodules/trunk/openutils-mgnltasks/pom.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnltasks/pom.xml	2012-03-14 13:41:25 UTC (rev 3791)
+++ magnoliamodules/trunk/openutils-mgnltasks/pom.xml	2012-03-14 15:48:06 UTC (rev 3792)
@@ -116,6 +116,6 @@
     </dependency>
   </dependencies>
   <properties>
-    <magnolia.version>4.5</magnolia.version>
+    <magnolia.version>4.5.1</magnolia.version>
   </properties>
 </project>
\ No newline at end of file

Modified: magnoliamodules/trunk/openutils-mgnlutils/pom.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnlutils/pom.xml	2012-03-14 13:41:25 UTC (rev 3791)
+++ magnoliamodules/trunk/openutils-mgnlutils/pom.xml	2012-03-14 15:48:06 UTC (rev 3792)
@@ -154,6 +154,6 @@
     </dependency>
   </dependencies>
   <properties>
-    <magnolia.version>4.5</magnolia.version>
+    <magnolia.version>4.5.1</magnolia.version>
   </properties>
 </project>
\ No newline at end of file

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

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

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

Revision: 3791
          http://openutils.svn.sourceforge.net/openutils/?rev=3791&view=rev
Author:   diego_schivo
Date:     2012-03-14 13:41:25 +0000 (Wed, 14 Mar 2012)
Log Message:
-----------
5.0.0-SNAPSHOT

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

Modified: magnoliamodules/trunk/magnolia-test-webapp/pom.xml
===================================================================
--- magnoliamodules/trunk/magnolia-test-webapp/pom.xml	2012-03-14 11:20:36 UTC (rev 3790)
+++ magnoliamodules/trunk/magnolia-test-webapp/pom.xml	2012-03-14 13:41:25 UTC (rev 3791)
@@ -164,8 +164,7 @@
     <dependency>
       <groupId>net.sourceforge.openutils</groupId>
       <artifactId>openutils-mgnlmessages</artifactId>
-      <!--version>5.0.0-SNAPSHOT</version-->
-      <version>4.2.4-SNAPSHOT</version>
+      <version>5.0.0-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>net.sourceforge.openutils</groupId>
@@ -215,8 +214,7 @@
     <dependency>
       <groupId>net.sourceforge.openutils</groupId>
       <artifactId>openutils-mgnlmobile</artifactId>
-      <!--version>5.0.0-SNAPSHOT</version-->
-      <version>1.0.1-SNAPSHOT</version>
+      <version>5.0.0-SNAPSHOT</version>
     </dependency>
   </dependencies>
   <dependencyManagement>

Modified: magnoliamodules/trunk/openutils-mgnlmessages/pom.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnlmessages/pom.xml	2012-03-14 11:20:36 UTC (rev 3790)
+++ magnoliamodules/trunk/openutils-mgnlmessages/pom.xml	2012-03-14 13:41:25 UTC (rev 3791)
@@ -11,7 +11,7 @@
   <artifactId>openutils-mgnlmessages</artifactId>
   <name>Messages Module for Magnolia CMS</name>
   <description>Manage your translations from the Magnolia admin interface</description>
-  <version>4.2.4-SNAPSHOT</version>
+  <version>5.0.0-SNAPSHOT</version>
   <licenses>
     <license>
       <name>GPLv3</name>

Modified: magnoliamodules/trunk/openutils-mgnlmobile/pom.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnlmobile/pom.xml	2012-03-14 11:20:36 UTC (rev 3790)
+++ magnoliamodules/trunk/openutils-mgnlmobile/pom.xml	2012-03-14 13:41:25 UTC (rev 3791)
@@ -10,7 +10,7 @@
   <packaging>jar</packaging>
   <artifactId>openutils-mgnlmobile</artifactId>
   <name>Mobile Module for Magnolia CMS</name>
-  <version>1.0.1-SNAPSHOT</version>
+  <version>5.0.0-SNAPSHOT</version>
   <inceptionYear>2010</inceptionYear>
   <licenses>
     <license>

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

[Openutils-svn] SF.net SVN: openutils:[3790] magnoliamodules/trunk/magnolia-test-webapp/pom .xml

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

Revision: 3790
          http://openutils.svn.sourceforge.net/openutils/?rev=3790&view=rev
Author:   diego_schivo
Date:     2012-03-14 11:20:36 +0000 (Wed, 14 Mar 2012)
Log Message:
-----------
magnolia-rendering, magnolia-module-dms

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

Modified: magnoliamodules/trunk/magnolia-test-webapp/pom.xml
===================================================================
--- magnoliamodules/trunk/magnolia-test-webapp/pom.xml	2012-03-14 11:13:25 UTC (rev 3789)
+++ magnoliamodules/trunk/magnolia-test-webapp/pom.xml	2012-03-14 11:20:36 UTC (rev 3790)
@@ -21,6 +21,11 @@
     </dependency>
     <dependency>
       <groupId>info.magnolia</groupId>
+      <artifactId>magnolia-rendering</artifactId>
+      <version>${magnolia.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>info.magnolia</groupId>
       <artifactId>magnolia-module-admininterface</artifactId>
       <version>${magnolia.version}</version>
     </dependency>
@@ -82,7 +87,7 @@
     <dependency>
       <groupId>info.magnolia</groupId>
       <artifactId>magnolia-module-dms</artifactId>
-      <version>1.5.2</version>
+      <version>1.6</version>
     </dependency>
     <dependency>
       <groupId>taglibs</groupId>

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

[Openutils-svn] SF.net SVN: openutils:[3789] magnoliamodules/trunk/magnolia-test-webapp/src /main/webapp/WEB-INF/config/default/magnolia.properties

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

Revision: 3789
          http://openutils.svn.sourceforge.net/openutils/?rev=3789&view=rev
Author:   diego_schivo
Date:     2012-03-14 11:13:25 +0000 (Wed, 14 Mar 2012)
Log Message:
-----------
magnolia.properties: magnolia.author.key.location

Modified Paths:
--------------
    magnoliamodules/trunk/magnolia-test-webapp/src/main/webapp/WEB-INF/config/default/magnolia.properties

Modified: magnoliamodules/trunk/magnolia-test-webapp/src/main/webapp/WEB-INF/config/default/magnolia.properties
===================================================================
--- magnoliamodules/trunk/magnolia-test-webapp/src/main/webapp/WEB-INF/config/default/magnolia.properties	2012-03-14 09:23:48 UTC (rev 3788)
+++ magnoliamodules/trunk/magnolia-test-webapp/src/main/webapp/WEB-INF/config/default/magnolia.properties	2012-03-14 11:13:25 UTC (rev 3789)
@@ -21,3 +21,5 @@
 magnolia.update.auto=true
 
 
+# Location of private and public keys used for activation
+magnolia.author.key.location=WEB-INF/config/default/keypair.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:[3788] magnoliamodules/trunk/openutils-mgnlutils/src/ main/java/it/openutils/mgnlutils/test/AbstractRepositoryTestcase.java

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

Revision: 3788
          http://openutils.svn.sourceforge.net/openutils/?rev=3788&view=rev
Author:   diego_schivo
Date:     2012-03-14 09:23:48 +0000 (Wed, 14 Mar 2012)
Log Message:
-----------
AbstractRepositoryTestcase.initDefaultImplementations() (MgnlTestCase)

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

Modified: magnoliamodules/trunk/openutils-mgnlutils/src/main/java/it/openutils/mgnlutils/test/AbstractRepositoryTestcase.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlutils/src/main/java/it/openutils/mgnlutils/test/AbstractRepositoryTestcase.java	2012-03-14 08:21:25 UTC (rev 3787)
+++ magnoliamodules/trunk/openutils-mgnlutils/src/main/java/it/openutils/mgnlutils/test/AbstractRepositoryTestcase.java	2012-03-14 09:23:48 UTC (rev 3788)
@@ -27,13 +27,43 @@
 import info.magnolia.cms.util.ClasspathResourcesUtil;
 import info.magnolia.cms.util.ContentUtil;
 import info.magnolia.content2bean.Content2BeanException;
+import info.magnolia.content2bean.Content2BeanProcessor;
 import info.magnolia.content2bean.Content2BeanUtil;
+import info.magnolia.content2bean.TypeMapping;
+import info.magnolia.content2bean.impl.Content2BeanProcessorImpl;
+import info.magnolia.content2bean.impl.TypeMappingImpl;
 import info.magnolia.context.MgnlContext;
 import info.magnolia.context.SystemContext;
 import info.magnolia.context.SystemRepositoryStrategy;
 import info.magnolia.importexport.BootstrapUtil;
+import info.magnolia.init.MagnoliaConfigurationProperties;
+import info.magnolia.init.properties.ClasspathPropertySource;
+import info.magnolia.init.properties.InitPathsPropertySource;
+import info.magnolia.init.properties.ModulePropertiesSource;
 import info.magnolia.module.ModuleLifecycle;
+import info.magnolia.module.ModuleManagementException;
+import info.magnolia.module.ModuleManager;
+import info.magnolia.module.ModuleManagerImpl;
 import info.magnolia.module.ModuleRegistry;
+import info.magnolia.module.ModuleRegistryImpl;
+import info.magnolia.module.model.ModuleDefinition;
+import info.magnolia.module.model.reader.BetwixtModuleDefinitionReader;
+import info.magnolia.module.model.reader.DependencyCheckerImpl;
+import info.magnolia.objectfactory.Components;
+import info.magnolia.objectfactory.DefaultComponentProvider;
+import info.magnolia.objectfactory.configuration.ComponentConfiguration;
+import info.magnolia.objectfactory.configuration.ComponentProviderConfiguration;
+import info.magnolia.objectfactory.configuration.ComponentProviderConfigurationBuilder;
+import info.magnolia.objectfactory.configuration.ConfiguredComponentConfiguration;
+import info.magnolia.objectfactory.configuration.ImplementationConfiguration;
+import info.magnolia.objectfactory.configuration.InstanceConfiguration;
+import info.magnolia.objectfactory.configuration.ProviderConfiguration;
+import info.magnolia.repository.DefaultRepositoryManager;
+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;
 
@@ -43,6 +73,7 @@
 import java.io.InputStream;
 import java.lang.reflect.Field;
 import java.util.ArrayList;
+import java.util.Collections;
 import java.util.List;
 import java.util.Map;
 
@@ -169,13 +200,68 @@
         MgnlContext.setInstance(null);
     }
 
-    private void initDefaultImplementations() throws IOException
-    {
-        PropertiesInitializer.getInstance().loadBeanProperties();
-        PropertiesInitializer.getInstance().loadAllModuleProperties();
+    // info.magnolia.test.MgnlTestCase.initDefaultImplementations()
+    private void initDefaultImplementations() throws IOException, ModuleManagementException {
+        final List<ModuleDefinition> modules = getModuleDefinitionsForTests();
+        final ModuleRegistry mr = new ModuleRegistryImpl();
+        ModuleManagerImpl mm = new ModuleManagerImpl(null, new FixedModuleDefinitionReader(modules), mr, new DependencyCheckerImpl());
+        mm.loadDefinitions();
+
+        final TestMagnoliaConfigurationProperties configurationProperties = new TestMagnoliaConfigurationProperties(
+                new ModulePropertiesSource(mr),
+                new ClasspathPropertySource("/test-magnolia.properties"),
+                new InitPathsPropertySource(new TestMagnoliaInitPaths())
+        );
+        SystemProperty.setMagnoliaConfigurationProperties(configurationProperties);
+
+        ComponentsTestUtil.setInstance(ModuleManager.class, mm);
+        ComponentsTestUtil.setInstance(ModuleRegistry.class, mr);
+        ComponentsTestUtil.setInstance(MagnoliaConfigurationProperties.class, configurationProperties);
+
+        ComponentsTestUtil.setImplementation(RepositoryManager.class, DefaultRepositoryManager.class);
+
+        ComponentProviderConfigurationBuilder configurationBuilder = new ComponentProviderConfigurationBuilder();
+        ComponentProviderConfiguration configuration = configurationBuilder.getComponentsFromModules("system", mr.getModuleDefinitions());
+        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
+        final TypeMappingImpl typeMapping = new TypeMappingImpl();
+        configuration.registerInstance(TypeMapping.class, typeMapping);
+        configuration.registerInstance(Content2BeanProcessor.class, new Content2BeanProcessorImpl(typeMapping));
+
+        for (Map.Entry<Class, ComponentConfiguration> entry : configuration.getComponents().entrySet()) {
+            ComponentConfiguration value = entry.getValue();
+            if (value instanceof ImplementationConfiguration) {
+                ImplementationConfiguration config = (ImplementationConfiguration) value;
+                ComponentsTestUtil.setImplementation(config.getType(), config.getImplementation());
+            } else if (value instanceof InstanceConfiguration) {
+                InstanceConfiguration config = (InstanceConfiguration) value;
+                ComponentsTestUtil.setInstance(config.getType(), config.getInstance());
+            } else if (value instanceof ProviderConfiguration) {
+                ProviderConfiguration config = (ProviderConfiguration) value;
+                ComponentsTestUtil.setImplementation(config.getType(), config.getProviderClass());
+            } else if (value instanceof ConfiguredComponentConfiguration) {
+                ConfiguredComponentConfiguration config = (ConfiguredComponentConfiguration) value;
+                ComponentsTestUtil.setConfigured(config.getType(), config.getWorkspace(), config.getPath(), config.isObserved());
+            }
+        }
+
+        for (Map.Entry<Class<?>, Class<?>> entry : configuration.getTypeMapping().entrySet()) {
+            ComponentsTestUtil.setImplementation((Class)entry.getKey(), (Class)entry.getValue());
+        }
     }
 
+    // info.magnolia.test.MgnlTestCase.getModuleDefinitionsForTests()
     /**
+     * Override this method to provide the appropriate list of modules your tests need.
+     */
+    protected List<ModuleDefinition> getModuleDefinitionsForTests() throws ModuleManagementException {
+        final ModuleDefinition core = new BetwixtModuleDefinitionReader().readFromResource("/META-INF/magnolia/core.xml");
+        return Collections.singletonList(core);
+    }
+
+    /**
      * Workaround for JCR-1778.
      */
     @SuppressWarnings("unchecked")
@@ -209,7 +295,8 @@
     protected void modifyContextesToUseRealRepository()
     {
         SystemContext systemContext = MgnlContext.getSystemContext();
-        SystemRepositoryStrategy repositoryStrategy = new SystemRepositoryStrategy(systemContext);
+        RepositoryManager repositoryManager = Components.getComponent(RepositoryManager.class);
+        SystemRepositoryStrategy repositoryStrategy = new SystemRepositoryStrategy(repositoryManager);
 
         ((MockContext) systemContext).setRepositoryStrategy(repositoryStrategy);
         ((MockContext) MgnlContext.getInstance()).setRepositoryStrategy(repositoryStrategy);

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

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

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

Revision: 3787
          http://openutils.svn.sourceforge.net/openutils/?rev=3787&view=rev
Author:   diego_schivo
Date:     2012-03-14 08:21:25 +0000 (Wed, 14 Mar 2012)
Log Message:
-----------
AclSearchIndexTest: fix compile error

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	2012-03-14 07:47:31 UTC (rev 3786)
+++ magnoliamodules/trunk/openutils-mgnlcriteria/src/test/java/net/sourceforge/openutils/mgnlcriteria/jcr/query/lucene/AclSearchIndexTest.java	2012-03-14 08:21:25 UTC (rev 3787)
@@ -28,7 +28,9 @@
 import info.magnolia.context.AbstractRepositoryStrategy;
 import info.magnolia.context.DefaultRepositoryStrategy;
 import info.magnolia.context.MgnlContext;
+import info.magnolia.objectfactory.Components;
 import info.magnolia.repository.RepositoryConstants;
+import info.magnolia.repository.RepositoryManager;
 import info.magnolia.test.mock.MockWebContext;
 import it.openutils.mgnlutils.test.RepositoryTestConfiguration;
 import it.openutils.mgnlutils.test.TestNgRepositoryTestcase;
@@ -105,7 +107,8 @@
         super.modifyContextesToUseRealRepository();
 
         MockWebContext mwc = (MockWebContext) MgnlContext.getInstance();
-        DefaultRepositoryStrategy drs = new DefaultRepositoryStrategy(mwc);
+        RepositoryManager repositoryManager = Components.getComponent(RepositoryManager.class);
+        DefaultRepositoryStrategy drs = new DefaultRepositoryStrategy(repositoryManager, mwc);
         try
         {
             Field hmsField = AbstractRepositoryStrategy.class.getDeclaredField("hierarchyManagers");

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

[Openutils-svn] SF.net SVN: openutils:[3786] magnoliamodules/trunk/openutils-mgnlcriteria/ src/main/java/net/sourceforge/openutils/mgnlcriteria/advanced/impl/ AdvancedResultItemImpl.java

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

Revision: 3786
          http://openutils.svn.sourceforge.net/openutils/?rev=3786&view=rev
Author:   diego_schivo
Date:     2012-03-14 07:47:31 +0000 (Wed, 14 Mar 2012)
Log Message:
-----------
AdvancedResultItemImpl: fix compile error

Modified Paths:
--------------
    magnoliamodules/trunk/openutils-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/advanced/impl/AdvancedResultItemImpl.java

Modified: magnoliamodules/trunk/openutils-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/advanced/impl/AdvancedResultItemImpl.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/advanced/impl/AdvancedResultItemImpl.java	2012-03-14 07:43:50 UTC (rev 3785)
+++ magnoliamodules/trunk/openutils-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/advanced/impl/AdvancedResultItemImpl.java	2012-03-14 07:47:31 UTC (rev 3786)
@@ -26,6 +26,7 @@
 import java.lang.reflect.Method;
 
 import javax.jcr.Item;
+import javax.jcr.Node;
 import javax.jcr.RepositoryException;
 import javax.jcr.Value;
 import javax.jcr.query.Row;
@@ -65,7 +66,7 @@
         throws RepositoryException,
         AccessDeniedException
     {
-        super(item);
+        super((Node) item, hierarchyManager);
         this.row = row;
     }
 

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

[Openutils-svn] SF.net SVN: openutils:[3785] magnoliamodules/trunk/magnolia-test-webapp/pom .xml

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

Revision: 3785
          http://openutils.svn.sourceforge.net/openutils/?rev=3785&view=rev
Author:   diego_schivo
Date:     2012-03-14 07:43:50 +0000 (Wed, 14 Mar 2012)
Log Message:
-----------
magnolia-test-webapp: fix Java Build Path Problems

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

Modified: magnoliamodules/trunk/magnolia-test-webapp/pom.xml
===================================================================
--- magnoliamodules/trunk/magnolia-test-webapp/pom.xml	2012-03-13 08:20:41 UTC (rev 3784)
+++ magnoliamodules/trunk/magnolia-test-webapp/pom.xml	2012-03-14 07:43:50 UTC (rev 3785)
@@ -159,7 +159,8 @@
     <dependency>
       <groupId>net.sourceforge.openutils</groupId>
       <artifactId>openutils-mgnlmessages</artifactId>
-      <version>5.0.0-SNAPSHOT</version>
+      <!--version>5.0.0-SNAPSHOT</version-->
+      <version>4.2.4-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>net.sourceforge.openutils</groupId>
@@ -209,7 +210,8 @@
     <dependency>
       <groupId>net.sourceforge.openutils</groupId>
       <artifactId>openutils-mgnlmobile</artifactId>
-      <version>5.0.0-SNAPSHOT</version>
+      <!--version>5.0.0-SNAPSHOT</version-->
+      <version>1.0.1-SNAPSHOT</version>
     </dependency>
   </dependencies>
   <dependencyManagement>

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

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

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

Revision: 3784
          http://openutils.svn.sourceforge.net/openutils/?rev=3784&view=rev
Author:   fgiust
Date:     2012-03-13 08:20:41 +0000 (Tue, 13 Mar 2012)
Log Message:
-----------
bump all versions to 5.0.0-SNAPSHOT

Modified Paths:
--------------
    magnoliamodules/trunk/magnolia-test-webapp/pom.xml
    magnoliamodules/trunk/openutils-mgnlbootstrapsync/pom.xml
    magnoliamodules/trunk/openutils-mgnlcache/pom.xml
    magnoliamodules/trunk/openutils-mgnlcas/pom.xml
    magnoliamodules/trunk/openutils-mgnlcontextmenu/pom.xml
    magnoliamodules/trunk/openutils-mgnlcontrols/pom.xml
    magnoliamodules/trunk/openutils-mgnlcriteria/pom.xml
    magnoliamodules/trunk/openutils-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/advanced/impl/AdvancedResultItemImpl.java
    magnoliamodules/trunk/openutils-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/advanced/impl/MappedDefaultContent.java
    magnoliamodules/trunk/openutils-mgnlext/pom.xml
    magnoliamodules/trunk/openutils-mgnlgroovy/pom.xml
    magnoliamodules/trunk/openutils-mgnllms/pom.xml
    magnoliamodules/trunk/openutils-mgnlmail/pom.xml
    magnoliamodules/trunk/openutils-mgnlmedia/pom.xml
    magnoliamodules/trunk/openutils-mgnlmessages/pom.xml
    magnoliamodules/trunk/openutils-mgnlmobile/pom.xml
    magnoliamodules/trunk/openutils-mgnlrepoutils/pom.xml
    magnoliamodules/trunk/openutils-mgnlrules/pom.xml
    magnoliamodules/trunk/openutils-mgnlstripes/pom.xml
    magnoliamodules/trunk/openutils-mgnlstruts11/pom.xml
    magnoliamodules/trunk/openutils-mgnltagcloud/pom.xml
    magnoliamodules/trunk/openutils-mgnltagcloud/src/test/java/net/sourceforge/openutils/mgnltagcloud/manager/TagCloudManagerTest.java
    magnoliamodules/trunk/openutils-mgnltasks/pom.xml
    magnoliamodules/trunk/openutils-mgnlutils/pom.xml
    magnoliamodules/trunk/openutils-mgnlutils/src/main/java/it/openutils/mgnlutils/el/MgnlUtilsElFunctions.java
    magnoliamodules/trunk/openutils-mgnlutils/src/main/java/it/openutils/mgnlutils/templating/ExtendedTemplate.java
    magnoliamodules/trunk/openutils-mgnlutils/src/test/java/it/openutils/mgnlutils/el/MgnlUtilsElFunctionsTest.java

Modified: magnoliamodules/trunk/magnolia-test-webapp/pom.xml
===================================================================
--- magnoliamodules/trunk/magnolia-test-webapp/pom.xml	2012-03-10 22:50:48 UTC (rev 3783)
+++ magnoliamodules/trunk/magnolia-test-webapp/pom.xml	2012-03-13 08:20:41 UTC (rev 3784)
@@ -100,122 +100,116 @@
       <version>${stk.version}</version>
     </dependency>
     <dependency>
+      <groupId>javax.servlet</groupId>
+      <artifactId>servlet-api</artifactId>
+      <version>2.4</version>
+      <scope>provided</scope>
+    </dependency>
+    <dependency>
+      <groupId>javax.servlet</groupId>
+      <artifactId>jsp-api</artifactId>
+      <version>2.0</version>
+      <scope>provided</scope>
+    </dependency>
+    <dependency>
       <groupId>net.sourceforge.openutils</groupId>
+      <artifactId>openutils-elfunctions</artifactId>
+      <version>1.1.2</version>
+    </dependency>
+    <dependency>
+      <groupId>net.sourceforge.openutils</groupId>
       <artifactId>openutils-mgnlbootstrapsync</artifactId>
-      <version>1.1-SNAPSHOT</version>
+      <version>5.0.0-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>net.sourceforge.openutils</groupId>
       <artifactId>openutils-mgnlcas</artifactId>
-      <version>1.1.2-SNAPSHOT</version>
+      <version>5.0.0-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>net.sourceforge.openutils</groupId>
       <artifactId>openutils-mgnlcontrols</artifactId>
-      <version>4.1.3-SNAPSHOT</version>
+      <version>5.0.0-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>net.sourceforge.openutils</groupId>
       <artifactId>openutils-mgnlcriteria</artifactId>
-      <version>3.3.4-SNAPSHOT</version>
+      <version>5.0.0-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>net.sourceforge.openutils</groupId>
       <artifactId>openutils-mgnlcache</artifactId>
-      <version>1.1.3-SNAPSHOT</version>
+      <version>5.0.0-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>net.sourceforge.openutils</groupId>
       <artifactId>openutils-mgnlext</artifactId>
-      <version>2.3-SNAPSHOT</version>
+      <version>5.0.0-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>net.sourceforge.openutils</groupId>
       <artifactId>openutils-mgnlgroovy</artifactId>
-      <version>1.2.1-SNAPSHOT</version>
+      <version>5.0.0-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>net.sourceforge.openutils</groupId>
       <artifactId>openutils-mgnlmedia</artifactId>
-      <version>4.4.3-SNAPSHOT</version>
+      <version>5.0.0-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>net.sourceforge.openutils</groupId>
       <artifactId>openutils-mgnlmessages</artifactId>
-      <version>4.2.4-SNAPSHOT</version>
+      <version>5.0.0-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>net.sourceforge.openutils</groupId>
       <artifactId>openutils-mgnlrepoutils</artifactId>
-      <version>4.1.1-SNAPSHOT</version>
+      <version>5.0.0-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>net.sourceforge.openutils</groupId>
       <artifactId>openutils-mgnlstripes</artifactId>
-      <version>4.1.4-SNAPSHOT</version>
+      <version>5.0.0-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>net.sourceforge.openutils</groupId>
       <artifactId>openutils-mgnlstruts11</artifactId>
-      <version>4.0.2-SNAPSHOT</version>
+      <version>5.0.0-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>net.sourceforge.openutils</groupId>
       <artifactId>openutils-mgnltasks</artifactId>
-      <version>4.1.3-SNAPSHOT</version>
+      <version>5.0.0-SNAPSHOT</version>
     </dependency>
-    <!--
-      dependency> <groupId>info.magnolia</groupId> <artifactId>magnolia-module-modulestore</artifactId>
-      <version>4.3-SNAPSHOT</version> </dependency
-    -->
     <dependency>
       <groupId>net.sourceforge.openutils</groupId>
       <artifactId>openutils-mgnlutils</artifactId>
-      <version>1.1.0-SNAPSHOT</version>
+      <version>5.0.0-SNAPSHOT</version>
     </dependency>
-    <!-- 
     <dependency>
       <groupId>net.sourceforge.openutils</groupId>
       <artifactId>openutils-mgnltagcloud</artifactId>
-      <version>1.1.1-SNAPSHOT</version>
+      <version>5.0.0-SNAPSHOT</version>
     </dependency>
-     -->
     <dependency>
-      <groupId>javax.servlet</groupId>
-      <artifactId>servlet-api</artifactId>
-      <version>2.4</version>
-      <scope>provided</scope>
-    </dependency>
-    <dependency>
-      <groupId>javax.servlet</groupId>
-      <artifactId>jsp-api</artifactId>
-      <version>2.0</version>
-      <scope>provided</scope>
-    </dependency>
-    <dependency>
       <groupId>net.sourceforge.openutils</groupId>
-      <artifactId>openutils-elfunctions</artifactId>
-      <version>1.1.3-SNAPSHOT</version>
-    </dependency>
-    <dependency>
-      <groupId>net.sourceforge.openutils</groupId>
       <artifactId>openutils-mgnlrules</artifactId>
-      <version>1.0.1-SNAPSHOT</version>
+      <version>5.0.0-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>net.sourceforge.openutils</groupId>
       <artifactId>openutils-mgnlcontextmenu</artifactId>
-      <version>1.0.1-SNAPSHOT</version>
+      <version>5.0.0-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>net.sourceforge.openutils</groupId>
       <artifactId>openutils-mgnllms</artifactId>
-      <version>1.0.1-SNAPSHOT</version>
+      <version>5.0.0-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>net.sourceforge.openutils</groupId>
       <artifactId>openutils-mgnlmobile</artifactId>
-      <version>1.0.1-SNAPSHOT</version>
+      <version>5.0.0-SNAPSHOT</version>
     </dependency>
   </dependencies>
   <dependencyManagement>

Modified: magnoliamodules/trunk/openutils-mgnlbootstrapsync/pom.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnlbootstrapsync/pom.xml	2012-03-10 22:50:48 UTC (rev 3783)
+++ magnoliamodules/trunk/openutils-mgnlbootstrapsync/pom.xml	2012-03-13 08:20:41 UTC (rev 3784)
@@ -12,7 +12,7 @@
   <artifactId>openutils-mgnlbootstrapsync</artifactId>
   <name>BootstrapSync for Magnolia CMS</name>
   <description>Keep your magnolia bootstrap files in sync while developing</description>
-  <version>1.1-SNAPSHOT</version>
+  <version>5.0.0-SNAPSHOT</version>
   <licenses>
     <license>
       <name>GPLv3</name>

Modified: magnoliamodules/trunk/openutils-mgnlcache/pom.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnlcache/pom.xml	2012-03-10 22:50:48 UTC (rev 3783)
+++ magnoliamodules/trunk/openutils-mgnlcache/pom.xml	2012-03-13 08:20:41 UTC (rev 3784)
@@ -1,4 +1,5 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
   <parent>
     <groupId>net.sourceforge.openutils</groupId>
     <artifactId>openutils-parent</artifactId>
@@ -10,7 +11,7 @@
   <artifactId>openutils-mgnlcache</artifactId>
   <name>Simplecache module for Magnolia CMS</name>
   <description>An alternative "simple is beautiful" cache module for Magnolia CMS</description>
-  <version>1.1.3-SNAPSHOT</version>
+  <version>5.0.0-SNAPSHOT</version>
   <inceptionYear>2010</inceptionYear>
   <licenses>
     <license>
@@ -60,7 +61,7 @@
     <dependency>
       <groupId>net.sourceforge.openutils</groupId>
       <artifactId>openutils-mgnltasks</artifactId>
-      <version>4.1.2</version>
+      <version>5.0.0-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>javax.servlet</groupId>

Modified: magnoliamodules/trunk/openutils-mgnlcas/pom.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnlcas/pom.xml	2012-03-10 22:50:48 UTC (rev 3783)
+++ magnoliamodules/trunk/openutils-mgnlcas/pom.xml	2012-03-13 08:20:41 UTC (rev 3784)
@@ -10,7 +10,7 @@
   <packaging>jar</packaging>
   <artifactId>openutils-mgnlcas</artifactId>
   <name>CAS integration module for Magnolia CMS</name>
-  <version>1.1.2-SNAPSHOT</version>
+  <version>5.0.0-SNAPSHOT</version>
   <inceptionYear>2007</inceptionYear>
   <licenses>
     <license>

Modified: magnoliamodules/trunk/openutils-mgnlcontextmenu/pom.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnlcontextmenu/pom.xml	2012-03-10 22:50:48 UTC (rev 3783)
+++ magnoliamodules/trunk/openutils-mgnlcontextmenu/pom.xml	2012-03-13 08:20:41 UTC (rev 3784)
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
   <parent>
     <groupId>net.sourceforge.openutils</groupId>
     <artifactId>openutils-parent</artifactId>
@@ -11,7 +12,7 @@
   <artifactId>openutils-mgnlcontextmenu</artifactId>
   <name>ContextMenu Module for Magnolia CMS</name>
   <description>A magnolia module for editing content via context menu</description>
-  <version>1.0.1-SNAPSHOT</version>
+  <version>5.0.0-SNAPSHOT</version>
   <inceptionYear>2010</inceptionYear>
   <licenses>
     <license>
@@ -111,12 +112,12 @@
     <dependency>
       <groupId>net.sourceforge.openutils</groupId>
       <artifactId>openutils-mgnlcontrols</artifactId>
-      <version>4.1.1</version>
+      <version>5.0.0-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>net.sourceforge.openutils</groupId>
       <artifactId>openutils-mgnlutils</artifactId>
-      <version>1.0.7</version>
+      <version>5.0.0-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>net.sourceforge.openutils</groupId>
@@ -126,7 +127,7 @@
     <dependency>
       <groupId>net.sourceforge.openutils</groupId>
       <artifactId>openutils-mgnlmedia</artifactId>
-      <version>4.3.0</version>
+      <version>5.0.0-SNAPSHOT</version>
       <optional>true</optional>
     </dependency>
     <dependency>

Modified: magnoliamodules/trunk/openutils-mgnlcontrols/pom.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnlcontrols/pom.xml	2012-03-10 22:50:48 UTC (rev 3783)
+++ magnoliamodules/trunk/openutils-mgnlcontrols/pom.xml	2012-03-13 08:20:41 UTC (rev 3784)
@@ -1,4 +1,5 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
   <parent>
     <groupId>net.sourceforge.openutils</groupId>
     <artifactId>openutils-parent</artifactId>
@@ -10,7 +11,7 @@
   <artifactId>openutils-mgnlcontrols</artifactId>
   <name>Controls module for Magnolia CMS</name>
   <description>Additional controls that can be used in Magnolia dialogs</description>
-  <version>4.1.3-SNAPSHOT</version>
+  <version>5.0.0-SNAPSHOT</version>
   <inceptionYear>2008</inceptionYear>
   <licenses>
     <license>
@@ -91,7 +92,7 @@
     <dependency>
       <groupId>net.sourceforge.openutils</groupId>
       <artifactId>openutils-mgnltasks</artifactId>
-      <version>4.1.2</version>
+      <version>5.0.0-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>net.sourceforge.openutils</groupId>

Modified: magnoliamodules/trunk/openutils-mgnlcriteria/pom.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnlcriteria/pom.xml	2012-03-10 22:50:48 UTC (rev 3783)
+++ magnoliamodules/trunk/openutils-mgnlcriteria/pom.xml	2012-03-13 08:20:41 UTC (rev 3784)
@@ -1,4 +1,5 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <groupId>net.sourceforge.openutils</groupId>
@@ -8,7 +9,7 @@
   </parent>
   <artifactId>openutils-mgnlcriteria</artifactId>
   <name>Criteria API for Magnolia CMS</name>
-  <version>3.3.4-SNAPSHOT</version>
+  <version>5.0.0-SNAPSHOT</version>
   <inceptionYear>2009</inceptionYear>
   <description>A Hibernate's Criteria-like API to programmatically generate JCR queries with Magnolia</description>
   <licenses>
@@ -131,7 +132,7 @@
     <dependency>
       <groupId>net.sourceforge.openutils</groupId>
       <artifactId>openutils-mgnlutils</artifactId>
-      <version>1.0.9</version>
+      <version>5.0.0-SNAPSHOT</version>
       <scope>test</scope>
       <exclusions>
         <exclusion>

Modified: magnoliamodules/trunk/openutils-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/advanced/impl/AdvancedResultItemImpl.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/advanced/impl/AdvancedResultItemImpl.java	2012-03-10 22:50:48 UTC (rev 3783)
+++ magnoliamodules/trunk/openutils-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/advanced/impl/AdvancedResultItemImpl.java	2012-03-13 08:20:41 UTC (rev 3784)
@@ -65,7 +65,7 @@
         throws RepositoryException,
         AccessDeniedException
     {
-        super(item, hierarchyManager);
+        super(item);
         this.row = row;
     }
 

Modified: magnoliamodules/trunk/openutils-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/advanced/impl/MappedDefaultContent.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/advanced/impl/MappedDefaultContent.java	2012-03-10 22:50:48 UTC (rev 3783)
+++ magnoliamodules/trunk/openutils-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/advanced/impl/MappedDefaultContent.java	2012-03-13 08:20:41 UTC (rev 3784)
@@ -36,7 +36,7 @@
 import java.util.Map;
 import java.util.Set;
 
-import javax.jcr.Item;
+import javax.jcr.Node;
 import javax.jcr.PropertyType;
 import javax.jcr.RepositoryException;
 import javax.jcr.Value;
@@ -64,11 +64,11 @@
      * @throws RepositoryException
      * @throws AccessDeniedException
      */
-    public MappedDefaultContent(Item elem, HierarchyManager hierarchyManager)
+    public MappedDefaultContent(Node elem, HierarchyManager hierarchyManager)
         throws RepositoryException,
         AccessDeniedException
     {
-        super(elem, hierarchyManager);
+        super(elem);
     }
 
     /**

Modified: magnoliamodules/trunk/openutils-mgnlext/pom.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnlext/pom.xml	2012-03-10 22:50:48 UTC (rev 3783)
+++ magnoliamodules/trunk/openutils-mgnlext/pom.xml	2012-03-13 08:20:41 UTC (rev 3784)
@@ -1,4 +1,5 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
   <parent>
     <groupId>net.sourceforge.openutils</groupId>
     <artifactId>openutils-parent</artifactId>
@@ -9,7 +10,7 @@
   <packaging>jar</packaging>
   <artifactId>openutils-mgnlext</artifactId>
   <name>openutils-mgnlext</name>
-  <version>2.3-SNAPSHOT</version>
+  <version>5.0.0-SNAPSHOT</version>
   <scm>
     <connection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/magnoliamodules/trunk/openutils-mgnlext</connection>
     <developerConnection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/magnoliamodules/trunk/openutils-mgnlext</developerConnection>

Modified: magnoliamodules/trunk/openutils-mgnlgroovy/pom.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnlgroovy/pom.xml	2012-03-10 22:50:48 UTC (rev 3783)
+++ magnoliamodules/trunk/openutils-mgnlgroovy/pom.xml	2012-03-13 08:20:41 UTC (rev 3784)
@@ -1,4 +1,5 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd ">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd ">
   <parent>
     <groupId>net.sourceforge.openutils</groupId>
     <artifactId>openutils-parent</artifactId>
@@ -10,7 +11,7 @@
   <artifactId>openutils-mgnlgroovy</artifactId>
   <name>Groovy Shell for Magnolia CMS</name>
   <description>Groovy Shell for Magnolia CMS is a module for running Groovy Scripts from the Magnolia admin interface. </description>
-  <version>1.2.1-SNAPSHOT</version>
+  <version>5.0.0-SNAPSHOT</version>
   <inceptionYear>2008</inceptionYear>
   <licenses>
     <license>
@@ -90,7 +91,7 @@
     <dependency>
       <groupId>net.sourceforge.openutils</groupId>
       <artifactId>openutils-mgnltasks</artifactId>
-      <version>4.1.2</version>
+      <version>5.0.0-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>javax.servlet</groupId>

Modified: magnoliamodules/trunk/openutils-mgnllms/pom.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnllms/pom.xml	2012-03-10 22:50:48 UTC (rev 3783)
+++ magnoliamodules/trunk/openutils-mgnllms/pom.xml	2012-03-13 08:20:41 UTC (rev 3784)
@@ -1,4 +1,5 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
   <parent>
     <groupId>net.sourceforge.openutils</groupId>
     <artifactId>openutils-parent</artifactId>
@@ -10,7 +11,7 @@
   <artifactId>openutils-mgnllms</artifactId>
   <name>E-learning Module for Magnolia CMS</name>
   <description>A module for Magnolia CMS to build a simple Learning Management System.</description>
-  <version>1.0.1-SNAPSHOT</version>
+  <version>5.0.0-SNAPSHOT</version>
   <inceptionYear>2010</inceptionYear>
   <licenses>
     <license>
@@ -102,12 +103,12 @@
     <dependency>
       <groupId>net.sourceforge.openutils</groupId>
       <artifactId>openutils-mgnltasks</artifactId>
-      <version>4.1.2</version>
+      <version>5.0.0-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>net.sourceforge.openutils</groupId>
       <artifactId>openutils-mgnlcontrols</artifactId>
-      <version>4.0.7</version>
+      <version>5.0.0-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>net.sourceforge.openutils</groupId>
@@ -152,14 +153,14 @@
         <exclusion>
           <groupId>xerces</groupId>
           <artifactId>xmlParserAPIs</artifactId>
-         </exclusion>
+        </exclusion>
         <exclusion>
           <groupId>xml-apis</groupId>
           <artifactId>xml-apis</artifactId>
         </exclusion>
         <exclusion>
           <groupId>junit</groupId>
-           <artifactId>junit</artifactId>
+          <artifactId>junit</artifactId>
         </exclusion>
       </exclusions>
     </dependency>
@@ -168,13 +169,11 @@
       <artifactId>commons-io</artifactId>
       <version>1.4</version>
     </dependency>
-    <!-- to be released before the final 4.3 version -->
     <dependency>
       <groupId>net.sourceforge.openutils</groupId>
       <artifactId>openutils-mgnlcriteria</artifactId>
-      <version>2.0-b8</version>
+      <version>5.0.0-SNAPSHOT</version>
     </dependency>
-    <!-- to be released before the final 4.3 version -->
     <dependency>
       <groupId>javax.servlet</groupId>
       <artifactId>servlet-api</artifactId>
@@ -204,4 +203,4 @@
   <properties>
     <magnolia.version>4.5</magnolia.version>
   </properties>
-</project>
+</project>
\ No newline at end of file

Modified: magnoliamodules/trunk/openutils-mgnlmail/pom.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnlmail/pom.xml	2012-03-10 22:50:48 UTC (rev 3783)
+++ magnoliamodules/trunk/openutils-mgnlmail/pom.xml	2012-03-13 08:20:41 UTC (rev 3784)
@@ -9,7 +9,7 @@
   <packaging>jar</packaging>
   <artifactId>openutils-mgnlmail</artifactId>
   <name>simplemail module for Magnolia CMS</name>
-  <version>0.0.2-SNAPSHOT</version>
+  <version>5.0.0-SNAPSHOT</version>
   <inceptionYear>2011</inceptionYear>
   <description>An extension to the mail module for Magnolia CMS</description>
   <url>http://www.openmindlab.com/lab/products/mgnlmail.html</url>
@@ -98,7 +98,7 @@
     <dependency>
       <groupId>net.sourceforge.openutils</groupId>
       <artifactId>openutils-mgnltasks</artifactId>
-      <version>4.1.2</version>
+      <version>5.0.0-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>javax.servlet</groupId>

Modified: magnoliamodules/trunk/openutils-mgnlmedia/pom.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnlmedia/pom.xml	2012-03-10 22:50:48 UTC (rev 3783)
+++ magnoliamodules/trunk/openutils-mgnlmedia/pom.xml	2012-03-13 08:20:41 UTC (rev 3784)
@@ -10,7 +10,7 @@
   <artifactId>openutils-mgnlmedia</artifactId>
   <name>SimpleMedia Module for Magnolia CMS</name>
   <description>SimpleMedia Module for Magnolia CMS: a module for Magnolia CMS for easier management of multimedia assets.</description>
-  <version>4.5.1-SNAPSHOT</version>
+  <version>5.0.0-SNAPSHOT</version>
   <inceptionYear>2008</inceptionYear>
   <licenses>
     <license>
@@ -112,12 +112,12 @@
     <dependency>
       <groupId>net.sourceforge.openutils</groupId>
       <artifactId>openutils-mgnltasks</artifactId>
-      <version>4.1.2</version>
+      <version>5.0.0-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>net.sourceforge.openutils</groupId>
       <artifactId>openutils-mgnlcontrols</artifactId>
-      <version>4.1.2</version>
+      <version>5.0.0-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>net.sourceforge.openutils</groupId>
@@ -127,7 +127,7 @@
     <dependency>
       <groupId>net.sourceforge.openutils</groupId>
       <artifactId>openutils-mgnlutils</artifactId>
-      <version>1.0.7</version>
+  <version>5.0.0-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>net.sourceforge.openutils</groupId>
@@ -170,7 +170,7 @@
     <dependency>
       <groupId>net.sourceforge.openutils</groupId>
       <artifactId>openutils-mgnlcriteria</artifactId>
-      <version>3.3.1</version>
+  <version>5.0.0-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>javax.servlet</groupId>

Modified: magnoliamodules/trunk/openutils-mgnlmessages/pom.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnlmessages/pom.xml	2012-03-10 22:50:48 UTC (rev 3783)
+++ magnoliamodules/trunk/openutils-mgnlmessages/pom.xml	2012-03-13 08:20:41 UTC (rev 3784)
@@ -1,4 +1,5 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd ">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd ">
   <parent>
     <groupId>net.sourceforge.openutils</groupId>
     <artifactId>openutils-parent</artifactId>
@@ -79,7 +80,7 @@
     <dependency>
       <groupId>net.sourceforge.openutils</groupId>
       <artifactId>openutils-mgnltasks</artifactId>
-      <version>4.1.2</version>
+      <version>5.0.0-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>net.sourceforge.openutils</groupId>
@@ -89,7 +90,7 @@
     <dependency>
       <groupId>net.sourceforge.openutils</groupId>
       <artifactId>openutils-mgnlcriteria</artifactId>
-      <version>3.3.3</version>
+      <version>5.0.0-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>net.sourceforge.openutils</groupId>

Modified: magnoliamodules/trunk/openutils-mgnlmobile/pom.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnlmobile/pom.xml	2012-03-10 22:50:48 UTC (rev 3783)
+++ magnoliamodules/trunk/openutils-mgnlmobile/pom.xml	2012-03-13 08:20:41 UTC (rev 3784)
@@ -87,15 +87,8 @@
       <artifactId>magnolia-module-admininterface</artifactId>
       <version>${magnolia.version}</version>
     </dependency>
-    <!--
     <dependency>
       <groupId>info.magnolia</groupId>
-      <artifactId>magnolia-taglib-cms</artifactId>
-      <version>${magnolia.version}</version>
-    </dependency>
-    -->
-    <dependency>
-      <groupId>info.magnolia</groupId>
       <artifactId>magnolia-gui</artifactId>
       <version>${magnolia.version}</version>
     </dependency>
@@ -113,7 +106,7 @@
     <dependency>
       <groupId>net.sourceforge.openutils</groupId>
       <artifactId>openutils-mgnltasks</artifactId>
-      <version>4.1.2</version>
+      <version>5.0.0-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>net.sourceforge.wurfl</groupId>

Modified: magnoliamodules/trunk/openutils-mgnlrepoutils/pom.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnlrepoutils/pom.xml	2012-03-10 22:50:48 UTC (rev 3783)
+++ magnoliamodules/trunk/openutils-mgnlrepoutils/pom.xml	2012-03-13 08:20:41 UTC (rev 3784)
@@ -1,4 +1,5 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd ">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd ">
   <parent>
     <groupId>net.sourceforge.openutils</groupId>
     <artifactId>openutils-parent</artifactId>
@@ -9,7 +10,7 @@
   <packaging>jar</packaging>
   <artifactId>openutils-mgnlrepoutils</artifactId>
   <name>Repository tools for Magnolia CMS</name>
-  <version>4.1.1-SNAPSHOT</version>
+  <version>5.0.0-SNAPSHOT</version>
   <description>A simple GUI for running maintenance operations on jackrabbit repositories from the Magnolia admin
     interface</description>
   <url>http://www.openmindlab.com/lab/products/repotools.html</url>
@@ -75,7 +76,7 @@
     <dependency>
       <groupId>net.sourceforge.openutils</groupId>
       <artifactId>openutils-mgnlcriteria</artifactId>
-      <version>3.3.1</version>
+      <version>5.0.0-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>javax.servlet</groupId>

Modified: magnoliamodules/trunk/openutils-mgnlrules/pom.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnlrules/pom.xml	2012-03-10 22:50:48 UTC (rev 3783)
+++ magnoliamodules/trunk/openutils-mgnlrules/pom.xml	2012-03-13 08:20:41 UTC (rev 3784)
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
   <parent>
     <groupId>net.sourceforge.openutils</groupId>
     <artifactId>openutils-parent</artifactId>
@@ -10,7 +11,7 @@
   <packaging>jar</packaging>
   <artifactId>openutils-mgnlrules</artifactId>
   <name>Rules module for Magnolia CMS</name>
-  <version>1.0.1-SNAPSHOT</version>
+  <version>5.0.0-SNAPSHOT</version>
   <description>A simple rule engine integrated into Magnolia CMS</description>
   <licenses>
     <license>
@@ -99,7 +100,7 @@
     <dependency>
       <groupId>net.sourceforge.openutils</groupId>
       <artifactId>openutils-mgnlcontrols</artifactId>
-      <version>4.1.1</version>
+      <version>5.0.0-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>info.magnolia</groupId>
@@ -148,4 +149,4 @@
   <properties>
     <magnolia.version>4.5</magnolia.version>
   </properties>
-</project>
+</project>
\ No newline at end of file

Modified: magnoliamodules/trunk/openutils-mgnlstripes/pom.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnlstripes/pom.xml	2012-03-10 22:50:48 UTC (rev 3783)
+++ magnoliamodules/trunk/openutils-mgnlstripes/pom.xml	2012-03-13 08:20:41 UTC (rev 3784)
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
   <parent>
     <groupId>net.sourceforge.openutils</groupId>
     <artifactId>openutils-parent</artifactId>
@@ -12,7 +13,7 @@
   <name>Stripes module for Magnolia CMS</name>
   <description>A Magnolia Module that let you use Stripes Framework inside Magnolia</description>
   <inceptionYear>2008</inceptionYear>
-  <version>4.1.4-SNAPSHOT</version>
+  <version>5.0.0-SNAPSHOT</version>
   <licenses>
     <license>
       <name>GPLv3</name>
@@ -72,7 +73,7 @@
     <dependency>
       <groupId>net.sourceforge.openutils</groupId>
       <artifactId>openutils-mgnltasks</artifactId>
-      <version>4.1.2</version>
+      <version>5.0.0-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>info.magnolia</groupId>

Modified: magnoliamodules/trunk/openutils-mgnlstruts11/pom.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnlstruts11/pom.xml	2012-03-10 22:50:48 UTC (rev 3783)
+++ magnoliamodules/trunk/openutils-mgnlstruts11/pom.xml	2012-03-13 08:20:41 UTC (rev 3784)
@@ -11,7 +11,7 @@
   <packaging>jar</packaging>
   <name>Struts 1.1 module for Magnolia CMS</name>
   <description>A module for for Magnolia CMS that let you use the Struts 1.1 framework inside Magnolia</description>
-  <version>4.0.2-SNAPSHOT</version>
+  <version>5.0.0-SNAPSHOT</version>
   <licenses>
     <license>
       <name>GPLv3</name>
@@ -96,7 +96,7 @@
     <dependency>
       <groupId>net.sourceforge.openutils</groupId>
       <artifactId>openutils-mgnltasks</artifactId>
-      <version>4.1.0</version>
+      <version>5.0.0-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>struts</groupId>

Modified: magnoliamodules/trunk/openutils-mgnltagcloud/pom.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnltagcloud/pom.xml	2012-03-10 22:50:48 UTC (rev 3783)
+++ magnoliamodules/trunk/openutils-mgnltagcloud/pom.xml	2012-03-13 08:20:41 UTC (rev 3784)
@@ -10,7 +10,7 @@
   <packaging>jar</packaging>
   <artifactId>openutils-mgnltagcloud</artifactId>
   <name>Tagcloud module for Magnolia CMS</name>
-  <version>1.1.1-SNAPSHOT</version>
+  <version>5.0.0-SNAPSHOT</version>
   <description>A module for managing tag clouds for Magnolia CMS</description>
   <licenses>
     <license>
@@ -123,12 +123,12 @@
     <dependency>
       <groupId>net.sourceforge.openutils</groupId>
       <artifactId>openutils-mgnltasks</artifactId>
-      <version>4.1.2</version>
+      <version>5.0.0-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>net.sourceforge.openutils</groupId>
       <artifactId>openutils-mgnlcontrols</artifactId>
-      <version>4.1.1</version>
+      <version>5.0.0-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>org.slf4j</groupId>

Modified: magnoliamodules/trunk/openutils-mgnltagcloud/src/test/java/net/sourceforge/openutils/mgnltagcloud/manager/TagCloudManagerTest.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnltagcloud/src/test/java/net/sourceforge/openutils/mgnltagcloud/manager/TagCloudManagerTest.java	2012-03-10 22:50:48 UTC (rev 3783)
+++ magnoliamodules/trunk/openutils-mgnltagcloud/src/test/java/net/sourceforge/openutils/mgnltagcloud/manager/TagCloudManagerTest.java	2012-03-13 08:20:41 UTC (rev 3784)
@@ -215,7 +215,7 @@
     }
 
     @Override
-    protected void setUp() throws Exception
+    public void setUp() throws Exception
     {
         super.setUp();
 
@@ -270,7 +270,7 @@
     }
 
     @Override
-    protected void tearDown() throws Exception
+    public void tearDown() throws Exception
     {
         super.tearDown();
         TagCloudManager.getInstance().stopObserving();

Modified: magnoliamodules/trunk/openutils-mgnltasks/pom.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnltasks/pom.xml	2012-03-10 22:50:48 UTC (rev 3783)
+++ magnoliamodules/trunk/openutils-mgnltasks/pom.xml	2012-03-13 08:20:41 UTC (rev 3784)
@@ -10,7 +10,7 @@
   <packaging>jar</packaging>
   <artifactId>openutils-mgnltasks</artifactId>
   <name>Tasks for for Magnolia CMS</name>
-  <version>4.1.3-SNAPSHOT</version>
+  <version>5.0.0-SNAPSHOT</version>
   <description>A collection of useful magnolia update tasks that can be reused in custom modules</description>
   <inceptionYear>2008</inceptionYear>
   <scm>

Modified: magnoliamodules/trunk/openutils-mgnlutils/pom.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnlutils/pom.xml	2012-03-10 22:50:48 UTC (rev 3783)
+++ magnoliamodules/trunk/openutils-mgnlutils/pom.xml	2012-03-13 08:20:41 UTC (rev 3784)
@@ -9,7 +9,7 @@
   <packaging>jar</packaging>
   <artifactId>openutils-mgnlutils</artifactId>
   <name>Generic utilities for Magnolia CMS</name>
-  <version>1.1.0-SNAPSHOT</version>
+  <version>5.0.0-SNAPSHOT</version>
   <inceptionYear>2009</inceptionYear>
   <description>A collection of Magnolia utilities and extensions</description>
   <url>http://www.openmindlab.com/lab/products/mgnlutils.html</url>

Modified: magnoliamodules/trunk/openutils-mgnlutils/src/main/java/it/openutils/mgnlutils/el/MgnlUtilsElFunctions.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlutils/src/main/java/it/openutils/mgnlutils/el/MgnlUtilsElFunctions.java	2012-03-10 22:50:48 UTC (rev 3783)
+++ magnoliamodules/trunk/openutils-mgnlutils/src/main/java/it/openutils/mgnlutils/el/MgnlUtilsElFunctions.java	2012-03-13 08:20:41 UTC (rev 3784)
@@ -23,6 +23,7 @@
 import info.magnolia.cms.core.Content;
 import info.magnolia.cms.core.HierarchyManager;
 import info.magnolia.cms.core.ItemType;
+import info.magnolia.cms.core.MgnlNodeType;
 import info.magnolia.cms.core.Path;
 import info.magnolia.cms.core.SystemProperty;
 import info.magnolia.cms.i18n.I18nContentSupportFactory;
@@ -340,7 +341,7 @@
 
         if (content != null)
         {
-            count = content.getChildren(ItemType.CONTENT).size();
+            count = content.getChildren(MgnlNodeType.NT_CONTENT).size();
         }
 
         return count;
@@ -356,7 +357,7 @@
 
         if (content != null)
         {
-            return content.getChildren(ItemType.CONTENT);
+            return content.getChildren(MgnlNodeType.NT_CONTENT);
         }
 
         return null;

Modified: magnoliamodules/trunk/openutils-mgnlutils/src/main/java/it/openutils/mgnlutils/templating/ExtendedTemplate.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlutils/src/main/java/it/openutils/mgnlutils/templating/ExtendedTemplate.java	2012-03-10 22:50:48 UTC (rev 3783)
+++ magnoliamodules/trunk/openutils-mgnlutils/src/main/java/it/openutils/mgnlutils/templating/ExtendedTemplate.java	2012-03-13 08:20:41 UTC (rev 3784)
@@ -20,6 +20,7 @@
 package it.openutils.mgnlutils.templating;
 
 import info.magnolia.cms.core.Content;
+import info.magnolia.rendering.template.configured.ConfiguredTemplateDefinition;
 
 import java.util.HashSet;
 import java.util.Set;
@@ -52,7 +53,7 @@
  * @author fgiust
  * @version $Id$
  */
-public class ExtendedTemplate extends Template
+public class ExtendedTemplate extends ConfiguredTemplateDefinition
 {
 
     private String parentPath;

Modified: magnoliamodules/trunk/openutils-mgnlutils/src/test/java/it/openutils/mgnlutils/el/MgnlUtilsElFunctionsTest.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlutils/src/test/java/it/openutils/mgnlutils/el/MgnlUtilsElFunctionsTest.java	2012-03-10 22:50:48 UTC (rev 3783)
+++ magnoliamodules/trunk/openutils-mgnlutils/src/test/java/it/openutils/mgnlutils/el/MgnlUtilsElFunctionsTest.java	2012-03-13 08:20:41 UTC (rev 3784)
@@ -49,9 +49,9 @@
 public class MgnlUtilsElFunctionsTest extends TestNgRepositoryTestcase
 {
 
-    LocaleDefinition en = new LocaleDefinition("en", null, true);
+    LocaleDefinition en = LocaleDefinition.make("en", null, true);
 
-    LocaleDefinition it = new LocaleDefinition("it", null, true);
+    LocaleDefinition it = LocaleDefinition.make("it", null, true);
 
     @Test
     public void testSplitAndTokenize() throws Exception

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

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

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

Revision: 3783
          http://openutils.svn.sourceforge.net/openutils/?rev=3783&view=rev
Author:   fgiust
Date:     2012-03-10 22:50:48 +0000 (Sat, 10 Mar 2012)
Log Message:
-----------
fix compilation

Modified Paths:
--------------
    magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/playlist/tree/PlaylistsTreeMVCHandler.java

Removed Paths:
-------------
    magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/freemarker/

Modified: magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/playlist/tree/PlaylistsTreeMVCHandler.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/playlist/tree/PlaylistsTreeMVCHandler.java	2012-03-10 22:30:37 UTC (rev 3782)
+++ magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/playlist/tree/PlaylistsTreeMVCHandler.java	2012-03-10 22:50:48 UTC (rev 3783)
@@ -139,14 +139,7 @@
         parentNode.updateMetaData();
         if (MediaEl.module().isSingleinstance())
         {
-            try
-            {
-                parentNode.getMetaData().setActivated();
-            }
-            catch (RepositoryException e)
-            {
-                log.error("Error adding activated status to playlist entry node", e);
-            }
+            parentNode.getMetaData().setActivated();
         }
         parentNode.save();
     }

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

[Openutils-svn] SF.net SVN: openutils:[3782] magnoliamodules/trunk/ openutils-mgnlcontextmenu/src/main/java/net/sourceforge/openutils/ mgnlcontextmenu/tags

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

Revision: 3782
          http://openutils.svn.sourceforge.net/openutils/?rev=3782&view=rev
Author:   fgiust
Date:     2012-03-10 22:30:37 +0000 (Sat, 10 Mar 2012)
Log Message:
-----------
remove dependency from compatibility taglib

Modified Paths:
--------------
    magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/java/net/sourceforge/openutils/mgnlcontextmenu/tags/ElementTag.java
    magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/java/net/sourceforge/openutils/mgnlcontextmenu/tags/LinksTag.java
    magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/java/net/sourceforge/openutils/mgnlcontextmenu/tags/ScriptTag.java

Modified: magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/java/net/sourceforge/openutils/mgnlcontextmenu/tags/ElementTag.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/java/net/sourceforge/openutils/mgnlcontextmenu/tags/ElementTag.java	2012-03-10 22:22:36 UTC (rev 3781)
+++ magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/java/net/sourceforge/openutils/mgnlcontextmenu/tags/ElementTag.java	2012-03-10 22:30:37 UTC (rev 3782)
@@ -20,7 +20,9 @@
 package net.sourceforge.openutils.mgnlcontextmenu.tags;
 
 import info.magnolia.cms.core.Content;
+import info.magnolia.cms.security.Permission;
 import info.magnolia.context.MgnlContext;
+import info.magnolia.jcr.util.NodeUtil;
 
 import java.io.IOException;
 import java.util.ArrayList;
@@ -110,8 +112,8 @@
     @Override
     public int doStartTag() throws JspException
     {
-        Content node = this.node != null ? this.node : CmsFunctions.currentParagraph();
-        boolean readonly = this.readonly || !CmsFunctions.canEdit();
+        Content node = this.node != null ? this.node : currentParagraph();
+        boolean readonly = this.readonly || !canEdit();
         if (!readonly)
         {
             if (StringUtils.isEmpty(wrapper))
@@ -153,8 +155,8 @@
     @Override
     public int doEndTag() throws JspException
     {
-        Content node = this.node != null ? this.node : CmsFunctions.currentParagraph();
-        boolean readonly = this.readonly || !CmsFunctions.canEdit();
+        Content node = this.node != null ? this.node : currentParagraph();
+        boolean readonly = this.readonly || !canEdit();
         if (!readonly)
         {
             try
@@ -194,6 +196,16 @@
         return info;
     }
 
+    private boolean canEdit()
+    {
+        return NodeUtil.isGranted(MgnlContext.getAggregationState().getMainContent().getJCRNode(), Permission.SET);
+    }
+
+    private Content currentParagraph()
+    {
+        return MgnlContext.getAggregationState().getCurrentContent();
+    }
+
     /**
      * {@inheritDoc}
      */

Modified: magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/java/net/sourceforge/openutils/mgnlcontextmenu/tags/LinksTag.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/java/net/sourceforge/openutils/mgnlcontextmenu/tags/LinksTag.java	2012-03-10 22:22:36 UTC (rev 3781)
+++ magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/java/net/sourceforge/openutils/mgnlcontextmenu/tags/LinksTag.java	2012-03-10 22:30:37 UTC (rev 3782)
@@ -19,7 +19,9 @@
 
 package net.sourceforge.openutils.mgnlcontextmenu.tags;
 
+import info.magnolia.cms.security.Permission;
 import info.magnolia.context.MgnlContext;
+import info.magnolia.jcr.util.NodeUtil;
 
 import java.io.IOException;
 
@@ -64,7 +66,7 @@
     public int doStartTag() throws JspException
     {
         String ctx = MgnlContext.getContextPath();
-        boolean canEdit = CmsFunctions.canEdit();
+        boolean canEdit = canEdit();
         JspWriter out = pageContext.getOut();
         try
         {
@@ -110,6 +112,11 @@
         return EVAL_PAGE;
     }
 
+    private boolean canEdit()
+    {
+        return NodeUtil.isGranted(MgnlContext.getAggregationState().getMainContent().getJCRNode(), Permission.SET);
+    }
+
     /**
      * {@inheritDoc}
      */

Modified: magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/java/net/sourceforge/openutils/mgnlcontextmenu/tags/ScriptTag.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/java/net/sourceforge/openutils/mgnlcontextmenu/tags/ScriptTag.java	2012-03-10 22:22:36 UTC (rev 3781)
+++ magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/java/net/sourceforge/openutils/mgnlcontextmenu/tags/ScriptTag.java	2012-03-10 22:30:37 UTC (rev 3782)
@@ -19,7 +19,9 @@
 
 package net.sourceforge.openutils.mgnlcontextmenu.tags;
 
+import info.magnolia.cms.security.Permission;
 import info.magnolia.context.MgnlContext;
+import info.magnolia.jcr.util.NodeUtil;
 
 import java.io.IOException;
 import java.util.List;
@@ -48,7 +50,7 @@
     @Override
     public int doStartTag() throws JspException
     {
-        if (CmsFunctions.canEdit())
+        if (canEdit())
         {
             JspWriter out = pageContext.getOut();
             try
@@ -146,4 +148,9 @@
         return "{" + sb + "}";
     }
 
+    private boolean canEdit()
+    {
+        return NodeUtil.isGranted(MgnlContext.getAggregationState().getMainContent().getJCRNode(), Permission.SET);
+    }
+
 }

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

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

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

Revision: 3781
          http://openutils.svn.sourceforge.net/openutils/?rev=3781&view=rev
Author:   fgiust
Date:     2012-03-10 22:22:36 +0000 (Sat, 10 Mar 2012)
Log Message:
-----------
initial cleanup

Modified Paths:
--------------
    magnoliamodules/trunk/magnolia-test-webapp/pom.xml
    magnoliamodules/trunk/magnolia-test-webapp/src/main/webapp/template_criteria/criteria.jsp
    magnoliamodules/trunk/openutils-mgnlcache/src/main/java/net/sourceforge/openutils/mgnlsimplecache/filesystem/FSCacheManager.java
    magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/java/net/sourceforge/openutils/mgnlcontextmenu/tags/ElementTag.java
    magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/java/net/sourceforge/openutils/mgnlcontextmenu/tags/LinksTag.java
    magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/java/net/sourceforge/openutils/mgnlcontextmenu/tags/ScriptTag.java
    magnoliamodules/trunk/openutils-mgnlcontrols/src/main/java/net/sourceforge/openutils/mgnlcontrols/configuration/UUIDLinkGridColumnType.java
    magnoliamodules/trunk/openutils-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/jcr/query/Criteria.java
    magnoliamodules/trunk/openutils-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/jcr/query/lucene/AclQueryDecorator.java
    magnoliamodules/trunk/openutils-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/jcr/query/xpath/impl/AbstractCriteriaImpl.java
    magnoliamodules/trunk/openutils-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/utils/ASCIIFoldingAnalyzer.java
    magnoliamodules/trunk/openutils-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/utils/BaseAnalyzer.java
    magnoliamodules/trunk/openutils-mgnlcriteria/src/test/java/net/sourceforge/openutils/mgnlcriteria/advanced/BasePathTest.java
    magnoliamodules/trunk/openutils-mgnlcriteria/src/test/java/net/sourceforge/openutils/mgnlcriteria/advanced/BasePathWithSpacesTest.java
    magnoliamodules/trunk/openutils-mgnlcriteria/src/test/java/net/sourceforge/openutils/mgnlcriteria/advanced/Content2BeanTest.java
    magnoliamodules/trunk/openutils-mgnlcriteria/src/test/java/net/sourceforge/openutils/mgnlcriteria/advanced/FirstDigitEscapeTest.java
    magnoliamodules/trunk/openutils-mgnlcriteria/src/test/java/net/sourceforge/openutils/mgnlcriteria/advanced/JcrContainsCriteriaSearchTest.java
    magnoliamodules/trunk/openutils-mgnlcriteria/src/test/java/net/sourceforge/openutils/mgnlcriteria/advanced/JcrContainsQuestionMarkTest.java
    magnoliamodules/trunk/openutils-mgnlcriteria/src/test/java/net/sourceforge/openutils/mgnlcriteria/advanced/OrderingTest.java
    magnoliamodules/trunk/openutils-mgnlcriteria/src/test/java/net/sourceforge/openutils/mgnlcriteria/advanced/PaginationTest.java
    magnoliamodules/trunk/openutils-mgnlcriteria/src/test/java/net/sourceforge/openutils/mgnlcriteria/advanced/ScoreAnalizerAndSortTest.java
    magnoliamodules/trunk/openutils-mgnlcriteria/src/test/java/net/sourceforge/openutils/mgnlcriteria/advanced/XpathEscapeTest.java
    magnoliamodules/trunk/openutils-mgnlcriteria/src/test/java/net/sourceforge/openutils/mgnlcriteria/advanced/impl/AccessibleResultItemResultIteratorTest.java
    magnoliamodules/trunk/openutils-mgnlcriteria/src/test/java/net/sourceforge/openutils/mgnlcriteria/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/criterion/ConjunctionTest.java
    magnoliamodules/trunk/openutils-mgnlcriteria/src/test/java/net/sourceforge/openutils/mgnlcriteria/jcr/query/lucene/AclSearchIndexTest.java
    magnoliamodules/trunk/openutils-mgnlcriteria/src/test/java/net/sourceforge/openutils/mgnlcriteria/tests/CriteriaTestUtils.java
    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/samples/listeners/ExactContentFilter.java
    magnoliamodules/trunk/openutils-mgnlmail/src/main/java/net/sourceforge/openutils/mgnlmail/EmailFromPage.java
    magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/freemarker/SktSimpleMediaParagraphRenderer.java
    magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/freemarker/SktSimpleMediaTemplateRenderer.java
    magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/advancedsearch/SearchFilterInMultivalue.java
    magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/advancedsearch/SearchFilterMultiplevalue.java
    magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/advancedsearch/SearchFilterSorting.java
    magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/configuration/MediaConfigurationManager.java
    magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/configuration/MediaUsedInManager.java
    magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/configuration/UsedInWorkspace.java
    magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/crop/PzcImageProcessor.java
    magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/crop/PzcServlet.java
    magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/dialog/DialogFileNoPreview.java
    magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/dialog/DialogMetadata.java
    magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/pages/MediaBeanBuilder.java
    magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/setup/ConditionallySubscribeMediaRepositoriesTask.java
    magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/setup/RemoveResolutionsNodeTask.java
    magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/setup/SetupModuleRepositoriesWithoutSubscriberTask.java
    magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/types/impl/ImageTypeHandler.java
    magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/utils/RtmpMedatadaFetcher.java
    magnoliamodules/trunk/openutils-mgnlmessages/src/main/java/net/sourceforge/openutils/mgnlmessages/el/MessagesEl.java
    magnoliamodules/trunk/openutils-mgnlmobile/src/main/java/net/sourceforge/openutils/mgnlmobile/magnolia/MobileModule.java
    magnoliamodules/trunk/openutils-mgnlmobile/src/main/java/net/sourceforge/openutils/mgnlmobile/tags/MobilePreviewButtonTag.java
    magnoliamodules/trunk/openutils-mgnlmobile/src/main/java/net/sourceforge/openutils/mgnlmobile/templating/BaseMobileParagraphDecorator.java
    magnoliamodules/trunk/openutils-mgnlmobile/src/main/java/net/sourceforge/openutils/mgnlmobile/templating/BaseMobileTemplateDecorator.java
    magnoliamodules/trunk/openutils-mgnlmobile/src/main/java/net/sourceforge/openutils/mgnlmobile/templating/DefaultMobileParagraphDecorator.java
    magnoliamodules/trunk/openutils-mgnlmobile/src/main/java/net/sourceforge/openutils/mgnlmobile/templating/DefaultMobileTemplate.java
    magnoliamodules/trunk/openutils-mgnlmobile/src/main/java/net/sourceforge/openutils/mgnlmobile/templating/DefaultMobileTemplateDecorator.java
    magnoliamodules/trunk/openutils-mgnlmobile/src/main/java/net/sourceforge/openutils/mgnlmobile/templating/MobileParagraph.java
    magnoliamodules/trunk/openutils-mgnlmobile/src/main/java/net/sourceforge/openutils/mgnlmobile/templating/MobileParagraphManager.java
    magnoliamodules/trunk/openutils-mgnlmobile/src/main/java/net/sourceforge/openutils/mgnlmobile/templating/MobileTemplate.java
    magnoliamodules/trunk/openutils-mgnlmobile/src/main/java/net/sourceforge/openutils/mgnlmobile/templating/MobileTemplateManager.java
    magnoliamodules/trunk/openutils-mgnlrules/src/main/java/net/sourceforge/openutils/mgnlrules/samples/render/ConditionalRenderer.java
    magnoliamodules/trunk/openutils-mgnlstripes/pom.xml
    magnoliamodules/trunk/openutils-mgnlstripes/src/main/java/it/openutils/magnoliastripes/MgnlActionResolver.java
    magnoliamodules/trunk/openutils-mgnlstripes/src/main/java/it/openutils/magnoliastripes/StripesAwareParagraphManager.java
    magnoliamodules/trunk/openutils-mgnlstripes/src/main/java/it/openutils/magnoliastripes/StripesMagnoliaFilter.java
    magnoliamodules/trunk/openutils-mgnlstripes/src/main/java/it/openutils/magnoliastripes/StripesRenderer.java
    magnoliamodules/trunk/openutils-mgnlstripes/src/main/java/it/openutils/magnoliastripes/pages/StripesConfigurationPage.java
    magnoliamodules/trunk/openutils-mgnlstruts11/pom.xml
    magnoliamodules/trunk/openutils-mgnlstruts11/src/main/java/it/openutils/mgnlstruts11/pages/StrutsConfigurationPage.java
    magnoliamodules/trunk/openutils-mgnlstruts11/src/main/java/it/openutils/mgnlstruts11/render/StrutsParagraph.java
    magnoliamodules/trunk/openutils-mgnlstruts11/src/main/java/it/openutils/mgnlstruts11/render/StrutsParagraphRegister.java
    magnoliamodules/trunk/openutils-mgnlstruts11/src/main/java/it/openutils/mgnlstruts11/render/StrutsRenderer.java
    magnoliamodules/trunk/openutils-mgnltagcloud/src/main/java/net/sourceforge/openutils/mgnltagcloud/bean/TagCloud.java
    magnoliamodules/trunk/openutils-mgnltagcloud/src/main/java/net/sourceforge/openutils/mgnltagcloud/module/TagCloudModule.java
    magnoliamodules/trunk/openutils-mgnltagcloud/src/test/java/net/sourceforge/openutils/mgnltagcloud/manager/TagCloudManagerTest.java
    magnoliamodules/trunk/openutils-mgnltagcloud/src/test/resources/groovyscripts/testCreatingPageTag.groovy
    magnoliamodules/trunk/openutils-mgnltasks/src/main/java/it/openutils/mgnltasks/BaseCheckMissingTask.java
    magnoliamodules/trunk/openutils-mgnltasks/src/main/java/it/openutils/mgnltasks/ChangePropertyForEachChildrenTask.java
    magnoliamodules/trunk/openutils-mgnltasks/src/main/java/it/openutils/mgnltasks/ReplaceParagraphTask.java
    magnoliamodules/trunk/openutils-mgnltasks/src/main/java/it/openutils/mgnltasks/ReplaceTemplateTask.java
    magnoliamodules/trunk/openutils-mgnlutils/src/main/java/it/openutils/mgnlutils/el/MgnlUtilsElFunctions.java
    magnoliamodules/trunk/openutils-mgnlutils/src/main/java/it/openutils/mgnlutils/templating/AutoGenerateTemplateModel.java
    magnoliamodules/trunk/openutils-mgnlutils/src/main/java/it/openutils/mgnlutils/templating/ExtendedTemplate.java
    magnoliamodules/trunk/openutils-mgnlutils/src/test/java/it/openutils/mgnlutils/test/junit/JUnitRepositoryTestcaseTest.java
    magnoliamodules/trunk/openutils-mgnlutils/src/test/java/it/openutils/mgnlutils/test/testng/TestNgRepositoryTestcaseTest.java
    magnoliamodules/trunk/pom.xml

Removed Paths:
-------------
    magnoliamodules/trunk/openutils-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/utils/ASCIIFoldingFilter.java
    magnoliamodules/trunk/openutils-mgnlspring/

Modified: magnoliamodules/trunk/magnolia-test-webapp/pom.xml
===================================================================
--- magnoliamodules/trunk/magnolia-test-webapp/pom.xml	2012-03-10 21:55:32 UTC (rev 3780)
+++ magnoliamodules/trunk/magnolia-test-webapp/pom.xml	2012-03-10 22:22:36 UTC (rev 3781)
@@ -151,11 +151,6 @@
     </dependency>
     <dependency>
       <groupId>net.sourceforge.openutils</groupId>
-      <artifactId>openutils-mgnlspring</artifactId>
-      <version>3.5.1-SNAPSHOT</version>
-    </dependency>
-    <dependency>
-      <groupId>net.sourceforge.openutils</groupId>
       <artifactId>openutils-mgnlstripes</artifactId>
       <version>4.1.4-SNAPSHOT</version>
     </dependency>

Modified: magnoliamodules/trunk/magnolia-test-webapp/src/main/webapp/template_criteria/criteria.jsp
===================================================================
--- magnoliamodules/trunk/magnolia-test-webapp/src/main/webapp/template_criteria/criteria.jsp	2012-03-10 21:55:32 UTC (rev 3780)
+++ magnoliamodules/trunk/magnolia-test-webapp/src/main/webapp/template_criteria/criteria.jsp	2012-03-10 22:22:36 UTC (rev 3781)
@@ -40,7 +40,7 @@
       <jsp:scriptlet><![CDATA[
 Criteria criteria = JCRCriteriaFactory
   .createCriteria()
-  .setWorkspace(ContentRepository.WEBSITE)
+  .setWorkspace(RepositoryConstants.WEBSITE)
   .setBasePath("/Criteria/pets")
   .add(Restrictions.eq("@jcr:primaryType", ItemType.CONTENT.getSystemName()))
   .addOrder(Order.asc("@birthDate"));

Modified: magnoliamodules/trunk/openutils-mgnlcache/src/main/java/net/sourceforge/openutils/mgnlsimplecache/filesystem/FSCacheManager.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlcache/src/main/java/net/sourceforge/openutils/mgnlsimplecache/filesystem/FSCacheManager.java	2012-03-10 21:55:32 UTC (rev 3780)
+++ magnoliamodules/trunk/openutils-mgnlcache/src/main/java/net/sourceforge/openutils/mgnlsimplecache/filesystem/FSCacheManager.java	2012-03-10 22:22:36 UTC (rev 3781)
@@ -19,10 +19,10 @@
 
 package net.sourceforge.openutils.mgnlsimplecache.filesystem;
 
-import info.magnolia.cms.beans.config.ContentRepository;
 import info.magnolia.cms.core.Path;
 import info.magnolia.cms.util.MBeanUtil;
 import info.magnolia.cms.util.ObservationUtil;
+import info.magnolia.repository.RepositoryConstants;
 import info.magnolia.voting.Voter;
 
 import java.io.File;
@@ -410,7 +410,7 @@
         // start observing repositories
         if (repositoryUrls.size() == 0)
         {
-            repositoryUrls.add(ContentRepository.WEBSITE);
+            repositoryUrls.add(RepositoryConstants.WEBSITE);
         }
         for (String repositoryUrl : repositoryUrls)
         {

Modified: magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/java/net/sourceforge/openutils/mgnlcontextmenu/tags/ElementTag.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/java/net/sourceforge/openutils/mgnlcontextmenu/tags/ElementTag.java	2012-03-10 21:55:32 UTC (rev 3780)
+++ magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/java/net/sourceforge/openutils/mgnlcontextmenu/tags/ElementTag.java	2012-03-10 22:22:36 UTC (rev 3781)
@@ -20,7 +20,6 @@
 package net.sourceforge.openutils.mgnlcontextmenu.tags;
 
 import info.magnolia.cms.core.Content;
-import info.magnolia.cms.taglibs.CmsFunctions;
 import info.magnolia.context.MgnlContext;
 
 import java.io.IOException;

Modified: magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/java/net/sourceforge/openutils/mgnlcontextmenu/tags/LinksTag.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/java/net/sourceforge/openutils/mgnlcontextmenu/tags/LinksTag.java	2012-03-10 21:55:32 UTC (rev 3780)
+++ magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/java/net/sourceforge/openutils/mgnlcontextmenu/tags/LinksTag.java	2012-03-10 22:22:36 UTC (rev 3781)
@@ -19,7 +19,6 @@
 
 package net.sourceforge.openutils.mgnlcontextmenu.tags;
 
-import info.magnolia.cms.taglibs.CmsFunctions;
 import info.magnolia.context.MgnlContext;
 
 import java.io.IOException;

Modified: magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/java/net/sourceforge/openutils/mgnlcontextmenu/tags/ScriptTag.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/java/net/sourceforge/openutils/mgnlcontextmenu/tags/ScriptTag.java	2012-03-10 21:55:32 UTC (rev 3780)
+++ magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/java/net/sourceforge/openutils/mgnlcontextmenu/tags/ScriptTag.java	2012-03-10 22:22:36 UTC (rev 3781)
@@ -19,7 +19,6 @@
 
 package net.sourceforge.openutils.mgnlcontextmenu.tags;
 
-import info.magnolia.cms.taglibs.CmsFunctions;
 import info.magnolia.context.MgnlContext;
 
 import java.io.IOException;

Modified: magnoliamodules/trunk/openutils-mgnlcontrols/src/main/java/net/sourceforge/openutils/mgnlcontrols/configuration/UUIDLinkGridColumnType.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlcontrols/src/main/java/net/sourceforge/openutils/mgnlcontrols/configuration/UUIDLinkGridColumnType.java	2012-03-10 21:55:32 UTC (rev 3780)
+++ magnoliamodules/trunk/openutils-mgnlcontrols/src/main/java/net/sourceforge/openutils/mgnlcontrols/configuration/UUIDLinkGridColumnType.java	2012-03-10 22:22:36 UTC (rev 3781)
@@ -19,13 +19,13 @@
 
 package net.sourceforge.openutils.mgnlcontrols.configuration;
 
-import info.magnolia.cms.beans.config.ContentRepository;
 import info.magnolia.cms.core.Content;
 import info.magnolia.cms.i18n.Messages;
 import info.magnolia.cms.security.AccessDeniedException;
 import info.magnolia.cms.util.ContentUtil;
 import info.magnolia.cms.util.NodeDataUtil;
 import info.magnolia.context.MgnlContext;
+import info.magnolia.repository.RepositoryConstants;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -86,7 +86,7 @@
     {
         String repository = StringUtils.defaultIfEmpty(
             NodeDataUtil.getString(colConfig, "repository"),
-            ContentRepository.WEBSITE);
+            RepositoryConstants.WEBSITE);
         for (int index = 0; index < column.length; index++)
         {
 
@@ -111,7 +111,7 @@
     {
         String repository = StringUtils.defaultIfEmpty(
             NodeDataUtil.getString(colConfig, "repository"),
-            ContentRepository.WEBSITE);
+            RepositoryConstants.WEBSITE);
         for (int index = 0; index < column.length; index++)
         {
             if (!StringUtils.isEmpty(column[index]))

Modified: magnoliamodules/trunk/openutils-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/jcr/query/Criteria.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/jcr/query/Criteria.java	2012-03-10 21:55:32 UTC (rev 3780)
+++ magnoliamodules/trunk/openutils-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/jcr/query/Criteria.java	2012-03-10 22:22:36 UTC (rev 3781)
@@ -36,7 +36,7 @@
  * Calendar end = Calendar.getInstance();
  * end.set(2001, Calendar.DECEMBER, 31);
  *
- * Criteria criteria = JCRCriteriaFactory.createCriteria().setWorkspace(ContentRepository.WEBSITE)
+ * Criteria criteria = JCRCriteriaFactory.createCriteria().setWorkspace(RepositoryConstants.WEBSITE)
  *     .setBasePath("/pets")
  *     .add(Restrictions.contains("@title", "Lucky"))
  *     .add(Restrictions.eq("@petType", "dog"))
@@ -60,7 +60,7 @@
  * <pre>
  * Criteria criteria = JCRCriteriaFactory
  *     .createCriteria()
- *     .setWorkspace(ContentRepository.WEBSITE)
+ *     .setWorkspace(RepositoryConstants.WEBSITE)
  *     .setBasePath("/pets")
  *     .add(Restrictions.betweenDates("@birthDate", begin, end))
  *     .addOrder(Order.asc("@birthDate"))
@@ -75,7 +75,7 @@
  * Another way to paginate results is by using the <code>setPaging</code> method:
  * 
  * <pre>
- * Criteria criteria = JCRCriteriaFactory.createCriteria().setWorkspace(ContentRepository.WEBSITE)
+ * Criteria criteria = JCRCriteriaFactory.createCriteria().setWorkspace(RepositoryConstants.WEBSITE)
  *     .setBasePath("/pets")
  *     .add(Restrictions.betweenDates("@birthDate", begin, end))
  *     .addOrder(Order.asc("@birthDate"))

Modified: magnoliamodules/trunk/openutils-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/jcr/query/lucene/AclQueryDecorator.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/jcr/query/lucene/AclQueryDecorator.java	2012-03-10 21:55:32 UTC (rev 3780)
+++ magnoliamodules/trunk/openutils-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/jcr/query/lucene/AclQueryDecorator.java	2012-03-10 22:22:36 UTC (rev 3781)
@@ -39,8 +39,8 @@
 import org.apache.jackrabbit.core.query.lucene.MatchAllDocsQuery;
 import org.apache.jackrabbit.core.query.lucene.QueryDecoratorSupport;
 import org.apache.jackrabbit.core.query.lucene.SearchIndex;
+import org.apache.lucene.search.BooleanClause.Occur;
 import org.apache.lucene.search.Query;
-import org.apache.lucene.search.BooleanClause.Occur;
 
 
 /**

Modified: magnoliamodules/trunk/openutils-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/jcr/query/xpath/impl/AbstractCriteriaImpl.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/jcr/query/xpath/impl/AbstractCriteriaImpl.java	2012-03-10 21:55:32 UTC (rev 3780)
+++ magnoliamodules/trunk/openutils-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/jcr/query/xpath/impl/AbstractCriteriaImpl.java	2012-03-10 22:22:36 UTC (rev 3781)
@@ -19,8 +19,8 @@
 
 package net.sourceforge.openutils.mgnlcriteria.jcr.query.xpath.impl;
 
-import info.magnolia.cms.beans.config.ContentRepository;
 import info.magnolia.context.MgnlContext;
+import info.magnolia.repository.RepositoryConstants;
 
 import java.util.ArrayList;
 import java.util.Collection;
@@ -66,7 +66,7 @@
 
     protected String spellCheckString;
 
-    protected String workspace = ContentRepository.WEBSITE;
+    protected String workspace = RepositoryConstants.WEBSITE;
 
     protected boolean forcePagingWithDocumentOrder;
 

Modified: magnoliamodules/trunk/openutils-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/utils/ASCIIFoldingAnalyzer.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/utils/ASCIIFoldingAnalyzer.java	2012-03-10 21:55:32 UTC (rev 3780)
+++ magnoliamodules/trunk/openutils-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/utils/ASCIIFoldingAnalyzer.java	2012-03-10 22:22:36 UTC (rev 3781)
@@ -19,6 +19,7 @@
 
 package net.sourceforge.openutils.mgnlcriteria.utils;
 
+import org.apache.lucene.analysis.ASCIIFoldingFilter;
 import org.apache.lucene.analysis.LowerCaseFilter;
 import org.apache.lucene.analysis.TokenStream;
 import org.apache.lucene.analysis.standard.StandardFilter;

Deleted: magnoliamodules/trunk/openutils-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/utils/ASCIIFoldingFilter.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/utils/ASCIIFoldingFilter.java	2012-03-10 21:55:32 UTC (rev 3780)
+++ magnoliamodules/trunk/openutils-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/utils/ASCIIFoldingFilter.java	2012-03-10 22:22:36 UTC (rev 3781)
@@ -1,2017 +0,0 @@
-/**
- *
- * Criteria API for Magnolia CMS (http://www.openmindlab.com/lab/products/mgnlcriteria.html)
- * Copyright(C) 2009-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
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-package net.sourceforge.openutils.mgnlcriteria.utils;
-
-import org.apache.lucene.analysis.Token;
-import org.apache.lucene.analysis.TokenFilter;
-import org.apache.lucene.analysis.TokenStream;
-
-
-/**
- * A filter backported da lucene 2.9.1 which converts any character variation into its ASCII equivalent.
- * @author fgiust
- * @version $Id$
- */
-
-public class ASCIIFoldingFilter extends TokenFilter
-{
-
-    public ASCIIFoldingFilter(TokenStream input)
-    {
-        super(input);
-    }
-
-    private char[] output = new char[256];
-
-    private int outputPos;
-
-    @Override
-    public final Token next(final Token reusableToken) throws java.io.IOException
-    {
-        assert reusableToken != null;
-        Token nextToken = input.next(reusableToken);
-        if (nextToken != null)
-        {
-            final char[] buffer = nextToken.termBuffer();
-            final int length = nextToken.termLength();
-            // If no characters actually require rewriting then we
-            // just return token as-is:
-            for (int i = 0; i < length; i++)
-            {
-                final char c = buffer[i];
-                if (c >= '\u0080')
-                {
-                    removeAccents(buffer, length);
-                    nextToken.setTermBuffer(output, 0, outputPos);
-                    break;
-                }
-            }
-            return nextToken;
-        }
-        else
-            return null;
-    }
-
-    /**
-     * To replace accented characters in a String by unaccented equivalents.
-     */
-    public final void removeAccents(char[] input, int length)
-    {
-
-        // Worst-case length required:
-        final int maxSizeNeeded = 2 * length;
-
-        int size = output.length;
-        while (size < maxSizeNeeded)
-            size *= 2;
-
-        if (size != output.length)
-            output = new char[size];
-
-        outputPos = 0;
-
-        for (int pos = 0; pos < length; ++pos)
-        {
-            final char c = input[pos];
-
-            // Quick test: if it's not in range then just keep current character
-            if (c < '\u0080')
-            {
-                output[outputPos++] = c;
-            }
-            else
-            {
-                switch (c)
-                {
-                    case '\u00C0' : // À [LATIN CAPITAL LETTER A WITH GRAVE]
-                    case '\u00C1' : // Á [LATIN CAPITAL LETTER A WITH ACUTE]
-                    case '\u00C2' : // Â [LATIN CAPITAL LETTER A WITH CIRCUMFLEX]
-                    case '\u00C3' : // Ã [LATIN CAPITAL LETTER A WITH TILDE]
-                    case '\u00C4' : // Ä [LATIN CAPITAL LETTER A WITH DIAERESIS]
-                    case '\u00C5' : // Å [LATIN CAPITAL LETTER A WITH RING ABOVE]
-                    case '\u0100' : // Ā [LATIN CAPITAL LETTER A WITH MACRON]
-                    case '\u0102' : // Ă [LATIN CAPITAL LETTER A WITH BREVE]
-                    case '\u0104' : // Ą [LATIN CAPITAL LETTER A WITH OGONEK]
-                    case '\u018F' : // Ə http://en.wikipedia.org/wiki/Schwa [LATIN CAPITAL LETTER SCHWA]
-                    case '\u01CD' : // Ǎ [LATIN CAPITAL LETTER A WITH CARON]
-                    case '\u01DE' : // Ǟ [LATIN CAPITAL LETTER A WITH DIAERESIS AND MACRON]
-                    case '\u01E0' : // Ǡ [LATIN CAPITAL LETTER A WITH DOT ABOVE AND MACRON]
-                    case '\u01FA' : // Ǻ [LATIN CAPITAL LETTER A WITH RING ABOVE AND ACUTE]
-                    case '\u0200' : // Ȁ [LATIN CAPITAL LETTER A WITH DOUBLE GRAVE]
-                    case '\u0202' : // Ȃ [LATIN CAPITAL LETTER A WITH INVERTED BREVE]
-                    case '\u0226' : // Ȧ [LATIN CAPITAL LETTER A WITH DOT ABOVE]
-                    case '\u023A' : // Ⱥ [LATIN CAPITAL LETTER A WITH STROKE]
-                    case '\u1D00' : // ᴀ [LATIN LETTER SMALL CAPITAL A]
-                    case '\u1E00' : // Ḁ [LATIN CAPITAL LETTER A WITH RING BELOW]
-                    case '\u1EA0' : // Ạ [LATIN CAPITAL LETTER A WITH DOT BELOW]
-                    case '\u1EA2' : // Ả [LATIN CAPITAL LETTER A WITH HOOK ABOVE]
-                    case '\u1EA4' : // Ấ [LATIN CAPITAL LETTER A WITH CIRCUMFLEX AND ACUTE]
-                    case '\u1EA6' : // Ầ [LATIN CAPITAL LETTER A WITH CIRCUMFLEX AND GRAVE]
-                    case '\u1EA8' : // Ẩ [LATIN CAPITAL LETTER A WITH CIRCUMFLEX AND HOOK ABOVE]
-                    case '\u1EAA' : // Ẫ [LATIN CAPITAL LETTER A WITH CIRCUMFLEX AND TILDE]
-                    case '\u1EAC' : // Ậ [LATIN CAPITAL LETTER A WITH CIRCUMFLEX AND DOT BELOW]
-                    case '\u1EAE' : // Ắ [LATIN CAPITAL LETTER A WITH BREVE AND ACUTE]
-                    case '\u1EB0' : // Ằ [LATIN CAPITAL LETTER A WITH BREVE AND GRAVE]
-                    case '\u1EB2' : // Ẳ [LATIN CAPITAL LETTER A WITH BREVE AND HOOK ABOVE]
-                    case '\u1EB4' : // Ẵ [LATIN CAPITAL LETTER A WITH BREVE AND TILDE]
-                    case '\u1EB6' : // Ặ [LATIN CAPITAL LETTER A WITH BREVE AND DOT BELOW]
-                    case '\u24B6' : // Ⓐ [CIRCLED LATIN CAPITAL LETTER A]
-                    case '\uFF21' : // Ａ [FULLWIDTH LATIN CAPITAL LETTER A]
-                        output[outputPos++] = 'A';
-                        break;
-                    case '\u00E0' : // à [LATIN SMALL LETTER A WITH GRAVE]
-                    case '\u00E1' : // á [LATIN SMALL LETTER A WITH ACUTE]
-                    case '\u00E2' : // â [LATIN SMALL LETTER A WITH CIRCUMFLEX]
-                    case '\u00E3' : // ã [LATIN SMALL LETTER A WITH TILDE]
-                    case '\u00E4' : // ä [LATIN SMALL LETTER A WITH DIAERESIS]
-                    case '\u00E5' : // å [LATIN SMALL LETTER A WITH RING ABOVE]
-                    case '\u0101' : // ā [LATIN SMALL LETTER A WITH MACRON]
-                    case '\u0103' : // ă [LATIN SMALL LETTER A WITH BREVE]
-                    case '\u0105' : // ą [LATIN SMALL LETTER A WITH OGONEK]
-                    case '\u01CE' : // ǎ [LATIN SMALL LETTER A WITH CARON]
-                    case '\u01DF' : // ǟ [LATIN SMALL LETTER A WITH DIAERESIS AND MACRON]
-                    case '\u01E1' : // ǡ [LATIN SMALL LETTER A WITH DOT ABOVE AND MACRON]
-                    case '\u01FB' : // ǻ [LATIN SMALL LETTER A WITH RING ABOVE AND ACUTE]
-                    case '\u0201' : // ȁ [LATIN SMALL LETTER A WITH DOUBLE GRAVE]
-                    case '\u0203' : // ȃ [LATIN SMALL LETTER A WITH INVERTED BREVE]
-                    case '\u0227' : // ȧ [LATIN SMALL LETTER A WITH DOT ABOVE]
-                    case '\u0250' : // ɐ [LATIN SMALL LETTER TURNED A]
-                    case '\u0259' : // ə [LATIN SMALL LETTER SCHWA]
-                    case '\u025A' : // ɚ [LATIN SMALL LETTER SCHWA WITH HOOK]
-                    case '\u1D8F' : // ᶏ [LATIN SMALL LETTER A WITH RETROFLEX HOOK]
-                    case '\u1D95' : // ᶕ [LATIN SMALL LETTER SCHWA WITH RETROFLEX HOOK]
-                    case '\u1E01' : // ạ [LATIN SMALL LETTER A WITH RING BELOW]
-                    case '\u1E9A' : // ả [LATIN SMALL LETTER A WITH RIGHT HALF RING]
-                    case '\u1EA1' : // ạ [LATIN SMALL LETTER A WITH DOT BELOW]
-                    case '\u1EA3' : // ả [LATIN SMALL LETTER A WITH HOOK ABOVE]
-                    case '\u1EA5' : // ấ [LATIN SMALL LETTER A WITH CIRCUMFLEX AND ACUTE]
-                    case '\u1EA7' : // ầ [LATIN SMALL LETTER A WITH CIRCUMFLEX AND GRAVE]
-                    case '\u1EA9' : // ẩ [LATIN SMALL LETTER A WITH CIRCUMFLEX AND HOOK ABOVE]
-                    case '\u1EAB' : // ẫ [LATIN SMALL LETTER A WITH CIRCUMFLEX AND TILDE]
-                    case '\u1EAD' : // ậ [LATIN SMALL LETTER A WITH CIRCUMFLEX AND DOT BELOW]
-                    case '\u1EAF' : // ắ [LATIN SMALL LETTER A WITH BREVE AND ACUTE]
-                    case '\u1EB1' : // ằ [LATIN SMALL LETTER A WITH BREVE AND GRAVE]
-                    case '\u1EB3' : // ẳ [LATIN SMALL LETTER A WITH BREVE AND HOOK ABOVE]
-                    case '\u1EB5' : // ẵ [LATIN SMALL LETTER A WITH BREVE AND TILDE]
-                    case '\u1EB7' : // ặ [LATIN SMALL LETTER A WITH BREVE AND DOT BELOW]
-                    case '\u2090' : // ₐ [LATIN SUBSCRIPT SMALL LETTER A]
-                    case '\u2094' : // ₔ [LATIN SUBSCRIPT SMALL LETTER SCHWA]
-                    case '\u24D0' : // ⓐ [CIRCLED LATIN SMALL LETTER A]
-                    case '\u2C65' : // ⱥ [LATIN SMALL LETTER A WITH STROKE]
-                    case '\u2C6F' : // Ɐ [LATIN CAPITAL LETTER TURNED A]
-                    case '\uFF41' : // ａ [FULLWIDTH LATIN SMALL LETTER A]
-                        output[outputPos++] = 'a';
-                        break;
-                    case '\uA732' : // Ꜳ [LATIN CAPITAL LETTER AA]
-                        output[outputPos++] = 'A';
-                        output[outputPos++] = 'A';
-                        break;
-                    case '\u00C6' : // Æ [LATIN CAPITAL LETTER AE]
-                    case '\u01E2' : // Ǣ [LATIN CAPITAL LETTER AE WITH MACRON]
-                    case '\u01FC' : // Ǽ [LATIN CAPITAL LETTER AE WITH ACUTE]
-                    case '\u1D01' : // ᴁ [LATIN LETTER SMALL CAPITAL AE]
-                        output[outputPos++] = 'A';
-                        output[outputPos++] = 'E';
-                        break;
-                    case '\uA734' : // Ꜵ [LATIN CAPITAL LETTER AO]
-                        output[outputPos++] = 'A';
-                        output[outputPos++] = 'O';
-                        break;
-                    case '\uA736' : // Ꜷ [LATIN CAPITAL LETTER AU]
-                        output[outputPos++] = 'A';
-                        output[outputPos++] = 'U';
-                        break;
-                    case '\uA738' : // Ꜹ [LATIN CAPITAL LETTER AV]
-                    case '\uA73A' : // Ꜻ [LATIN CAPITAL LETTER AV WITH HORIZONTAL BAR]
-                        output[outputPos++] = 'A';
-                        output[outputPos++] = 'V';
-                        break;
-                    case '\uA73C' : // Ꜽ [LATIN CAPITAL LETTER AY]
-                        output[outputPos++] = 'A';
-                        output[outputPos++] = 'Y';
-                        break;
-                    case '\u249C' : // ⒜ [PARENTHESIZED LATIN SMALL LETTER A]
-                        output[outputPos++] = '(';
-                        output[outputPos++] = 'a';
-                        output[outputPos++] = ')';
-                        break;
-                    case '\uA733' : // ꜳ [LATIN SMALL LETTER AA]
-                        output[outputPos++] = 'a';
-                        output[outputPos++] = 'a';
-                        break;
-                    case '\u00E6' : // æ [LATIN SMALL LETTER AE]
-                    case '\u01E3' : // ǣ [LATIN SMALL LETTER AE WITH MACRON]
-                    case '\u01FD' : // ǽ [LATIN SMALL LETTER AE WITH ACUTE]
-                    case '\u1D02' : // ᴂ [LATIN SMALL LETTER TURNED AE]
-                        output[outputPos++] = 'a';
-                        output[outputPos++] = 'e';
-                        break;
-                    case '\uA735' : // ꜵ [LATIN SMALL LETTER AO]
-                        output[outputPos++] = 'a';
-                        output[outputPos++] = 'o';
-                        break;
-                    case '\uA737' : // ꜷ [LATIN SMALL LETTER AU]
-                        output[outputPos++] = 'a';
-                        output[outputPos++] = 'u';
-                        break;
-                    case '\uA739' : // ꜹ [LATIN SMALL LETTER AV]
-                    case '\uA73B' : // ꜻ [LATIN SMALL LETTER AV WITH HORIZONTAL BAR]
-                        output[outputPos++] = 'a';
-                        output[outputPos++] = 'v';
-                        break;
-                    case '\uA73D' : // ꜽ [LATIN SMALL LETTER AY]
-                        output[outputPos++] = 'a';
-                        output[outputPos++] = 'y';
-                        break;
-                    case '\u0181' : // Ɓ [LATIN CAPITAL LETTER B WITH HOOK]
-                    case '\u0182' : // Ƃ [LATIN CAPITAL LETTER B WITH TOPBAR]
-                    case '\u0243' : // Ƀ [LATIN CAPITAL LETTER B WITH STROKE]
-                    case '\u0299' : // ʙ [LATIN LETTER SMALL CAPITAL B]
-                    case '\u1D03' : // ᴃ [LATIN LETTER SMALL CAPITAL BARRED B]
-                    case '\u1E02' : // Ḃ [LATIN CAPITAL LETTER B WITH DOT ABOVE]
-                    case '\u1E04' : // Ḅ [LATIN CAPITAL LETTER B WITH DOT BELOW]
-                    case '\u1E06' : // Ḇ [LATIN CAPITAL LETTER B WITH LINE BELOW]
-                    case '\u24B7' : // Ⓑ [CIRCLED LATIN CAPITAL LETTER B]
-                    case '\uFF22' : // Ｂ [FULLWIDTH LATIN CAPITAL LETTER B]
-                        output[outputPos++] = 'B';
-                        break;
-                    case '\u0180' : // ƀ [LATIN SMALL LETTER B WITH STROKE]
-                    case '\u0183' : // ƃ [LATIN SMALL LETTER B WITH TOPBAR]
-                    case '\u0253' : // ɓ [LATIN SMALL LETTER B WITH HOOK]
-                    case '\u1D6C' : // ᵬ [LATIN SMALL LETTER B WITH MIDDLE TILDE]
-                    case '\u1D80' : // ᶀ [LATIN SMALL LETTER B WITH PALATAL HOOK]
-                    case '\u1E03' : // ḃ [LATIN SMALL LETTER B WITH DOT ABOVE]
-                    case '\u1E05' : // ḅ [LATIN SMALL LETTER B WITH DOT BELOW]
-                    case '\u1E07' : // ḇ [LATIN SMALL LETTER B WITH LINE BELOW]
-                    case '\u24D1' : // ⓑ [CIRCLED LATIN SMALL LETTER B]
-                    case '\uFF42' : // ｂ [FULLWIDTH LATIN SMALL LETTER B]
-                        output[outputPos++] = 'b';
-                        break;
-                    case '\u249D' : // ⒝ [PARENTHESIZED LATIN SMALL LETTER B]
-                        output[outputPos++] = '(';
-                        output[outputPos++] = 'b';
-                        output[outputPos++] = ')';
-                        break;
-                    case '\u00C7' : // Ç [LATIN CAPITAL LETTER C WITH CEDILLA]
-                    case '\u0106' : // Ć [LATIN CAPITAL LETTER C WITH ACUTE]
-                    case '\u0108' : // Ĉ [LATIN CAPITAL LETTER C WITH CIRCUMFLEX]
-                    case '\u010A' : // Ċ [LATIN CAPITAL LETTER C WITH DOT ABOVE]
-                    case '\u010C' : // Č [LATIN CAPITAL LETTER C WITH CARON]
-                    case '\u0187' : // Ƈ [LATIN CAPITAL LETTER C WITH HOOK]
-                    case '\u023B' : // Ȼ [LATIN CAPITAL LETTER C WITH STROKE]
-                    case '\u0297' : // ʗ [LATIN LETTER STRETCHED C]
-                    case '\u1D04' : // ᴄ [LATIN LETTER SMALL CAPITAL C]
-                    case '\u1E08' : // Ḉ [LATIN CAPITAL LETTER C WITH CEDILLA AND ACUTE]
-                    case '\u24B8' : // Ⓒ [CIRCLED LATIN CAPITAL LETTER C]
-                    case '\uFF23' : // Ｃ [FULLWIDTH LATIN CAPITAL LETTER C]
-                        output[outputPos++] = 'C';
-                        break;
-                    case '\u00E7' : // ç [LATIN SMALL LETTER C WITH CEDILLA]
-                    case '\u0107' : // ć [LATIN SMALL LETTER C WITH ACUTE]
-                    case '\u0109' : // ĉ [LATIN SMALL LETTER C WITH CIRCUMFLEX]
-                    case '\u010B' : // ċ [LATIN SMALL LETTER C WITH DOT ABOVE]
-                    case '\u010D' : // č [LATIN SMALL LETTER C WITH CARON]
-                    case '\u0188' : // ƈ [LATIN SMALL LETTER C WITH HOOK]
-                    case '\u023C' : // ȼ [LATIN SMALL LETTER C WITH STROKE]
-                    case '\u0255' : // ɕ [LATIN SMALL LETTER C WITH CURL]
-                    case '\u1E09' : // ḉ [LATIN SMALL LETTER C WITH CEDILLA AND ACUTE]
-                    case '\u2184' : // ↄ [LATIN SMALL LETTER REVERSED C]
-                    case '\u24D2' : // ⓒ [CIRCLED LATIN SMALL LETTER C]
-                    case '\uA73E' : // Ꜿ [LATIN CAPITAL LETTER REVERSED C WITH DOT]
-                    case '\uA73F' : // ꜿ [LATIN SMALL LETTER REVERSED C WITH DOT]
-                    case '\uFF43' : // ｃ [FULLWIDTH LATIN SMALL LETTER C]
-                        output[outputPos++] = 'c';
-                        break;
-                    case '\u249E' : // ⒞ [PARENTHESIZED LATIN SMALL LETTER C]
-                        output[outputPos++] = '(';
-                        output[outputPos++] = 'c';
-                        output[outputPos++] = ')';
-                        break;
-                    case '\u00D0' : // Ð [LATIN CAPITAL LETTER ETH]
-                    case '\u010E' : // Ď [LATIN CAPITAL LETTER D WITH CARON]
-                    case '\u0110' : // Đ [LATIN CAPITAL LETTER D WITH STROKE]
-                    case '\u0189' : // Ɖ [LATIN CAPITAL LETTER AFRICAN D]
-                    case '\u018A' : // Ɗ [LATIN CAPITAL LETTER D WITH HOOK]
-                    case '\u018B' : // Ƌ [LATIN CAPITAL LETTER D WITH TOPBAR]
-                    case '\u1D05' : // ᴅ [LATIN LETTER SMALL CAPITAL D]
-                    case '\u1D06' : // ᴆ [LATIN LETTER SMALL CAPITAL ETH]
-                    case '\u1E0A' : // Ḋ [LATIN CAPITAL LETTER D WITH DOT ABOVE]
-                    case '\u1E0C' : // Ḍ [LATIN CAPITAL LETTER D WITH DOT BELOW]
-                    case '\u1E0E' : // Ḏ [LATIN CAPITAL LETTER D WITH LINE BELOW]
-                    case '\u1E10' : // Ḑ [LATIN CAPITAL LETTER D WITH CEDILLA]
-                    case '\u1E12' : // Ḓ [LATIN CAPITAL LETTER D WITH CIRCUMFLEX BELOW]
-                    case '\u24B9' : // Ⓓ [CIRCLED LATIN CAPITAL LETTER D]
-                    case '\uA779' : // Ꝺ [LATIN CAPITAL LETTER INSULAR D]
-                    case '\uFF24' : // Ｄ [FULLWIDTH LATIN CAPITAL LETTER D]
-                        output[outputPos++] = 'D';
-                        break;
-                    case '\u00F0' : // ð [LATIN SMALL LETTER ETH]
-                    case '\u010F' : // ď [LATIN SMALL LETTER D WITH CARON]
-                    case '\u0111' : // đ [LATIN SMALL LETTER D WITH STROKE]
-                    case '\u018C' : // ƌ [LATIN SMALL LETTER D WITH TOPBAR]
-                    case '\u0221' : // ȡ [LATIN SMALL LETTER D WITH CURL]
-                    case '\u0256' : // ɖ [LATIN SMALL LETTER D WITH TAIL]
-                    case '\u0257' : // ɗ [LATIN SMALL LETTER D WITH HOOK]
-                    case '\u1D6D' : // ᵭ [LATIN SMALL LETTER D WITH MIDDLE TILDE]
-                    case '\u1D81' : // ᶁ [LATIN SMALL LETTER D WITH PALATAL HOOK]
-                    case '\u1D91' : // ᶑ [LATIN SMALL LETTER D WITH HOOK AND TAIL]
-                    case '\u1E0B' : // ḋ [LATIN SMALL LETTER D WITH DOT ABOVE]
-                    case '\u1E0D' : // ḍ [LATIN SMALL LETTER D WITH DOT BELOW]
-                    case '\u1E0F' : // ḏ [LATIN SMALL LETTER D WITH LINE BELOW]
-                    case '\u1E11' : // ḑ [LATIN SMALL LETTER D WITH CEDILLA]
-                    case '\u1E13' : // ḓ [LATIN SMALL LETTER D WITH CIRCUMFLEX BELOW]
-                    case '\u24D3' : // ⓓ [CIRCLED LATIN SMALL LETTER D]
-                    case '\uA77A' : // ꝺ [LATIN SMALL LETTER INSULAR D]
-                    case '\uFF44' : // ｄ [FULLWIDTH LATIN SMALL LETTER D]
-                        output[outputPos++] = 'd';
-                        break;
-                    case '\u01C4' : // DŽ [LATIN CAPITAL LETTER DZ WITH CARON]
-                    case '\u01F1' : // DZ [LATIN CAPITAL LETTER DZ]
-                        output[outputPos++] = 'D';
-                        output[outputPos++] = 'Z';
-                        break;
-                    case '\u01C5' : // Dž [LATIN CAPITAL LETTER D WITH SMALL LETTER Z WITH CARON]
-                    case '\u01F2' : // Dz [LATIN CAPITAL LETTER D WITH SMALL LETTER Z]
-                        output[outputPos++] = 'D';
-                        output[outputPos++] = 'z';
-                        break;
-                    case '\u249F' : // ⒟ [PARENTHESIZED LATIN SMALL LETTER D]
-                        output[outputPos++] = '(';
-                        output[outputPos++] = 'd';
-                        output[outputPos++] = ')';
-                        break;
-                    case '\u0238' : // ȸ [LATIN SMALL LETTER DB DIGRAPH]
-                        output[outputPos++] = 'd';
-                        output[outputPos++] = 'b';
-                        break;
-                    case '\u01C6' : // dž [LATIN SMALL LETTER DZ WITH CARON]
-                    case '\u01F3' : // dz [LATIN SMALL LETTER DZ]
-                    case '\u02A3' : // ʣ [LATIN SMALL LETTER DZ DIGRAPH]
-                    case '\u02A5' : // ʥ [LATIN SMALL LETTER DZ DIGRAPH WITH CURL]
-                        output[outputPos++] = 'd';
-                        output[outputPos++] = 'z';
-                        break;
-                    case '\u00C8' : // È [LATIN CAPITAL LETTER E WITH GRAVE]
-                    case '\u00C9' : // É [LATIN CAPITAL LETTER E WITH ACUTE]
-                    case '\u00CA' : // Ê [LATIN CAPITAL LETTER E WITH CIRCUMFLEX]
-                    case '\u00CB' : // Ë [LATIN CAPITAL LETTER E WITH DIAERESIS]
-                    case '\u0112' : // Ē [LATIN CAPITAL LETTER E WITH MACRON]
-                    case '\u0114' : // Ĕ [LATIN CAPITAL LETTER E WITH BREVE]
-                    case '\u0116' : // Ė [LATIN CAPITAL LETTER E WITH DOT ABOVE]
-                    case '\u0118' : // Ę [LATIN CAPITAL LETTER E WITH OGONEK]
-                    case '\u011A' : // Ě [LATIN CAPITAL LETTER E WITH CARON]
-                    case '\u018E' : // Ǝ [LATIN CAPITAL LETTER REVERSED E]
-                    case '\u0190' : // Ɛ [LATIN CAPITAL LETTER OPEN E]
-                    case '\u0204' : // Ȅ [LATIN CAPITAL LETTER E WITH DOUBLE GRAVE]
-                    case '\u0206' : // Ȇ [LATIN CAPITAL LETTER E WITH INVERTED BREVE]
-                    case '\u0228' : // Ȩ [LATIN CAPITAL LETTER E WITH CEDILLA]
-                    case '\u0246' : // Ɇ [LATIN CAPITAL LETTER E WITH STROKE]
-                    case '\u1D07' : // ᴇ [LATIN LETTER SMALL CAPITAL E]
-                    case '\u1E14' : // Ḕ [LATIN CAPITAL LETTER E WITH MACRON AND GRAVE]
-                    case '\u1E16' : // Ḗ [LATIN CAPITAL LETTER E WITH MACRON AND ACUTE]
-                    case '\u1E18' : // Ḙ [LATIN CAPITAL LETTER E WITH CIRCUMFLEX BELOW]
-                    case '\u1E1A' : // Ḛ [LATIN CAPITAL LETTER E WITH TILDE BELOW]
-                    case '\u1E1C' : // Ḝ [LATIN CAPITAL LETTER E WITH CEDILLA AND BREVE]
-                    case '\u1EB8' : // Ẹ [LATIN CAPITAL LETTER E WITH DOT BELOW]
-                    case '\u1EBA' : // Ẻ [LATIN CAPITAL LETTER E WITH HOOK ABOVE]
-                    case '\u1EBC' : // Ẽ [LATIN CAPITAL LETTER E WITH TILDE]
-                    case '\u1EBE' : // Ế [LATIN CAPITAL LETTER E WITH CIRCUMFLEX AND ACUTE]
-                    case '\u1EC0' : // Ề [LATIN CAPITAL LETTER E WITH CIRCUMFLEX AND GRAVE]
-                    case '\u1EC2' : // Ể [LATIN CAPITAL LETTER E WITH CIRCUMFLEX AND HOOK ABOVE]
-                    case '\u1EC4' : // Ễ [LATIN CAPITAL LETTER E WITH CIRCUMFLEX AND TILDE]
-                    case '\u1EC6' : // Ệ [LATIN CAPITAL LETTER E WITH CIRCUMFLEX AND DOT BELOW]
-                    case '\u24BA' : // Ⓔ [CIRCLED LATIN CAPITAL LETTER E]
-                    case '\u2C7B' : // ⱻ [LATIN LETTER SMALL CAPITAL TURNED E]
-                    case '\uFF25' : // Ｅ [FULLWIDTH LATIN CAPITAL LETTER E]
-                        output[outputPos++] = 'E';
-                        break;
-                    case '\u00E8' : // è [LATIN SMALL LETTER E WITH GRAVE]
-                    case '\u00E9' : // é [LATIN SMALL LETTER E WITH ACUTE]
-                    case '\u00EA' : // ê [LATIN SMALL LETTER E WITH CIRCUMFLEX]
-                    case '\u00EB' : // ë [LATIN SMALL LETTER E WITH DIAERESIS]
-                    case '\u0113' : // ē [LATIN SMALL LETTER E WITH MACRON]
-                    case '\u0115' : // ĕ [LATIN SMALL LETTER E WITH BREVE]
-                    case '\u0117' : // ė [LATIN SMALL LETTER E WITH DOT ABOVE]
-                    case '\u0119' : // ę [LATIN SMALL LETTER E WITH OGONEK]
-                    case '\u011B' : // ě [LATIN SMALL LETTER E WITH CARON]
-                    case '\u01DD' : // ǝ [LATIN SMALL LETTER TURNED E]
-                    case '\u0205' : // ȅ [LATIN SMALL LETTER E WITH DOUBLE GRAVE]
-                    case '\u0207' : // ȇ [LATIN SMALL LETTER E WITH INVERTED BREVE]
-                    case '\u0229' : // ȩ [LATIN SMALL LETTER E WITH CEDILLA]
-                    case '\u0247' : // ɇ [LATIN SMALL LETTER E WITH STROKE]
-                    case '\u0258' : // ɘ [LATIN SMALL LETTER REVERSED E]
-                    case '\u025B' : // ɛ [LATIN SMALL LETTER OPEN E]
-                    case '\u025C' : // ɜ [LATIN SMALL LETTER REVERSED OPEN E]
-                    case '\u025D' : // ɝ [LATIN SMALL LETTER REVERSED OPEN E WITH HOOK]
-                    case '\u025E' : // ɞ [LATIN SMALL LETTER CLOSED REVERSED OPEN E]
-                    case '\u029A' : // ʚ [LATIN SMALL LETTER CLOSED OPEN E]
-                    case '\u1D08' : // ᴈ [LATIN SMALL LETTER TURNED OPEN E]
-                    case '\u1D92' : // ᶒ [LATIN SMALL LETTER E WITH RETROFLEX HOOK]
-                    case '\u1D93' : // ᶓ [LATIN SMALL LETTER OPEN E WITH RETROFLEX HOOK]
-                    case '\u1D94' : // ᶔ [LATIN SMALL LETTER REVERSED OPEN E WITH RETROFLEX HOOK]
-                    case '\u1E15' : // ḕ [LATIN SMALL LETTER E WITH MACRON AND GRAVE]
-                    case '\u1E17' : // ḗ [LATIN SMALL LETTER E WITH MACRON AND ACUTE]
-                    case '\u1E19' : // ḙ [LATIN SMALL LETTER E WITH CIRCUMFLEX BELOW]
-                    case '\u1E1B' : // ḛ [LATIN SMALL LETTER E WITH TILDE BELOW]
-                    case '\u1E1D' : // ḝ [LATIN SMALL LETTER E WITH CEDILLA AND BREVE]
-                    case '\u1EB9' : // ẹ [LATIN SMALL LETTER E WITH DOT BELOW]
-                    case '\u1EBB' : // ẻ [LATIN SMALL LETTER E WITH HOOK ABOVE]
-                    case '\u1EBD' : // ẽ [LATIN SMALL LETTER E WITH TILDE]
-                    case '\u1EBF' : // ế [LATIN SMALL LETTER E WITH CIRCUMFLEX AND ACUTE]
-                    case '\u1EC1' : // ề [LATIN SMALL LETTER E WITH CIRCUMFLEX AND GRAVE]
-                    case '\u1EC3' : // ể [LATIN SMALL LETTER E WITH CIRCUMFLEX AND HOOK ABOVE]
-                    case '\u1EC5' : // ễ [LATIN SMALL LETTER E WITH CIRCUMFLEX AND TILDE]
-                    case '\u1EC7' : // ệ [LATIN SMALL LETTER E WITH CIRCUMFLEX AND DOT BELOW]
-                    case '\u2091' : // ₑ [LATIN SUBSCRIPT SMALL LETTER E]
-                    case '\u24D4' : // ⓔ [CIRCLED LATIN SMALL LETTER E]
-                    case '\u2C78' : // ⱸ [LATIN SMALL LETTER E WITH NOTCH]
-                    case '\uFF45' : // ｅ [FULLWIDTH LATIN SMALL LETTER E]
-                        output[outputPos++] = 'e';
-                        break;
-                    case '\u24A0' : // ⒠ [PARENTHESIZED LATIN SMALL LETTER E]
-                        output[outputPos++] = '(';
-                        output[outputPos++] = 'e';
-                        output[outputPos++] = ')';
-                        break;
-                    case '\u0191' : // Ƒ [LATIN CAPITAL LETTER F WITH HOOK]
-                    case '\u1E1E' : // Ḟ [LATIN CAPITAL LETTER F WITH DOT ABOVE]
-                    case '\u24BB' : // Ⓕ [CIRCLED LATIN CAPITAL LETTER F]
-                    case '\uA730' : // ꜰ [LATIN LETTER SMALL CAPITAL F]
-                    case '\uA77B' : // Ꝼ [LATIN CAPITAL LETTER INSULAR F]
-                    case '\uA7FB' : // ꟻ [LATIN EPIGRAPHIC LETTER REVERSED F]
-                    case '\uFF26' : // Ｆ [FULLWIDTH LATIN CAPITAL LETTER F]
-                        output[outputPos++] = 'F';
-                        break;
-                    case '\u0192' : // ƒ [LATIN SMALL LETTER F WITH HOOK]
-                    case '\u1D6E' : // ᵮ [LATIN SMALL LETTER F WITH MIDDLE TILDE]
-                    case '\u1D82' : // ᶂ [LATIN SMALL LETTER F WITH PALATAL HOOK]
-                    case '\u1E1F' : // ḟ [LATIN SMALL LETTER F WITH DOT ABOVE]
-                    case '\u1E9B' : // ẛ [LATIN SMALL LETTER LONG S WITH DOT ABOVE]
-                    case '\u24D5' : // ⓕ [CIRCLED LATIN SMALL LETTER F]
-                    case '\uA77C' : // ꝼ [LATIN SMALL LETTER INSULAR F]
-                    case '\uFF46' : // ｆ [FULLWIDTH LATIN SMALL LETTER F]
-                        output[outputPos++] = 'f';
-                        break;
-                    case '\u24A1' : // ⒡ [PARENTHESIZED LATIN SMALL LETTER F]
-                        output[outputPos++] = '(';
-                        output[outputPos++] = 'f';
-                        output[outputPos++] = ')';
-                        break;
-                    case '\uFB00' : // ff [LATIN SMALL LIGATURE FF]
-                        output[outputPos++] = 'f';
-                        output[outputPos++] = 'f';
-                        break;
-                    case '\uFB03' : // ffi [LATIN SMALL LIGATURE FFI]
-                        output[outputPos++] = 'f';
-                        output[outputPos++] = 'f';
-                        output[outputPos++] = 'i';
-                        break;
-                    case '\uFB04' : // ffl [LATIN SMALL LIGATURE FFL]
-                        output[outputPos++] = 'f';
-                        output[outputPos++] = 'f';
-                        output[outputPos++] = 'l';
-                        break;
-                    case '\uFB01' : // fi [LATIN SMALL LIGATURE FI]
-                        output[outputPos++] = 'f';
-                        output[outputPos++] = 'i';
-                        break;
-                    case '\uFB02' : // fl [LATIN SMALL LIGATURE FL]
-                        output[outputPos++] = 'f';
-                        output[outputPos++] = 'l';
-                        break;
-                    case '\u011C' : // Ĝ [LATIN CAPITAL LETTER G WITH CIRCUMFLEX]
-                    case '\u011E' : // Ğ [LATIN CAPITAL LETTER G WITH BREVE]
-                    case '\u0120' : // Ġ [LATIN CAPITAL LETTER G WITH DOT ABOVE]
-                    case '\u0122' : // Ģ [LATIN CAPITAL LETTER G WITH CEDILLA]
-                    case '\u0193' : // Ɠ [LATIN CAPITAL LETTER G WITH HOOK]
-                    case '\u01E4' : // Ǥ [LATIN CAPITAL LETTER G WITH STROKE]
-                    case '\u01E5' : // ǥ [LATIN SMALL LETTER G WITH STROKE]
-                    case '\u01E6' : // Ǧ [LATIN CAPITAL LETTER G WITH CARON]
-                    case '\u01E7' : // ǧ [LATIN SMALL LETTER G WITH CARON]
-                    case '\u01F4' : // Ǵ [LATIN CAPITAL LETTER G WITH ACUTE]
-                    case '\u0262' : // ɢ [LATIN LETTER SMALL CAPITAL G]
-                    case '\u029B' : // ʛ [LATIN LETTER SMALL CAPITAL G WITH HOOK]
-                    case '\u1E20' : // Ḡ [LATIN CAPITAL LETTER G WITH MACRON]
-                    case '\u24BC' : // Ⓖ [CIRCLED LATIN CAPITAL LETTER G]
-                    case '\uA77D' : // Ᵹ [LATIN CAPITAL LETTER INSULAR G]
-                    case '\uA77E' : // Ꝿ [LATIN CAPITAL LETTER TURNED INSULAR G]
-                    case '\uFF27' : // Ｇ [FULLWIDTH LATIN CAPITAL LETTER G]
-                        output[outputPos++] = 'G';
-                        break;
-                    case '\u011D' : // ĝ [LATIN SMALL LETTER G WITH CIRCUMFLEX]
-                    case '\u011F' : // ğ [LATIN SMALL LETTER G WITH BREVE]
-                    case '\u0121' : // ġ [LATIN SMALL LETTER G WITH DOT ABOVE]
-                    case '\u0123' : // ģ [LATIN SMALL LETTER G WITH CEDILLA]
-                    case '\u01F5' : // ǵ [LATIN SMALL LETTER G WITH ACUTE]
-                    case '\u0260' : // ɠ [LATIN SMALL LETTER G WITH HOOK]
-                    case '\u0261' : // ɡ [LATIN SMALL LETTER SCRIPT G]
-                    case '\u1D77' : // ᵷ [LATIN SMALL LETTER TURNED G]
-                    case '\u1D79' : // ᵹ [LATIN SMALL LETTER INSULAR G]
-                    case '\u1D83' : // ᶃ [LATIN SMALL LETTER G WITH PALATAL HOOK]
-                    case '\u1E21' : // ḡ [LATIN SMALL LETTER G WITH MACRON]
-                    case '\u24D6' : // ⓖ [CIRCLED LATIN SMALL LETTER G]
-                    case '\uA77F' : // ꝿ [LATIN SMALL LETTER TURNED INSULAR G]
-                    case '\uFF47' : // ｇ [FULLWIDTH LATIN SMALL LETTER G]
-                        output[outputPos++] = 'g';
-                        break;
-                    case '\u24A2' : // ⒢ [PARENTHESIZED LATIN SMALL LETTER G]
-                        output[outputPos++] = '(';
-                        output[outputPos++] = 'g';
-                        output[outputPos++] = ')';
-                        break;
-                    case '\u0124' : // Ĥ [LATIN CAPITAL LETTER H WITH CIRCUMFLEX]
-                    case '\u0126' : // Ħ [LATIN CAPITAL LETTER H WITH STROKE]
-                    case '\u021E' : // Ȟ [LATIN CAPITAL LETTER H WITH CARON]
-                    case '\u029C' : // ʜ [LATIN LETTER SMALL CAPITAL H]
-                    case '\u1E22' : // Ḣ [LATIN CAPITAL LETTER H WITH DOT ABOVE]
-                    case '\u1E24' : // Ḥ [LATIN CAPITAL LETTER H WITH DOT BELOW]
-                    case '\u1E26' : // Ḧ [LATIN CAPITAL LETTER H WITH DIAERESIS]
-                    case '\u1E28' : // Ḩ [LATIN CAPITAL LETTER H WITH CEDILLA]
-                    case '\u1E2A' : // Ḫ [LATIN CAPITAL LETTER H WITH BREVE BELOW]
-                    case '\u24BD' : // Ⓗ [CIRCLED LATIN CAPITAL LETTER H]
-                    case '\u2C67' : // Ⱨ [LATIN CAPITAL LETTER H WITH DESCENDER]
-                    case '\u2C75' : // Ⱶ [LATIN CAPITAL LETTER HALF H]
-                    case '\uFF28' : // Ｈ [FULLWIDTH LATIN CAPITAL LETTER H]
-                        output[outputPos++] = 'H';
-                        break;
-                    case '\u0125' : // ĥ [LATIN SMALL LETTER H WITH CIRCUMFLEX]
-                    case '\u0127' : // ħ [LATIN SMALL LETTER H WITH STROKE]
-                    case '\u021F' : // ȟ [LATIN SMALL LETTER H WITH CARON]
-                    case '\u0265' : // ɥ [LATIN SMALL LETTER TURNED H]
-                    case '\u0266' : // ɦ [LATIN SMALL LETTER H WITH HOOK]
-                    case '\u02AE' : // ʮ [LATIN SMALL LETTER TURNED H WITH FISHHOOK]
-                    case '\u02AF' : // ʯ [LATIN SMALL LETTER TURNED H WITH FISHHOOK AND TAIL]
-                    case '\u1E23' : // ḣ [LATIN SMALL LETTER H WITH DOT ABOVE]
-                    case '\u1E25' : // ḥ [LATIN SMALL LETTER H WITH DOT BELOW]
-                    case '\u1E27' : // ḧ [LATIN SMALL LETTER H WITH DIAERESIS]
-                    case '\u1E29' : // ḩ [LATIN SMALL LETTER H WITH CEDILLA]
-                    case '\u1E2B' : // ḫ [LATIN SMALL LETTER H WITH BREVE BELOW]
-                    case '\u1E96' : // ẖ [LATIN SMALL LETTER H WITH LINE BELOW]
-                    case '\u24D7' : // ⓗ [CIRCLED LATIN SMALL LETTER H]
-                    case '\u2C68' : // ⱨ [LATIN SMALL LETTER H WITH DESCENDER]
-                    case '\u2C76' : // ⱶ [LATIN SMALL LETTER HALF H]
-                    case '\uFF48' : // ｈ [FULLWIDTH LATIN SMALL LETTER H]
-                        output[outputPos++] = 'h';
-                        break;
-                    case '\u01F6' : // Ƕ http://en.wikipedia.org/wiki/Hwair [LATIN CAPITAL LETTER HWAIR]
-                        output[outputPos++] = 'H';
-                        output[outputPos++] = 'V';
-                        break;
-                    case '\u24A3' : // ⒣ [PARENTHESIZED LATIN SMALL LETTER H]
-                        output[outputPos++] = '(';
-                        output[outputPos++] = 'h';
-                        output[outputPos++] = ')';
-                        break;
-                    case '\u0195' : // ƕ [LATIN SMALL LETTER HV]
-                        output[outputPos++] = 'h';
-                        output[outputPos++] = 'v';
-                        break;
-                    case '\u00CC' : // Ì [LATIN CAPITAL LETTER I WITH GRAVE]
-                    case '\u00CD' : // Í [LATIN CAPITAL LETTER I WITH ACUTE...
 
[truncated message content]

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

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

Revision: 3780
          http://openutils.svn.sourceforge.net/openutils/?rev=3780&view=rev
Author:   fgiust
Date:     2012-03-10 21:55:32 +0000 (Sat, 10 Mar 2012)
Log Message:
-----------
update dependencies to magnolia 4.5

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

Added Paths:
-----------
    magnoliamodules/trunk/pom.xml

Modified: magnoliamodules/trunk/magnolia-test-webapp/pom.xml
===================================================================
--- magnoliamodules/trunk/magnolia-test-webapp/pom.xml	2012-03-10 21:30:56 UTC (rev 3779)
+++ magnoliamodules/trunk/magnolia-test-webapp/pom.xml	2012-03-10 21:55:32 UTC (rev 3780)
@@ -16,31 +16,36 @@
   <dependencies>
     <dependency>
       <groupId>info.magnolia</groupId>
-      <artifactId>magnolia-module-templating</artifactId>
+      <artifactId>magnolia-core</artifactId>
       <version>${magnolia.version}</version>
     </dependency>
     <dependency>
       <groupId>info.magnolia</groupId>
-      <artifactId>magnolia-core</artifactId>
+      <artifactId>magnolia-module-admininterface</artifactId>
       <version>${magnolia.version}</version>
     </dependency>
     <dependency>
       <groupId>info.magnolia</groupId>
-      <artifactId>magnolia-module-admininterface</artifactId>
+      <artifactId>magnolia-templating-samples</artifactId>
       <version>${magnolia.version}</version>
     </dependency>
     <dependency>
       <groupId>info.magnolia</groupId>
-      <artifactId>magnolia-taglib-utility</artifactId>
+      <artifactId>magnolia-templating-compatibility</artifactId>
       <version>${magnolia.version}</version>
     </dependency>
     <dependency>
       <groupId>info.magnolia</groupId>
-      <artifactId>magnolia-taglib-cms</artifactId>
+      <artifactId>magnolia-templating-compatibility-taglib-utility</artifactId>
       <version>${magnolia.version}</version>
     </dependency>
     <dependency>
       <groupId>info.magnolia</groupId>
+      <artifactId>magnolia-templating-compatibility-taglib-cms</artifactId>
+      <version>${magnolia.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>info.magnolia</groupId>
       <artifactId>magnolia-module-cache</artifactId>
       <version>${magnolia.version}</version>
     </dependency>
@@ -70,11 +75,6 @@
       <version>${magnolia.version}</version>
     </dependency>
     <dependency>
-      <groupId>info.magnolia</groupId>
-      <artifactId>magnolia-module-samples</artifactId>
-      <version>${magnolia.version}</version>
-    </dependency>
-    <dependency>
       <groupId>net.sourceforge.openutils</groupId>
       <artifactId>openutils-log4j</artifactId>
       <version>2.0.5</version>
@@ -277,15 +277,15 @@
     </dependencies>
   </dependencyManagement>
   <properties>
-    <magnolia.version>4.4.5</magnolia.version>
+    <magnolia.version>4.5</magnolia.version>
     <stk.version>1.3.1</stk.version>
-    <jackrabbit.version>2.3.3</jackrabbit.version>
+    <jackrabbit.version>2.4.0</jackrabbit.version>
   </properties>
   <build>
     <plugins>
       <plugin>
         <artifactId>maven-eclipse-plugin</artifactId>
-        <version>2.7</version>
+        <version>2.9</version>
         <configuration>
           <wtpContextName>open</wtpContextName>
           <classpathContainers>

Modified: magnoliamodules/trunk/openutils-mgnlbootstrapsync/pom.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnlbootstrapsync/pom.xml	2012-03-10 21:30:56 UTC (rev 3779)
+++ magnoliamodules/trunk/openutils-mgnlbootstrapsync/pom.xml	2012-03-10 21:55:32 UTC (rev 3780)
@@ -92,6 +92,6 @@
     </dependency>
   </dependencies>
   <properties>
-    <magnolia.version>4.4.1</magnolia.version>
+    <magnolia.version>4.5</magnolia.version>
   </properties>
 </project>
\ No newline at end of file

Modified: magnoliamodules/trunk/openutils-mgnlcache/pom.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnlcache/pom.xml	2012-03-10 21:30:56 UTC (rev 3779)
+++ magnoliamodules/trunk/openutils-mgnlcache/pom.xml	2012-03-10 21:55:32 UTC (rev 3780)
@@ -63,6 +63,12 @@
       <version>4.1.2</version>
     </dependency>
     <dependency>
+      <groupId>javax.servlet</groupId>
+      <artifactId>servlet-api</artifactId>
+      <version>2.4</version>
+      <scope>provided</scope>
+    </dependency>
+    <dependency>
       <groupId>org.testng</groupId>
       <artifactId>testng</artifactId>
       <version>5.10</version>
@@ -78,6 +84,6 @@
     </dependency>
   </dependencies>
   <properties>
-    <magnolia.version>4.4.1</magnolia.version>
+    <magnolia.version>4.5</magnolia.version>
   </properties>
 </project>
\ No newline at end of file

Modified: magnoliamodules/trunk/openutils-mgnlcas/pom.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnlcas/pom.xml	2012-03-10 21:30:56 UTC (rev 3779)
+++ magnoliamodules/trunk/openutils-mgnlcas/pom.xml	2012-03-10 21:55:32 UTC (rev 3780)
@@ -63,12 +63,18 @@
         </exclusion>
       </exclusions>
     </dependency>
+    <dependency>
+      <groupId>javax.servlet</groupId>
+      <artifactId>servlet-api</artifactId>
+      <version>2.4</version>
+      <scope>provided</scope>
+    </dependency>
   </dependencies>
   <repositories>
     <repository>
-      <id>repository.magnolia.info</id>
+      <id>repository.magnolia-cms.com</id>
       <name>magnolia repository</name>
-      <url>http://svn.magnolia.info/maven/m2</url>
+      <url>http://nexus.magnolia-cms.com/content/groups/public</url>
       <releases>
         <enabled>true</enabled>
       </releases>
@@ -89,6 +95,6 @@
     </repository>
   </repositories>
   <properties>
-    <magnolia.version>4.4.1</magnolia.version>
+    <magnolia.version>4.5</magnolia.version>
   </properties>
 </project>
\ No newline at end of file

Modified: magnoliamodules/trunk/openutils-mgnlcontextmenu/pom.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnlcontextmenu/pom.xml	2012-03-10 21:30:56 UTC (rev 3779)
+++ magnoliamodules/trunk/openutils-mgnlcontextmenu/pom.xml	2012-03-10 21:55:32 UTC (rev 3780)
@@ -96,11 +96,13 @@
         </exclusion>
       </exclusions>
     </dependency>
+    <!--
     <dependency>
       <groupId>info.magnolia</groupId>
       <artifactId>magnolia-taglib-cms</artifactId>
       <version>${magnolia.version}</version>
     </dependency>
+    -->
     <dependency>
       <groupId>info.magnolia</groupId>
       <artifactId>magnolia-module-fckeditor</artifactId>
@@ -167,6 +169,6 @@
     </repository>
   </repositories>
   <properties>
-    <magnolia.version>4.4.1</magnolia.version>
+    <magnolia.version>4.5</magnolia.version>
   </properties>
 </project>
\ No newline at end of file

Modified: magnoliamodules/trunk/openutils-mgnlcontrols/pom.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnlcontrols/pom.xml	2012-03-10 21:30:56 UTC (rev 3779)
+++ magnoliamodules/trunk/openutils-mgnlcontrols/pom.xml	2012-03-10 21:55:32 UTC (rev 3780)
@@ -99,6 +99,12 @@
       <version>2.2</version>
     </dependency>
     <dependency>
+      <groupId>javax.servlet</groupId>
+      <artifactId>servlet-api</artifactId>
+      <version>2.4</version>
+      <scope>provided</scope>
+    </dependency>
+    <dependency>
       <groupId>org.testng</groupId>
       <artifactId>testng</artifactId>
       <classifier>jdk15</classifier>
@@ -113,6 +119,6 @@
     </dependency>
   </dependencies>
   <properties>
-    <magnolia.version>4.4.1</magnolia.version>
+    <magnolia.version>4.5</magnolia.version>
   </properties>
 </project>
\ No newline at end of file

Modified: magnoliamodules/trunk/openutils-mgnlcriteria/pom.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnlcriteria/pom.xml	2012-03-10 21:30:56 UTC (rev 3779)
+++ magnoliamodules/trunk/openutils-mgnlcriteria/pom.xml	2012-03-10 21:55:32 UTC (rev 3780)
@@ -164,6 +164,12 @@
       <scope>test</scope>
     </dependency>
     <dependency>
+      <groupId>javax.servlet</groupId>
+      <artifactId>servlet-api</artifactId>
+      <version>2.4</version>
+      <scope>provided</scope>
+    </dependency>
+    <dependency>
       <groupId>org.testng</groupId>
       <artifactId>testng</artifactId>
       <version>6.0.1</version>
@@ -177,9 +183,9 @@
     </dependency>
   </dependencies>
   <properties>
-    <magnolia.version>4.4.4</magnolia.version>
-    <jackrabbit.version>1.6.2</jackrabbit.version>
-    <jcr.version>1.0</jcr.version>
+    <magnolia.version>4.5</magnolia.version>
+    <jackrabbit.version>2.4.0</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 -->
 </project>
\ No newline at end of file

Modified: magnoliamodules/trunk/openutils-mgnlgroovy/pom.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnlgroovy/pom.xml	2012-03-10 21:30:56 UTC (rev 3779)
+++ magnoliamodules/trunk/openutils-mgnlgroovy/pom.xml	2012-03-10 21:55:32 UTC (rev 3780)
@@ -92,8 +92,14 @@
       <artifactId>openutils-mgnltasks</artifactId>
       <version>4.1.2</version>
     </dependency>
+    <dependency>
+      <groupId>javax.servlet</groupId>
+      <artifactId>servlet-api</artifactId>
+      <version>2.4</version>
+      <scope>provided</scope>
+    </dependency>
   </dependencies>
   <properties>
-    <magnolia.version>4.4.1</magnolia.version>
+    <magnolia.version>4.5</magnolia.version>
   </properties>
 </project>
\ No newline at end of file

Modified: magnoliamodules/trunk/openutils-mgnllms/pom.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnllms/pom.xml	2012-03-10 21:30:56 UTC (rev 3779)
+++ magnoliamodules/trunk/openutils-mgnllms/pom.xml	2012-03-10 21:55:32 UTC (rev 3780)
@@ -177,6 +177,12 @@
     <!-- to be released before the final 4.3 version -->
     <dependency>
       <groupId>javax.servlet</groupId>
+      <artifactId>servlet-api</artifactId>
+      <version>2.4</version>
+      <scope>provided</scope>
+    </dependency>
+    <dependency>
+      <groupId>javax.servlet</groupId>
       <artifactId>jsp-api</artifactId>
       <version>2.0</version>
       <scope>provided</scope>
@@ -195,20 +201,7 @@
       </exclusions>
     </dependency>
   </dependencies>
-  <repositories>
-    <repository>
-      <id>repository.openmindonline.it</id>
-      <name>openmindonline repository</name>
-      <url>http://repository.openmindonline.it</url>
-      <releases>
-        <enabled>true</enabled>
-      </releases>
-      <snapshots>
-        <enabled>false</enabled>
-      </snapshots>
-    </repository>
-  </repositories>
   <properties>
-    <magnolia.version>4.4.1</magnolia.version>
+    <magnolia.version>4.5</magnolia.version>
   </properties>
 </project>

Modified: magnoliamodules/trunk/openutils-mgnlmail/pom.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnlmail/pom.xml	2012-03-10 21:30:56 UTC (rev 3779)
+++ magnoliamodules/trunk/openutils-mgnlmail/pom.xml	2012-03-10 21:55:32 UTC (rev 3780)
@@ -100,8 +100,14 @@
       <artifactId>openutils-mgnltasks</artifactId>
       <version>4.1.2</version>
     </dependency>
+    <dependency>
+      <groupId>javax.servlet</groupId>
+      <artifactId>servlet-api</artifactId>
+      <version>2.4</version>
+      <scope>provided</scope>
+    </dependency>
   </dependencies>
   <properties>
-    <magnolia.version>4.4.4</magnolia.version>
+    <magnolia.version>4.5</magnolia.version>
   </properties>
 </project>
\ No newline at end of file

Modified: magnoliamodules/trunk/openutils-mgnlmedia/pom.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnlmedia/pom.xml	2012-03-10 21:30:56 UTC (rev 3779)
+++ magnoliamodules/trunk/openutils-mgnlmedia/pom.xml	2012-03-10 21:55:32 UTC (rev 3780)
@@ -247,8 +247,14 @@
         </exclusion>
       </exclusions>
     </dependency>
+    <dependency>
+      <groupId>javax.servlet</groupId>
+      <artifactId>servlet-api</artifactId>
+      <version>2.4</version>
+      <scope>provided</scope>
+    </dependency>
   </dependencies>
   <properties>
-    <magnolia.version>4.4.4</magnolia.version>
+    <magnolia.version>4.5</magnolia.version>
   </properties>
 </project>
\ No newline at end of file

Modified: magnoliamodules/trunk/openutils-mgnlmessages/pom.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnlmessages/pom.xml	2012-03-10 21:30:56 UTC (rev 3779)
+++ magnoliamodules/trunk/openutils-mgnlmessages/pom.xml	2012-03-10 21:55:32 UTC (rev 3780)
@@ -108,6 +108,12 @@
       </exclusions>
     </dependency>
     <dependency>
+      <groupId>javax.servlet</groupId>
+      <artifactId>servlet-api</artifactId>
+      <version>2.4</version>
+      <scope>provided</scope>
+    </dependency>
+    <dependency>
       <groupId>org.testng</groupId>
       <artifactId>testng</artifactId>
       <version>6.0.1</version>
@@ -121,6 +127,6 @@
     </dependency>
   </dependencies>
   <properties>
-    <magnolia.version>4.4.4</magnolia.version>
+    <magnolia.version>4.5</magnolia.version>
   </properties>
 </project>
\ No newline at end of file

Modified: magnoliamodules/trunk/openutils-mgnlmobile/pom.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnlmobile/pom.xml	2012-03-10 21:30:56 UTC (rev 3779)
+++ magnoliamodules/trunk/openutils-mgnlmobile/pom.xml	2012-03-10 21:55:32 UTC (rev 3780)
@@ -87,11 +87,13 @@
       <artifactId>magnolia-module-admininterface</artifactId>
       <version>${magnolia.version}</version>
     </dependency>
+    <!--
     <dependency>
       <groupId>info.magnolia</groupId>
       <artifactId>magnolia-taglib-cms</artifactId>
       <version>${magnolia.version}</version>
     </dependency>
+    -->
     <dependency>
       <groupId>info.magnolia</groupId>
       <artifactId>magnolia-gui</artifactId>
@@ -128,8 +130,14 @@
         </exclusion>
       </exclusions>
     </dependency>
+    <dependency>
+      <groupId>javax.servlet</groupId>
+      <artifactId>servlet-api</artifactId>
+      <version>2.4</version>
+      <scope>provided</scope>
+    </dependency>
   </dependencies>
   <properties>
-    <magnolia.version>4.4.1</magnolia.version>
+    <magnolia.version>4.5</magnolia.version>
   </properties>
 </project>
\ No newline at end of file

Modified: magnoliamodules/trunk/openutils-mgnlrepoutils/pom.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnlrepoutils/pom.xml	2012-03-10 21:30:56 UTC (rev 3779)
+++ magnoliamodules/trunk/openutils-mgnlrepoutils/pom.xml	2012-03-10 21:55:32 UTC (rev 3780)
@@ -78,6 +78,12 @@
       <version>3.3.1</version>
     </dependency>
     <dependency>
+      <groupId>javax.servlet</groupId>
+      <artifactId>servlet-api</artifactId>
+      <version>2.4</version>
+      <scope>provided</scope>
+    </dependency>
+    <dependency>
       <groupId>org.testng</groupId>
       <artifactId>testng</artifactId>
       <classifier>jdk15</classifier>
@@ -92,6 +98,6 @@
     </dependency>
   </dependencies>
   <properties>
-    <magnolia.version>4.4.1</magnolia.version>
+    <magnolia.version>4.5</magnolia.version>
   </properties>
 </project>
\ No newline at end of file

Modified: magnoliamodules/trunk/openutils-mgnlrules/pom.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnlrules/pom.xml	2012-03-10 21:30:56 UTC (rev 3779)
+++ magnoliamodules/trunk/openutils-mgnlrules/pom.xml	2012-03-10 21:55:32 UTC (rev 3780)
@@ -146,6 +146,6 @@
     </repository>
   </repositories>
   <properties>
-    <magnolia.version>4.4.1</magnolia.version>
+    <magnolia.version>4.5</magnolia.version>
   </properties>
 </project>

Modified: magnoliamodules/trunk/openutils-mgnlspring/pom.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnlspring/pom.xml	2012-03-10 21:30:56 UTC (rev 3779)
+++ magnoliamodules/trunk/openutils-mgnlspring/pom.xml	2012-03-10 21:55:32 UTC (rev 3780)
@@ -153,6 +153,6 @@
   </repositories>
   <properties>
     <spring.version>3.0.0.RELEASE</spring.version>
-    <magnolia.version>4.4.1</magnolia.version>
+    <magnolia.version>4.5</magnolia.version>
   </properties>
 </project>
\ No newline at end of file

Modified: magnoliamodules/trunk/openutils-mgnlstripes/pom.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnlstripes/pom.xml	2012-03-10 21:30:56 UTC (rev 3779)
+++ magnoliamodules/trunk/openutils-mgnlstripes/pom.xml	2012-03-10 21:55:32 UTC (rev 3780)
@@ -100,6 +100,6 @@
     </dependency>
   </dependencies>
   <properties>
-    <magnolia.version>4.4.1</magnolia.version>
+    <magnolia.version>4.5</magnolia.version>
   </properties>
 </project>
\ No newline at end of file

Modified: magnoliamodules/trunk/openutils-mgnlstruts11/pom.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnlstruts11/pom.xml	2012-03-10 21:30:56 UTC (rev 3779)
+++ magnoliamodules/trunk/openutils-mgnlstruts11/pom.xml	2012-03-10 21:55:32 UTC (rev 3780)
@@ -110,6 +110,6 @@
     </dependency>
   </dependencies>
   <properties>
-    <magnolia.version>4.4.1</magnolia.version>
+    <magnolia.version>4.5</magnolia.version>
   </properties>
 </project>
\ No newline at end of file

Modified: magnoliamodules/trunk/openutils-mgnltagcloud/pom.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnltagcloud/pom.xml	2012-03-10 21:30:56 UTC (rev 3779)
+++ magnoliamodules/trunk/openutils-mgnltagcloud/pom.xml	2012-03-10 21:55:32 UTC (rev 3780)
@@ -171,7 +171,7 @@
     </dependency>
   </dependencies>
   <properties>
-    <magnolia.version>4.4.2</magnolia.version>
-    <jackrabbit.version>2.2.5</jackrabbit.version>
+    <magnolia.version>4.5</magnolia.version>
+    <jackrabbit.version>2.4.0</jackrabbit.version>
   </properties>
 </project>
\ No newline at end of file

Modified: magnoliamodules/trunk/openutils-mgnltasks/pom.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnltasks/pom.xml	2012-03-10 21:30:56 UTC (rev 3779)
+++ magnoliamodules/trunk/openutils-mgnltasks/pom.xml	2012-03-10 21:55:32 UTC (rev 3780)
@@ -116,6 +116,6 @@
     </dependency>
   </dependencies>
   <properties>
-    <magnolia.version>4.4.1</magnolia.version>
+    <magnolia.version>4.5</magnolia.version>
   </properties>
 </project>
\ No newline at end of file

Modified: magnoliamodules/trunk/openutils-mgnlutils/pom.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnlutils/pom.xml	2012-03-10 21:30:56 UTC (rev 3779)
+++ magnoliamodules/trunk/openutils-mgnlutils/pom.xml	2012-03-10 21:55:32 UTC (rev 3780)
@@ -101,6 +101,11 @@
   <dependencies>
     <dependency>
       <groupId>info.magnolia</groupId>
+      <artifactId>magnolia-rendering</artifactId>
+      <version>${magnolia.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>info.magnolia</groupId>
       <artifactId>magnolia-module-admininterface</artifactId>
       <version>${magnolia.version}</version>
       <optional>true</optional>
@@ -123,6 +128,12 @@
       <version>4.1.2</version>
     </dependency>
     <dependency>
+      <groupId>javax.servlet</groupId>
+      <artifactId>servlet-api</artifactId>
+      <version>2.4</version>
+      <scope>provided</scope>
+    </dependency>
+    <dependency>
       <groupId>net.sourceforge.openutils</groupId>
       <artifactId>openutils-testing4web</artifactId>
       <version>1.2.1</version>
@@ -143,6 +154,6 @@
     </dependency>
   </dependencies>
   <properties>
-    <magnolia.version>4.4.4</magnolia.version>
+    <magnolia.version>4.5</magnolia.version>
   </properties>
 </project>
\ No newline at end of file

Added: magnoliamodules/trunk/pom.xml
===================================================================
--- magnoliamodules/trunk/pom.xml	                        (rev 0)
+++ magnoliamodules/trunk/pom.xml	2012-03-10 21:55:32 UTC (rev 3780)
@@ -0,0 +1,43 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd ">
+  <modelVersion>4.0.0</modelVersion>
+  <groupId>net.sourceforge.openutils</groupId>
+  <artifactId>openutils</artifactId>
+  <packaging>pom</packaging>
+  <version>12-SNAPSHOT</version>
+  <name>openutils</name>
+  <description>Reactor pom, only to do an eclipse:eclipse for all the projects. Not to be released</description>
+  <build>
+    <plugins>
+      <plugin>
+        <artifactId>maven-eclipse-plugin</artifactId>
+        <version>2.9</version>
+      </plugin>
+    </plugins>
+  </build>
+  <modules>
+    <module>openutils-mgnlspring</module>
+    <module>openutils-mgnlstripes</module>
+    <module>openutils-mgnltasks</module>
+    <module>openutils-mgnlbootstrapsync</module>
+    <module>openutils-mgnlext</module>
+    <module>openutils-mgnlcontrols</module>
+    <module>openutils-mgnlmessages</module>
+    <module>openutils-mgnlcache</module>
+    <module>openutils-mgnlcas</module>
+    <module>openutils-mgnlgroovy</module>
+    <module>openutils-mgnlstruts11</module>
+    <module>openutils-mgnlmedia</module>
+    <module>openutils-mgnlcriteria</module>
+    <module>openutils-mgnlrepoutils</module>
+    <module>openutils-mgnlutils</module>
+    <module>openutils-mgnltagcloud</module>
+    <module>openutils-mgnlrules</module>
+    <module>openutils-mgnlcontextmenu</module>
+    <module>openutils-mgnllms</module>
+    <module>openutils-mgnlmobile</module>
+    <module>openutils-mgnlmail</module>
+    <module>magnolia-test-webapp</module>
+  </modules>
+</project>


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

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

[Openutils-svn] SF.net SVN: openutils:[3779] magnoliamodules/branches/magnolia44/

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

Revision: 3779
          http://openutils.svn.sourceforge.net/openutils/?rev=3779&view=rev
Author:   fgiust
Date:     2012-03-10 21:30:56 +0000 (Sat, 10 Mar 2012)
Log Message:
-----------
magnolia 4.4 compatibility branch

Added Paths:
-----------
    magnoliamodules/branches/magnolia44/

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