openutils-svn — developer list with svn commits

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

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

Revision: 4415
          http://openutils.svn.sourceforge.net/openutils/?rev=4415&view=rev
Author:   fgiust
Date:     2013-10-20 19:02:14 +0000 (Sun, 20 Oct 2013)
Log Message:
-----------
upgrade tagcloud to jackrabbit 2.&/lucene 3.6 and fix test configuration

Modified Paths:
--------------
    magnoliamodules/trunk/magnolia-test-webapp/pom.xml
    magnoliamodules/trunk/magnolia-test-webapp/src/main/resources/log4j.xml
    magnoliamodules/trunk/openutils-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/utils/BaseAnalyzer.java
    magnoliamodules/trunk/openutils-mgnlcriteria/src/test/resources/log4j.xml
    magnoliamodules/trunk/openutils-mgnltagcloud/pom.xml

Added Paths:
-----------
    magnoliamodules/trunk/magnolia-test-webapp/src/main/java/com/
    magnoliamodules/trunk/magnolia-test-webapp/src/main/java/com/browseengine/
    magnoliamodules/trunk/magnolia-test-webapp/src/main/java/com/browseengine/bobo/
    magnoliamodules/trunk/magnolia-test-webapp/src/main/java/com/browseengine/bobo/api/
    magnoliamodules/trunk/magnolia-test-webapp/src/main/java/com/browseengine/bobo/api/BoboIndexReader.java
    magnoliamodules/trunk/magnolia-test-webapp/src/main/webapp/templates/samples-lms/
    magnoliamodules/trunk/magnolia-test-webapp/src/main/webapp/templates/samples-lms/courses.jsp
    magnoliamodules/trunk/magnolia-test-webapp/src/main/webapp/templates/samples-lms/index.jsp
    magnoliamodules/trunk/openutils-mgnltagcloud/src/test/java/com/
    magnoliamodules/trunk/openutils-mgnltagcloud/src/test/java/com/browseengine/
    magnoliamodules/trunk/openutils-mgnltagcloud/src/test/java/com/browseengine/bobo/
    magnoliamodules/trunk/openutils-mgnltagcloud/src/test/java/com/browseengine/bobo/api/
    magnoliamodules/trunk/openutils-mgnltagcloud/src/test/java/com/browseengine/bobo/api/BoboIndexReader.java

Modified: magnoliamodules/trunk/magnolia-test-webapp/pom.xml
===================================================================
--- magnoliamodules/trunk/magnolia-test-webapp/pom.xml	2013-10-20 18:52:41 UTC (rev 4414)
+++ magnoliamodules/trunk/magnolia-test-webapp/pom.xml	2013-10-20 19:02:14 UTC (rev 4415)
@@ -218,6 +218,17 @@
       <artifactId>openutils-mgnllms</artifactId>
       <version>5.0.10-SNAPSHOT</version>
     </dependency>
+    <dependency>
+      <groupId>org.springframework</groupId>
+      <artifactId>spring-context</artifactId>
+      <version>2.5.5</version><!-- temporarily used for bobo-browse patch -->
+      <exclusions>
+        <exclusion>
+          <groupId>commons-logging</groupId>
+          <artifactId>commons-logging</artifactId>
+        </exclusion>
+      </exclusions>
+    </dependency>
   </dependencies>
   <dependencyManagement>
     <dependencies>

Added: magnoliamodules/trunk/magnolia-test-webapp/src/main/java/com/browseengine/bobo/api/BoboIndexReader.java
===================================================================
--- magnoliamodules/trunk/magnolia-test-webapp/src/main/java/com/browseengine/bobo/api/BoboIndexReader.java	                        (rev 0)
+++ magnoliamodules/trunk/magnolia-test-webapp/src/main/java/com/browseengine/bobo/api/BoboIndexReader.java	2013-10-20 19:02:14 UTC (rev 4415)
@@ -0,0 +1,914 @@
+/**
+ *
+ * Tagcloud module for Magnolia CMS (http://www.openmindlab.com/lab/products/mgnltagcloud.html)
+ * Copyright(C) 2010-2013, Openmind S.r.l. http://www.openmindonline.it
+ *
+ *  This program is free software: you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation, either version 3 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+// lucene 3.6 compatibility patch for bobo-browse 3.2.0, see https://github.com/senseidb/bobo/commit/e78d91ef8a00965d8d55c819f967cac172c23d17
+/**
+ * Bobo Browse Engine - High performance faceted/parametric search implementation 
+ * that handles various types of semi-structured data.  Written in Java.
+ * 
+ * Copyright (C) 2005-2006  John Wang
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library 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
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ * 
+ * To contact the project administrators for the bobo-browse project, 
+ * please go to https://sourceforge.net/projects/bobo-browse/, or 
+ * send mail to ow...@br....
+ */
+
+package com.browseengine.bobo.api;
+
+import java.io.File;
+import java.io.FileWriter;
+import java.io.IOException;
+import java.io.PrintWriter;
+import java.net.URLEncoder;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.Map.Entry;
+
+import org.apache.log4j.Logger;
+import org.apache.lucene.document.Document;
+import org.apache.lucene.document.Field;
+import org.apache.lucene.index.CorruptIndexException;
+import org.apache.lucene.index.FilterIndexReader;
+import org.apache.lucene.index.IndexReader;
+import org.apache.lucene.index.MultiReader;
+import org.apache.lucene.index.SegmentInfo;
+import org.apache.lucene.index.SegmentInfos;
+import org.apache.lucene.index.SegmentReader;
+import org.apache.lucene.index.Term;
+import org.apache.lucene.index.TermEnum;
+import org.apache.lucene.search.MatchAllDocsQuery;
+import org.apache.lucene.search.Query;
+import org.apache.lucene.store.Directory;
+import org.apache.lucene.store.FSDirectory;
+import org.apache.lucene.util.ReaderUtil;
+import org.springframework.context.support.FileSystemXmlApplicationContext;
+import org.springframework.context.support.GenericApplicationContext;
+
+import com.browseengine.bobo.facets.FacetHandler;
+import com.browseengine.bobo.facets.RuntimeFacetHandler;
+import com.browseengine.bobo.facets.RuntimeFacetHandlerFactory;
+
+
+/**
+ * bobo browse index reader
+ */
+public class BoboIndexReader extends FilterIndexReader
+{
+
+    private static final String SPRING_CONFIG = "bobo.spring";
+
+    private static Logger logger = Logger.getLogger(BoboIndexReader.class);
+
+    protected Map<String, FacetHandler< ? >> _facetHandlerMap;
+
+    protected Collection<FacetHandler< ? >> _facetHandlers;
+
+    protected Collection<RuntimeFacetHandlerFactory< ? , ? >> _runtimeFacetHandlerFactories;
+
+    protected Map<String, RuntimeFacetHandlerFactory< ? , ? >> _runtimeFacetHandlerFactoryMap;
+
+    protected WorkArea _workArea;
+
+    protected IndexReader _srcReader;
+
+    protected BoboIndexReader[] _subReaders = null;
+
+    protected int[] _starts = null;
+
+    private Directory _dir = null;
+
+    private final Map<String, Object> _facetDataMap = new HashMap<String, Object>();
+
+    private final ThreadLocal<Map<String, Object>> _runtimeFacetDataMap = new ThreadLocal<Map<String, Object>>()
+    {
+
+        protected Map<String, Object> initialValue()
+        {
+            return new HashMap<String, Object>();
+        }
+    };
+
+    private final ThreadLocal<Map<String, RuntimeFacetHandler< ? >>> _runtimeFacetHandlerMap = new ThreadLocal<Map<String, RuntimeFacetHandler< ? >>>()
+    {
+
+        protected Map<String, RuntimeFacetHandler< ? >> initialValue()
+        {
+            return new HashMap<String, RuntimeFacetHandler< ? >>();
+        }
+    };
+
+    /**
+     * Constructor
+     * @param reader Index reader
+     * @throws IOException
+     */
+    public static BoboIndexReader getInstance(IndexReader reader) throws IOException
+    {
+        return BoboIndexReader.getInstance(reader, null, null, new WorkArea());
+    }
+
+    public static BoboIndexReader getInstance(IndexReader reader, WorkArea workArea) throws IOException
+    {
+        return BoboIndexReader.getInstance(reader, null, null, workArea);
+    }
+
+    /**
+     * Constructor.
+     * @param reader index reader
+     * @param facetHandlers List of facet handlers
+     * @throws IOException
+     */
+    public static BoboIndexReader getInstance(IndexReader reader, Collection<FacetHandler< ? >> facetHandlers,
+        Collection<RuntimeFacetHandlerFactory< ? , ? >> facetHandlerFactories) throws IOException
+    {
+        return BoboIndexReader.getInstance(reader, facetHandlers, facetHandlerFactories, new WorkArea());
+    }
+
+    public static BoboIndexReader getInstance(IndexReader reader, Collection<FacetHandler< ? >> facetHandlers)
+        throws IOException
+    {
+        return BoboIndexReader.getInstance(reader, facetHandlers, Collections.EMPTY_LIST, new WorkArea());
+    }
+
+    public static BoboIndexReader getInstance(IndexReader reader, Collection<FacetHandler< ? >> facetHandlers,
+        Collection<RuntimeFacetHandlerFactory< ? , ? >> facetHandlerFactories, WorkArea workArea) throws IOException
+    {
+        BoboIndexReader boboReader = new BoboIndexReader(reader, facetHandlers, facetHandlerFactories, workArea);
+        boboReader.facetInit();
+        return boboReader;
+    }
+
+    public static BoboIndexReader getInstanceAsSubReader(IndexReader reader) throws IOException
+    {
+        return getInstanceAsSubReader(reader, null, null, new WorkArea());
+    }
+
+    public static BoboIndexReader getInstanceAsSubReader(IndexReader reader,
+        Collection<FacetHandler< ? >> facetHandlers,
+        Collection<RuntimeFacetHandlerFactory< ? , ? >> facetHandlerFactories) throws IOException
+    {
+        return getInstanceAsSubReader(reader, facetHandlers, facetHandlerFactories, new WorkArea());
+    }
+
+    public static BoboIndexReader getInstanceAsSubReader(IndexReader reader,
+        Collection<FacetHandler< ? >> facetHandlers,
+        Collection<RuntimeFacetHandlerFactory< ? , ? >> facetHandlerFactories, WorkArea workArea) throws IOException
+    {
+        BoboIndexReader boboReader = new BoboIndexReader(reader, facetHandlers, facetHandlerFactories, workArea, false);
+        boboReader.facetInit();
+        return boboReader;
+    }
+
+    @Override
+    public long getVersion()
+    {
+        try
+        {
+            SegmentInfos sinfos = new SegmentInfos();
+            sinfos.read(_dir);
+            return sinfos.getVersion();
+        }
+        catch (Exception e)
+        {
+            return 0L;
+        }
+    }
+
+    public IndexReader getInnerReader()
+    {
+        return in;
+    }
+
+    @Override
+    public synchronized IndexReader reopen() throws CorruptIndexException, IOException
+    {
+        IndexReader newInner = null;
+
+        SegmentInfos sinfos = new SegmentInfos();
+        sinfos.read(_dir);
+        int size = sinfos.size();
+
+        if (in instanceof MultiReader)
+        {
+            // setup current reader list
+            List<IndexReader> boboReaderList = new LinkedList<IndexReader>();
+            ReaderUtil.gatherSubReaders((List<IndexReader>) boboReaderList, in);
+            Map<String, BoboIndexReader> readerMap = new HashMap<String, BoboIndexReader>();
+            for (IndexReader reader : boboReaderList)
+            {
+                BoboIndexReader boboReader = (BoboIndexReader) reader;
+                SegmentReader sreader = (SegmentReader) (boboReader.in);
+                readerMap.put(sreader.getSegmentName(), boboReader);
+            }
+
+            ArrayList<BoboIndexReader> currentReaders = new ArrayList<BoboIndexReader>(size);
+            boolean isNewReader = false;
+            for (int i = 0; i < size; ++i)
+            {
+                SegmentInfo sinfo = (SegmentInfo) sinfos.info(i);
+                BoboIndexReader breader = readerMap.remove(sinfo.name);
+                if (breader != null)
+                {
+                    // should use SegmentReader.reopen
+                    // TODO: see LUCENE-2559
+                    BoboIndexReader newReader = (BoboIndexReader) breader.reopen(true);
+                    if (newReader != breader)
+                    {
+                        isNewReader = true;
+                    }
+                    if (newReader != null)
+                    {
+                        currentReaders.add(newReader);
+                    }
+                }
+                else
+                {
+                    isNewReader = true;
+                    SegmentReader newSreader = SegmentReader.get(true, sinfo, 1);
+                    breader = BoboIndexReader.getInstanceAsSubReader(
+                        newSreader,
+                        this._facetHandlers,
+                        this._runtimeFacetHandlerFactories);
+                    breader._dir = _dir;
+                    currentReaders.add(breader);
+                }
+            }
+            isNewReader = isNewReader || (readerMap.size() != 0);
+            if (!isNewReader)
+            {
+                return this;
+            }
+            else
+            {
+                MultiReader newMreader = new MultiReader(currentReaders.toArray(new BoboIndexReader[currentReaders
+                    .size()]), false);
+                BoboIndexReader newReader = BoboIndexReader.getInstanceAsSubReader(
+                    newMreader,
+                    this._facetHandlers,
+                    this._runtimeFacetHandlerFactories);
+                newReader._dir = _dir;
+                return newReader;
+            }
+        }
+        else if (in instanceof SegmentReader)
+        {
+            // should use SegmentReader.reopen
+            // TODO: see LUCENE-2559
+
+            SegmentReader sreader = (SegmentReader) in;
+            int numDels = sreader.numDeletedDocs();
+
+            SegmentInfo sinfo = null;
+            boolean sameSeg = false;
+            // get SegmentInfo instance
+            for (int i = 0; i < size; ++i)
+            {
+                SegmentInfo sinfoTmp = (SegmentInfo) sinfos.info(i);
+                if (sinfoTmp.name.equals(sreader.getSegmentName()))
+                {
+                    int numDels2 = sinfoTmp.getDelCount();
+                    sameSeg = numDels == numDels2;
+                    sinfo = sinfoTmp;
+                    break;
+                }
+            }
+
+            if (sinfo == null)
+            {
+                // segment no longer exists
+                return null;
+            }
+            if (sameSeg)
+            {
+                return this;
+            }
+            else
+            {
+                SegmentReader newSreader = SegmentReader.get(true, sinfo, 1);
+                return BoboIndexReader.getInstanceAsSubReader(
+                    newSreader,
+                    this._facetHandlers,
+                    this._runtimeFacetHandlerFactories);
+            }
+        }
+        else
+        {
+            // should not reach here, a catch-all default case
+            IndexReader reader = in.reopen(true);
+            if (in != reader)
+            {
+                return BoboIndexReader.getInstance(newInner, _facetHandlers, _runtimeFacetHandlerFactories, _workArea);
+            }
+            else
+            {
+                return this;
+            }
+        }
+    }
+
+    @Override
+    public synchronized IndexReader reopen(boolean openReadOnly) throws CorruptIndexException, IOException
+    {
+
+        // bobo readers are always readonly
+        return reopen();
+    }
+
+    public Object getFacetData(String name)
+    {
+        return _facetDataMap.get(name);
+    }
+
+    public Object putFacetData(String name, Object data)
+    {
+        return _facetDataMap.put(name, data);
+    }
+
+    public Object getRuntimeFacetData(String name)
+    {
+        Map<String, Object> map = _runtimeFacetDataMap.get();
+        if (map == null)
+            return null;
+
+        return map.get(name);
+    }
+
+    public Object putRuntimeFacetData(String name, Object data)
+    {
+        Map<String, Object> map = _runtimeFacetDataMap.get();
+        if (map == null)
+        {
+            map = new HashMap<String, Object>();
+            _runtimeFacetDataMap.set(map);
+        }
+        return map.put(name, data);
+    }
+
+    public void clearRuntimeFacetData()
+    {
+        _runtimeFacetDataMap.set(null);
+    }
+
+    public RuntimeFacetHandler< ? > getRuntimeFacetHandler(String name)
+    {
+        Map<String, RuntimeFacetHandler< ? >> map = _runtimeFacetHandlerMap.get();
+        if (map == null)
+            return null;
+
+        return map.get(name);
+    }
+
+    public void putRuntimeFacetHandler(String name, RuntimeFacetHandler< ? > data)
+    {
+        Map<String, RuntimeFacetHandler< ? >> map = _runtimeFacetHandlerMap.get();
+        if (map == null)
+        {
+            map = new HashMap<String, RuntimeFacetHandler< ? >>();
+            _runtimeFacetHandlerMap.set(map);
+        }
+        map.put(name, data);
+    }
+
+    public void clearRuntimeFacetHandler()
+    {
+        _runtimeFacetHandlerMap.set(null);
+    }
+
+    @Override
+    protected void doClose() throws IOException
+    {
+        _facetDataMap.clear();
+        if (_srcReader != null)
+            _srcReader.close();
+        super.doClose();
+    }
+
+    @Override
+    protected void doCommit(Map commitUserData) throws IOException
+    {
+        if (_srcReader != null)
+            _srcReader.flush(commitUserData);
+    }
+
+    @Override
+    protected void doDelete(int n) throws CorruptIndexException, IOException
+    {
+        if (_srcReader != null)
+            _srcReader.deleteDocument(n);
+    }
+
+    private void loadFacetHandler(String name, Set<String> loaded, Set<String> visited, WorkArea workArea)
+        throws IOException
+    {
+        FacetHandler< ? > facetHandler = _facetHandlerMap.get(name);
+        if (facetHandler != null && !loaded.contains(name))
+        {
+            visited.add(name);
+            Set<String> dependsOn = facetHandler.getDependsOn();
+            if (dependsOn.size() > 0)
+            {
+                Iterator<String> iter = dependsOn.iterator();
+                while (iter.hasNext())
+                {
+                    String f = iter.next();
+                    if (name.equals(f))
+                        continue;
+                    if (!loaded.contains(f))
+                    {
+                        if (visited.contains(f))
+                        {
+                            throw new IOException("Facet handler dependency cycle detected, facet handler: "
+                                + name
+                                + " not loaded");
+                        }
+                        loadFacetHandler(f, loaded, visited, workArea);
+                    }
+                    if (!loaded.contains(f))
+                    {
+                        throw new IOException("unable to load facet handler: " + f);
+                    }
+                    facetHandler.putDependedFacetHandler(_facetHandlerMap.get(f));
+                }
+            }
+
+            long start = System.currentTimeMillis();
+            facetHandler.loadFacetData(this, workArea);
+            long end = System.currentTimeMillis();
+            if (logger.isDebugEnabled())
+            {
+                StringBuffer buf = new StringBuffer();
+                buf.append("facetHandler loaded: ").append(name).append(", took: ").append(end - start).append(" ms");
+                logger.debug(buf.toString());
+            }
+            loaded.add(name);
+        }
+    }
+
+    private void loadFacetHandlers(WorkArea workArea, Set<String> toBeRemoved) throws IOException
+    {
+        Set<String> loaded = new HashSet<String>();
+        Set<String> visited = new HashSet<String>();
+
+        for (String name : _facetHandlerMap.keySet())
+        {
+            loadFacetHandler(name, loaded, visited, workArea);
+        }
+
+        for (String name : toBeRemoved)
+        {
+            _facetHandlerMap.remove(name);
+        }
+    }
+
+    /**
+     * Find all the leaf sub-readers and wrap each in BoboIndexReader.
+     * @param reader
+     * @param workArea
+     * @return
+     * @throws IOException
+     */
+    private static IndexReader[] createSubReaders(IndexReader reader, WorkArea workArea) throws IOException
+    {
+        List<IndexReader> readerList = new ArrayList<IndexReader>();
+        ReaderUtil.gatherSubReaders(readerList, reader);
+        IndexReader[] subReaders = (IndexReader[]) readerList.toArray(new IndexReader[readerList.size()]);
+        BoboIndexReader[] boboReaders;
+
+        if (subReaders != null && subReaders.length > 0)
+        {
+            boboReaders = new BoboIndexReader[subReaders.length];
+            for (int i = 0; i < subReaders.length; i++)
+            {
+                boboReaders[i] = new BoboIndexReader(subReaders[i], null, null, workArea, false);
+            }
+        }
+        else
+        {
+            boboReaders = new BoboIndexReader[]{new BoboIndexReader(reader, null, null, workArea, false) };
+        }
+        return boboReaders;
+    }
+
+    @Override
+    public Directory directory()
+    {
+        return (_subReaders != null ? _subReaders[0].directory() : super.directory());
+    }
+
+    private static Collection<FacetHandler< ? >> loadFromIndex(File file, WorkArea workArea) throws IOException
+    {
+        // File springFile = new File(file, SPRING_CONFIG);
+        // FileSystemXmlApplicationContext appCtx =
+        // new FileSystemXmlApplicationContext("file:" + springFile.getAbsolutePath());
+        // return (Collection<FacetHandler<?>>) appCtx.getBean("handlers");
+
+        Set<Entry<Class< ? >, Object>> entries = workArea.map.entrySet();
+        FileSystemXmlApplicationContext appCtx = new FileSystemXmlApplicationContext();
+        for (Entry<Class< ? >, Object> entry : entries)
+        {
+            Object obj = entry.getValue();
+            if (obj instanceof ClassLoader)
+            {
+                appCtx.setClassLoader((ClassLoader) obj);
+                break;
+            }
+        }
+
+        String absolutePath = file.getAbsolutePath();
+        String partOne = absolutePath.substring(0, absolutePath.lastIndexOf(File.separator));
+        String partTwo = URLEncoder.encode(
+            absolutePath.substring(absolutePath.lastIndexOf(File.separator) + 1),
+            "UTF-8");
+        absolutePath = partOne + File.separator + partTwo;
+
+        File springFile = new File(new File(absolutePath), SPRING_CONFIG);
+        appCtx.setConfigLocation("file:" + springFile.getAbsolutePath());
+        appCtx.refresh();
+
+        return (Collection<FacetHandler< ? >>) appCtx.getBean("handlers");
+
+    }
+
+    protected void initialize(Collection<FacetHandler< ? >> facetHandlers) throws IOException
+    {
+        if (facetHandlers == null) // try to load from index
+        {
+            Directory idxDir = directory();
+            if (idxDir != null && idxDir instanceof FSDirectory)
+            {
+                FSDirectory fsDir = (FSDirectory) idxDir;
+                File file = fsDir.getFile();
+
+                if (new File(file, SPRING_CONFIG).exists())
+                {
+                    facetHandlers = loadFromIndex(file, _workArea);
+                }
+                else
+                {
+                    facetHandlers = new ArrayList<FacetHandler< ? >>();
+                }
+            }
+            else
+            {
+                facetHandlers = new ArrayList<FacetHandler< ? >>();
+            }
+        }
+
+        _facetHandlers = facetHandlers;
+        _facetHandlerMap = new HashMap<String, FacetHandler< ? >>();
+        for (FacetHandler< ? > facetHandler : facetHandlers)
+        {
+            _facetHandlerMap.put(facetHandler.getName(), facetHandler);
+        }
+    }
+
+    /**
+     * @param reader
+     * @param facetHandlers
+     * @param facetHandlerFactories
+     * @param workArea
+     * @throws IOException
+     */
+    protected BoboIndexReader(
+        IndexReader reader,
+        Collection<FacetHandler< ? >> facetHandlers,
+        Collection<RuntimeFacetHandlerFactory< ? , ? >> facetHandlerFactories,
+        WorkArea workArea) throws IOException
+    {
+        this(reader, facetHandlers, facetHandlerFactories, workArea, true);
+        _srcReader = reader;
+    }
+
+    /**
+     * @param reader
+     * @param facetHandlers
+     * @param facetHandlerFactories
+     * @param workArea
+     * @param useSubReaders true => we create a MultiReader of all the leaf sub-readers as the inner reader. false => we
+     * use the given reader as the inner reader.
+     * @throws IOException
+     */
+    protected BoboIndexReader(
+        IndexReader reader,
+        Collection<FacetHandler< ? >> facetHandlers,
+        Collection<RuntimeFacetHandlerFactory< ? , ? >> facetHandlerFactories,
+        WorkArea workArea,
+        boolean useSubReaders) throws IOException
+    {
+        super(useSubReaders ? new MultiReader(createSubReaders(reader, workArea), false) : reader);
+        if (useSubReaders)
+        {
+            _dir = reader.directory();
+            BoboIndexReader[] subReaders = (BoboIndexReader[]) in.getSequentialSubReaders();
+            if (subReaders != null && subReaders.length > 0)
+            {
+                _subReaders = subReaders;
+
+                int maxDoc = 0;
+                _starts = new int[_subReaders.length + 1];
+                for (int i = 0; i < _subReaders.length; i++)
+                {
+                    _subReaders[i]._dir = _dir;
+                    if (facetHandlers != null)
+                        _subReaders[i].setFacetHandlers(facetHandlers);
+                    _starts[i] = maxDoc;
+                    maxDoc += _subReaders[i].maxDoc();
+                }
+                _starts[_subReaders.length] = maxDoc;
+            }
+        }
+        _runtimeFacetHandlerFactories = facetHandlerFactories;
+        _runtimeFacetHandlerFactoryMap = new HashMap<String, RuntimeFacetHandlerFactory< ? , ? >>();
+        if (_runtimeFacetHandlerFactories != null)
+        {
+            for (RuntimeFacetHandlerFactory< ? , ? > factory : _runtimeFacetHandlerFactories)
+            {
+                _runtimeFacetHandlerFactoryMap.put(factory.getName(), factory);
+            }
+        }
+        _facetHandlers = facetHandlers;
+        _workArea = workArea;
+    }
+
+    protected void facetInit() throws IOException
+    {
+        facetInit(new HashSet<String>());
+    }
+
+    protected void facetInit(Set<String> toBeRemoved) throws IOException
+    {
+        initialize(_facetHandlers);
+        if (_subReaders == null)
+        {
+            loadFacetHandlers(_workArea, toBeRemoved);
+        }
+        else
+        {
+            for (BoboIndexReader r : _subReaders)
+            {
+                r.facetInit(toBeRemoved);
+            }
+
+            for (String name : toBeRemoved)
+            {
+                _facetHandlerMap.remove(name);
+            }
+        }
+    }
+
+    protected void setFacetHandlers(Collection<FacetHandler< ? >> facetHandlers)
+    {
+        _facetHandlers = facetHandlers;
+    }
+
+    /**
+     * @deprecated use {@link org.apache.lucene.search.MatchAllDocsQuery} instead.
+     * @return query that matches all docs in the index
+     */
+    public Query getFastMatchAllDocsQuery()
+    {
+        return new MatchAllDocsQuery();
+    }
+
+    /**
+     * Utility method to dump out all fields (name and terms) for a given index.
+     * @param outFile File to dump to.
+     * @throws IOException
+     */
+    public void dumpFields(File outFile) throws IOException
+    {
+        FileWriter writer = null;
+        try
+        {
+            writer = new FileWriter(outFile);
+            PrintWriter out = new PrintWriter(writer);
+            Set<String> fieldNames = getFacetNames();
+            for (String fieldName : fieldNames)
+            {
+                TermEnum te = terms(new Term(fieldName, ""));
+                out.write(fieldName + ":\n");
+                while (te.next())
+                {
+                    Term term = te.term();
+                    if (!fieldName.equals(term.field()))
+                    {
+                        break;
+                    }
+                    out.write(term.text() + "\n");
+                }
+                out.write("\n\n");
+            }
+        }
+        finally
+        {
+            if (writer != null)
+            {
+                writer.close();
+            }
+        }
+    }
+
+    /**
+     * Gets all the facet field names
+     * @return Set of facet field names
+     */
+    public Set<String> getFacetNames()
+    {
+        return _facetHandlerMap.keySet();
+    }
+
+    /**
+     * Gets a facet handler
+     * @param fieldname name
+     * @return facet handler
+     */
+    public FacetHandler< ? > getFacetHandler(String fieldname)
+    {
+        FacetHandler< ? > f = _facetHandlerMap.get(fieldname);
+        if (f == null)
+            f = getRuntimeFacetHandler(fieldname);
+        return f;
+    }
+
+    @Override
+    public IndexReader[] getSequentialSubReaders()
+    {
+        return _subReaders;
+    }
+
+    /**
+     * Gets the facet handler map
+     * @return facet handler map
+     */
+    public Map<String, FacetHandler< ? >> getFacetHandlerMap()
+    {
+        return _facetHandlerMap;
+    }
+
+    /**
+     * @return the map of RuntimeFacetHandlerFactories
+     */
+    public Map<String, RuntimeFacetHandlerFactory< ? , ? >> getRuntimeFacetHandlerFactoryMap()
+    {
+        return _runtimeFacetHandlerFactoryMap;
+    }
+
+    public Document fillFacetData(int docid, Document doc) throws IOException
+    {
+        if (_subReaders != null)
+        {
+            int readerIndex = readerIndex(docid, _starts, _subReaders.length);
+            BoboIndexReader subReader = _subReaders[readerIndex];
+            int subid = docid - _starts[readerIndex];
+            return subReader.fillFacetData(subid, doc);
+        }
+        else
+        {
+            if (doc == null)
+            {
+                doc = new Document();
+            }
+            Collection<FacetHandler< ? >> facetHandlers = _facetHandlerMap.values();
+            for (FacetHandler< ? > facetHandler : facetHandlers)
+            {
+                String[] vals = facetHandler.getFieldValues(this, docid);
+                if (vals != null)
+                {
+                    String[] values = doc.getValues(facetHandler.getName());
+                    Set<String> storedVals = new HashSet<String>(Arrays.asList(values));
+
+                    for (String val : vals)
+                    {
+                        storedVals.add(val);
+                    }
+                    doc.removeField(facetHandler.getName());
+
+                    for (String val : storedVals)
+                    {
+                        doc.add(new Field(facetHandler.getName(), val, Field.Store.NO, Field.Index.NOT_ANALYZED));
+                    }
+                }
+            }
+            return doc;
+        }
+    }
+
+    private static int readerIndex(int n, int[] starts, int numSubReaders)
+    {
+        int lo = 0;
+        int hi = numSubReaders - 1;
+
+        while (hi >= lo)
+        {
+            int mid = (lo + hi) >>> 1;
+            int midValue = starts[mid];
+            if (n < midValue)
+                hi = mid - 1;
+            else if (n > midValue)
+                lo = mid + 1;
+            else
+            {
+                while (mid + 1 < numSubReaders && starts[mid + 1] == midValue)
+                {
+                    mid++;
+                }
+                return mid;
+            }
+        }
+        return hi;
+    }
+
+    /**
+     * Work area for loading
+     */
+    public static class WorkArea
+    {
+
+        HashMap<Class< ? >, Object> map = new HashMap<Class< ? >, Object>();
+
+        @SuppressWarnings("unchecked")
+        public <T> T get(Class<T> cls)
+        {
+            T obj = (T) map.get(cls);
+            return obj;
+        }
+
+        public void put(Object obj)
+        {
+            map.put(obj.getClass(), obj);
+        }
+
+        public void clear()
+        {
+            map.clear();
+        }
+
+        @Override
+        public String toString()
+        {
+            return map.toString();
+        }
+    }
+
+    private BoboIndexReader(IndexReader in)
+    {
+        super(in);
+    }
+
+    public BoboIndexReader copy(IndexReader in)
+    {
+        if (_subReaders != null)
+        {
+            throw new IllegalStateException("this BoboIndexReader has subreaders");
+        }
+        BoboIndexReader copy = new BoboIndexReader(in);
+        copy._facetHandlerMap = this._facetHandlerMap;
+        copy._facetHandlers = this._facetHandlers;
+        copy._runtimeFacetHandlerFactories = this._runtimeFacetHandlerFactories;
+        copy._runtimeFacetHandlerFactoryMap = this._runtimeFacetHandlerFactoryMap;
+        copy._workArea = this._workArea;
+        copy._facetDataMap.putAll(this._facetDataMap);
+        copy._srcReader = in;
+        copy._starts = this._starts;
+        return copy;
+    }
+}


Property changes on: magnoliamodules/trunk/magnolia-test-webapp/src/main/java/com/browseengine/bobo/api/BoboIndexReader.java
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Added: svn:keywords
## -0,0 +1 ##
+Author Date Id Revision
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Modified: magnoliamodules/trunk/magnolia-test-webapp/src/main/resources/log4j.xml
===================================================================
--- magnoliamodules/trunk/magnolia-test-webapp/src/main/resources/log4j.xml	2013-10-20 18:52:41 UTC (rev 4414)
+++ magnoliamodules/trunk/magnolia-test-webapp/src/main/resources/log4j.xml	2013-10-20 19:02:14 UTC (rev 4415)
@@ -1,5 +1,5 @@
-    <?xml version="1.0" encoding="UTF-8"?>
-    <!DOCTYPE log4j:configuration SYSTEM "log4j.dtd">
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE log4j:configuration SYSTEM "log4j.dtd">
 <log4j:configuration>
       <!-- log4j test configuration -->
   <appender name="test-appender" class="org.apache.log4j.ConsoleAppender">
@@ -31,6 +31,9 @@
   <category name="score">
     <priority value="INFO" />
   </category>
+  <category name="it">
+    <priority value="INFO" />
+  </category>
   <category name="info.magnolia.module.model.reader.BetwixtModuleDefinitionReader">
     <priority value="INFO" />
   </category>

Added: magnoliamodules/trunk/magnolia-test-webapp/src/main/webapp/templates/samples-lms/courses.jsp
===================================================================
--- magnoliamodules/trunk/magnolia-test-webapp/src/main/webapp/templates/samples-lms/courses.jsp	                        (rev 0)
+++ magnoliamodules/trunk/magnolia-test-webapp/src/main/webapp/templates/samples-lms/courses.jsp	2013-10-20 19:02:14 UTC (rev 4415)
@@ -0,0 +1,36 @@
+<jsp:root version="2.0" xmlns:jsp="http://java.sun.com/JSP/Page" xmlns:cms="urn:jsptld:cms-taglib" xmlns:cmsu="urn:jsptld:cms-util-taglib"
+  xmlns:c="urn:jsptld:http://java.sun.com/jsp/jstl/core" xmlns:fmt="urn:jsptld:http://java.sun.com/jsp/jstl/fmt"
+  xmlns:cmsfn="http://www.magnolia.info/tlds/cmsfn-taglib.tld" xmlns:lmsfn="urn:jsptld:lms-fn">
+  <jsp:directive.page contentType="text/html; charset=UTF-8" session="false" />
+  <jsp:text>
+    <![CDATA[<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> ]]>
+  </jsp:text>
+  <html xmlns="http://www.w3.org/1999/xhtml" lang="en">
+    <head>
+      <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
+      <title>${actpage.title}</title>
+      <cms:links />
+    </head>
+    <body>
+      <h1>${actpage.title}</h1>
+      <p>Click on a course in the list below. It opens a popup with the course inside</p>
+      <ul>
+        <c:forEach items="${lmsfn:courseList()}" var="course">
+          <li>
+            <lmsfn:playerUrl course="${course}" target="blank" />
+          </li>
+        </c:forEach>
+      </ul>
+      <p>The code to create the list is:</p>
+      <pre>
+        &amp;lt;ul&amp;gt;
+          &amp;lt;c:forEach items="\${lmsfn:courseList()}" var="course"&amp;gt;
+            &amp;lt;li&amp;gt;
+              &amp;lt;lmsfn:playerUrl course="\${course}" target="blank" /&amp;gt;
+            &amp;lt;/li&amp;gt;
+          &amp;lt;/c:forEach&amp;gt;
+        &amp;lt;/ul&amp;gt;
+      </pre>
+    </body>
+  </html>
+</jsp:root>
\ No newline at end of file


Property changes on: magnoliamodules/trunk/magnolia-test-webapp/src/main/webapp/templates/samples-lms/courses.jsp
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+text/xml
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: magnoliamodules/trunk/magnolia-test-webapp/src/main/webapp/templates/samples-lms/index.jsp
===================================================================
--- magnoliamodules/trunk/magnolia-test-webapp/src/main/webapp/templates/samples-lms/index.jsp	                        (rev 0)
+++ magnoliamodules/trunk/magnolia-test-webapp/src/main/webapp/templates/samples-lms/index.jsp	2013-10-20 19:02:14 UTC (rev 4415)
@@ -0,0 +1,62 @@
+<jsp:root version="2.0" xmlns:jsp="http://java.sun.com/JSP/Page" xmlns:cms="urn:jsptld:cms-taglib" xmlns:cmsu="urn:jsptld:cms-util-taglib"
+  xmlns:c="urn:jsptld:http://java.sun.com/jsp/jstl/core" xmlns:fmt="urn:jsptld:http://java.sun.com/jsp/jstl/fmt"
+  xmlns:cmsfn="http://www.magnolia.info/tlds/cmsfn-taglib.tld" xmlns:lmsfn="urn:jsptld:lms-fn">
+  <jsp:directive.page contentType="text/html; charset=UTF-8" session="false" />
+  <jsp:text>
+    <![CDATA[<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> ]]>
+  </jsp:text>
+  <html xmlns="http://www.w3.org/1999/xhtml" lang="en">
+    <head>
+      <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
+      <title>${actpage.title}</title>
+      <cms:links />
+    </head>
+    <body>
+      <h1>${actpage.title}</h1>
+      <p>Welcome to Magnolia LMS Module sample page.</p>
+      <p>The sample course repository is structured as:</p>
+      <ul>
+        <li>
+          <b>samples</b>
+          <ul>
+            <li>
+              <b>std-level-1</b>
+              <ol>
+                <li>Simple course 1</li>
+                <li>Simple course 2</li>
+              </ol>
+              <ul>
+                <li>
+                  <b>std-level2a</b>
+                  <ol>
+                    <li>Simple course 1</li>
+                  </ol>
+                </li>
+                <li>
+                  <b>std-level2b</b>
+                  <ol>
+                    <li>Simple course 1</li>
+                  </ol>
+                </li>
+              </ul>
+            </li>
+          </ul>
+        </li>
+      </ul>
+      <p>There are three roles, one for each folder:</p>
+      <ul>
+        <li><b>std-level-1</b> which can view its courses but not subfolders</li>
+        <li><b>std-level-2a</b> which can view its courses but not subfolders</li>
+        <li><b>std-level-3a</b> which can view its courses but not subfolders</li>
+      </ul>
+      <p>The user student/student has the role std-level-1; there is an example listener (net.sourceforge.openutils.mgnllms.samples.listeners.StudentLevelListener defined in /modules/lms/lms-config/listeners/student-level), 
+      that is called whenever a user complete a course and performs following actions:
+        <ol>
+          <li>check if the user has successfully completed all courses to which he has access</li>
+          <li>if true assign to user additional roles corresponding to the names of subfolders of the last completed course</li>
+        </ol>
+      </p>
+      <p><a href="${pageContext.request.contextPath}/sample-lms/courses.html">Go to the courses list!</a> (use student/student to access)</p>
+    </body>
+  </html>
+</jsp:root>
\ No newline at end of file


Property changes on: magnoliamodules/trunk/magnolia-test-webapp/src/main/webapp/templates/samples-lms/index.jsp
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+text/xml
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Modified: magnoliamodules/trunk/openutils-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/utils/BaseAnalyzer.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/utils/BaseAnalyzer.java	2013-10-20 18:52:41 UTC (rev 4414)
+++ magnoliamodules/trunk/openutils-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/utils/BaseAnalyzer.java	2013-10-20 19:02:14 UTC (rev 4415)
@@ -37,14 +37,14 @@
 {
 
     @Override
-    public TokenStream tokenStream(String fieldName, Reader reader)
+    public final TokenStream tokenStream(String fieldName, Reader reader)
     {
         StandardTokenizer tokenStream = tokenize(reader);
         return tokenFiltersChain(tokenStream);
     }
 
     @Override
-    public TokenStream reusableTokenStream(String fieldName, Reader reader) throws IOException
+    public final TokenStream reusableTokenStream(String fieldName, Reader reader) throws IOException
     {
         SavedStreams streams = (SavedStreams) getPreviousTokenStream();
         if (streams == null)

Modified: magnoliamodules/trunk/openutils-mgnlcriteria/src/test/resources/log4j.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnlcriteria/src/test/resources/log4j.xml	2013-10-20 18:52:41 UTC (rev 4414)
+++ magnoliamodules/trunk/openutils-mgnlcriteria/src/test/resources/log4j.xml	2013-10-20 19:02:14 UTC (rev 4415)
@@ -28,9 +28,6 @@
   <category name="org.dbunit">
     <priority value="WARN" />
   </category>
-  <category name="it.openmindonline.sapere.search.SapereSearcher">
-    <priority value="DEBUG" />
-  </category>
   <category name="score">
     <priority value="INFO" />
   </category>

Modified: magnoliamodules/trunk/openutils-mgnltagcloud/pom.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnltagcloud/pom.xml	2013-10-20 18:52:41 UTC (rev 4414)
+++ magnoliamodules/trunk/openutils-mgnltagcloud/pom.xml	2013-10-20 19:02:14 UTC (rev 4415)
@@ -145,7 +145,8 @@
     <dependency>
       <groupId>com.browseengine.bobo</groupId>
       <artifactId>bobo-browse</artifactId>
-      <version>2.5.1</version>
+      <version>3.2.0</version>
+      <!-- <version>2.5.1</version> for jackrabbit 2.4 -->
       <exclusions>
         <exclusion>
           <groupId>org.springframework</groupId>

Added: magnoliamodules/trunk/openutils-mgnltagcloud/src/test/java/com/browseengine/bobo/api/BoboIndexReader.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnltagcloud/src/test/java/com/browseengine/bobo/api/BoboIndexReader.java	                        (rev 0)
+++ magnoliamodules/trunk/openutils-mgnltagcloud/src/test/java/com/browseengine/bobo/api/BoboIndexReader.java	2013-10-20 19:02:14 UTC (rev 4415)
@@ -0,0 +1,914 @@
+/**
+ *
+ * Tagcloud module for Magnolia CMS (http://www.openmindlab.com/lab/products/mgnltagcloud.html)
+ * Copyright(C) 2010-2013, Openmind S.r.l. http://www.openmindonline.it
+ *
+ *  This program is free software: you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation, either version 3 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+// lucene 3.6 compatibility patch for bobo-browse 3.2.0, see https://github.com/senseidb/bobo/commit/e78d91ef8a00965d8d55c819f967cac172c23d17
+/**
+ * Bobo Browse Engine - High performance faceted/parametric search implementation 
+ * that handles various types of semi-structured data.  Written in Java.
+ * 
+ * Copyright (C) 2005-2006  John Wang
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library 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
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ * 
+ * To contact the project administrators for the bobo-browse project, 
+ * please go to https://sourceforge.net/projects/bobo-browse/, or 
+ * send mail to ow...@br....
+ */
+
+package com.browseengine.bobo.api;
+
+import java.io.File;
+import java.io.FileWriter;
+import java.io.IOException;
+import java.io.PrintWriter;
+import java.net.URLEncoder;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.Map.Entry;
+
+import org.apache.log4j.Logger;
+import org.apache.lucene.document.Document;
+import org.apache.lucene.document.Field;
+import org.apache.lucene.index.CorruptIndexException;
+import org.apache.lucene.index.FilterIndexReader;
+import org.apache.lucene.index.IndexReader;
+import org.apache.lucene.index.MultiReader;
+import org.apache.lucene.index.SegmentInfo;
+import org.apache.lucene.index.SegmentInfos;
+import org.apache.lucene.index.SegmentReader;
+import org.apache.lucene.index.Term;
+import org.apache.lucene.index.TermEnum;
+import org.apache.lucene.search.MatchAllDocsQuery;
+import org.apache.lucene.search.Query;
+import org.apache.lucene.store.Directory;
+import org.apache.lucene.store.FSDirectory;
+import org.apache.lucene.util.ReaderUtil;
+import org.springframework.context.support.FileSystemXmlApplicationContext;
+import org.springframework.context.support.GenericApplicationContext;
+
+import com.browseengine.bobo.facets.FacetHandler;
+import com.browseengine.bobo.facets.RuntimeFacetHandler;
+import com.browseengine.bobo.facets.RuntimeFacetHandlerFactory;
+
+
+/**
+ * bobo browse index reader
+ */
+public class BoboIndexReader extends FilterIndexReader
+{
+
+    private static final String SPRING_CONFIG = "bobo.spring";
+
+    private static Logger logger = Logger.getLogger(BoboIndexReader.class);
+
+    protected Map<String, FacetHandler< ? >> _facetHandlerMap;
+
+    protected Collection<FacetHandler< ? >> _facetHandlers;
+
+    protected Collection<RuntimeFacetHandlerFactory< ? , ? >> _runtimeFacetHandlerFactories;
+
+    protected Map<String, RuntimeFacetHandlerFactory< ? , ? >> _runtimeFacetHandlerFactoryMap;
+
+    protected WorkArea _workArea;
+
+    protected IndexReader _srcReader;
+
+    protected BoboIndexReader[] _subReaders = null;
+
+    protected int[] _starts = null;
+
+    private Directory _dir = null;
+
+    private final Map<String, Object> _facetDataMap = new HashMap<String, Object>();
+
+    private final ThreadLocal<Map<String, Object>> _runtimeFacetDataMap = new ThreadLocal<Map<String, Object>>()
+    {
+
+        protected Map<String, Object> initialValue()
+        {
+            return new HashMap<String, Object>();
+        }
+    };
+
+    private final ThreadLocal<Map<String, RuntimeFacetHandler< ? >>> _runtimeFacetHandlerMap = new ThreadLocal<Map<String, RuntimeFacetHandler< ? >>>()
+    {
+
+        protected Map<String, RuntimeFacetHandler< ? >> initialValue()
+        {
+            return new HashMap<String, RuntimeFacetHandler< ? >>();
+        }
+    };
+
+    /**
+     * Constructor
+     * @param reader Index reader
+     * @throws IOException
+     */
+    public static BoboIndexReader getInstance(IndexReader reader) throws IOException
+    {
+        return BoboIndexReader.getInstance(reader, null, null, new WorkArea());
+    }
+
+    public static BoboIndexReader getInstance(IndexReader reader, WorkArea workArea) throws IOException
+    {
+        return BoboIndexReader.getInstance(reader, null, null, workArea);
+    }
+
+    /**
+     * Constructor.
+     * @param reader index reader
+     * @param facetHandlers List of facet handlers
+     * @throws IOException
+     */
+    public static BoboIndexReader getInstance(IndexReader reader, Collection<FacetHandler< ? >> facetHandlers,
+        Collection<RuntimeFacetHandlerFactory< ? , ? >> facetHandlerFactories) throws IOException
+    {
+        return BoboIndexReader.getInstance(reader, facetHandlers, facetHandlerFactories, new WorkArea());
+    }
+
+    public static BoboIndexReader getInstance(IndexReader reader, Collection<FacetHandler< ? >> facetHandlers)
+        throws IOException
+    {
+        return BoboIndexReader.getInstance(reader, facetHandlers, Collections.EMPTY_LIST, new WorkArea());
+    }
+
+    public static BoboIndexReader getInstance(IndexReader reader, Collection<FacetHandler< ? >> facetHandlers,
+        Collection<RuntimeFacetHandlerFactory< ? , ? >> facetHandlerFactories, WorkArea workArea) throws IOException
+    {
+        BoboIndexReader boboReader = new BoboIndexReader(reader, facetHandlers, facetHandlerFactories, workArea);
+        boboReader.facetInit();
+        return boboReader;
+    }
+
+    public static BoboIndexReader getInstanceAsSubReader(IndexReader reader) throws IOException
+    {
+        return getInstanceAsSubReader(reader, null, null, new WorkArea());
+    }
+
+    public static BoboIndexReader getInstanceAsSubReader(IndexReader reader,
+        Collection<FacetHandler< ? >> facetHandlers,
+        Collection<RuntimeFacetHandlerFactory< ? , ? >> facetHandlerFactories) throws IOException
+    {
+        return getInstanceAsSubReader(reader, facetHandlers, facetHandlerFactories, new WorkArea());
+    }
+
+    public static BoboIndexReader getInstanceAsSubReader(IndexReader reader,
+        Collection<FacetHandler< ? >> facetHandlers,
+        Collection<RuntimeFacetHandlerFactory< ? , ? >> facetHandlerFactories, WorkArea workArea) throws IOException
+    {
+        BoboIndexReader boboReader = new BoboIndexReader(reader, facetHandlers, facetHandlerFactories, workArea, false);
+        boboReader.facetInit();
+        return boboReader;
+    }
+
+    @Override
+    public long getVersion()
+    {
+        try
+        {
+            SegmentInfos sinfos = new SegmentInfos();
+            sinfos.read(_dir);
+            return sinfos.getVersion();
+        }
+        catch (Exception e)
+        {
+            return 0L;
+        }
+    }
+
+    public IndexReader getInnerReader()
+    {
+        return in;
+    }
+
+    @Override
+    public synchronized IndexReader reopen() throws CorruptIndexException, IOException
+    {
+        IndexReader newInner = null;
+
+        SegmentInfos sinfos = new SegmentInfos();
+        sinfos.read(_dir);
+        int size = sinfos.size();
+
+        if (in instanceof MultiReader)
+        {
+            // setup current reader list
+            List<IndexReader> boboReaderList = new LinkedList<IndexReader>();
+            ReaderUtil.gatherSubReaders((List<IndexReader>) boboReaderList, in);
+            Map<String, BoboIndexReader> readerMap = new HashMap<String, BoboIndexReader>();
+            for (IndexReader reader : boboReaderList)
+            {
+                BoboIndexReader boboReader = (BoboIndexReader) reader;
+                SegmentReader sreader = (SegmentReader) (boboReader.in);
+                readerMap.put(sreader.getSegmentName(), boboReader);
+            }
+
+            ArrayList<BoboIndexReader> currentReaders = new ArrayList<BoboIndexReader>(size);
+            boolean isNewReader = false;
+            for (int i = 0; i < size; ++i)
+            {
+                SegmentInfo sinfo = (SegmentInfo) sinfos.info(i);
+                BoboIndexReader breader = readerMap.remove(sinfo.name);
+                if (breader != null)
+                {
+                    // should use SegmentReader.reopen
+                    // TODO: see LUCENE-2559
+                    BoboIndexReader newReader = (BoboIndexReader) breader.reopen(true);
+                    if (newReader != breader)
+                    {
+                        isNewReader = true;
+                    }
+                    if (newReader != null)
+                    {
+                        currentReaders.add(newReader);
+                    }
+                }
+                else
+                {
+                    isNewReader = true;
+                    SegmentReader newSreader = SegmentReader.get(true, sinfo, 1);
+                    breader = BoboIndexReader.getInstanceAsSubReader(
+                        newSreader,
+                        this._facetHandlers,
+                        this._runtimeFacetHandlerFactories);
+                    breader._dir = _dir;
+                    currentReaders.add(breader);
+                }
+            }
+            isNewReader = isNewReader || (readerMap.size() != 0);
+            if (!isNewReader)
+            {
+                return this;
+            }
+            else
+            {
+                MultiReader newMreader = new MultiReader(currentReaders.toArray(new BoboIndexReader[currentReaders
+                    .size()]), false);
+                BoboIndexReader newReader = BoboIndexReader.getInstanceAsSubReader(
+                    newMreader,
+                    this._facetHandlers,
+                    this._runtimeFacetHandlerFactories);
+                newReader._dir = _dir;
+                return newReader;
+            }
+        }
+        else if (in instanceof SegmentReader)
+        {
+            // should use SegmentReader.reopen
+            // TODO: see LUCENE-2559
+
+            SegmentReader sreader = (SegmentReader) in;
+            int numDels = sreader.numDeletedDocs();
+
+            SegmentInfo sinfo = null;
+            boolean sameSeg = false;
+            // get SegmentInfo instance
+            for (int i = 0; i < size; ++i)
+            {
+                SegmentInfo sinfoTmp = (SegmentInfo) sinfos.info(i);
+                if (sinfoTmp.name.equals(sreader.getSegmentName()))
+                {
+                    int numDels2 = sinfoTmp.getDelCount();
+                    sameSeg = numDels == numDels2;
+                    sinfo = sinfoTmp;
+                    break;
+                }
+            }
+
+            if (sinfo == null)
+            {
+                // segment no longer exists
+                return null;
+            }
+            if (sameSeg)
+            {
+                return this;
+            }
+            else
+            {
+                SegmentReader newSreader = SegmentReader.get(true, sinfo, 1);
+                return BoboIndexReader.getInstanceAsSubReader(
+                    newSreader,
+                    this._facetHandlers,
+                    this._runtimeFacetHandlerFactories);
+            }
+        }
+        else
+        {
+            // should not reach here, a catch-all default case
+            IndexReader reader = in.reopen(true);
+            if (in != reader)
+            {
+                return BoboIndexReader.getInstance(newInner, _facetHandlers, _runtimeFacetHandlerFactories, _workArea);
+            }
+            else
+            {
+                return this;
+            }
+        }
+    }
+
+    @Override
+    public synchronized IndexReader reopen(boolean openReadOnly) throws CorruptIndexException, IOException
+    {
+
+        // bobo readers are always readonly
+        return reopen();
+    }
+
+    public Object getFacetData(String name)
+    {
+        return _facetDataMap.get(name);
+    }
+
+    public Object putFacetData(String name, Object data)
+    {
+        return _facetDataMap.put(name, data);
+    }
+
+    public Object getRuntimeFacetData(String name)
+    {
+        Map<String, Object> map = _runtimeFacetDataMap.get();
+        if (map == null)
+            return null;
+
+        return map.get(name);
+    }
+
+    public Object putRuntimeFacetData(String name, Object data)
+    {
+        Map<String, Object> map = _runtimeFacetDataMap.get();
+        if (map == null)
+        {
+            map = new HashMap<String, Object>();
+            _runtimeFacetDataMap.set(map);
+        }
+        return map.put(name, data);
+    }
+
+    public void clearRuntimeFacetData()
+    {
+        _runtimeFacetDataMap.set(null);
+    }
+
+    public RuntimeFacetHandler< ? > getRuntimeFacetHandler(String name)
+    {
+        Map<String, RuntimeFacetHandler< ? >> map = _runtimeFacetHandlerMap.get();
+        if (map == null)
+            return null;
+
+        return map.get(name);
+    }
+
+    public void putRuntimeFacetHandler(String name, RuntimeFacetHandler< ? > data)
+    {
+        Map<String, RuntimeFacetHandler< ? >> map = _runtimeFacetHandlerMap.get();
+        if (map == null)
+        {
+            map = new HashMap<String, RuntimeFacetHandler< ? >>();
+            _runtimeFacetHandlerMap.set(map);
+        }
+        map.put(name, data);
+    }
+
+    public void clearRuntimeFacetHandler()
+    {
+        _runtimeFacetHandlerMap.set(null);
+    }
+
+    @Override
+    protected void doClose() throws IOException
+    {
+        _facetDataMap.clear();
+        if (_srcReader != null)
+            _srcReader.close();
+        super.doClose();
+    }
+
+    @Override
+    protected void doCommit(Map commitUserData) throws IOException
+    {
+        if (_srcReader != null)
+            _srcReader.flush(commitUserData);
+    }
+
+    @Override
+    protected void doDelete(int n) throws CorruptIndexException, IOException
+    {
+        if (_srcReader != null)
+            _srcReader.deleteDocument(n);
+    }
+
+    private void loadFacetHandler(String name, Set<String> loaded, Set<String> visited, WorkArea workArea)
+        throws IOException
+    {
+        FacetHandler< ? > facetHandler = _facetHandlerMap.get(name);
+        if (facetHandler != null && !loaded.contains(name))
+        {
+            visited.add(name);
+            Set<String> dependsOn = facetHandler.getDependsOn();
+            if (dependsOn.size() > 0)
+            {
+                Iterator<String> iter = dependsOn.iterator();
+                while (iter.hasNext())
+                {
+                    String f = iter.next();
+  ...
 
[truncated message content]

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

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

Revision: 4414
          http://openutils.svn.sourceforge.net/openutils/?rev=4414&view=rev
Author:   fgiust
Date:     2013-10-20 18:52:41 +0000 (Sun, 20 Oct 2013)
Log Message:
-----------
fix module definition

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

Added Paths:
-----------
    magnoliamodules/trunk/magnolia-test-webapp/src/main/resources/log4j.dtd
    magnoliamodules/trunk/magnolia-test-webapp/src/main/resources/log4j.xml

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


Property changes on: magnoliamodules/trunk/magnolia-test-webapp/src/main/resources/log4j.dtd
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+text/xml
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: magnoliamodules/trunk/magnolia-test-webapp/src/main/resources/log4j.xml
===================================================================
--- magnoliamodules/trunk/magnolia-test-webapp/src/main/resources/log4j.xml	                        (rev 0)
+++ magnoliamodules/trunk/magnolia-test-webapp/src/main/resources/log4j.xml	2013-10-20 18:52:41 UTC (rev 4414)
@@ -0,0 +1,41 @@
+    <?xml version="1.0" encoding="UTF-8"?>
+    <!DOCTYPE log4j:configuration SYSTEM "log4j.dtd">
+<log4j:configuration>
+      <!-- log4j test configuration -->
+  <appender name="test-appender" class="org.apache.log4j.ConsoleAppender">
+    <layout class="org.apache.log4j.PatternLayout">
+      <param name="ConversionPattern" value="%-5p %c.%M(%C{1}.java:%L)   %m%n" />
+    </layout>
+  </appender>
+  <category name="jdbc">
+    <priority value="WARN" />
+  </category>
+  <category name="it">
+    <priority value="INFO" />
+  </category>
+  <category name="info">
+    <priority value="INFO" />
+  </category>
+  <category name="org">
+    <priority value="WARN" />
+  </category>
+  <category name="com">
+    <priority value="WARN" />
+  </category>
+  <category name="net">
+    <priority value="WARN" />
+  </category>
+  <category name="org.dbunit">
+    <priority value="WARN" />
+  </category>
+  <category name="score">
+    <priority value="INFO" />
+  </category>
+  <category name="info.magnolia.module.model.reader.BetwixtModuleDefinitionReader">
+    <priority value="INFO" />
+  </category>
+  <root>
+    <priority value="ALL" />
+    <appender-ref ref="test-appender" />
+  </root>
+</log4j:configuration>
\ No newline at end of file


Property changes on: magnoliamodules/trunk/magnolia-test-webapp/src/main/resources/log4j.xml
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+text/xml
\ No newline at end of property
Added: svn:keywords
## -0,0 +1 ##
+Author Date Id Revision
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Modified: magnoliamodules/trunk/openutils-mgnlmessages/src/main/resources/META-INF/magnolia/messages.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnlmessages/src/main/resources/META-INF/magnolia/messages.xml	2013-10-20 18:38:09 UTC (rev 4413)
+++ magnoliamodules/trunk/openutils-mgnlmessages/src/main/resources/META-INF/magnolia/messages.xml	2013-10-20 18:52:41 UTC (rev 4414)
@@ -45,7 +45,6 @@
       <version>*</version>
     </dependency>
   </dependencies>
-</dependencies>
   <repositories>
     <repository>
       <name>magnolia</name>

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

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

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

Revision: 4413
          http://openutils.svn.sourceforge.net/openutils/?rev=4413&view=rev
Author:   fgiust
Date:     2013-10-20 18:38:09 +0000 (Sun, 20 Oct 2013)
Log Message:
-----------
properly shutdown without warnings

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

Modified: magnoliamodules/trunk/openutils-mgnltests/src/main/java/it/openutils/mgnlutils/test/AbstractRepositoryTestcase.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnltests/src/main/java/it/openutils/mgnlutils/test/AbstractRepositoryTestcase.java	2013-10-20 18:13:24 UTC (rev 4412)
+++ magnoliamodules/trunk/openutils-mgnltests/src/main/java/it/openutils/mgnlutils/test/AbstractRepositoryTestcase.java	2013-10-20 18:38:09 UTC (rev 4413)
@@ -18,7 +18,7 @@
  */
 
 package it.openutils.mgnlutils.test;
- 
+
 import info.magnolia.cms.core.Path;
 import info.magnolia.cms.core.SystemProperty;
 import info.magnolia.cms.util.ClasspathResourcesUtil;
@@ -55,6 +55,7 @@
 import info.magnolia.objectfactory.configuration.InstanceConfiguration;
 import info.magnolia.objectfactory.configuration.ProviderConfiguration;
 import info.magnolia.repository.DefaultRepositoryManager;
+import info.magnolia.repository.RepositoryConstants;
 import info.magnolia.repository.RepositoryManager;
 import info.magnolia.test.ComponentsTestUtil;
 import info.magnolia.test.FixedModuleDefinitionReader;
@@ -76,6 +77,8 @@
 import javax.jcr.ImportUUIDBehavior;
 import javax.jcr.Node;
 import javax.jcr.RepositoryException;
+import javax.jcr.observation.EventListenerIterator;
+import javax.jcr.observation.ObservationManager;
 
 import org.apache.commons.io.FileUtils;
 import org.apache.commons.io.IOUtils;
@@ -183,8 +186,21 @@
                 logger.setLevel(Level.WARN);
             }
             MgnlContext.release();
-            Components.getComponent(SystemContext.class).release();
 
+            SystemContext systemContext = Components.getComponent(SystemContext.class);
+
+            final ObservationManager observationManager = systemContext
+                .getJCRSession(RepositoryConstants.CONFIG)
+                .getWorkspace()
+                .getObservationManager();
+            final EventListenerIterator listeners = observationManager.getRegisteredEventListeners();
+            while (listeners.hasNext())
+            {
+                observationManager.removeEventListener(listeners.nextEventListener());
+            }
+
+            systemContext.release();
+
             Components.getComponent(RepositoryManager.class).shutdown();
             if (true)
             {

Modified: magnoliamodules/trunk/openutils-mgnltests/src/test/java/it/openutils/mgnlutils/test/junit/JUnitRepositoryTestcaseTest.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnltests/src/test/java/it/openutils/mgnlutils/test/junit/JUnitRepositoryTestcaseTest.java	2013-10-20 18:13:24 UTC (rev 4412)
+++ magnoliamodules/trunk/openutils-mgnltests/src/test/java/it/openutils/mgnlutils/test/junit/JUnitRepositoryTestcaseTest.java	2013-10-20 18:38:09 UTC (rev 4413)
@@ -57,7 +57,7 @@
         Node letters = session.getNode("/letters");
         Assert.assertNotNull(letters);
 
-        Assert.assertEquals(NodeUtil.getCollectionFromNodeIterator(letters.getNodes()).size(), 26);
+        Assert.assertEquals(NodeUtil.asList(NodeUtil.getNodes(letters, NodeUtil.EXCLUDE_META_DATA_FILTER)).size(), 26);
     }
 
     @Test

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

[Openutils-svn] SF.net SVN: openutils:[4412] magnoliamodules/trunk/openutils-mgnlrepoutils/ src/main/java/org/apache/jackrabbit/core/query/lucene/IndexUtils.java

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

Revision: 4412
          http://openutils.svn.sourceforge.net/openutils/?rev=4412&view=rev
Author:   fgiust
Date:     2013-10-20 18:13:24 +0000 (Sun, 20 Oct 2013)
Log Message:
-----------
jackrabbit 2.6 compatibility

Modified Paths:
--------------
    magnoliamodules/trunk/openutils-mgnlrepoutils/src/main/java/org/apache/jackrabbit/core/query/lucene/IndexUtils.java

Modified: magnoliamodules/trunk/openutils-mgnlrepoutils/src/main/java/org/apache/jackrabbit/core/query/lucene/IndexUtils.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlrepoutils/src/main/java/org/apache/jackrabbit/core/query/lucene/IndexUtils.java	2013-10-20 17:58:12 UTC (rev 4411)
+++ magnoliamodules/trunk/openutils-mgnlrepoutils/src/main/java/org/apache/jackrabbit/core/query/lucene/IndexUtils.java	2013-10-20 18:13:24 UTC (rev 4412)
@@ -55,7 +55,7 @@
 
         MultiIndex index = searchIndex.getIndex();
 
-        ConsistencyCheck check = ConsistencyCheck.run(index, searchIndex.getContext().getItemStateManager());
+        ConsistencyCheck check = index.runConsistencyCheck();
 
         List<ConsistencyCheckError> errors = check.getErrors();
 

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

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

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

Revision: 4411
          http://openutils.svn.sourceforge.net/openutils/?rev=4411&view=rev
Author:   fgiust
Date:     2013-10-20 17:58:12 +0000 (Sun, 20 Oct 2013)
Log Message:
-----------
upgrade magnolia/jackrabbit versions

Modified Paths:
--------------
    magnoliamodules/trunk/magnolia-test-webapp/pom.xml
    magnoliamodules/trunk/magnolia5-test-webapp/pom.xml
    magnoliamodules/trunk/openutils-mgnlcriteria/pom.xml
    magnoliamodules/trunk/openutils-mgnltagcloud/pom.xml

Modified: magnoliamodules/trunk/magnolia-test-webapp/pom.xml
===================================================================
--- magnoliamodules/trunk/magnolia-test-webapp/pom.xml	2013-10-20 17:55:52 UTC (rev 4410)
+++ magnoliamodules/trunk/magnolia-test-webapp/pom.xml	2013-10-20 17:58:12 UTC (rev 4411)
@@ -275,7 +275,7 @@
   <properties>
     <magnolia.version>4.5.11</magnolia.version>
     <stk.version>2.0.10</stk.version>
-    <jackrabbit.version>2.4.1</jackrabbit.version>
+    <jackrabbit.version>2.6.4</jackrabbit.version>
   </properties>
   <build>
     <plugins>

Modified: magnoliamodules/trunk/magnolia5-test-webapp/pom.xml
===================================================================
--- magnoliamodules/trunk/magnolia5-test-webapp/pom.xml	2013-10-20 17:55:52 UTC (rev 4410)
+++ magnoliamodules/trunk/magnolia5-test-webapp/pom.xml	2013-10-20 17:58:12 UTC (rev 4411)
@@ -221,7 +221,7 @@
     <magnolia.version2>5.0-prev1-rc1</magnolia.version2>
     <!-- <magnolia.version2>5.0.4</magnolia.version2> -->
     <stk.version>2.5.3</stk.version>
-    <jackrabbit.version>2.6.2</jackrabbit.version>
+    <jackrabbit.version>2.6.4</jackrabbit.version>
   </properties>
   <build>
     <plugins>

Modified: magnoliamodules/trunk/openutils-mgnlcriteria/pom.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnlcriteria/pom.xml	2013-10-20 17:55:52 UTC (rev 4410)
+++ magnoliamodules/trunk/openutils-mgnlcriteria/pom.xml	2013-10-20 17:58:12 UTC (rev 4411)
@@ -177,8 +177,8 @@
     </dependency>
   </dependencies>
   <properties>
-    <magnolia.version>4.5.6</magnolia.version>
-    <jackrabbit.version>2.4.1</jackrabbit.version>
+    <magnolia.version>4.5.11</magnolia.version>
+    <jackrabbit.version>2.6.4</jackrabbit.version>
     <jcr.version>2.0</jcr.version>
   </properties>
   <!-- test running maven with -Djcr.version=2.0 -Djackrabbit.version=2.0.0 -Djcr.version=2.0 -Djackrabbit.version=2.1.0 -->

Modified: magnoliamodules/trunk/openutils-mgnltagcloud/pom.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnltagcloud/pom.xml	2013-10-20 17:55:52 UTC (rev 4410)
+++ magnoliamodules/trunk/openutils-mgnltagcloud/pom.xml	2013-10-20 17:58:12 UTC (rev 4411)
@@ -233,7 +233,7 @@
     </dependency>
   </dependencies>
   <properties>
-    <magnolia.version>4.5.6</magnolia.version>
-    <jackrabbit.version>2.4.0</jackrabbit.version>
+    <magnolia.version>4.5.11</magnolia.version>
+    <jackrabbit.version>2.6.4</jackrabbit.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:[4410] trunk

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

Revision: 4410
          http://openutils.svn.sourceforge.net/openutils/?rev=4410&view=rev
Author:   fgiust
Date:     2013-10-20 17:55:52 +0000 (Sun, 20 Oct 2013)
Log Message:
-----------
update sl4j version

Modified Paths:
--------------
    magnoliamodules/trunk/magnolia-test-webapp/pom.xml
    magnoliamodules/trunk/magnolia5-test-webapp/pom.xml
    magnoliamodules/trunk/openutils-mgnlcriteria/pom.xml
    magnoliamodules/trunk/openutils-mgnltagcloud/pom.xml
    magnoliamodules/trunk/openutils-mgnlutils/src/main/java/it/openutils/mgnlutils/util/NodeUtilsExt.java
    trunk/openutils-bshd5/pom.xml
    trunk/openutils-dbmigration/pom.xml
    trunk/openutils-deployment/pom.xml
    trunk/openutils-elfunctions/pom.xml
    trunk/openutils-spring/pom.xml
    trunk/openutils-testing/pom.xml
    trunk/openutils-testing4dwr/pom.xml
    trunk/openutils-testing4web/pom.xml

Modified: magnoliamodules/trunk/magnolia-test-webapp/pom.xml
===================================================================
--- magnoliamodules/trunk/magnolia-test-webapp/pom.xml	2013-10-20 17:51:17 UTC (rev 4409)
+++ magnoliamodules/trunk/magnolia-test-webapp/pom.xml	2013-10-20 17:55:52 UTC (rev 4410)
@@ -253,17 +253,17 @@
       <dependency>
         <groupId>org.slf4j</groupId>
         <artifactId>slf4j-api</artifactId>
-        <version>1.6.1</version>
+        <version>1.7.5</version>
       </dependency>
       <dependency>
         <groupId>org.slf4j</groupId>
         <artifactId>slf4j-log4j12</artifactId>
-        <version>1.6.1</version>
+        <version>1.7.5</version>
       </dependency>
       <dependency>
         <groupId>org.slf4j</groupId>
         <artifactId>jcl-over-slf4j</artifactId>
-        <version>1.6.1</version>
+        <version>1.7.5</version>
       </dependency>
       <dependency>
         <groupId>org.devlib.schmidt</groupId>

Modified: magnoliamodules/trunk/magnolia5-test-webapp/pom.xml
===================================================================
--- magnoliamodules/trunk/magnolia5-test-webapp/pom.xml	2013-10-20 17:51:17 UTC (rev 4409)
+++ magnoliamodules/trunk/magnolia5-test-webapp/pom.xml	2013-10-20 17:55:52 UTC (rev 4410)
@@ -197,17 +197,17 @@
       <dependency>
         <groupId>org.slf4j</groupId>
         <artifactId>slf4j-api</artifactId>
-        <version>1.6.1</version>
+        <version>1.7.5</version>
       </dependency>
       <dependency>
         <groupId>org.slf4j</groupId>
         <artifactId>slf4j-log4j12</artifactId>
-        <version>1.6.1</version>
+        <version>1.7.5</version>
       </dependency>
       <dependency>
         <groupId>org.slf4j</groupId>
         <artifactId>jcl-over-slf4j</artifactId>
-        <version>1.6.1</version>
+        <version>1.7.5</version>
       </dependency>
       <dependency>
         <groupId>org.devlib.schmidt</groupId>

Modified: magnoliamodules/trunk/openutils-mgnlcriteria/pom.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnlcriteria/pom.xml	2013-10-20 17:51:17 UTC (rev 4409)
+++ magnoliamodules/trunk/openutils-mgnlcriteria/pom.xml	2013-10-20 17:55:52 UTC (rev 4410)
@@ -111,17 +111,17 @@
     <dependency>
       <groupId>org.slf4j</groupId>
       <artifactId>slf4j-api</artifactId>
-      <version>1.6.1</version>
+      <version>1.7.5</version>
     </dependency>
     <dependency>
       <groupId>org.slf4j</groupId>
       <artifactId>slf4j-log4j12</artifactId>
-      <version>1.6.1</version>
+      <version>1.7.5</version>
     </dependency>
     <dependency>
       <groupId>org.slf4j</groupId>
       <artifactId>jcl-over-slf4j</artifactId>
-      <version>1.6.1</version>
+      <version>1.7.5</version>
     </dependency>
     <dependency>
       <groupId>commons-lang</groupId>

Modified: magnoliamodules/trunk/openutils-mgnltagcloud/pom.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnltagcloud/pom.xml	2013-10-20 17:51:17 UTC (rev 4409)
+++ magnoliamodules/trunk/openutils-mgnltagcloud/pom.xml	2013-10-20 17:55:52 UTC (rev 4410)
@@ -188,7 +188,7 @@
     <dependency>
       <groupId>org.slf4j</groupId>
       <artifactId>jcl-over-slf4j</artifactId>
-      <version>1.6.1</version>
+      <version>1.7.5</version>
     </dependency>
     <dependency>
       <groupId>javax.jcr</groupId>

Modified: magnoliamodules/trunk/openutils-mgnlutils/src/main/java/it/openutils/mgnlutils/util/NodeUtilsExt.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlutils/src/main/java/it/openutils/mgnlutils/util/NodeUtilsExt.java	2013-10-20 17:51:17 UTC (rev 4409)
+++ magnoliamodules/trunk/openutils-mgnlutils/src/main/java/it/openutils/mgnlutils/util/NodeUtilsExt.java	2013-10-20 17:55:52 UTC (rev 4410)
@@ -222,10 +222,6 @@
         {
             node = new I18nNodeWrapper(node);
         }
-        if (!NodeUtil.isWrappedWith(node, HTMLEscapingNodeWrapper.class))
-        {
-            node = new HTMLEscapingNodeWrapper(node, true);
-        }
 
         return node;
     }

Modified: trunk/openutils-bshd5/pom.xml
===================================================================
--- trunk/openutils-bshd5/pom.xml	2013-10-20 17:51:17 UTC (rev 4409)
+++ trunk/openutils-bshd5/pom.xml	2013-10-20 17:55:52 UTC (rev 4410)
@@ -174,7 +174,7 @@
     </dependency>
   </dependencies>
   <properties>
-    <slf4j.version>1.7.2</slf4j.version>
+    <slf4j.version>1.7.5</slf4j.version>
     <hibernate.version>4.1.10.Final</hibernate.version>
     <javassist.version>3.17.1-GA</javassist.version>
     <spring.version>3.2.1.RELEASE</spring.version>

Modified: trunk/openutils-dbmigration/pom.xml
===================================================================
--- trunk/openutils-dbmigration/pom.xml	2013-10-20 17:51:17 UTC (rev 4409)
+++ trunk/openutils-dbmigration/pom.xml	2013-10-20 17:55:52 UTC (rev 4410)
@@ -79,12 +79,12 @@
     <dependency>
       <groupId>org.slf4j</groupId>
       <artifactId>slf4j-api</artifactId>
-      <version>1.5.6</version>
+        <version>1.7.5</version>
     </dependency>
     <dependency>
       <groupId>org.slf4j</groupId>
       <artifactId>jcl-over-slf4j</artifactId>
-      <version>1.5.6</version>
+        <version>1.7.5</version>
     </dependency>
     <dependency>
       <groupId>org.apache.poi</groupId>

Modified: trunk/openutils-deployment/pom.xml
===================================================================
--- trunk/openutils-deployment/pom.xml	2013-10-20 17:51:17 UTC (rev 4409)
+++ trunk/openutils-deployment/pom.xml	2013-10-20 17:55:52 UTC (rev 4410)
@@ -60,12 +60,12 @@
     <dependency>
       <groupId>org.slf4j</groupId>
       <artifactId>slf4j-log4j12</artifactId>
-      <version>1.6.1</version>
+      <version>1.7.5</version>
     </dependency>
     <dependency>
       <groupId>org.slf4j</groupId>
       <artifactId>jcl-over-slf4j</artifactId>
-      <version>1.6.1</version>
+      <version>1.7.5</version>
     </dependency>
     <dependency>
       <groupId>javax.servlet</groupId>

Modified: trunk/openutils-elfunctions/pom.xml
===================================================================
--- trunk/openutils-elfunctions/pom.xml	2013-10-20 17:51:17 UTC (rev 4409)
+++ trunk/openutils-elfunctions/pom.xml	2013-10-20 17:55:52 UTC (rev 4410)
@@ -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>
@@ -101,12 +102,12 @@
     <dependency>
       <groupId>org.slf4j</groupId>
       <artifactId>slf4j-api</artifactId>
-      <version>1.5.6</version>
+      <version>1.7.5</version>
     </dependency>
     <dependency>
       <groupId>org.slf4j</groupId>
       <artifactId>slf4j-log4j12</artifactId>
-      <version>1.5.6</version>
+      <version>1.7.5</version>
       <scope>test</scope>
     </dependency>
     <dependency>

Modified: trunk/openutils-spring/pom.xml
===================================================================
--- trunk/openutils-spring/pom.xml	2013-10-20 17:51:17 UTC (rev 4409)
+++ trunk/openutils-spring/pom.xml	2013-10-20 17:55:52 UTC (rev 4410)
@@ -92,12 +92,12 @@
     <dependency>
       <groupId>org.slf4j</groupId>
       <artifactId>slf4j-log4j12</artifactId>
-      <version>1.5.6</version>
+      <version>1.7.5</version>
     </dependency>
     <dependency>
       <groupId>org.slf4j</groupId>
       <artifactId>jcl-over-slf4j</artifactId>
-      <version>1.5.6</version>
+      <version>1.7.5</version>
     </dependency>
     <dependency>
       <groupId>org.hibernate</groupId>

Modified: trunk/openutils-testing/pom.xml
===================================================================
--- trunk/openutils-testing/pom.xml	2013-10-20 17:51:17 UTC (rev 4409)
+++ trunk/openutils-testing/pom.xml	2013-10-20 17:55:52 UTC (rev 4410)
@@ -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>
@@ -62,12 +63,12 @@
     <dependency>
       <groupId>org.slf4j</groupId>
       <artifactId>slf4j-log4j12</artifactId>
-      <version>1.7.2</version>
+      <version>1.7.5</version>
     </dependency>
     <dependency>
       <groupId>org.slf4j</groupId>
       <artifactId>jcl-over-slf4j</artifactId>
-      <version>1.7.2</version>
+      <version>1.7.5</version>
     </dependency>
     <dependency>
       <groupId>org.apache.commons</groupId>

Modified: trunk/openutils-testing4dwr/pom.xml
===================================================================
--- trunk/openutils-testing4dwr/pom.xml	2013-10-20 17:51:17 UTC (rev 4409)
+++ trunk/openutils-testing4dwr/pom.xml	2013-10-20 17:55:52 UTC (rev 4410)
@@ -35,12 +35,12 @@
     <dependency>
       <groupId>org.slf4j</groupId>
       <artifactId>slf4j-log4j12</artifactId>
-      <version>1.5.6</version>
+      <version>1.7.5</version>
     </dependency>
     <dependency>
       <groupId>org.slf4j</groupId>
       <artifactId>jcl-over-slf4j</artifactId>
-      <version>1.5.6</version>
+      <version>1.7.5</version>
     </dependency>
     <dependency>
       <groupId>log4j</groupId>

Modified: trunk/openutils-testing4web/pom.xml
===================================================================
--- trunk/openutils-testing4web/pom.xml	2013-10-20 17:51:17 UTC (rev 4409)
+++ trunk/openutils-testing4web/pom.xml	2013-10-20 17:55:52 UTC (rev 4410)
@@ -214,7 +214,7 @@
     <dependency>
       <groupId>org.slf4j</groupId>
       <artifactId>slf4j-api</artifactId>
-      <version>1.5.6</version>
+      <version>1.7.5</version>
     </dependency>
     <dependency>
       <groupId>commons-lang</groupId>
@@ -229,7 +229,7 @@
     <dependency>
       <groupId>org.slf4j</groupId>
       <artifactId>slf4j-log4j12</artifactId>
-      <version>1.5.6</version>
+      <version>1.7.5</version>
       <scope>test</scope>
     </dependency>
   </dependencies>

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

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

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

Revision: 4409
          http://openutils.svn.sourceforge.net/openutils/?rev=4409&view=rev
Author:   fgiust
Date:     2013-10-20 17:51:17 +0000 (Sun, 20 Oct 2013)
Log Message:
-----------
Node instead of ContentMap everywhere + test update

Modified Paths:
--------------
    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/jcr/query/AdvancedResultItem.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/JcrContainsCriteriaSearchTest.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/XpathEscapeTest.java
    magnoliamodules/trunk/openutils-mgnlcriteria/src/test/java/net/sourceforge/openutils/mgnlcriteria/advanced/impl/CorrectElementsWithoutMaxResults.java
    magnoliamodules/trunk/openutils-mgnlcriteria/src/test/java/net/sourceforge/openutils/mgnlcriteria/jcr/query/CriteriaTest.java
    magnoliamodules/trunk/openutils-mgnlcriteria/src/test/java/net/sourceforge/openutils/mgnlcriteria/jcr/query/EscapeSignTest.java
    magnoliamodules/trunk/openutils-mgnlcriteria/src/test/java/net/sourceforge/openutils/mgnlcriteria/tests/CriteriaTestUtils.java
    magnoliamodules/trunk/openutils-mgnlcriteria/src/test/resources/crit-bootstrap/website.00000.xml
    magnoliamodules/trunk/openutils-mgnlcriteria/src/test/resources/crit-repository/indexing_configuration.xml

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	2013-10-20 16:16:14 UTC (rev 4408)
+++ magnoliamodules/trunk/openutils-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/advanced/impl/AdvancedResultItemImpl.java	2013-10-20 17:51:17 UTC (rev 4409)
@@ -21,51 +21,20 @@
 
 import info.magnolia.cms.security.AccessDeniedException;
 import info.magnolia.jcr.RuntimeRepositoryException;
-import info.magnolia.jcr.util.ContentMap;
+import info.magnolia.jcr.wrapper.DelegateNodeWrapper;
 import info.magnolia.jcr.wrapper.I18nNodeWrapper;
 
-import java.io.InputStream;
 import java.lang.reflect.InvocationTargetException;
-import java.math.BigDecimal;
-import java.util.Calendar;
 
-import javax.jcr.Binary;
-import javax.jcr.InvalidItemStateException;
-import javax.jcr.InvalidLifecycleTransitionException;
 import javax.jcr.Item;
-import javax.jcr.ItemExistsException;
-import javax.jcr.ItemNotFoundException;
-import javax.jcr.ItemVisitor;
-import javax.jcr.MergeException;
-import javax.jcr.NoSuchWorkspaceException;
 import javax.jcr.Node;
-import javax.jcr.NodeIterator;
-import javax.jcr.PathNotFoundException;
-import javax.jcr.Property;
-import javax.jcr.PropertyIterator;
-import javax.jcr.ReferentialIntegrityException;
 import javax.jcr.RepositoryException;
-import javax.jcr.Session;
-import javax.jcr.UnsupportedRepositoryOperationException;
 import javax.jcr.Value;
-import javax.jcr.ValueFormatException;
-import javax.jcr.lock.Lock;
-import javax.jcr.lock.LockException;
-import javax.jcr.nodetype.ConstraintViolationException;
-import javax.jcr.nodetype.NoSuchNodeTypeException;
-import javax.jcr.nodetype.NodeDefinition;
-import javax.jcr.nodetype.NodeType;
 import javax.jcr.query.Row;
-import javax.jcr.version.ActivityViolationException;
-import javax.jcr.version.Version;
-import javax.jcr.version.VersionException;
-import javax.jcr.version.VersionHistory;
 
 import net.sourceforge.openutils.mgnlcriteria.jcr.query.AdvancedResultItem;
 
 import org.apache.commons.beanutils.PropertyUtils;
-import org.apache.commons.lang.ObjectUtils;
-import org.apache.commons.lang.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -74,13 +43,11 @@
  * @author fgiust
  * @version $Id$
  */
-public class AdvancedResultItemImpl extends ContentMap implements AdvancedResultItem
+public class AdvancedResultItemImpl extends DelegateNodeWrapper implements AdvancedResultItem
 {
 
     private final Row row;
 
-    private final Node node;
-
     /**
      * Logger.
      */
@@ -99,7 +66,6 @@
     public AdvancedResultItemImpl(Row row, Item item) throws RepositoryException, AccessDeniedException
     {
         super(new I18nNodeWrapper((Node) item));
-        this.node = new I18nNodeWrapper((Node) item);
         this.row = row;
     }
 
@@ -199,1188 +165,13 @@
         return 0;
     }
 
-    /**
-     * @return
-     * @throws RepositoryException
-     * @see javax.jcr.Item#getPath()
-     */
-    public String getPath() throws RepositoryException
-    {
-        return node.getPath();
-    }
-
-    /**
-     * @ * @see javax.jcr.Item#getName()
-     */
-    public String getName()
-    {
-        try
-        {
-            return node.getName();
-        }
-        catch (RepositoryException e)
-        {
-            throw new RuntimeRepositoryException(e);
-        }
-    }
-
-    /**
-     * @param depth
-     * @return
-     * @throws ItemNotFoundException
-     * @throws AccessDeniedException
-     * @throws RepositoryException
-     * @see javax.jcr.Item#getAncestor(int)
-     */
-    public Item getAncestor(int depth) throws ItemNotFoundException, javax.jcr.AccessDeniedException,
-        RepositoryException
-    {
-        return node.getAncestor(depth);
-    }
-
-    /**
-     * @param relPath
-     * @return
-     * @throws ItemExistsException
-     * @throws PathNotFoundException
-     * @throws VersionException
-     * @throws ConstraintViolationException
-     * @throws LockException
-     * @throws RepositoryException
-     * @see javax.jcr.Node#addNode(java.lang.String)
-     */
-    public Node addNode(String relPath) throws ItemExistsException, PathNotFoundException, VersionException,
-        ConstraintViolationException, LockException, RepositoryException
-    {
-        return node.addNode(relPath);
-    }
-
-    /**
-     * @return
-     * @throws ItemNotFoundException
-     * @throws AccessDeniedException
-     * @throws RepositoryException
-     * @see javax.jcr.Item#getParent()
-     */
-    public Node getParent() throws ItemNotFoundException, javax.jcr.AccessDeniedException, RepositoryException
-    {
-        return node.getParent();
-    }
-
-    /**
-     * @return
-     * @throws RepositoryException
-     * @see javax.jcr.Item#getDepth()
-     */
-    public int getDepth() throws RepositoryException
-    {
-        return node.getDepth();
-    }
-
-    /**
-     * @return
-     * @throws RepositoryException
-     * @see javax.jcr.Item#getSession()
-     */
-    public Session getSession() throws RepositoryException
-    {
-        return node.getSession();
-    }
-
-    /**
-     * @return
-     * @see javax.jcr.Item#isNode()
-     */
-    public boolean isNode()
-    {
-        return node.isNode();
-    }
-
-    /**
-     * @return
-     * @see javax.jcr.Item#isNew()
-     */
-    public boolean isNew()
-    {
-        return node.isNew();
-    }
-
-    /**
-     * @return
-     * @see javax.jcr.Item#isModified()
-     */
-    public boolean isModified()
-    {
-        return node.isModified();
-    }
-
-    /**
-     * @param otherItem
-     * @return
-     * @throws RepositoryException
-     * @see javax.jcr.Item#isSame(javax.jcr.Item)
-     */
-    public boolean isSame(Item otherItem) throws RepositoryException
-    {
-        return node.isSame(otherItem);
-    }
-
-    /**
-     * @param relPath
-     * @param primaryNodeTypeName
-     * @return
-     * @throws ItemExistsException
-     * @throws PathNotFoundException
-     * @throws NoSuchNodeTypeException
-     * @throws LockException
-     * @throws VersionException
-     * @throws ConstraintViolationException
-     * @throws RepositoryException
-     * @see javax.jcr.Node#addNode(java.lang.String, java.lang.String)
-     */
-    public Node addNode(String relPath, String primaryNodeTypeName) throws ItemExistsException, PathNotFoundException,
-        NoSuchNodeTypeException, LockException, VersionException, ConstraintViolationException, RepositoryException
-    {
-        return node.addNode(relPath, primaryNodeTypeName);
-    }
-
-    /**
-     * @param visitor
-     * @throws RepositoryException
-     * @see javax.jcr.Item#accept(javax.jcr.ItemVisitor)
-     */
-    public void accept(ItemVisitor visitor) throws RepositoryException
-    {
-        node.accept(visitor);
-    }
-
-    /**
-     * @throws AccessDeniedException
-     * @throws ItemExistsException
-     * @throws ConstraintViolationException
-     * @throws InvalidItemStateException
-     * @throws ReferentialIntegrityException
-     * @throws VersionException
-     * @throws LockException
-     * @throws NoSuchNodeTypeException
-     * @throws RepositoryException
-     * @deprecated
-     * @see javax.jcr.Item#save()
-     */
-    @Deprecated
-    public void save() throws javax.jcr.AccessDeniedException, ItemExistsException, ConstraintViolationException,
-        InvalidItemStateException, ReferentialIntegrityException, VersionException, LockException,
-        NoSuchNodeTypeException, RepositoryException
-    {
-        node.save();
-    }
-
-    /**
-     * @param srcChildRelPath
-     * @param destChildRelPath
-     * @throws UnsupportedRepositoryOperationException
-     * @throws VersionException
-     * @throws ConstraintViolationException
-     * @throws ItemNotFoundException
-     * @throws LockException
-     * @throws RepositoryException
-     * @see javax.jcr.Node#orderBefore(java.lang.String, java.lang.String)
-     */
-    public void orderBefore(String srcChildRelPath, String destChildRelPath)
-        throws UnsupportedRepositoryOperationException, VersionException, ConstraintViolationException,
-        ItemNotFoundException, LockException, RepositoryException
-    {
-        node.orderBefore(srcChildRelPath, destChildRelPath);
-    }
-
-    /**
-     * @param keepChanges
-     * @throws InvalidItemStateException
-     * @throws RepositoryException
-     * @see javax.jcr.Item#refresh(boolean)
-     */
-    public void refresh(boolean keepChanges) throws InvalidItemStateException, RepositoryException
-    {
-        node.refresh(keepChanges);
-    }
-
-    /**
-     * @param name
-     * @param value
-     * @return
-     * @throws ValueFormatException
-     * @throws VersionException
-     * @throws LockException
-     * @throws ConstraintViolationException
-     * @throws RepositoryException
-     * @see javax.jcr.Node#setProperty(java.lang.String, javax.jcr.Value)
-     */
-    public Property setProperty(String name, Value value) throws ValueFormatException, VersionException, LockException,
-        ConstraintViolationException, RepositoryException
-    {
-        return node.setProperty(name, value);
-    }
-
-    /**
-     * @throws VersionException
-     * @throws LockException
-     * @throws ConstraintViolationException
-     * @throws AccessDeniedException
-     * @throws RepositoryException
-     * @see javax.jcr.Item#remove()
-     */
-    public void remove() throws VersionException, LockException, ConstraintViolationException,
-        javax.jcr.AccessDeniedException, RepositoryException
-    {
-        node.remove();
-    }
-
-    /**
-     * @param name
-     * @param value
-     * @param type
-     * @return
-     * @throws ValueFormatException
-     * @throws VersionException
-     * @throws LockException
-     * @throws ConstraintViolationException
-     * @throws RepositoryException
-     * @see javax.jcr.Node#setProperty(java.lang.String, javax.jcr.Value, int)
-     */
-    public Property setProperty(String name, Value value, int type) throws ValueFormatException, VersionException,
-        LockException, ConstraintViolationException, RepositoryException
-    {
-        return node.setProperty(name, value, type);
-    }
-
-    /**
-     * @param name
-     * @param values
-     * @return
-     * @throws ValueFormatException
-     * @throws VersionException
-     * @throws LockException
-     * @throws ConstraintViolationException
-     * @throws RepositoryException
-     * @see javax.jcr.Node#setProperty(java.lang.String, javax.jcr.Value[])
-     */
-    public Property setProperty(String name, Value[] values) throws ValueFormatException, VersionException,
-        LockException, ConstraintViolationException, RepositoryException
-    {
-        return node.setProperty(name, values);
-    }
-
-    /**
-     * @param name
-     * @param values
-     * @param type
-     * @return
-     * @throws ValueFormatException
-     * @throws VersionException
-     * @throws LockException
-     * @throws ConstraintViolationException
-     * @throws RepositoryException
-     * @see javax.jcr.Node#setProperty(java.lang.String, javax.jcr.Value[], int)
-     */
-    public Property setProperty(String name, Value[] values, int type) throws ValueFormatException, VersionException,
-        LockException, ConstraintViolationException, RepositoryException
-    {
-        return node.setProperty(name, values, type);
-    }
-
-    /**
-     * @param name
-     * @param values
-     * @return
-     * @throws ValueFormatException
-     * @throws VersionException
-     * @throws LockException
-     * @throws ConstraintViolationException
-     * @throws RepositoryException
-     * @see javax.jcr.Node#setProperty(java.lang.String, java.lang.String[])
-     */
-    public Property setProperty(String name, String[] values) throws ValueFormatException, VersionException,
-        LockException, ConstraintViolationException, RepositoryException
-    {
-        return node.setProperty(name, values);
-    }
-
-    /**
-     * @param name
-     * @param values
-     * @param type
-     * @return
-     * @throws ValueFormatException
-     * @throws VersionException
-     * @throws LockException
-     * @throws ConstraintViolationException
-     * @throws RepositoryException
-     * @see javax.jcr.Node#setProperty(java.lang.String, java.lang.String[], int)
-     */
-    public Property setProperty(String name, String[] values, int type) throws ValueFormatException, VersionException,
-        LockException, ConstraintViolationException, RepositoryException
-    {
-        return node.setProperty(name, values, type);
-    }
-
-    /**
-     * @param name
-     * @param value
-     * @return
-     * @throws ValueFormatException
-     * @throws VersionException
-     * @throws LockException
-     * @throws ConstraintViolationException
-     * @throws RepositoryException
-     * @see javax.jcr.Node#setProperty(java.lang.String, java.lang.String)
-     */
-    public Property setProperty(String name, String value) throws ValueFormatException, VersionException,
-        LockException, ConstraintViolationException, RepositoryException
-    {
-        return node.setProperty(name, value);
-    }
-
-    /**
-     * @param name
-     * @param value
-     * @param type
-     * @return
-     * @throws ValueFormatException
-     * @throws VersionException
-     * @throws LockException
-     * @throws ConstraintViolationException
-     * @throws RepositoryException
-     * @see javax.jcr.Node#setProperty(java.lang.String, java.lang.String, int)
-     */
-    public Property setProperty(String name, String value, int type) throws ValueFormatException, VersionException,
-        LockException, ConstraintViolationException, RepositoryException
-    {
-        return node.setProperty(name, value, type);
-    }
-
-    /**
-     * @param name
-     * @param value
-     * @return
-     * @throws ValueFormatException
-     * @throws VersionException
-     * @throws LockException
-     * @throws ConstraintViolationException
-     * @throws RepositoryException
-     * @deprecated
-     * @see javax.jcr.Node#setProperty(java.lang.String, java.io.InputStream)
-     */
-    @Deprecated
-    public Property setProperty(String name, InputStream value) throws ValueFormatException, VersionException,
-        LockException, ConstraintViolationException, RepositoryException
-    {
-        return node.setProperty(name, value);
-    }
-
-    /**
-     * @param name
-     * @param value
-     * @return
-     * @throws ValueFormatException
-     * @throws VersionException
-     * @throws LockException
-     * @throws ConstraintViolationException
-     * @throws RepositoryException
-     * @see javax.jcr.Node#setProperty(java.lang.String, javax.jcr.Binary)
-     */
-    public Property setProperty(String name, Binary value) throws ValueFormatException, VersionException,
-        LockException, ConstraintViolationException, RepositoryException
-    {
-        return node.setProperty(name, value);
-    }
-
-    /**
-     * @param name
-     * @param value
-     * @return
-     * @throws ValueFormatException
-     * @throws VersionException
-     * @throws LockException
-     * @throws ConstraintViolationException
-     * @throws RepositoryException
-     * @see javax.jcr.Node#setProperty(java.lang.String, boolean)
-     */
-    public Property setProperty(String name, boolean value) throws ValueFormatException, VersionException,
-        LockException, ConstraintViolationException, RepositoryException
-    {
-        return node.setProperty(name, value);
-    }
-
-    /**
-     * @param name
-     * @param value
-     * @return
-     * @throws ValueFormatException
-     * @throws VersionException
-     * @throws LockException
-     * @throws ConstraintViolationException
-     * @throws RepositoryException
-     * @see javax.jcr.Node#setProperty(java.lang.String, double)
-     */
-    public Property setProperty(String name, double value) throws ValueFormatException, VersionException,
-        LockException, ConstraintViolationException, RepositoryException
-    {
-        return node.setProperty(name, value);
-    }
-
-    /**
-     * @param name
-     * @param value
-     * @return
-     * @throws ValueFormatException
-     * @throws VersionException
-     * @throws LockException
-     * @throws ConstraintViolationException
-     * @throws RepositoryException
-     * @see javax.jcr.Node#setProperty(java.lang.String, java.math.BigDecimal)
-     */
-    public Property setProperty(String name, BigDecimal value) throws ValueFormatException, VersionException,
-        LockException, ConstraintViolationException, RepositoryException
-    {
-        return node.setProperty(name, value);
-    }
-
-    /**
-     * @param name
-     * @param value
-     * @return
-     * @throws ValueFormatException
-     * @throws VersionException
-     * @throws LockException
-     * @throws ConstraintViolationException
-     * @throws RepositoryException
-     * @see javax.jcr.Node#setProperty(java.lang.String, long)
-     */
-    public Property setProperty(String name, long value) throws ValueFormatException, VersionException, LockException,
-        ConstraintViolationException, RepositoryException
-    {
-        return node.setProperty(name, value);
-    }
-
-    /**
-     * @param name
-     * @param value
-     * @return
-     * @throws ValueFormatException
-     * @throws VersionException
-     * @throws LockException
-     * @throws ConstraintViolationException
-     * @throws RepositoryException
-     * @see javax.jcr.Node#setProperty(java.lang.String, java.util.Calendar)
-     */
-    public Property setProperty(String name, Calendar value) throws ValueFormatException, VersionException,
-        LockException, ConstraintViolationException, RepositoryException
-    {
-        return node.setProperty(name, value);
-    }
-
-    /**
-     * @param name
-     * @param value
-     * @return
-     * @throws ValueFormatException
-     * @throws VersionException
-     * @throws LockException
-     * @throws ConstraintViolationException
-     * @throws RepositoryException
-     * @see javax.jcr.Node#setProperty(java.lang.String, javax.jcr.Node)
-     */
-    public Property setProperty(String name, Node value) throws ValueFormatException, VersionException, LockException,
-        ConstraintViolationException, RepositoryException
-    {
-        return node.setProperty(name, value);
-    }
-
-    /**
-     * @param relPath
-     * @return
-     * @throws PathNotFoundException
-     * @throws RepositoryException
-     * @see javax.jcr.Node#getNode(java.lang.String)
-     */
-    public Node getNode(String relPath) throws PathNotFoundException, RepositoryException
-    {
-        return node.getNode(relPath);
-    }
-
-    /**
-     * @return
-     * @throws RepositoryException
-     * @see javax.jcr.Node#getNodes()
-     */
-    public NodeIterator getNodes() throws RepositoryException
-    {
-        return node.getNodes();
-    }
-
-    /**
-     * @param namePattern
-     * @return
-     * @throws RepositoryException
-     * @see javax.jcr.Node#getNodes(java.lang.String)
-     */
-    public NodeIterator getNodes(String namePattern) throws RepositoryException
-    {
-        return node.getNodes(namePattern);
-    }
-
-    /**
-     * @param nameGlobs
-     * @return
-     * @throws RepositoryException
-     * @see javax.jcr.Node#getNodes(java.lang.String[])
-     */
-    public NodeIterator getNodes(String[] nameGlobs) throws RepositoryException
-    {
-        return node.getNodes(nameGlobs);
-    }
-
-    /**
-     * @param relPath
-     * @return
-     * @throws PathNotFoundException
-     * @throws RepositoryException
-     * @see javax.jcr.Node#getProperty(java.lang.String)
-     */
-    public Property getProperty(String relPath) throws PathNotFoundException, RepositoryException
-    {
-        return node.getProperty(relPath);
-    }
-
-    /**
-     * @return
-     * @throws RepositoryException
-     * @see javax.jcr.Node#getProperties()
-     */
-    public PropertyIterator getProperties() throws RepositoryException
-    {
-        return node.getProperties();
-    }
-
-    /**
-     * @param namePattern
-     * @return
-     * @throws RepositoryException
-     * @see javax.jcr.Node#getProperties(java.lang.String)
-     */
-    public PropertyIterator getProperties(String namePattern) throws RepositoryException
-    {
-        return node.getProperties(namePattern);
-    }
-
-    /**
-     * @param nameGlobs
-     * @return
-     * @throws RepositoryException
-     * @see javax.jcr.Node#getProperties(java.lang.String[])
-     */
-    public PropertyIterator getProperties(String[] nameGlobs) throws RepositoryException
-    {
-        return node.getProperties(nameGlobs);
-    }
-
-    /**
-     * @return
-     * @throws ItemNotFoundException
-     * @throws RepositoryException
-     * @see javax.jcr.Node#getPrimaryItem()
-     */
-    public Item getPrimaryItem() throws ItemNotFoundException, RepositoryException
-    {
-        return node.getPrimaryItem();
-    }
-
-    /**
-     * @return
-     * @throws UnsupportedRepositoryOperationException
-     * @throws RepositoryException
-     * @deprecated
-     * @see javax.jcr.Node#getUUID()
-     */
-    @Deprecated
-    public String getUUID() throws UnsupportedRepositoryOperationException, RepositoryException
-    {
-        return node.getUUID();
-    }
-
-    /**
-     * @return
-     * @throws RepositoryException
-     * @see javax.jcr.Node#getIdentifier()
-     */
-    public String getIdentifier() throws RepositoryException
-    {
-        return node.getIdentifier();
-    }
-
-    /**
-     * @return
-     * @throws RepositoryException
-     * @see javax.jcr.Node#getIndex()
-     */
-    public int getIndex() throws RepositoryException
-    {
-        return node.getIndex();
-    }
-
-    /**
-     * @return
-     * @throws RepositoryException
-     * @see javax.jcr.Node#getReferences()
-     */
-    public PropertyIterator getReferences() throws RepositoryException
-    {
-        return node.getReferences();
-    }
-
-    /**
-     * @param name
-     * @return
-     * @throws RepositoryException
-     * @see javax.jcr.Node#getReferences(java.lang.String)
-     */
-    public PropertyIterator getReferences(String name) throws RepositoryException
-    {
-        return node.getReferences(name);
-    }
-
-    /**
-     * @return
-     * @throws RepositoryException
-     * @see javax.jcr.Node#getWeakReferences()
-     */
-    public PropertyIterator getWeakReferences() throws RepositoryException
-    {
-        return node.getWeakReferences();
-    }
-
-    /**
-     * @param name
-     * @return
-     * @throws RepositoryException
-     * @see javax.jcr.Node#getWeakReferences(java.lang.String)
-     */
-    public PropertyIterator getWeakReferences(String name) throws RepositoryException
-    {
-        return node.getWeakReferences(name);
-    }
-
-    /**
-     * @param relPath
-     * @return
-     * @throws RepositoryException
-     * @see javax.jcr.Node#hasNode(java.lang.String)
-     */
-    public boolean hasNode(String relPath) throws RepositoryException
-    {
-        return node.hasNode(relPath);
-    }
-
-    /**
-     * @param relPath
-     * @return
-     * @throws RepositoryException
-     * @see javax.jcr.Node#hasProperty(java.lang.String)
-     */
-    public boolean hasProperty(String relPath) throws RepositoryException
-    {
-        return node.hasProperty(relPath);
-    }
-
-    /**
-     * @return
-     * @throws RepositoryException
-     * @see javax.jcr.Node#hasNodes()
-     */
-    public boolean hasNodes() throws RepositoryException
-    {
-        return node.hasNodes();
-    }
-
-    /**
-     * @return
-     * @throws RepositoryException
-     * @see javax.jcr.Node#hasProperties()
-     */
-    public boolean hasProperties() throws RepositoryException
-    {
-        return node.hasProperties();
-    }
-
-    /**
-     * @return
-     * @throws RepositoryException
-     * @see javax.jcr.Node#getPrimaryNodeType()
-     */
-    public NodeType getPrimaryNodeType() throws RepositoryException
-    {
-        return node.getPrimaryNodeType();
-    }
-
-    /**
-     * @return
-     * @throws RepositoryException
-     * @see javax.jcr.Node#getMixinNodeTypes()
-     */
-    public NodeType[] getMixinNodeTypes() throws RepositoryException
-    {
-        return node.getMixinNodeTypes();
-    }
-
-    /**
-     * @param nodeTypeName
-     * @return
-     * @throws RepositoryException
-     * @see javax.jcr.Node#isNodeType(java.lang.String)
-     */
-    public boolean isNodeType(String nodeTypeName) throws RepositoryException
-    {
-        return node.isNodeType(nodeTypeName);
-    }
-
-    /**
-     * @param nodeTypeName
-     * @throws NoSuchNodeTypeException
-     * @throws VersionException
-     * @throws ConstraintViolationException
-     * @throws LockException
-     * @throws RepositoryException
-     * @see javax.jcr.Node#setPrimaryType(java.lang.String)
-     */
-    public void setPrimaryType(String nodeTypeName) throws NoSuchNodeTypeException, VersionException,
-        ConstraintViolationException, LockException, RepositoryException
-    {
-        node.setPrimaryType(nodeTypeName);
-    }
-
-    /**
-     * @param mixinName
-     * @throws NoSuchNodeTypeException
-     * @throws VersionException
-     * @throws ConstraintViolationException
-     * @throws LockException
-     * @throws RepositoryException
-     * @see javax.jcr.Node#addMixin(java.lang.String)
-     */
-    public void addMixin(String mixinName) throws NoSuchNodeTypeException, VersionException,
-        ConstraintViolationException, LockException, RepositoryException
-    {
-        node.addMixin(mixinName);
-    }
-
-    /**
-     * @param mixinName
-     * @throws NoSuchNodeTypeException
-     * @throws VersionException
-     * @throws ConstraintViolationException
-     * @throws LockException
-     * @throws RepositoryException
-     * @see javax.jcr.Node#removeMixin(java.lang.String)
-     */
-    public void removeMixin(String mixinName) throws NoSuchNodeTypeException, VersionException,
-        ConstraintViolationException, LockException, RepositoryException
-    {
-        node.removeMixin(mixinName);
-    }
-
-    /**
-     * @param mixinName
-     * @return
-     * @throws NoSuchNodeTypeException
-     * @throws RepositoryException
-     * @see javax.jcr.Node#canAddMixin(java.lang.String)
-     */
-    public boolean canAddMixin(String mixinName) throws NoSuchNodeTypeException, RepositoryException
-    {
-        return node.canAddMixin(mixinName);
-    }
-
-    /**
-     * @return
-     * @throws RepositoryException
-     * @see javax.jcr.Node#getDefinition()
-     */
-    public NodeDefinition getDefinition() throws RepositoryException
-    {
-        return node.getDefinition();
-    }
-
-    /**
-     * @return
-     * @throws VersionException
-     * @throws UnsupportedRepositoryOperationException
-     * @throws InvalidItemStateException
-     * @throws LockException
-     * @throws RepositoryException
-     * @deprecated
-     * @see javax.jcr.Node#checkin()
-     */
-    @Deprecated
-    public Version checkin() throws VersionException, UnsupportedRepositoryOperationException,
-        InvalidItemStateException, LockException, RepositoryException
-    {
-        return node.checkin();
-    }
-
-    /**
-     * @throws UnsupportedRepositoryOperationException
-     * @throws LockException
-     * @throws ActivityViolationException
-     * @throws RepositoryException
-     * @deprecated
-     * @see javax.jcr.Node#checkout()
-     */
-    @Deprecated
-    public void checkout() throws UnsupportedRepositoryOperationException, LockException, ActivityViolationException,
-        RepositoryException
-    {
-        node.checkout();
-    }
-
-    /**
-     * @param version
-     * @throws VersionException
-     * @throws InvalidItemStateException
-     * @throws UnsupportedRepositoryOperationException
-     * @throws RepositoryException
-     * @deprecated
-     * @see javax.jcr.Node#doneMerge(javax.jcr.version.Version)
-     */
-    @Deprecated
-    public void doneMerge(Version version) throws VersionException, InvalidItemStateException,
-        UnsupportedRepositoryOperationException, RepositoryException
-    {
-        node.doneMerge(version);
-    }
-
-    /**
-     * @param version
-     * @throws VersionException
-     * @throws InvalidItemStateException
-     * @throws UnsupportedRepositoryOperationException
-     * @throws RepositoryException
-     * @deprecated
-     * @see javax.jcr.Node#cancelMerge(javax.jcr.version.Version)
-     */
-    @Deprecated
-    public void cancelMerge(Version version) throws VersionException, InvalidItemStateException,
-        UnsupportedRepositoryOperationException, RepositoryException
-    {
-        node.cancelMerge(version);
-    }
-
-    /**
-     * @param srcWorkspace
-     * @throws NoSuchWorkspaceException
-     * @throws AccessDeniedException
-     * @throws LockException
-     * @throws InvalidItemStateException
-     * @throws RepositoryException
-     * @see javax.jcr.Node#update(java.lang.String)
-     */
-    public void update(String srcWorkspace) throws NoSuchWorkspaceException, javax.jcr.AccessDeniedException,
-        LockException, InvalidItemStateException, RepositoryException
-    {
-        node.update(srcWorkspace);
-    }
-
-    /**
-     * @param srcWorkspace
-     * @param bestEffort
-     * @return
-     * @throws NoSuchWorkspaceException
-     * @throws AccessDeniedException
-     * @throws MergeException
-     * @throws LockException
-     * @throws InvalidItemStateException
-     * @throws RepositoryException
-     * @deprecated
-     * @see javax.jcr.Node#merge(java.lang.String, boolean)
-     */
-    @Deprecated
-    public NodeIterator merge(String srcWorkspace, boolean bestEffort) throws NoSuchWorkspaceException,
-        javax.jcr.AccessDeniedException, MergeException, LockException, InvalidItemStateException, RepositoryException
-    {
-        return node.merge(srcWorkspace, bestEffort);
-    }
-
-    /**
-     * @param workspaceName
-     * @return
-     * @throws ItemNotFoundException
-     * @throws NoSuchWorkspaceException
-     * @throws AccessDeniedException
-     * @throws RepositoryException
-     * @see javax.jcr.Node#getCorrespondingNodePath(java.lang.String)
-     */
-    public String getCorrespondingNodePath(String workspaceName) throws ItemNotFoundException,
-        NoSuchWorkspaceException, javax.jcr.AccessDeniedException, RepositoryException
-    {
-        return node.getCorrespondingNodePath(workspaceName);
-    }
-
-    /**
-     * @return
-     * @throws RepositoryException
-     * @see javax.jcr.Node#getSharedSet()
-     */
-    public NodeIterator getSharedSet() throws RepositoryException
-    {
-        return node.getSharedSet();
-    }
-
-    /**
-     * @throws VersionException
-     * @throws LockException
-     * @throws ConstraintViolationException
-     * @throws RepositoryException
-     * @see javax.jcr.Node#removeSharedSet()
-     */
-    public void removeSharedSet() throws VersionException, LockException, ConstraintViolationException,
-        RepositoryException
-    {
-        node.removeSharedSet();
-    }
-
-    /**
-     * @throws VersionException
-     * @throws LockException
-     * @throws ConstraintViolationException
-     * @throws RepositoryException
-     * @see javax.jcr.Node#removeShare()
-     */
-    public void removeShare() throws VersionException, LockException, ConstraintViolationException, RepositoryException
-    {
-        node.removeShare();
-    }
-
-    /**
-     * @return
-     * @throws RepositoryException
-     * @see javax.jcr.Node#isCheckedOut()
-     */
-    public boolean isCheckedOut() throws RepositoryException
-    {
-        return node.isCheckedOut();
-    }
-
-    /**
-     * @param versionName
-     * @param removeExisting
-     * @throws VersionException
-     * @throws ItemExistsException
-     * @throws UnsupportedRepositoryOperationException
-     * @throws LockException
-     * @throws InvalidItemStateException
-     * @throws RepositoryException
-     * @deprecated
-     * @see javax.jcr.Node#restore(java.lang.String, boolean)
-     */
-    @Deprecated
-    public void restore(String versionName, boolean removeExisting) throws VersionException, ItemExistsException,
-        UnsupportedRepositoryOperationException, LockException, InvalidItemStateException, RepositoryException
-    {
-        node.restore(versionName, removeExisting);
-    }
-
-    /**
-     * @param version
-     * @param removeExisting
-     * @throws VersionException
-     * @throws ItemExistsException
-     * @throws InvalidItemStateException
-     * @throws UnsupportedRepositoryOperationException
-     * @throws LockException
-     * @throws RepositoryException
-     * @deprecated
-     * @see javax.jcr.Node#restore(javax.jcr.version.Version, boolean)
-     */
-    @Deprecated
-    public void restore(Version version, boolean removeExisting) throws VersionException, ItemExistsException,
-        InvalidItemStateException, UnsupportedRepositoryOperationException, LockException, RepositoryException
-    {
-        node.restore(version, removeExisting);
-    }
-
-    /**
-     * @param version
-     * @param relPath
-     * @param removeExisting
-     * @throws PathNotFoundException
-     * @throws ItemExistsException
-     * @throws VersionException
-     * @throws ConstraintViolationException
-     * @throws UnsupportedRepositoryOperationException
-     * @throws LockException
-     * @throws InvalidItemStateException
-     * @throws RepositoryException
-     * @deprecated
-     * @see javax.jcr.Node#restore(javax.jcr.version.Version, java.lang.String, boolean)
-     */
-    @Deprecated
-    public void restore(Version version, String relPath, boolean removeExisting) throws PathNotFoundException,
-        ItemExistsException, VersionException, ConstraintViolationException, UnsupportedRepositoryOperationException,
-        LockException, InvalidItemStateException, RepositoryException
-    {
-        node.restore(version, relPath, removeExisting);
-    }
-
-    /**
-     * @param versionLabel
-     * @param removeExisting
-     * @throws VersionException
-     * @throws ItemExistsException
-     * @throws UnsupportedRepositoryOperationException
-     * @throws LockException
-     * @throws InvalidItemStateException
-     * @throws RepositoryException
-     * @deprecated
-     * @see javax.jcr.Node#restoreByLabel(java.lang.String, boolean)
-     */
-    @Deprecated
-    public void restoreByLabel(String versionLabel, boolean removeExisting) throws VersionException,
-        ItemExistsException, UnsupportedRepositoryOperationException, LockException, InvalidItemStateException,
-        RepositoryException
-    {
-        node.restoreByLabel(versionLabel, removeExisting);
-    }
-
-    /**
-     * @return
-     * @throws UnsupportedRepositoryOperationException
-     * @throws RepositoryException
-     * @deprecated
-     * @see javax.jcr.Node#getVersionHistory()
-     */
-    @Deprecated
-    public VersionHistory getVersionHistory() throws UnsupportedRepositoryOperationException, RepositoryException
-    {
-        return node.getVersionHistory();
-    }
-
-    /**
-     * @return
-     * @throws UnsupportedRepositoryOperationException
-     * @throws RepositoryException
-     * @deprecated
-     * @see javax.jcr.Node#getBaseVersion()
-     */
-    @Deprecated
-    public Version getBaseVersion() throws UnsupportedRepositoryOperationException, RepositoryException
-    {
-        return node.getBaseVersion();
-    }
-
-    /**
-     * @param isDeep
-     * @param isSessionScoped
-     * @return
-     * @throws UnsupportedRepositoryOperationException
-     * @throws LockException
-     * @throws AccessDeniedException
-     * @throws InvalidItemStateException
-     * @throws RepositoryException
-     * @deprecated
-     * @see javax.jcr.Node#lock(boolean, boolean)
-     */
-    @Deprecated
-    public Lock lock(boolean isDeep, boolean isSessionScoped) throws UnsupportedRepositoryOperationException,
-        LockException, javax.jcr.AccessDeniedException, InvalidItemStateException, RepositoryException
-    {
-        return node.lock(isDeep, isSessionScoped);
-    }
-
-    /**
-     * @return
-     * @throws UnsupportedRepositoryOperationException
-     * @throws LockException
-     * @throws AccessDeniedException
-     * @throws RepositoryException
-     * @deprecated
-     * @see javax.jcr.Node#getLock()
-     */
-    @Deprecated
-    public Lock getLock() throws UnsupportedRepositoryOperationException, LockException,
-        javax.jcr.AccessDeniedException, RepositoryException
-    {
-        return node.getLock();
-    }
-
-    /**
-     * @throws UnsupportedRepositoryOperationException
-     * @throws LockException
-     * @throws AccessDeniedException
-     * @throws InvalidItemStateException
-     * @throws RepositoryException
-     * @deprecated
-     * @see javax.jcr.Node#unlock()
-     */
-    @Deprecated
-    public void unlock() throws UnsupportedRepositoryOperationException, LockException,
-        javax.jcr.AccessDeniedException, InvalidItemStateException, RepositoryException
-    {
-        node.unlock();
-    }
-
-    /**
-     * @return
-     * @throws RepositoryException
-     * @deprecated
-     * @see javax.jcr.Node#holdsLock()
-     */
-    @Deprecated
-    public boolean holdsLock() throws RepositoryException
-    {
-        return node.holdsLock();
-    }
-
-    /**
-     * @return
-     * @throws RepositoryException
-     * @see javax.jcr.Node#isLocked()
-     */
-    public boolean isLocked() throws RepositoryException
-    {
-        return node.isLocked();
-    }
-
-    /**
-     * @param transition
-     * @throws UnsupportedRepositoryOperationException
-     * @throws InvalidLifecycleTransitionException
-     * @throws RepositoryException
-     * @see javax.jcr.Node#followLifecycleTransition(java.lang.String)
-     */
-    public void followLifecycleTransition(String transition) throws UnsupportedRepositoryOperationException,
-        InvalidLifecycleTransitionException, RepositoryException
-    {
-        node.followLifecycleTransition(transition);
-    }
-
-    /**
-     * @return
-     * @throws UnsupportedRepositoryOperationException
-     * @throws RepositoryException
-     * @see javax.jcr.Node#getAllowedLifecycleTransistions()
-     */
-    public String[] getAllowedLifecycleTransistions() throws UnsupportedRepositoryOperationException,
-        RepositoryException
-    {
-        return node.getAllowedLifecycleTransistions();
-    }
-
     public String getTitle()
     {
         try
         {
-            if (node.hasProperty("title"))
+            if (hasProperty("title"))
             {
-                return node.getProperty("title").getString();
+                return getProperty("title").getString();
             }
         }
         catch (RepositoryException e)
@@ -1395,7 +186,7 @@
     {
         try
         {
-            return node.getPath();
+            return getPath();
         }
         catch (RepositoryException e)
         {
@@ -1403,39 +194,9 @@
         }
     }
 
-    /**
-     * {@inheritDoc}
-     */
-    @Override
-    public Object get(Object key)
+    public Node getJCRNode()
     {
-        if (key == null)
-        {
-            return null;
-        }
-
-        String keystr = ObjectUtils.toString(key);
-
-        if (StringUtils.equals(keystr, "handle"))
-        {
-            keystr = "@path";
-        }
-
-        Object result = super.get(keystr);
-
-        if (result == null)
-        {
-            try
-            {
-                return PropertyUtils.getProperty(this, keystr);
-            }
-            catch (Throwable e)
-            {
-                // ignore
-            }
-        }
-
-        return result;
+        return this;
     }
 
 }

Modified: magnoliamodules/trunk/openutils-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/jcr/query/AdvancedResultItem.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/jcr/query/AdvancedResultItem.java	2013-10-20 16:16:14 UTC (rev 4408)
+++ magnoliamodules/trunk/openutils-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/jcr/query/AdvancedResultItem.java	2013-10-20 17:51:17 UTC (rev 4409)
@@ -29,7 +29,7 @@
  * @author fgiust
  * @version $Id$
  */
-public interface AdvancedResultItem extends Node, Map<String, Object>
+public interface AdvancedResultItem extends Node
 {
 
     /**
@@ -72,12 +72,6 @@
     String getTitle();
 
     /**
-     * Same as getName() in javax.jcr.node, but it doesn't throw any checked exception
-     * @return the name of this node
-     */
-    String getName();
-
-    /**
      * Method added for compatibility with the old info.magnolia.cms.core.Content. You should use getPath()
      * @return the node path
      */

Modified: magnoliamodules/trunk/openutils-mgnlcriteria/src/test/java/net/sourceforge/openutils/mgnlcriteria/advanced/BasePathTest.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlcriteria/src/test/java/net/sourceforge/openutils/mgnlcriteria/advanced/BasePathTest.java	2013-10-20 16:16:14 UTC (rev 4408)
+++ magnoliamodules/trunk/openutils-mgnlcriteria/src/test/java/net/sourceforge/openutils/mgnlcriteria/advanced/BasePathTest.java	2013-10-20 17:51:17 UTC (rev 4409)
@@ -19,6 +19,7 @@
 
 package net.sourceforge.openutils.mgnlcriteria.advanced;
 
+import info.magnolia.cms.core.MgnlNodeType;
 import info.magnolia.cms.security.MgnlRoleManager;
 import info.magnolia.cms.security.Realm;
 import info.magnolia.cms.security.SecuritySupport;
@@ -182,7 +183,7 @@
     {
         Criteria criteria = JCRCriteriaFactory.createCriteria().setWorkspace(RepositoryConstants.WEBSITE);
         criteria.setBasePath(basePath);
-        criteria.add(Restrictions.eq(Criterion.JCR_PRIMARYTYPE, "mgnl:content"));
+        criteria.add(Restrictions.eq(Criterion.JCR_PRIMARYTYPE, MgnlNodeType.NT_PAGE));
         if (!StringUtils.isEmpty(title))
         {
             criteria.add(Restrictions.eq("@title", title));

Modified: magnoliamodules/trunk/openutils-mgnlcriteria/src/test/java/net/sourceforge/openutils/mgnlcriteria/advanced/BasePathWithSpacesTest.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlcriteria/src/test/java/net/sourceforge/openutils/mgnlcriteria/advanced/BasePathWithSpacesTest.java	2013-10-20 16:16:14 UTC (rev 4408)
+++ magnoliamodules/trunk/openutils-mgnlcriteria/src/test/java/net/sourceforge/openutils/mgnlcriteria/advanced/BasePathWithSpacesTest.java	2013-10-20 17:51:17 UTC (rev 4409)
@@ -19,6 +19,7 @@
 
 package net.sourceforge.openutils.mgnlcriteria.advanced;
 
+import info.magnolia.cms.core.MgnlNodeType;
 import info.magnolia.cms.security.MgnlRoleManager;
 import info.magnolia.cms.security.Realm;
 import info.magnolia.cms.security.SecuritySupport;
@@ -84,7 +85,7 @@
     {
         Criteria criteria = JCRCriteriaFactory.createCriteria().setWorkspace(RepositoryConstants.WEBSITE);
         criteria.setBasePath("/Lorem ipsum dolor sit amet");
-        criteria.add(Restrictions.eq(Criterion.JCR_PRIMARYTYPE, "mgnl:content"));
+        criteria.add(Restrictions.eq(Criterion.JCR_PRIMARYTYPE, MgnlNodeType.NT_PAGE  ));
         AdvancedResult advResult = criteria.execute();
         ResultIterator<? extends Node> items = advResult.getItems();
         Assert.assertTrue(items.hasNext());
@@ -99,7 +100,7 @@
     {
         Criteria criteria = JCRCriteriaFactory.createCriteria().setWorkspace(RepositoryConstants.WEBSITE);
         criteria.setBasePath("//*[prop1='A' and prop2='B']/Lorem ipsum dolor sit amet");
-        criteria.add(Restrictions.eq(Criterion.JCR_PRIMARYTYPE, "mgnl:content"));
+        criteria.add(Restrictions.eq(Criterion.JCR_PRIMARYTYPE, MgnlNodeType.NT_PAGE));
         // criteria.addOrder(Order.desc("@jcr:score"));
         AdvancedResult advResult = criteria.execute();
 

Modified: magnoliamodules/trunk/openutils-mgnlcriteria/src/test/java/net/sourceforge/openutils/mgnlcriteria/advanced/Content2BeanTest.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlcriteria/src/test/java/net/sourceforge/openutils/mgnlcriteria/advanced/Content2BeanTest.java	2013-10-20 16:16:14 UTC (rev 4408)
+++ magnoliamodules/trunk/openutils-mgnlcriteria/src/test/java/net/sourceforge/openutils/mgnlcriteria/advanced/Content2BeanTest.java	2013-10-20 17:51:17 UTC (rev 4409)
@@ -19,6 +19,7 @@
 
 package net.sourceforge.openutils.mgnlcriteria.advanced;
 
+import info.magnolia.cms.core.MgnlNodeType;
 import info.magnolia.cms.i18n.DefaultI18nContentSupport;
 import info.magnolia.cms.i18n.I18nContentSupport;
 import info.magnolia.cms.security.MgnlRoleManager;
@@ -89,7 +90,7 @@
     {
         Criteria criteria = JCRCriteriaFactory.createCriteria().setWorkspace(RepositoryConstants.WEBSITE);
         criteria.setBasePath(StringUtils.EMPTY);
-        criteria.add(Restrictions.eq("@jcr:primaryType", "mgnl:content"));
+        criteria.add(Restrictions.eq("@jcr:primaryType", MgnlNodeType.NT_PAGE));
         criteria.add(Restrictions.contains("@title", "lorem ipsum"));
         criteria.addOrder(Order.desc("@jcr:score"));
 

Modified: magnoliamodules/trunk/openutils-mgnlcriteria/src/test/java/net/sourceforge/openutils/mgnlcriteria/advanced/JcrContainsCriteriaSearchTest.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlcriteria/src/test/java/net/sourceforge/openutils/mgnlcriteria/advanced/JcrContainsCriteriaSearchTest.java	2013-10-20 16:16:14 UTC (rev 4408)
+++ magnoliamodules/trunk/openutils-mgnlcriteria/src/test/java/net/sourceforge/openutils/mgnlcriteria/advanced/JcrContainsCriteriaSearchTest.java	2013-10-20 17:51:17 UTC (rev 4409)
@@ -19,6 +19,7 @@
 
 package net.sourceforge.openutils.mgnlcriteria.advanced;
 
+import info.magnolia.cms.core.MgnlNodeType;
 import info.magnolia.cms.i18n.DefaultI18nContentSupport;
 import info.magnolia.cms.i18n.I18nContentSupport;
 import info.magnolia.cms.security.MgnlRoleManager;
@@ -257,7 +258,7 @@
     {
         Criteria criteria = JCRCriteriaFactory.createCriteria().setWorkspace(RepositoryConstants.WEBSITE);
         criteria.setBasePath(StringUtils.EMPTY);
-        criteria.add(Restrictions.eq("@jcr:primaryType", "mgnl:content"));
+        criteria.add(Restrictions.eq("@jcr:primaryType", MgnlNodeType.NT_PAGE));
         criteria.add(Restrictions.contains("@title", titleSearch, escape));
         criteria.addOrder(Order.desc("@jcr:score"));
         return criteria;

Modified: magnoliamodules/trunk/openutils-mgnlcriteria/src/test/java/net/sourceforge/openutils/mgnlcriteria/advanced/OrderingTest.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlcriteria/src/test/java/net/sourceforge/openutils/mgnlcriteria/advanced/OrderingTest.java	2013-10-20 16:16:14 UTC (rev 4408)
+++ magnoliamodules/trunk/openutils-mgnlcriteria/src/test/java/net/sourceforge/openutils/mgnlcriteria/advanced/OrderingTest.java	2013-10-20 17:51:17 UTC (rev 4409)
@@ -19,6 +19,7 @@
 
 package net.sourceforge.openutils.mgnlcriteria.advanced;
 
+import info.magnolia.cms.core.MgnlNodeType;
 import info.magnolia.cms.i18n.DefaultI18nContentSupport;
 import info.magnolia.cms.i18n.I18nContentSupport;
 import info.magnolia.cms.security.MgnlRoleManager;
@@ -126,7 +127,7 @@
     {
         Criteria criteria = JCRCriteriaFactory.createCriteria().setWorkspace(RepositoryConstants.WEBSITE);
         criteria.setBasePath("/letters");
-        criteria.add(Restrictions.eq("@jcr:primaryType", "mgnl:content"));
+        criteria.add(Restrictions.eq("@jcr:primaryType", MgnlNodeType.NT_PAGE));
 
         AdvancedResult advResult = criteria.execute();
 
@@ -153,7 +154,7 @@
 
         Criteria criteria = JCRCriteriaFactory.createCriteria().setWorkspace(RepositoryConstants.WEBSITE);
         criteria.setBasePath("/letters");
-        criteria.add(Restrictions.eq("@jcr:primaryType", "mgnl:content"));
+        criteria.add(Restrictions.eq("@jcr:primaryType", MgnlNodeType.NT_PAGE));
         criteria.setPaging(PAGINATION_LENGTH, 1);
         criteria.setForcePagingWithDocumentOrder(true);
 
@@ -211,7 +212,7 @@
 
         Criteria criteria = JCRCriteriaFactory.createCriteria().setWorkspace(RepositoryConstants.WEBSITE);
         criteria.setBasePath("/letters");
-        criteria.add(Restrictions.eq("@jcr:primaryType", "mgnl:content"));
+        criteria.add(Restrictions.eq("@jcr:primaryType", MgnlNodeType.NT_PAGE));
         criteria.setPaging(PAGINATION_LENGTH, 1);
         criteria.setForcePagingWithDocumentOrder(true);
 
@@ -251,7 +252,7 @@
 
         Criteria criteria = JCRCriteriaFactory.createCriteria().setWorkspace(RepositoryConstants.WEBSITE);
         criteria.setBasePath("/letters");
-        criteria.add(Restrictions.eq("@jcr:primaryType", "mgnl:content"));
+        criteria.add(Restrictions.eq("@jcr:primaryType", MgnlNodeType.NT_PAGE));
         criteria.setForcePagingWithDocumentOrder(true);
         criteria.setFirstResult(offset);
         criteria.setMaxResults(Integer.MAX_VALUE);

Modified: magnoliamodules/trunk/openutils-mgnlcriteria/src/test/java/net/sourceforge/openutils/mgnlcriteria/advanced/PaginationTest.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlcriteria/src/test/java/net/sourceforge/openutils/mgnlcriteria/advanced/PaginationTest.java	2013-10-20 16:16:14 UTC (rev 4408)
+++ magnoliamodules/trunk/openutils-mgnlcriteria/src/test/java/net/sourceforge/openutils/mgnlcriteria/advanced/PaginationTest.java	2013-10-20 17:51:17 UTC (rev 4409)
@@ -19,6 +19,7 @@
 
 package net.sourceforge.openutils.mgnlcriteria.advanced;
 
+import info.magnolia.cms.core.MgnlNodeType;
 import info.magnolia.cms.i18n.DefaultI18nContentSupport;
 import info.magnolia.cms.i18n.I18nContentSupport;
 import info.magnolia.cms.security.MgnlRoleManager;
@@ -97,7 +98,7 @@
     {
         Criteria criteria = JCRCriteriaFactory.createCriteria().setWorkspace(RepositoryConstants.WEBSITE);
         criteria.setBasePath("/letters");
-        criteria.add(Restrictions.eq("@jcr:primaryType", "mgnl:content"));
+        criteria.add(Restrictions.eq("@jcr:primaryType", MgnlNodeType.NT_PAGE));
         criteria.addOrder(Order.asc("@title"));
         AdvancedResult advResult = criteria.execute();
 
@@ -121,7 +122,7 @@
     {
         Criteria criteria = JCRCriteriaFactory.createCriteria().setWorkspace(RepositoryConstants.WEBSITE);
         criteria.setBasePath("/letters");
-        criteria.add(Restrictions.eq("@jcr:primaryType", "mgnl:content"));
+        criteria.add(Restrictions.eq("@jcr:primaryType", MgnlNodeType.NT_PAGE));
         criteria.addOrder(Order.asc("@title"));
         AdvancedResult advResult = criteria.execute();
 
@@ -145,7 +146,7 @@
     {
         Criteria criteria = JCRCriteriaFactory.createCriteria().setWorkspace(RepositoryConstants.WEBSITE);
         criteria.setBasePath("/letters");
-        criteria.add(Restrictions.eq("@jcr:primaryType", "mgnl:content"));
+        criteria.add(Restrictions.eq("@jcr:primaryType", MgnlNodeType.NT_PAGE));
         criteria.addOrder(Order.asc("@title"));
         criteria.setFirstResult(9);
         AdvancedResult advResult = criteria.execute();
@@ -167,7 +168,7 @@
     {
         Criteria criteria = JCRCriteriaFactory.createCriteria().setWorkspace(RepositoryConstants.WEBSITE);
         criteria.setBasePath("/letters");
-        criteria.add(Restrictions.eq("@jcr:primaryType", "mgnl:content"));
+        criteria.add(Restrictions.eq("@jcr:primaryType", MgnlNodeType.NT_PAGE));
         criteria.addOrder(Order.asc("@title"));
         criteria.setMaxResults(10);
         AdvancedResult advResult = criteria.execute();
@@ -194,7 +195,7 @@
     {
         Criteria criteria = JCRCriteriaFactory.createCriteria().setWorkspace(RepositoryConstants.WEBSITE);
         criteria.setBasePath("/letters");
-        criteria.add(Restrictions.eq("@jcr:primaryType", "mgnl:content"));
+        criteria.add(Restrictions.eq("@jcr:primaryType", MgnlNodeType.NT_PAGE));
         criteria.addOrder(Order.asc("@title"));
         criteria.setPaging(5, 3);
         AdvancedResult advResult = criteria.execute();
@@ -220,7 +221,7 @@
     {
         Criteria criteria = JCRCriteriaFactory.createCriteria().setWorkspace(RepositoryConstants.WEBSITE);
         criteria.setBasePath("/letters");
-        criteria.add(Restrictions.eq("@jcr:primaryType", "mgnl:content"));
+        criteria.add(Restrictions.eq("@jcr:primaryType", MgnlNodeType.NT_PAGE));
         criteria.addOrder(Order.asc("@title"));
         criteria.setPaging(8, 4);
         AdvancedResult advResult = criteria.execute();
@@ -243,7 +244,7 @@
     {
         Criteria criteria = JCRCriteriaFactory.createCriteria().setWorkspace(RepositoryConstants.WEBSITE);
         criteria.setBasePath("/letters");
-        criteria.add(Restrictions.eq("@jcr:primaryType", "mgnl:content"));
+        criteria.add(Restrictions.eq("@jcr:primaryType", MgnlNodeType.NT_PAGE));
         criteria.addOrder(Order.asc("@title"));
         criteria.setPaging(5, 1);
 

Modified: magnoliamodules/trunk/openutils-mgnlcriteria/src/test/java/net/sourceforge/openutils/mgnlcriteria/advanced/XpathEscapeTest.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlcriteria/src/test/java/net/sourceforge/openutils/mgnlcriteria/advanced/XpathEscapeTest.java	2013-10-20 16:16:14 UTC (rev 4408)
+++ magnoliamodules/trunk/openutils-mgnlcriteria/src/test/java/net/sourceforge/openutils/mgnlcriteria/advanced/XpathEscapeTest.java	2013-10-20 17:51:17 UTC (rev 4409)
@@ -19,6 +19,7 @@
 
 package net.sourceforge.openutils.mgnlcriteria.advanced;
 
+import info.magnolia.cms.core.MgnlNodeType;
 import info.magnolia.cms.i18n.DefaultI18nContentSupport;
 import info.magnolia.cms.i18n.I18nContentSupport;
 import info.magnolia.cms.security.MgnlRoleManager;
@@ -87,7 +88,7 @@
         String title = "Tallart, Camille d'Hostun, cónte di-";
         Criteria criteria = JCRCriteriaFactory.createCriteria().setWorkspace(RepositoryConstants.WEBSITE);
         criteria.setBasePath(StringUtils.EMPTY);
-        criteria.add(Restrictions.eq("@jcr:primaryType", "mgnl:content"));
+        criteria.add(Restrictions.eq("@jcr:primaryType", MgnlNodeType.NT_PAGE));
         criteria.add(Restrictions.eq("@title", title));
         AdvancedResult advResult = null;
         try
@@ -116,7 +117,7 @@
         String searchText = "\"Milano\"";
         Criteria criteria = JCRCriteriaFactory.createCriteria().setWorkspace(RepositoryConstants.WEBSITE);
         criteria.setBasePath(StringUtils.EMPTY);
-        criteria.add(Restrictions.eq("@jcr:primaryType", "mgnl:content"));
+        criteria.add(Restrictions.eq("@jcr:primaryType", MgnlNodeType.NT_PAGE));
         criteria.add(Restrictions.contains("@title", searchText));
         try
         {
@@ -134,7 +135,7 @@
         String searchText = "\"Milano(){}[]+*?^|\\/!";
         Criteria criteria = JCRCriteriaFactory.createCriteria().setWorkspace(RepositoryConstants.WEBSITE);
         criteria.setBasePath(StringUtils.EMPTY);
-        criteria.add(Restrictions.eq("@jcr:primaryType", "mgnl:content"));
+        criteria.add(Restrictions.eq("@jcr:primaryType", MgnlNodeType.NT_PAGE));
         criteria.add(Restrictions.contains("@title", searchText));
         try
         {
@@ -152,7 +153,7 @@
         String searchText = "Milano'";
         Criteria criteria = JCRCriteriaFactory.createCriteria().setWorkspace(RepositoryConstants.WEBSITE);
         criteria.setBasePath(StringUtils.EMPTY);
-        criteria.add(Restrictions.eq("@jcr:primaryType", "mgnl:content"));
+        criteria.add(Restrictions.eq("@jcr:primaryType", MgnlNodeType.NT_PAGE));
         criteria.add(Restrictions.contains("@title", searchText));
         try
         {
@@ -170,7 +171,7 @@
         String searchText = "Milano +";
         Criteria criteria = JCRCriteriaFactory.createCriteria().setWorkspace(RepositoryConstants.WEBSITE);
         criteria.setBasePath(StringUtils.EMPTY);
-        criteria.add(Restrictions.eq("@jcr:primaryType", "mgnl:content"));
+        criteria.add(Restrictions.eq("@jcr:primaryType", MgnlNodeType.NT_PAGE));
         criteria.add(Restrictions.contains("@title", searchText));
         try
         {
@@ -207,7 +208,7 @@
         String searchText = "giovanni paolo ||";
         Criteria criteria = JCRCriteriaFactory.createCriteria().setWorkspace(RepositoryConstants.WEBSITE);
         criteria.setBasePath(StringUtils.EMPTY);
-        criteria.add(Restrictions.eq("@jcr:primaryType", "mgnl:content"));
+        criteria.add(Restrictions.eq("@jcr:primaryType", MgnlNodeType.NT_PAGE));
         criteria.add(Restrictions.contains("@title", searchText));
         try
         {
@@ -230,7 +231,7 @@
 
         Criteria criteria = JCRCriteriaFactory.createCriteria().setWorkspace(RepositoryConstants.WEBSITE);
         criteria.setBasePath(StringUtils.EMPTY);
-        criteria.add(Restrictions.eq("@jcr:primaryType", "mgnl:content"));
+        criteria.add(Restrictions.eq("@jcr:primaryType", MgnlNodeType.NT_PAGE));
         criteria.add(Restrictions.eq("@title", searchText));
         try
         {
@@ -254,7 +255,7 @@
 
         Criteria criteria = JCRCriteriaFactory.createCriteria().setWorkspace(RepositoryConstants.WEBSITE);
         criteria.setBasePath(StringUtils.EMPTY);
-        criteria.add(Restrictions.eq("@jcr:primaryType", "mgnl:content"));
+        criteria.add(Restrictions.eq("@jcr:primaryType", MgnlNodeType.NT_PAGE));
         criteria.add(Restrictions.contains("@title", searchText));
 
         Assert.assertEquals(
@@ -315,7 +316,7 @@
 
         ...
 
[truncated message content]

[Openutils-svn] SF.net SVN: openutils:[4408] magnoliamodules/trunk/openutils-mgnltests/src/ test/java/it/openutils/mgnlutils/test/testng/TestNgRepositoryTestcaseTest. java

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

Revision: 4408
          http://openutils.svn.sourceforge.net/openutils/?rev=4408&view=rev
Author:   fgiust
Date:     2013-10-20 16:16:14 +0000 (Sun, 20 Oct 2013)
Log Message:
-----------
fix test

Modified Paths:
--------------
    magnoliamodules/trunk/openutils-mgnltests/src/test/java/it/openutils/mgnlutils/test/testng/TestNgRepositoryTestcaseTest.java

Modified: magnoliamodules/trunk/openutils-mgnltests/src/test/java/it/openutils/mgnlutils/test/testng/TestNgRepositoryTestcaseTest.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnltests/src/test/java/it/openutils/mgnlutils/test/testng/TestNgRepositoryTestcaseTest.java	2013-10-20 16:11:39 UTC (rev 4407)
+++ magnoliamodules/trunk/openutils-mgnltests/src/test/java/it/openutils/mgnlutils/test/testng/TestNgRepositoryTestcaseTest.java	2013-10-20 16:16:14 UTC (rev 4408)
@@ -56,7 +56,7 @@
         Node letters = session.getNode("/letters");
         Assert.assertNotNull(letters);
 
-        Assert.assertEquals(NodeUtil.getCollectionFromNodeIterator(letters.getNodes()).size(), 26);
+        Assert.assertEquals(NodeUtil.asList(NodeUtil.getNodes(letters, NodeUtil.EXCLUDE_META_DATA_FILTER)).size(), 26);
     }
 
     @Test

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

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

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

Revision: 4407
          http://openutils.svn.sourceforge.net/openutils/?rev=4407&view=rev
Author:   fgiust
Date:     2013-10-20 16:11:39 +0000 (Sun, 20 Oct 2013)
Log Message:
-----------
update method signature

Modified Paths:
--------------
    magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/grid/MediaGridColumnType.java

Modified: magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/grid/MediaGridColumnType.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/grid/MediaGridColumnType.java	2013-10-20 16:10:14 UTC (rev 4406)
+++ magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/grid/MediaGridColumnType.java	2013-10-20 16:11:39 UTC (rev 4407)
@@ -99,7 +99,7 @@
      * {@inheritDoc}
      */
     @Override
-    public void processColumnOnLoad(String[] column, Content colConfig)
+    public void processColumnOnLoad(String[] column, Content colConfig, String propertyName, Content storageNode)
     {
         String valueType = StringUtils.defaultIfEmpty(NodeDataUtil.getString(colConfig, "valueType"), "uuid");
         if ("uuid".equals(valueType))

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

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

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

Revision: 4406
          http://openutils.svn.sourceforge.net/openutils/?rev=4406&view=rev
Author:   fgiust
Date:     2013-10-20 16:10:14 +0000 (Sun, 20 Oct 2013)
Log Message:
-----------
update license headers

Modified Paths:
--------------
    magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/filters/AggregatorServingZipFilter.java
    magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/filters/RenderingServingZipFilter.java
    magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/listeners/CourseEventListener.java
    magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/listeners/EmptyCourseEventListener.java
    magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/lms/configuration/LmsTypeConfiguration.java
    magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/lms/dialog/DialogFileCourse.java
    magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/lms/dialog/DialogMetadata.java
    magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/lms/dialog/PreSaveDialogMVC.java
    magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/lms/el/LmsElFunctions.java
    magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/lms/exceptions/CourseException.java
    magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/lms/gui/control/LmsDialogFile.java
    magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/lms/tree/LmsBrowserConfiguration.java
    magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/lms/tree/LmsJcrBrowserTreeConfiguration.java
    magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/lms/tree/LmsModuleTree.java
    magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/lms/tree/LmsModuleTreeConfiguration.java
    magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/lms/tree/LmsModuleTreeMVCHandler.java
    magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/lms/types/LmsTypeHandler.java
    magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/lms/types/impl/BaseTypeHandler.java
    magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/lms/types/impl/CourseTypeHandler.java
    magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/lms/types/impl/ScormTypeHandler.java
    magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/lms/uri/LmsURI2RepositoryMapping.java
    magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/managers/LearnerActivitiesManager.java
    magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/managers/LearnerManager.java
    magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/managers/ScormCMIManager.java
    magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/managers/impl/LearnerManagerWithMagnoliaUsers.java
    magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/managers/impl/MagnoliaLearnerActivitiesManager.java
    magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/managers/impl/MagnoliaScormCmiManager.java
    magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/module/LMSConfigurationModuleManager.java
    magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/module/LMSModule.java
    magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/module/LMSModuleVersionHandler.java
    magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/module/LmsTypesManager.java
    magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/pages/lms/ScormCmiPage.java
    magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/pages/lms/ScormPlayerPage.java
    magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/pages/report/UserReportPage.java
    magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/pages/report/UserReportPageAdmin.java
    magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/report/Helper.java
    magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/report/Objective.java
    magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/report/TrackingModel.java
    magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/report/UserReport.java
    magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/samples/listeners/ExactContentFilter.java
    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/scorm/model/CommonDataItemOrganization.java
    magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/scorm/model/Dependency.java
    magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/scorm/model/File.java
    magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/scorm/model/Item.java
    magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/scorm/model/Manifest.java
    magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/scorm/model/Metadata.java
    magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/scorm/model/ObjectFactory.java
    magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/scorm/model/Organization.java
    magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/scorm/model/Organizations.java
    magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/scorm/model/Resource.java
    magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/scorm/model/Resources.java
    magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/scorm/model/cp/CompletionThreshold.java
    magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/scorm/model/cp/Data.java
    magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/scorm/model/cp/Map.java
    magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/scorm/model/cp/ObjectFactory.java
    magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/scorm/model/cp/TimeLimitAction.java
    magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/scorm/model/cp/package-info.java
    magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/scorm/model/imsss/AuxiliaryResource.java
    magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/scorm/model/imsss/AuxiliaryResources.java
    magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/scorm/model/imsss/ChildActivity.java
    magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/scorm/model/imsss/ConditionCombination.java
    magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/scorm/model/imsss/ConditionOperator.java
    magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/scorm/model/imsss/ControlMode.java
    magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/scorm/model/imsss/DeliveryControls.java
    magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/scorm/model/imsss/ExitConditionRule.java
    magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/scorm/model/imsss/ExitConditionRuleAction.java
    magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/scorm/model/imsss/LimitConditions.java
    magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/scorm/model/imsss/MapInfo.java
    magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/scorm/model/imsss/ObjectFactory.java
    magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/scorm/model/imsss/Objective.java
    magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/scorm/model/imsss/ObjectiveBase.java
    magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/scorm/model/imsss/ObjectiveMapping.java
    magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/scorm/model/imsss/Objectives.java
    magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/scorm/model/imsss/PostConditionRule.java
    magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/scorm/model/imsss/PostConditionRuleAction.java
    magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/scorm/model/imsss/PreConditionRule.java
    magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/scorm/model/imsss/PreConditionRuleAction.java
    magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/scorm/model/imsss/PrimaryObjective.java
    magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/scorm/model/imsss/RandomTiming.java
    magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/scorm/model/imsss/Randomization.java
    magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/scorm/model/imsss/RollupAction.java
    magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/scorm/model/imsss/RollupActionEnum.java
    magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/scorm/model/imsss/RollupCondition.java
    magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/scorm/model/imsss/RollupConditions.java
    magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/scorm/model/imsss/RollupRule.java
    magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/scorm/model/imsss/RollupRuleCondition.java
    magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/scorm/model/imsss/RollupRules.java
    magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/scorm/model/imsss/RuleActionExitCondition.java
    magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/scorm/model/imsss/RuleActionPostCondition.java
    magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/scorm/model/imsss/RuleActionPreCondition.java
    magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/scorm/model/imsss/RuleCondition.java
    magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/scorm/model/imsss/RuleConditions.java
    magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/scorm/model/imsss/Sequencing.java
    magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/scorm/model/imsss/SequencingCollection.java
    magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/scorm/model/imsss/SequencingRule.java
    magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/scorm/model/imsss/SequencingRuleCondition.java
    magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/scorm/model/imsss/SequencingRules.java
    magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/scorm/model/imsss/package-info.java
    magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/scorm/model/nav/HideLMSUI.java
    magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/scorm/model/nav/NavigationInterface.java
    magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/scorm/model/nav/ObjectFactory.java
    magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/scorm/model/nav/Presentation.java
    magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/scorm/model/nav/package-info.java
    magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/scorm/model/package-info.java
    magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/scorm/model/seq/ConstrainChoiceConsiderations.java
    magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/scorm/model/seq/MapInfo.java
    magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/scorm/model/seq/ObjectFactory.java
    magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/scorm/model/seq/Objective.java
    magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/scorm/model/seq/Objectives.java
    magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/scorm/model/seq/RollupConsideration.java
    magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/scorm/model/seq/RollupConsiderations.java
    magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/scorm/model/seq/SeqObjective.java
    magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/scorm/model/seq/SeqObjectives.java
    magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/scorm/model/seq/package-info.java
    magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/scorm/utils/JaxbUtils.java
    magnoliamodules/trunk/openutils-mgnllms/src/test/java/net/sourceforge/openutils/mgnllms/TestJaxb.java
    magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/externalvideo/AsyncUploadExternalVideoProvider.java
    magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/externalvideo/AsyncUploadThread.java
    magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/externalvideo/BaseExternalVideoProvider.java
    magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/externalvideo/BaseVideoTypeHandler.java
    magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/externalvideo/ExternalVideoProvider.java
    magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/externalvideo/ExternalVideoTypeHandler.java
    magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/externalvideo/ExternalVideoUtil.java
    magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/externalvideo/FtpAccount.java
    magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/externalvideo/FtpAsyncUploadExternalVideoProvider.java
    magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/externalvideo/FtpUtil.java
    magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/externalvideo/TrascodingExternalVideoProvider.java
    magnoliamodules/trunk/openutils-mgnltagcloud/src/main/java/net/sourceforge/openutils/mgnltagcloud/manager/TagCloudManager.java
    magnoliamodules/trunk/pom.xml

Modified: magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/filters/AggregatorServingZipFilter.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/filters/AggregatorServingZipFilter.java	2013-10-20 16:08:22 UTC (rev 4405)
+++ magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/filters/AggregatorServingZipFilter.java	2013-10-20 16:10:14 UTC (rev 4406)
@@ -1,7 +1,7 @@
 /**
  *
  * E-learning Module for Magnolia CMS (http://www.openmindlab.com/lab/products/lms.html)
- * Copyright(C) 2010-2011, Openmind S.r.l. http://www.openmindonline.it
+ * Copyright(C) 2010-2013, Openmind S.r.l. http://www.openmindonline.it
  *
  *  This program is free software: you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
@@ -16,7 +16,6 @@
  *  You should have received a copy of the GNU General Public License
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-
 package net.sourceforge.openutils.mgnllms.filters;
 
 import info.magnolia.cms.beans.runtime.File;

Modified: magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/filters/RenderingServingZipFilter.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/filters/RenderingServingZipFilter.java	2013-10-20 16:08:22 UTC (rev 4405)
+++ magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/filters/RenderingServingZipFilter.java	2013-10-20 16:10:14 UTC (rev 4406)
@@ -1,7 +1,7 @@
 /**
  *
  * E-learning Module for Magnolia CMS (http://www.openmindlab.com/lab/products/lms.html)
- * Copyright(C) 2010-2011, Openmind S.r.l. http://www.openmindonline.it
+ * Copyright(C) 2010-2013, Openmind S.r.l. http://www.openmindonline.it
  *
  *  This program is free software: you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
@@ -16,7 +16,6 @@
  *  You should have received a copy of the GNU General Public License
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-
 package net.sourceforge.openutils.mgnllms.filters;
 
 import info.magnolia.cms.core.AggregationState;

Modified: magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/listeners/CourseEventListener.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/listeners/CourseEventListener.java	2013-10-20 16:08:22 UTC (rev 4405)
+++ magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/listeners/CourseEventListener.java	2013-10-20 16:10:14 UTC (rev 4406)
@@ -1,7 +1,7 @@
 /**
  *
  * E-learning Module for Magnolia CMS (http://www.openmindlab.com/lab/products/lms.html)
- * Copyright(C) 2010-2011, Openmind S.r.l. http://www.openmindonline.it
+ * Copyright(C) 2010-2013, Openmind S.r.l. http://www.openmindonline.it
  *
  *  This program is free software: you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
@@ -16,7 +16,6 @@
  *  You should have received a copy of the GNU General Public License
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-
 package net.sourceforge.openutils.mgnllms.listeners;
 
 /**

Modified: magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/listeners/EmptyCourseEventListener.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/listeners/EmptyCourseEventListener.java	2013-10-20 16:08:22 UTC (rev 4405)
+++ magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/listeners/EmptyCourseEventListener.java	2013-10-20 16:10:14 UTC (rev 4406)
@@ -1,7 +1,7 @@
 /**
  *
  * E-learning Module for Magnolia CMS (http://www.openmindlab.com/lab/products/lms.html)
- * Copyright(C) 2010-2011, Openmind S.r.l. http://www.openmindonline.it
+ * Copyright(C) 2010-2013, Openmind S.r.l. http://www.openmindonline.it
  *
  *  This program is free software: you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
@@ -16,7 +16,6 @@
  *  You should have received a copy of the GNU General Public License
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-
 package net.sourceforge.openutils.mgnllms.listeners;
 
 /**

Modified: magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/lms/configuration/LmsTypeConfiguration.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/lms/configuration/LmsTypeConfiguration.java	2013-10-20 16:08:22 UTC (rev 4405)
+++ magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/lms/configuration/LmsTypeConfiguration.java	2013-10-20 16:10:14 UTC (rev 4406)
@@ -1,7 +1,7 @@
 /**
  *
  * E-learning Module for Magnolia CMS (http://www.openmindlab.com/lab/products/lms.html)
- * Copyright(C) 2010-2011, Openmind S.r.l. http://www.openmindonline.it
+ * Copyright(C) 2010-2013, Openmind S.r.l. http://www.openmindonline.it
  *
  *  This program is free software: you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
@@ -16,7 +16,6 @@
  *  You should have received a copy of the GNU General Public License
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-
 package net.sourceforge.openutils.mgnllms.lms.configuration;
 
 import net.sourceforge.openutils.mgnllms.lms.types.LmsTypeHandler;

Modified: magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/lms/dialog/DialogFileCourse.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/lms/dialog/DialogFileCourse.java	2013-10-20 16:08:22 UTC (rev 4405)
+++ magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/lms/dialog/DialogFileCourse.java	2013-10-20 16:10:14 UTC (rev 4406)
@@ -1,7 +1,7 @@
 /**
  *
  * E-learning Module for Magnolia CMS (http://www.openmindlab.com/lab/products/lms.html)
- * Copyright(C) 2010-2011, Openmind S.r.l. http://www.openmindonline.it
+ * Copyright(C) 2010-2013, Openmind S.r.l. http://www.openmindonline.it
  *
  *  This program is free software: you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
@@ -16,7 +16,6 @@
  *  You should have received a copy of the GNU General Public License
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-
 package net.sourceforge.openutils.mgnllms.lms.dialog;
 
 import info.magnolia.cms.beans.config.MIMEMapping;

Modified: magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/lms/dialog/DialogMetadata.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/lms/dialog/DialogMetadata.java	2013-10-20 16:08:22 UTC (rev 4405)
+++ magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/lms/dialog/DialogMetadata.java	2013-10-20 16:10:14 UTC (rev 4406)
@@ -1,7 +1,7 @@
 /**
  *
  * E-learning Module for Magnolia CMS (http://www.openmindlab.com/lab/products/lms.html)
- * Copyright(C) 2010-2011, Openmind S.r.l. http://www.openmindonline.it
+ * Copyright(C) 2010-2013, Openmind S.r.l. http://www.openmindonline.it
  *
  *  This program is free software: you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
@@ -16,7 +16,6 @@
  *  You should have received a copy of the GNU General Public License
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-
 package net.sourceforge.openutils.mgnllms.lms.dialog;
 
 import info.magnolia.cms.gui.dialog.DialogStatic;

Modified: magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/lms/dialog/PreSaveDialogMVC.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/lms/dialog/PreSaveDialogMVC.java	2013-10-20 16:08:22 UTC (rev 4405)
+++ magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/lms/dialog/PreSaveDialogMVC.java	2013-10-20 16:10:14 UTC (rev 4406)
@@ -1,7 +1,7 @@
 /**
  *
  * E-learning Module for Magnolia CMS (http://www.openmindlab.com/lab/products/lms.html)
- * Copyright(C) 2010-2011, Openmind S.r.l. http://www.openmindonline.it
+ * Copyright(C) 2010-2013, Openmind S.r.l. http://www.openmindonline.it
  *
  *  This program is free software: you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
@@ -16,7 +16,6 @@
  *  You should have received a copy of the GNU General Public License
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-
 package net.sourceforge.openutils.mgnllms.lms.dialog;
 
 import info.magnolia.cms.core.Content;

Modified: magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/lms/el/LmsElFunctions.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/lms/el/LmsElFunctions.java	2013-10-20 16:08:22 UTC (rev 4405)
+++ magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/lms/el/LmsElFunctions.java	2013-10-20 16:10:14 UTC (rev 4406)
@@ -1,7 +1,7 @@
 /**
  *
  * E-learning Module for Magnolia CMS (http://www.openmindlab.com/lab/products/lms.html)
- * Copyright(C) 2010-2011, Openmind S.r.l. http://www.openmindonline.it
+ * Copyright(C) 2010-2013, Openmind S.r.l. http://www.openmindonline.it
  *
  *  This program is free software: you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
@@ -16,7 +16,6 @@
  *  You should have received a copy of the GNU General Public License
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-
 package net.sourceforge.openutils.mgnllms.lms.el;
 
 import info.magnolia.cms.core.Content;

Modified: magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/lms/exceptions/CourseException.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/lms/exceptions/CourseException.java	2013-10-20 16:08:22 UTC (rev 4405)
+++ magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/lms/exceptions/CourseException.java	2013-10-20 16:10:14 UTC (rev 4406)
@@ -1,7 +1,7 @@
 /**
  *
  * E-learning Module for Magnolia CMS (http://www.openmindlab.com/lab/products/lms.html)
- * Copyright(C) 2010-2011, Openmind S.r.l. http://www.openmindonline.it
+ * Copyright(C) 2010-2013, Openmind S.r.l. http://www.openmindonline.it
  *
  *  This program is free software: you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
@@ -16,7 +16,6 @@
  *  You should have received a copy of the GNU General Public License
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-
 package net.sourceforge.openutils.mgnllms.lms.exceptions;
 
 /**

Modified: magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/lms/gui/control/LmsDialogFile.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/lms/gui/control/LmsDialogFile.java	2013-10-20 16:08:22 UTC (rev 4405)
+++ magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/lms/gui/control/LmsDialogFile.java	2013-10-20 16:10:14 UTC (rev 4406)
@@ -1,7 +1,7 @@
 /**
  *
  * E-learning Module for Magnolia CMS (http://www.openmindlab.com/lab/products/lms.html)
- * Copyright(C) 2010-2011, Openmind S.r.l. http://www.openmindonline.it
+ * Copyright(C) 2010-2013, Openmind S.r.l. http://www.openmindonline.it
  *
  *  This program is free software: you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
@@ -16,7 +16,6 @@
  *  You should have received a copy of the GNU General Public License
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-
 package net.sourceforge.openutils.mgnllms.lms.gui.control;
 
 import info.magnolia.cms.gui.control.File;

Modified: magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/lms/tree/LmsBrowserConfiguration.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/lms/tree/LmsBrowserConfiguration.java	2013-10-20 16:08:22 UTC (rev 4405)
+++ magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/lms/tree/LmsBrowserConfiguration.java	2013-10-20 16:10:14 UTC (rev 4406)
@@ -1,7 +1,7 @@
 /**
  *
  * E-learning Module for Magnolia CMS (http://www.openmindlab.com/lab/products/lms.html)
- * Copyright(C) 2010-2011, Openmind S.r.l. http://www.openmindonline.it
+ * Copyright(C) 2010-2013, Openmind S.r.l. http://www.openmindonline.it
  *
  *  This program is free software: you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
@@ -16,7 +16,6 @@
  *  You should have received a copy of the GNU General Public License
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-
 package net.sourceforge.openutils.mgnllms.lms.tree;
 
 import info.magnolia.cms.core.Content;

Modified: magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/lms/tree/LmsJcrBrowserTreeConfiguration.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/lms/tree/LmsJcrBrowserTreeConfiguration.java	2013-10-20 16:08:22 UTC (rev 4405)
+++ magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/lms/tree/LmsJcrBrowserTreeConfiguration.java	2013-10-20 16:10:14 UTC (rev 4406)
@@ -1,7 +1,7 @@
 /**
  *
  * E-learning Module for Magnolia CMS (http://www.openmindlab.com/lab/products/lms.html)
- * Copyright(C) 2010-2011, Openmind S.r.l. http://www.openmindonline.it
+ * Copyright(C) 2010-2013, Openmind S.r.l. http://www.openmindonline.it
  *
  *  This program is free software: you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
@@ -16,7 +16,6 @@
  *  You should have received a copy of the GNU General Public License
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-
 package net.sourceforge.openutils.mgnllms.lms.tree;
 
 import info.magnolia.cms.gui.control.Tree;

Modified: magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/lms/tree/LmsModuleTree.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/lms/tree/LmsModuleTree.java	2013-10-20 16:08:22 UTC (rev 4405)
+++ magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/lms/tree/LmsModuleTree.java	2013-10-20 16:10:14 UTC (rev 4406)
@@ -1,7 +1,7 @@
 /**
  *
  * E-learning Module for Magnolia CMS (http://www.openmindlab.com/lab/products/lms.html)
- * Copyright(C) 2010-2011, Openmind S.r.l. http://www.openmindonline.it
+ * Copyright(C) 2010-2013, Openmind S.r.l. http://www.openmindonline.it
  *
  *  This program is free software: you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
@@ -16,7 +16,6 @@
  *  You should have received a copy of the GNU General Public License
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-
 package net.sourceforge.openutils.mgnllms.lms.tree;
 
 import info.magnolia.cms.core.Content;

Modified: magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/lms/tree/LmsModuleTreeConfiguration.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/lms/tree/LmsModuleTreeConfiguration.java	2013-10-20 16:08:22 UTC (rev 4405)
+++ magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/lms/tree/LmsModuleTreeConfiguration.java	2013-10-20 16:10:14 UTC (rev 4406)
@@ -1,7 +1,7 @@
 /**
  *
  * E-learning Module for Magnolia CMS (http://www.openmindlab.com/lab/products/lms.html)
- * Copyright(C) 2010-2011, Openmind S.r.l. http://www.openmindonline.it
+ * Copyright(C) 2010-2013, Openmind S.r.l. http://www.openmindonline.it
  *
  *  This program is free software: you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
@@ -16,7 +16,6 @@
  *  You should have received a copy of the GNU General Public License
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-
 package net.sourceforge.openutils.mgnllms.lms.tree;
 
 import info.magnolia.cms.beans.config.ServerConfiguration;

Modified: magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/lms/tree/LmsModuleTreeMVCHandler.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/lms/tree/LmsModuleTreeMVCHandler.java	2013-10-20 16:08:22 UTC (rev 4405)
+++ magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/lms/tree/LmsModuleTreeMVCHandler.java	2013-10-20 16:10:14 UTC (rev 4406)
@@ -1,7 +1,7 @@
 /**
  *
  * E-learning Module for Magnolia CMS (http://www.openmindlab.com/lab/products/lms.html)
- * Copyright(C) 2010-2011, Openmind S.r.l. http://www.openmindonline.it
+ * Copyright(C) 2010-2013, Openmind S.r.l. http://www.openmindonline.it
  *
  *  This program is free software: you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
@@ -16,7 +16,6 @@
  *  You should have received a copy of the GNU General Public License
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-
 package net.sourceforge.openutils.mgnllms.lms.tree;
 
 import info.magnolia.module.admininterface.AdminTreeMVCHandler;

Modified: magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/lms/types/LmsTypeHandler.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/lms/types/LmsTypeHandler.java	2013-10-20 16:08:22 UTC (rev 4405)
+++ magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/lms/types/LmsTypeHandler.java	2013-10-20 16:10:14 UTC (rev 4406)
@@ -1,7 +1,7 @@
 /**
  *
  * E-learning Module for Magnolia CMS (http://www.openmindlab.com/lab/products/lms.html)
- * Copyright(C) 2010-2011, Openmind S.r.l. http://www.openmindonline.it
+ * Copyright(C) 2010-2013, Openmind S.r.l. http://www.openmindonline.it
  *
  *  This program is free software: you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
@@ -16,7 +16,6 @@
  *  You should have received a copy of the GNU General Public License
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-
 package net.sourceforge.openutils.mgnllms.lms.types;
 
 import info.magnolia.cms.beans.runtime.MultipartForm;

Modified: magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/lms/types/impl/BaseTypeHandler.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/lms/types/impl/BaseTypeHandler.java	2013-10-20 16:08:22 UTC (rev 4405)
+++ magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/lms/types/impl/BaseTypeHandler.java	2013-10-20 16:10:14 UTC (rev 4406)
@@ -1,7 +1,7 @@
 /**
  *
  * E-learning Module for Magnolia CMS (http://www.openmindlab.com/lab/products/lms.html)
- * Copyright(C) 2010-2011, Openmind S.r.l. http://www.openmindonline.it
+ * Copyright(C) 2010-2013, Openmind S.r.l. http://www.openmindonline.it
  *
  *  This program is free software: you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
@@ -16,7 +16,6 @@
  *  You should have received a copy of the GNU General Public License
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-
 package net.sourceforge.openutils.mgnllms.lms.types.impl;
 
 import info.magnolia.cms.beans.runtime.MultipartForm;

Modified: magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/lms/types/impl/CourseTypeHandler.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/lms/types/impl/CourseTypeHandler.java	2013-10-20 16:08:22 UTC (rev 4405)
+++ magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/lms/types/impl/CourseTypeHandler.java	2013-10-20 16:10:14 UTC (rev 4406)
@@ -1,7 +1,7 @@
 /**
  *
  * E-learning Module for Magnolia CMS (http://www.openmindlab.com/lab/products/lms.html)
- * Copyright(C) 2010-2011, Openmind S.r.l. http://www.openmindonline.it
+ * Copyright(C) 2010-2013, Openmind S.r.l. http://www.openmindonline.it
  *
  *  This program is free software: you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
@@ -16,7 +16,6 @@
  *  You should have received a copy of the GNU General Public License
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-
 package net.sourceforge.openutils.mgnllms.lms.types.impl;
 
 

Modified: magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/lms/types/impl/ScormTypeHandler.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/lms/types/impl/ScormTypeHandler.java	2013-10-20 16:08:22 UTC (rev 4405)
+++ magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/lms/types/impl/ScormTypeHandler.java	2013-10-20 16:10:14 UTC (rev 4406)
@@ -1,7 +1,7 @@
 /**
  *
  * E-learning Module for Magnolia CMS (http://www.openmindlab.com/lab/products/lms.html)
- * Copyright(C) 2010-2011, Openmind S.r.l. http://www.openmindonline.it
+ * Copyright(C) 2010-2013, Openmind S.r.l. http://www.openmindonline.it
  *
  *  This program is free software: you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
@@ -16,7 +16,6 @@
  *  You should have received a copy of the GNU General Public License
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-
 package net.sourceforge.openutils.mgnllms.lms.types.impl;
 
 import info.magnolia.cms.beans.runtime.FileProperties;

Modified: magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/lms/uri/LmsURI2RepositoryMapping.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/lms/uri/LmsURI2RepositoryMapping.java	2013-10-20 16:08:22 UTC (rev 4405)
+++ magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/lms/uri/LmsURI2RepositoryMapping.java	2013-10-20 16:10:14 UTC (rev 4406)
@@ -1,7 +1,7 @@
 /**
  *
  * E-learning Module for Magnolia CMS (http://www.openmindlab.com/lab/products/lms.html)
- * Copyright(C) 2010-2011, Openmind S.r.l. http://www.openmindonline.it
+ * Copyright(C) 2010-2013, Openmind S.r.l. http://www.openmindonline.it
  *
  *  This program is free software: you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
@@ -16,7 +16,6 @@
  *  You should have received a copy of the GNU General Public License
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-
 package net.sourceforge.openutils.mgnllms.lms.uri;
 
 import info.magnolia.cms.beans.config.URI2RepositoryMapping;

Modified: magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/managers/LearnerActivitiesManager.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/managers/LearnerActivitiesManager.java	2013-10-20 16:08:22 UTC (rev 4405)
+++ magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/managers/LearnerActivitiesManager.java	2013-10-20 16:10:14 UTC (rev 4406)
@@ -1,7 +1,7 @@
 /**
  *
  * E-learning Module for Magnolia CMS (http://www.openmindlab.com/lab/products/lms.html)
- * Copyright(C) 2010-2011, Openmind S.r.l. http://www.openmindonline.it
+ * Copyright(C) 2010-2013, Openmind S.r.l. http://www.openmindonline.it
  *
  *  This program is free software: you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
@@ -16,7 +16,6 @@
  *  You should have received a copy of the GNU General Public License
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-
 package net.sourceforge.openutils.mgnllms.managers;
 
 import net.sourceforge.openutils.mgnllms.listeners.CourseEventListener;

Modified: magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/managers/LearnerManager.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/managers/LearnerManager.java	2013-10-20 16:08:22 UTC (rev 4405)
+++ magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/managers/LearnerManager.java	2013-10-20 16:10:14 UTC (rev 4406)
@@ -1,7 +1,7 @@
 /**
  *
  * E-learning Module for Magnolia CMS (http://www.openmindlab.com/lab/products/lms.html)
- * Copyright(C) 2010-2011, Openmind S.r.l. http://www.openmindonline.it
+ * Copyright(C) 2010-2013, Openmind S.r.l. http://www.openmindonline.it
  *
  *  This program is free software: you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
@@ -16,7 +16,6 @@
  *  You should have received a copy of the GNU General Public License
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-
 package net.sourceforge.openutils.mgnllms.managers;
 
 /**

Modified: magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/managers/ScormCMIManager.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/managers/ScormCMIManager.java	2013-10-20 16:08:22 UTC (rev 4405)
+++ magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/managers/ScormCMIManager.java	2013-10-20 16:10:14 UTC (rev 4406)
@@ -1,7 +1,7 @@
 /**
  *
  * E-learning Module for Magnolia CMS (http://www.openmindlab.com/lab/products/lms.html)
- * Copyright(C) 2010-2011, Openmind S.r.l. http://www.openmindonline.it
+ * Copyright(C) 2010-2013, Openmind S.r.l. http://www.openmindonline.it
  *
  *  This program is free software: you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
@@ -16,7 +16,6 @@
  *  You should have received a copy of the GNU General Public License
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-
 package net.sourceforge.openutils.mgnllms.managers;
 
 import net.sourceforge.openutils.mgnllms.lms.exceptions.CourseException;

Modified: magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/managers/impl/LearnerManagerWithMagnoliaUsers.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/managers/impl/LearnerManagerWithMagnoliaUsers.java	2013-10-20 16:08:22 UTC (rev 4405)
+++ magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/managers/impl/LearnerManagerWithMagnoliaUsers.java	2013-10-20 16:10:14 UTC (rev 4406)
@@ -1,7 +1,7 @@
 /**
  *
  * E-learning Module for Magnolia CMS (http://www.openmindlab.com/lab/products/lms.html)
- * Copyright(C) 2010-2011, Openmind S.r.l. http://www.openmindonline.it
+ * Copyright(C) 2010-2013, Openmind S.r.l. http://www.openmindonline.it
  *
  *  This program is free software: you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
@@ -16,7 +16,6 @@
  *  You should have received a copy of the GNU General Public License
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-
 package net.sourceforge.openutils.mgnllms.managers.impl;
 
 import info.magnolia.context.MgnlContext;

Modified: magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/managers/impl/MagnoliaLearnerActivitiesManager.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/managers/impl/MagnoliaLearnerActivitiesManager.java	2013-10-20 16:08:22 UTC (rev 4405)
+++ magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/managers/impl/MagnoliaLearnerActivitiesManager.java	2013-10-20 16:10:14 UTC (rev 4406)
@@ -1,7 +1,7 @@
 /**
  *
  * E-learning Module for Magnolia CMS (http://www.openmindlab.com/lab/products/lms.html)
- * Copyright(C) 2010-2011, Openmind S.r.l. http://www.openmindonline.it
+ * Copyright(C) 2010-2013, Openmind S.r.l. http://www.openmindonline.it
  *
  *  This program is free software: you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
@@ -16,7 +16,6 @@
  *  You should have received a copy of the GNU General Public License
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-
 package net.sourceforge.openutils.mgnllms.managers.impl;
 
 import info.magnolia.cms.core.Content;

Modified: magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/managers/impl/MagnoliaScormCmiManager.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/managers/impl/MagnoliaScormCmiManager.java	2013-10-20 16:08:22 UTC (rev 4405)
+++ magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/managers/impl/MagnoliaScormCmiManager.java	2013-10-20 16:10:14 UTC (rev 4406)
@@ -1,7 +1,7 @@
 /**
  *
  * E-learning Module for Magnolia CMS (http://www.openmindlab.com/lab/products/lms.html)
- * Copyright(C) 2010-2011, Openmind S.r.l. http://www.openmindonline.it
+ * Copyright(C) 2010-2013, Openmind S.r.l. http://www.openmindonline.it
  *
  *  This program is free software: you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
@@ -16,7 +16,6 @@
  *  You should have received a copy of the GNU General Public License
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-
 package net.sourceforge.openutils.mgnllms.managers.impl;
 
 import info.magnolia.cms.core.Content;

Modified: magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/module/LMSConfigurationModuleManager.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/module/LMSConfigurationModuleManager.java	2013-10-20 16:08:22 UTC (rev 4405)
+++ magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/module/LMSConfigurationModuleManager.java	2013-10-20 16:10:14 UTC (rev 4406)
@@ -1,7 +1,7 @@
 /**
  *
  * E-learning Module for Magnolia CMS (http://www.openmindlab.com/lab/products/lms.html)
- * Copyright(C) 2010-2011, Openmind S.r.l. http://www.openmindonline.it
+ * Copyright(C) 2010-2013, Openmind S.r.l. http://www.openmindonline.it
  *
  *  This program is free software: you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
@@ -16,7 +16,6 @@
  *  You should have received a copy of the GNU General Public License
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-
 package net.sourceforge.openutils.mgnllms.module;
 
 import info.magnolia.cms.beans.config.ObservedManager;

Modified: magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/module/LMSModule.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/module/LMSModule.java	2013-10-20 16:08:22 UTC (rev 4405)
+++ magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/module/LMSModule.java	2013-10-20 16:10:14 UTC (rev 4406)
@@ -1,7 +1,7 @@
 /**
  *
  * E-learning Module for Magnolia CMS (http://www.openmindlab.com/lab/products/lms.html)
- * Copyright(C) 2010-2011, Openmind S.r.l. http://www.openmindonline.it
+ * Copyright(C) 2010-2013, Openmind S.r.l. http://www.openmindonline.it
  *
  *  This program is free software: you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
@@ -16,7 +16,6 @@
  *  You should have received a copy of the GNU General Public License
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-
 package net.sourceforge.openutils.mgnllms.module;
 
 import info.magnolia.module.ModuleLifecycle;

Modified: magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/module/LMSModuleVersionHandler.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/module/LMSModuleVersionHandler.java	2013-10-20 16:08:22 UTC (rev 4405)
+++ magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/module/LMSModuleVersionHandler.java	2013-10-20 16:10:14 UTC (rev 4406)
@@ -1,7 +1,7 @@
 /**
  *
  * E-learning Module for Magnolia CMS (http://www.openmindlab.com/lab/products/lms.html)
- * Copyright(C) 2010-2011, Openmind S.r.l. http://www.openmindonline.it
+ * Copyright(C) 2010-2013, Openmind S.r.l. http://www.openmindonline.it
  *
  *  This program is free software: you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
@@ -16,7 +16,6 @@
  *  You should have received a copy of the GNU General Public License
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-
 package net.sourceforge.openutils.mgnllms.module;
 
 import info.magnolia.cms.security.Permission;

Modified: magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/module/LmsTypesManager.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/module/LmsTypesManager.java	2013-10-20 16:08:22 UTC (rev 4405)
+++ magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/module/LmsTypesManager.java	2013-10-20 16:10:14 UTC (rev 4406)
@@ -1,7 +1,7 @@
 /**
  *
  * E-learning Module for Magnolia CMS (http://www.openmindlab.com/lab/products/lms.html)
- * Copyright(C) 2010-2011, Openmind S.r.l. http://www.openmindonline.it
+ * Copyright(C) 2010-2013, Openmind S.r.l. http://www.openmindonline.it
  *
  *  This program is free software: you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
@@ -16,7 +16,6 @@
  *  You should have received a copy of the GNU General Public License
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-
 package net.sourceforge.openutils.mgnllms.module;
 
 import info.magnolia.cms.beans.config.ObservedManager;

Modified: magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/pages/lms/ScormCmiPage.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/pages/lms/ScormCmiPage.java	2013-10-20 16:08:22 UTC (rev 4405)
+++ magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/pages/lms/ScormCmiPage.java	2013-10-20 16:10:14 UTC (rev 4406)
@@ -1,7 +1,7 @@
 /**
  *
  * E-learning Module for Magnolia CMS (http://www.openmindlab.com/lab/products/lms.html)
- * Copyright(C) 2010-2011, Openmind S.r.l. http://www.openmindonline.it
+ * Copyright(C) 2010-2013, Openmind S.r.l. http://www.openmindonline.it
  *
  *  This program is free software: you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
@@ -16,7 +16,6 @@
  *  You should have received a copy of the GNU General Public License
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-
 package net.sourceforge.openutils.mgnllms.pages.lms;
 
 import info.magnolia.cms.core.Content;

Modified: magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/pages/lms/ScormPlayerPage.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/pages/lms/ScormPlayerPage.java	2013-10-20 16:08:22 UTC (rev 4405)
+++ magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/pages/lms/ScormPlayerPage.java	2013-10-20 16:10:14 UTC (rev 4406)
@@ -1,7 +1,7 @@
 /**
  *
  * E-learning Module for Magnolia CMS (http://www.openmindlab.com/lab/products/lms.html)
- * Copyright(C) 2010-2011, Openmind S.r.l. http://www.openmindonline.it
+ * Copyright(C) 2010-2013, Openmind S.r.l. http://www.openmindonline.it
  *
  *  This program is free software: you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
@@ -16,7 +16,6 @@
  *  You should have received a copy of the GNU General Public License
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-
 package net.sourceforge.openutils.mgnllms.pages.lms;
 
 import info.magnolia.cms.beans.config.URI2RepositoryManager;

Modified: magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/pages/report/UserReportPage.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/pages/report/UserReportPage.java	2013-10-20 16:08:22 UTC (rev 4405)
+++ magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/pages/report/UserReportPage.java	2013-10-20 16:10:14 UTC (rev 4406)
@@ -1,7 +1,7 @@
 /**
  *
  * E-learning Module for Magnolia CMS (http://www.openmindlab.com/lab/products/lms.html)
- * Copyright(C) 2010-2011, Openmind S.r.l. http://www.openmindonline.it
+ * Copyright(C) 2010-2013, Openmind S.r.l. http://www.openmindonline.it
  *
  *  This program is free software: you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
@@ -16,7 +16,6 @@
  *  You should have received a copy of the GNU General Public License
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-
 package net.sourceforge.openutils.mgnllms.pages.report;
 
 import info.magnolia.cms.core.Content;

Modified: magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/pages/report/UserReportPageAdmin.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/pages/report/UserReportPageAdmin.java	2013-10-20 16:08:22 UTC (rev 4405)
+++ magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/pages/report/UserReportPageAdmin.java	2013-10-20 16:10:14 UTC (rev 4406)
@@ -1,7 +1,7 @@
 /**
  *
  * E-learning Module for Magnolia CMS (http://www.openmindlab.com/lab/products/lms.html)
- * Copyright(C) 2010-2011, Openmind S.r.l. http://www.openmindonline.it
+ * Copyright(C) 2010-2013, Openmind S.r.l. http://www.openmindonline.it
  *
  *  This program is free software: you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
@@ -16,7 +16,6 @@
  *  You should have received a copy of the GNU General Public License
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-
 package net.sourceforge.openutils.mgnllms.pages.report;
 
 import info.magnolia.cms.core.Content;

Modified: magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/report/Helper.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/report/Helper.java	2013-10-20 16:08:22 UTC (rev 4405)
+++ magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/report/Helper.java	2013-10-20 16:10:14 UTC (rev 4406)
@@ -1,7 +1,7 @@
 /**
  *
  * E-learning Module for Magnolia CMS (http://www.openmindlab.com/lab/products/lms.html)
- * Copyright(C) 2010-2011, Openmind S.r.l. http://www.openmindonline.it
+ * Copyright(C) 2010-2013, Openmind S.r.l. http://www.openmindonline.it
  *
  *  This program is free software: you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
@@ -16,7 +16,6 @@
  *  You should have received a copy of the GNU General Public License
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-
 package net.sourceforge.openutils.mgnllms.report;
 
 /**

Modified: magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/report/Objective.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnllms/...
 
[truncated message content]

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

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

Revision: 4405
          http://openutils.svn.sourceforge.net/openutils/?rev=4405&view=rev
Author:   fgiust
Date:     2013-10-20 16:08:22 +0000 (Sun, 20 Oct 2013)
Log Message:
-----------
shared copy of bootstrap 3.0 css

Modified Paths:
--------------
    magnoliamodules/trunk/magnolia-test-webapp/src/main/webapp/template_magnoliautils/magnoliaUtils.jsp
    magnoliamodules/trunk/magnolia5-test-webapp/src/main/webapp/template_magnoliautils/magnoliaUtils.jsp
    magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/resources/mgnl-files/templates/samples-contextmenu/template-contextmenu.jsp
    magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/resources/samples-contextmenu/template-contextmenu.ftl
    magnoliamodules/trunk/openutils-mgnlcontrols/src/main/resources/samples-controls/template-controls.ftl
    magnoliamodules/trunk/openutils-mgnlmedia/src/main/resources/samples-media/template.ftl
    magnoliamodules/trunk/openutils-mgnlrules/src/main/resources/samples-rules/template-rules.ftl
    magnoliamodules/trunk/openutils-mgnltagcloud/src/main/resources/mgnl-files/templates/samples-tagcloud/template.jsp

Removed Paths:
-------------
    magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/resources/mgnl-resources/contextmenu/css/bootstrap.min.css
    magnoliamodules/trunk/openutils-mgnlcontrols/src/main/resources/mgnl-resources/controls/samples/css/bootstrap.min.css
    magnoliamodules/trunk/openutils-mgnlmedia/src/main/resources/mgnl-resources/media-samples/css/bootstrap.min.css
    magnoliamodules/trunk/openutils-mgnlrules/src/main/resources/mgnl-resources/rules/css/bootstrap.min.css
    magnoliamodules/trunk/openutils-mgnltagcloud/src/main/resources/mgnl-resources/tagcloud/samples/css/bootstrap.min.css

Modified: magnoliamodules/trunk/magnolia-test-webapp/src/main/webapp/template_magnoliautils/magnoliaUtils.jsp
===================================================================
--- magnoliamodules/trunk/magnolia-test-webapp/src/main/webapp/template_magnoliautils/magnoliaUtils.jsp	2013-10-20 16:01:48 UTC (rev 4404)
+++ magnoliamodules/trunk/magnolia-test-webapp/src/main/webapp/template_magnoliautils/magnoliaUtils.jsp	2013-10-20 16:08:22 UTC (rev 4405)
@@ -11,7 +11,7 @@
       <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
       <title> ${content.title}
       </title>
-      <link rel="stylesheet" type="text/css" href="${pageContext.request.contextPath}/.resources/bootstrap/css/bootstrap.min.css" />
+      <link rel="stylesheet" type="text/css" href="${pageContext.request.contextPath}/.resources/bootstrap/3.0/css/bootstrap.min.css" />
       <style>
     <![CDATA[
       code { display: block}

Modified: magnoliamodules/trunk/magnolia5-test-webapp/src/main/webapp/template_magnoliautils/magnoliaUtils.jsp
===================================================================
--- magnoliamodules/trunk/magnolia5-test-webapp/src/main/webapp/template_magnoliautils/magnoliaUtils.jsp	2013-10-20 16:01:48 UTC (rev 4404)
+++ magnoliamodules/trunk/magnolia5-test-webapp/src/main/webapp/template_magnoliautils/magnoliaUtils.jsp	2013-10-20 16:08:22 UTC (rev 4405)
@@ -11,7 +11,7 @@
       <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
       <title> ${content.title}
       </title>
-      <link rel="stylesheet" type="text/css" href="${pageContext.request.contextPath}/.resources/bootstrap/css/bootstrap.min.css" />
+      <link rel="stylesheet" type="text/css" href="${pageContext.request.contextPath}/.resources/bootstrap/3.0/css/bootstrap.min.css" />
       <style>
     <![CDATA[
       code { display: block}

Modified: magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/resources/mgnl-files/templates/samples-contextmenu/template-contextmenu.jsp
===================================================================
--- magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/resources/mgnl-files/templates/samples-contextmenu/template-contextmenu.jsp	2013-10-20 16:01:48 UTC (rev 4404)
+++ magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/resources/mgnl-files/templates/samples-contextmenu/template-contextmenu.jsp	2013-10-20 16:08:22 UTC (rev 4405)
@@ -14,7 +14,7 @@
       ${contextmenu:init()} 
       ${contextmenu:links()}
       <cms:init />
-      <link rel="stylesheet" type="text/css" href="${pageContext.request.contextPath}/.resources/contextmenu/css/bootstrap.min.css" />
+      <link rel="stylesheet" type="text/css" href="${pageContext.request.contextPath}/.resources/bootstrap/3.0/css/bootstrap.min.css" />
       <!-- samples css/js -->
       <link rel="stylesheet" type="text/css"
         href="${pageContext.request.contextPath}/.resources/contextmenu/css/contextmenu-samples.css" />

Deleted: magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/resources/mgnl-resources/contextmenu/css/bootstrap.min.css
===================================================================
--- magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/resources/mgnl-resources/contextmenu/css/bootstrap.min.css	2013-10-20 16:01:48 UTC (rev 4404)
+++ magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/resources/mgnl-resources/contextmenu/css/bootstrap.min.css	2013-10-20 16:08:22 UTC (rev 4405)
@@ -1,9 +0,0 @@
-/*!
- * Bootstrap v3.0.0
- *
- * Copyright 2013 Twitter, Inc
- * Licensed under the Apache License v2.0
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Designed and built with all the love in the world by @mdo and @fat.

@@ Diff output truncated at 100000 characters. @@
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

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

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

Revision: 4404
          http://openutils.svn.sourceforge.net/openutils/?rev=4404&view=rev
Author:   fgiust
Date:     2013-10-20 16:01:48 +0000 (Sun, 20 Oct 2013)
Log Message:
-----------
fix dependency

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

Modified: magnoliamodules/trunk/openutils-mgnlcontextmenu/pom.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnlcontextmenu/pom.xml	2013-10-20 16:00:37 UTC (rev 4403)
+++ magnoliamodules/trunk/openutils-mgnlcontextmenu/pom.xml	2013-10-20 16:01:48 UTC (rev 4404)
@@ -105,7 +105,7 @@
     <dependency>
       <groupId>net.sourceforge.openutils</groupId>
       <artifactId>openutils-mgnlcontrols</artifactId>
-      <version>5.0.0</version>
+      <version>5.0.10-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>net.sourceforge.openutils</groupId>

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

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

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

Revision: 4403
          http://openutils.svn.sourceforge.net/openutils/?rev=4403&view=rev
Author:   fgiust
Date:     2013-10-20 16:00:37 +0000 (Sun, 20 Oct 2013)
Log Message:
-----------
bump module versions and align dependencies

Modified Paths:
--------------
    magnoliamodules/trunk/magnolia-test-webapp/pom.xml
    magnoliamodules/trunk/magnolia5-test-webapp/pom.xml
    magnoliamodules/trunk/openutils-mgnlbootstrapsync/pom.xml
    magnoliamodules/trunk/openutils-mgnlbootstrapsync/src/main/resources/META-INF/magnolia/bootstrapsync.xml
    magnoliamodules/trunk/openutils-mgnlcache/pom.xml
    magnoliamodules/trunk/openutils-mgnlcache/src/main/resources/META-INF/magnolia/simplecache.xml
    magnoliamodules/trunk/openutils-mgnlcas/pom.xml
    magnoliamodules/trunk/openutils-mgnlcas/src/main/resources/META-INF/magnolia/cas.xml
    magnoliamodules/trunk/openutils-mgnlcontextmenu/pom.xml
    magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/resources/META-INF/magnolia/contextmenu.xml
    magnoliamodules/trunk/openutils-mgnlcontrols/pom.xml
    magnoliamodules/trunk/openutils-mgnlcontrols/src/main/resources/META-INF/magnolia/controls.xml
    magnoliamodules/trunk/openutils-mgnlcriteria/pom.xml
    magnoliamodules/trunk/openutils-mgnlcriteria/src/main/resources/META-INF/magnolia/criteria.xml
    magnoliamodules/trunk/openutils-mgnlext/pom.xml
    magnoliamodules/trunk/openutils-mgnlext/src/main/resources/META-INF/magnolia/ext.xml
    magnoliamodules/trunk/openutils-mgnlgroovy/pom.xml
    magnoliamodules/trunk/openutils-mgnlgroovy/src/main/resources/META-INF/magnolia/groovyshell.xml
    magnoliamodules/trunk/openutils-mgnllms/pom.xml
    magnoliamodules/trunk/openutils-mgnllms/src/main/resources/META-INF/magnolia/mgnllms.xml
    magnoliamodules/trunk/openutils-mgnlmail/pom.xml
    magnoliamodules/trunk/openutils-mgnlmail/src/main/resources/META-INF/magnolia/simplemail.xml
    magnoliamodules/trunk/openutils-mgnlmedia/pom.xml
    magnoliamodules/trunk/openutils-mgnlmedia/src/main/resources/META-INF/magnolia/media.xml
    magnoliamodules/trunk/openutils-mgnlmessages/pom.xml
    magnoliamodules/trunk/openutils-mgnlmessages/src/main/resources/META-INF/magnolia/messages.xml
    magnoliamodules/trunk/openutils-mgnlrepoutils/pom.xml
    magnoliamodules/trunk/openutils-mgnlrepoutils/src/main/resources/META-INF/magnolia/repoutils.xml
    magnoliamodules/trunk/openutils-mgnlrules/pom.xml
    magnoliamodules/trunk/openutils-mgnlrules/src/main/resources/META-INF/magnolia/rules.xml
    magnoliamodules/trunk/openutils-mgnlstripes/pom.xml
    magnoliamodules/trunk/openutils-mgnlstripes/src/main/resources/META-INF/magnolia/stripes.xml
    magnoliamodules/trunk/openutils-mgnlstruts11/pom.xml
    magnoliamodules/trunk/openutils-mgnlstruts11/src/main/resources/META-INF/magnolia/struts11.xml
    magnoliamodules/trunk/openutils-mgnltagcloud/pom.xml
    magnoliamodules/trunk/openutils-mgnltagcloud/src/main/resources/META-INF/magnolia/tagcloud.xml
    magnoliamodules/trunk/openutils-mgnltasks/pom.xml
    magnoliamodules/trunk/openutils-mgnltasks/src/main/resources/META-INF/magnolia/tasks.xml
    magnoliamodules/trunk/openutils-mgnltests/pom.xml
    magnoliamodules/trunk/openutils-mgnlutils/pom.xml
    magnoliamodules/trunk/openutils-mgnlutils/src/main/resources/META-INF/magnolia/mgnlutils.xml

Modified: magnoliamodules/trunk/magnolia-test-webapp/pom.xml
===================================================================
--- magnoliamodules/trunk/magnolia-test-webapp/pom.xml	2013-10-20 15:39:10 UTC (rev 4402)
+++ magnoliamodules/trunk/magnolia-test-webapp/pom.xml	2013-10-20 16:00:37 UTC (rev 4403)
@@ -131,100 +131,93 @@
     <dependency>
       <groupId>net.sourceforge.openutils</groupId>
       <artifactId>openutils-mgnlbootstrapsync</artifactId>
-      <version>5.0.0-SNAPSHOT</version>
+      <version>5.0.10-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>net.sourceforge.openutils</groupId>
       <artifactId>openutils-mgnlcas</artifactId>
-      <version>5.0.0-SNAPSHOT</version>
+      <version>5.0.10-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>net.sourceforge.openutils</groupId>
       <artifactId>openutils-mgnlcontrols</artifactId>
-      <version>5.0.1-SNAPSHOT</version>
+      <version>5.0.10-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>net.sourceforge.openutils</groupId>
       <artifactId>openutils-mgnlcriteria</artifactId>
-      <version>5.0.2-SNAPSHOT</version>
+      <version>5.0.10-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>net.sourceforge.openutils</groupId>
       <artifactId>openutils-mgnlcache</artifactId>
-      <version>5.0.0-SNAPSHOT</version>
+      <version>5.0.10-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>net.sourceforge.openutils</groupId>
       <artifactId>openutils-mgnlext</artifactId>
-      <version>5.0.0-SNAPSHOT</version>
+      <version>5.0.10-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>net.sourceforge.openutils</groupId>
       <artifactId>openutils-mgnlgroovy</artifactId>
-      <version>5.0.1-SNAPSHOT</version>
+      <version>5.0.10-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>net.sourceforge.openutils</groupId>
       <artifactId>openutils-mgnlmedia</artifactId>
-      <version>5.0.3-SNAPSHOT</version>
+      <version>5.0.10-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>net.sourceforge.openutils</groupId>
       <artifactId>openutils-mgnlmessages</artifactId>
-      <version>5.0.2-SNAPSHOT</version>
+      <version>5.0.10-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>net.sourceforge.openutils</groupId>
       <artifactId>openutils-mgnlrepoutils</artifactId>
-      <version>5.0.0-SNAPSHOT</version>
+      <version>5.0.10-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>net.sourceforge.openutils</groupId>
       <artifactId>openutils-mgnlstripes</artifactId>
-      <version>5.0.1-SNAPSHOT</version>
+      <version>5.0.10-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>net.sourceforge.openutils</groupId>
       <artifactId>openutils-mgnlstruts11</artifactId>
-      <version>5.0.0-SNAPSHOT</version>
+      <version>5.0.10-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>net.sourceforge.openutils</groupId>
       <artifactId>openutils-mgnltasks</artifactId>
-      <version>5.0.1-SNAPSHOT</version>
+      <version>5.0.10-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>net.sourceforge.openutils</groupId>
       <artifactId>openutils-mgnlutils</artifactId>
-      <version>5.0.2-SNAPSHOT</version>
+      <version>5.0.10-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>net.sourceforge.openutils</groupId>
       <artifactId>openutils-mgnltagcloud</artifactId>
-      <version>5.0.2-SNAPSHOT</version>
+      <version>5.0.10-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>net.sourceforge.openutils</groupId>
       <artifactId>openutils-mgnlrules</artifactId>
-      <version>4.5.1-SNAPSHOT</version>
+      <version>5.0.10-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>net.sourceforge.openutils</groupId>
       <artifactId>openutils-mgnlcontextmenu</artifactId>
-      <version>4.5.5-SNAPSHOT</version>
+      <version>5.0.10-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>net.sourceforge.openutils</groupId>
       <artifactId>openutils-mgnllms</artifactId>
-      <version>5.0.0-SNAPSHOT</version>
+      <version>5.0.10-SNAPSHOT</version>
     </dependency>
-    <!--
-    <dependency>
-      <groupId>net.sourceforge.openutils</groupId>
-      <artifactId>openutils-mgnlmobile</artifactId>
-      <version>5.0.0-SNAPSHOT</version>
-    </dependency>
-    -->
   </dependencies>
   <dependencyManagement>
     <dependencies>

Modified: magnoliamodules/trunk/magnolia5-test-webapp/pom.xml
===================================================================
--- magnoliamodules/trunk/magnolia5-test-webapp/pom.xml	2013-10-20 15:39:10 UTC (rev 4402)
+++ magnoliamodules/trunk/magnolia5-test-webapp/pom.xml	2013-10-20 16:00:37 UTC (rev 4403)
@@ -157,38 +157,13 @@
     <dependency>
       <groupId>net.sourceforge.openutils</groupId>
       <artifactId>openutils-mgnlcriteria</artifactId>
-      <version>5.0.2-SNAPSHOT</version>
+      <version>5.0.10-SNAPSHOT</version>
     </dependency>
-<!--     <dependency> -->
-<!--       <groupId>net.sourceforge.openutils</groupId> -->
-<!--       <artifactId>openutils-mgnlmedia</artifactId> -->
-<!--       <version>5.0.3-SNAPSHOT</version> -->
-<!--     </dependency> -->
     <dependency>
       <groupId>net.sourceforge.openutils</groupId>
       <artifactId>openutils-mgnltasks</artifactId>
-      <version>5.0.1-SNAPSHOT</version>
+      <version>5.0.10-SNAPSHOT</version>
     </dependency>
-    <!-- <dependency> <groupId>net.sourceforge.openutils</groupId> <artifactId>openutils-mgnlbootstrapsync</artifactId> <version>5.0.0-SNAPSHOT</version> 
-      </dependency> <dependency> <groupId>net.sourceforge.openutils</groupId> <artifactId>openutils-mgnlcas</artifactId> <version>5.0.0-SNAPSHOT</version> 
-      </dependency> <dependency> <groupId>net.sourceforge.openutils</groupId> <artifactId>openutils-mgnlcontrols</artifactId> <version>5.0.1-SNAPSHOT</version> 
-      </dependency> <dependency> <groupId>net.sourceforge.openutils</groupId> <artifactId>openutils-mgnlcache</artifactId> <version>5.0.0-SNAPSHOT</version> 
-      </dependency> <dependency> <groupId>net.sourceforge.openutils</groupId> <artifactId>openutils-mgnlext</artifactId> <version>5.0.0-SNAPSHOT</version> 
-      </dependency> <dependency> <groupId>net.sourceforge.openutils</groupId> <artifactId>openutils-mgnlgroovy</artifactId> <version>5.0.1-SNAPSHOT</version> 
-      </dependency> <dependency> <groupId>net.sourceforge.openutils</groupId> <artifactId>openutils-mgnlmedia</artifactId> <version>5.0.3-SNAPSHOT</version> 
-      </dependency> <dependency> <groupId>net.sourceforge.openutils</groupId> <artifactId>openutils-mgnlmessages</artifactId> <version>5.0.2-SNAPSHOT</version> 
-      </dependency> <dependency> <groupId>net.sourceforge.openutils</groupId> <artifactId>openutils-mgnlrepoutils</artifactId> 
-      <version>5.0.0-SNAPSHOT</version> </dependency> <dependency> <groupId>net.sourceforge.openutils</groupId> <artifactId>openutils-mgnlstripes</artifactId> 
-      <version>5.0.1-SNAPSHOT</version> </dependency> <dependency> <groupId>net.sourceforge.openutils</groupId> <artifactId>openutils-mgnlstruts11</artifactId> 
-      <version>5.0.0-SNAPSHOT</version> </dependency> <dependency> <groupId>net.sourceforge.openutils</groupId> <artifactId>openutils-mgnltasks</artifactId> 
-      <version>5.0.1-SNAPSHOT</version> </dependency> <dependency> <groupId>net.sourceforge.openutils</groupId> <artifactId>openutils-mgnlutils</artifactId> 
-      <version>5.0.2-SNAPSHOT</version> </dependency> <dependency> <groupId>net.sourceforge.openutils</groupId> <artifactId>openutils-mgnltagcloud</artifactId> 
-      <version>5.0.2-SNAPSHOT</version> </dependency> <dependency> <groupId>net.sourceforge.openutils</groupId> <artifactId>openutils-mgnlrules</artifactId> 
-      <version>5.0.0-SNAPSHOT</version> </dependency> <dependency> <groupId>net.sourceforge.openutils</groupId> <artifactId>openutils-mgnlcontextmenu</artifactId> 
-      <version>5.0.0-SNAPSHOT</version> </dependency> <dependency> <groupId>net.sourceforge.openutils</groupId> <artifactId>openutils-mgnllms</artifactId> 
-      <version>5.0.0-SNAPSHOT</version> </dependency> -->
-    <!-- <dependency> <groupId>net.sourceforge.openutils</groupId> <artifactId>openutils-mgnlmobile</artifactId> <version>5.0.0-SNAPSHOT</version> 
-      </dependency> -->
   </dependencies>
   <dependencyManagement>
     <dependencies>

Modified: magnoliamodules/trunk/openutils-mgnlbootstrapsync/pom.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnlbootstrapsync/pom.xml	2013-10-20 15:39:10 UTC (rev 4402)
+++ magnoliamodules/trunk/openutils-mgnlbootstrapsync/pom.xml	2013-10-20 16:00:37 UTC (rev 4403)
@@ -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>5.0.0-SNAPSHOT</version>
+  <version>5.0.10-SNAPSHOT</version>
   <licenses>
     <license>
       <name>GPLv3</name>

Modified: magnoliamodules/trunk/openutils-mgnlbootstrapsync/src/main/resources/META-INF/magnolia/bootstrapsync.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnlbootstrapsync/src/main/resources/META-INF/magnolia/bootstrapsync.xml	2013-10-20 15:39:10 UTC (rev 4402)
+++ magnoliamodules/trunk/openutils-mgnlbootstrapsync/src/main/resources/META-INF/magnolia/bootstrapsync.xml	2013-10-20 16:00:37 UTC (rev 4403)
@@ -6,4 +6,18 @@
   <description>Bootstrap Synchronizer</description>
   <class>it.openutils.mgnlbootstrapsync.lifecycle.BootstrapSyncModuleLifecycle</class>
   <version>${project.version}</version>
-</module>
+  <dependencies>
+    <dependency>
+      <name>core</name>
+      <version>4.5.11/4.5.99</version>
+    </dependency>
+    <dependency>
+      <name>mgnlutils</name>
+      <version>5.0.10/*</version>
+    </dependency>
+    <dependency>
+      <name>adminInterface</name>
+      <version>*</version>
+    </dependency>
+  </dependencies>
+</module>
\ No newline at end of file

Modified: magnoliamodules/trunk/openutils-mgnlcache/pom.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnlcache/pom.xml	2013-10-20 15:39:10 UTC (rev 4402)
+++ magnoliamodules/trunk/openutils-mgnlcache/pom.xml	2013-10-20 16:00:37 UTC (rev 4403)
@@ -11,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>5.0.0-SNAPSHOT</version>
+  <version>5.0.10-SNAPSHOT</version>
   <inceptionYear>2010</inceptionYear>
   <licenses>
     <license>
@@ -61,7 +61,7 @@
     <dependency>
       <groupId>net.sourceforge.openutils</groupId>
       <artifactId>openutils-mgnltasks</artifactId>
-      <version>5.0.0</version>
+      <version>5.0.10-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>javax.servlet</groupId>

Modified: magnoliamodules/trunk/openutils-mgnlcache/src/main/resources/META-INF/magnolia/simplecache.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnlcache/src/main/resources/META-INF/magnolia/simplecache.xml	2013-10-20 15:39:10 UTC (rev 4402)
+++ magnoliamodules/trunk/openutils-mgnlcache/src/main/resources/META-INF/magnolia/simplecache.xml	2013-10-20 16:00:37 UTC (rev 4403)
@@ -8,8 +8,16 @@
   <version>${project.version}</version>
   <dependencies>
     <dependency>
+      <name>core</name>
+      <version>4.5.11/4.5.99</version>
+    </dependency>
+    <dependency>
+      <name>mgnlutils</name>
+      <version>5.0.10/*</version>
+    </dependency>
+    <dependency>
       <name>adminInterface</name>
-      <version>4.5/*</version>
+      <version>*</version>
     </dependency>
   </dependencies>
 </module>
\ No newline at end of file

Modified: magnoliamodules/trunk/openutils-mgnlcas/pom.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnlcas/pom.xml	2013-10-20 15:39:10 UTC (rev 4402)
+++ magnoliamodules/trunk/openutils-mgnlcas/pom.xml	2013-10-20 16:00:37 UTC (rev 4403)
@@ -10,7 +10,7 @@
   <packaging>jar</packaging>
   <artifactId>openutils-mgnlcas</artifactId>
   <name>CAS integration module for Magnolia CMS</name>
-  <version>5.0.0-SNAPSHOT</version>
+  <version>5.0.10-SNAPSHOT</version>
   <inceptionYear>2007</inceptionYear>
   <licenses>
     <license>

Modified: magnoliamodules/trunk/openutils-mgnlcas/src/main/resources/META-INF/magnolia/cas.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnlcas/src/main/resources/META-INF/magnolia/cas.xml	2013-10-20 15:39:10 UTC (rev 4402)
+++ magnoliamodules/trunk/openutils-mgnlcas/src/main/resources/META-INF/magnolia/cas.xml	2013-10-20 16:00:37 UTC (rev 4403)
@@ -8,8 +8,16 @@
   <version>${project.version}</version>
   <dependencies>
     <dependency>
+      <name>core</name>
+      <version>4.5.11/4.5.99</version>
+    </dependency>
+    <dependency>
+      <name>mgnlutils</name>
+      <version>5.0.10/*</version>
+    </dependency>
+    <dependency>
       <name>adminInterface</name>
-      <version>4.5/*</version>
+      <version>*</version>
     </dependency>
   </dependencies>
 </module>
\ No newline at end of file

Modified: magnoliamodules/trunk/openutils-mgnlcontextmenu/pom.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnlcontextmenu/pom.xml	2013-10-20 15:39:10 UTC (rev 4402)
+++ magnoliamodules/trunk/openutils-mgnlcontextmenu/pom.xml	2013-10-20 16:00:37 UTC (rev 4403)
@@ -12,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>4.5.5-SNAPSHOT</version>
+  <version>5.0.10-SNAPSHOT</version>
   <inceptionYear>2010</inceptionYear>
   <licenses>
     <license>
@@ -110,12 +110,12 @@
     <dependency>
       <groupId>net.sourceforge.openutils</groupId>
       <artifactId>openutils-mgnlutils</artifactId>
-      <version>5.0.2-SNAPSHOT</version>
+      <version>5.0.10-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>net.sourceforge.openutils</groupId>
       <artifactId>openutils-mgnltasks</artifactId>
-      <version>5.0.1-SNAPSHOT</version>
+      <version>5.0.10-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>net.sourceforge.openutils</groupId>
@@ -125,7 +125,7 @@
     <dependency>
       <groupId>net.sourceforge.openutils</groupId>
       <artifactId>openutils-mgnlmedia</artifactId>
-      <version>5.0.0</version>
+      <version>5.0.10-SNAPSHOT</version>
       <optional>true</optional>
     </dependency>
     <dependency>

Modified: magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/resources/META-INF/magnolia/contextmenu.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/resources/META-INF/magnolia/contextmenu.xml	2013-10-20 15:39:10 UTC (rev 4402)
+++ magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/resources/META-INF/magnolia/contextmenu.xml	2013-10-20 16:00:37 UTC (rev 4403)
@@ -5,7 +5,7 @@
   <displayName>contextmenu</displayName>
   <description>Openutils - Magnolia Context Menu Library</description>
   <class>net.sourceforge.openutils.mgnlcontextmenu.module.ContextMenuModule</class>
-    <versionHandler>net.sourceforge.openutils.mgnlcontextmenu.setup.ContextMenuModuleVersionHandler</versionHandler>
+  <versionHandler>net.sourceforge.openutils.mgnlcontextmenu.setup.ContextMenuModuleVersionHandler</versionHandler>
   <version>${project.version}</version>
   <components>
     <id>main</id>
@@ -14,4 +14,18 @@
       <implementation>net.sourceforge.openutils.mgnlcontextmenu.configuration.ContextMenuManager</implementation>
     </component>
   </components>
+  <dependencies>
+    <dependency>
+      <name>core</name>
+      <version>4.5.11/4.5.99</version>
+    </dependency>
+    <dependency>
+      <name>mgnlutils</name>
+      <version>5.0.10/*</version>
+    </dependency>
+    <dependency>
+      <name>adminInterface</name>
+      <version>*</version>
+    </dependency>
+  </dependencies>
 </module>
\ No newline at end of file

Modified: magnoliamodules/trunk/openutils-mgnlcontrols/pom.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnlcontrols/pom.xml	2013-10-20 15:39:10 UTC (rev 4402)
+++ magnoliamodules/trunk/openutils-mgnlcontrols/pom.xml	2013-10-20 16:00:37 UTC (rev 4403)
@@ -11,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>5.0.1-SNAPSHOT</version>
+  <version>5.0.10-SNAPSHOT</version>
   <inceptionYear>2008</inceptionYear>
   <licenses>
     <license>
@@ -92,17 +92,17 @@
     <dependency>
       <groupId>net.sourceforge.openutils</groupId>
       <artifactId>openutils-mgnltasks</artifactId>
-      <version>5.0.0</version>
+      <version>5.0.10-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>net.sourceforge.openutils</groupId>
       <artifactId>openutils-mgnlext</artifactId>
-      <version>2.2</version>
+      <version>5.0.10-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>net.sourceforge.openutils</groupId>
       <artifactId>openutils-mgnlutils</artifactId>
-      <version>5.0.2-SNAPSHOT</version>
+      <version>5.0.10-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>javax.servlet</groupId>

Modified: magnoliamodules/trunk/openutils-mgnlcontrols/src/main/resources/META-INF/magnolia/controls.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnlcontrols/src/main/resources/META-INF/magnolia/controls.xml	2013-10-20 15:39:10 UTC (rev 4402)
+++ magnoliamodules/trunk/openutils-mgnlcontrols/src/main/resources/META-INF/magnolia/controls.xml	2013-10-20 16:00:37 UTC (rev 4403)
@@ -16,8 +16,16 @@
   </components>
   <dependencies>
     <dependency>
+      <name>core</name>
+      <version>4.5.11/4.5.99</version>
+    </dependency>
+    <dependency>
+      <name>mgnlutils</name>
+      <version>5.0.10/*</version>
+    </dependency>
+    <dependency>
       <name>adminInterface</name>
-      <version>4.5/*</version>
+      <version>*</version>
     </dependency>
   </dependencies>
-</module>
+</module>
\ No newline at end of file

Modified: magnoliamodules/trunk/openutils-mgnlcriteria/pom.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnlcriteria/pom.xml	2013-10-20 15:39:10 UTC (rev 4402)
+++ magnoliamodules/trunk/openutils-mgnlcriteria/pom.xml	2013-10-20 16:00:37 UTC (rev 4403)
@@ -8,7 +8,7 @@
   </parent>
   <artifactId>openutils-mgnlcriteria</artifactId>
   <name>Criteria API for Magnolia CMS</name>
-  <version>5.0.2-SNAPSHOT</version>
+  <version>5.0.10-SNAPSHOT</version>
   <inceptionYear>2009</inceptionYear>
   <description>A Hibernate's Criteria-like API to programmatically generate JCR queries with Magnolia</description>
   <licenses>
@@ -154,7 +154,7 @@
     <dependency>
       <groupId>net.sourceforge.openutils</groupId>
       <artifactId>openutils-mgnltests</artifactId>
-      <version>5.0.0</version>
+      <version>5.0.10-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
     <dependency>

Modified: magnoliamodules/trunk/openutils-mgnlcriteria/src/main/resources/META-INF/magnolia/criteria.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnlcriteria/src/main/resources/META-INF/magnolia/criteria.xml	2013-10-20 15:39:10 UTC (rev 4402)
+++ magnoliamodules/trunk/openutils-mgnlcriteria/src/main/resources/META-INF/magnolia/criteria.xml	2013-10-20 16:00:37 UTC (rev 4403)
@@ -8,7 +8,7 @@
   <dependencies>
     <dependency>
       <name>core</name>
-      <version>4.5/*</version>
+      <version>4.5.11/4.5.99</version>
     </dependency>
   </dependencies>
 </module>
\ No newline at end of file

Modified: magnoliamodules/trunk/openutils-mgnlext/pom.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnlext/pom.xml	2013-10-20 15:39:10 UTC (rev 4402)
+++ magnoliamodules/trunk/openutils-mgnlext/pom.xml	2013-10-20 16:00:37 UTC (rev 4403)
@@ -10,7 +10,7 @@
   <packaging>jar</packaging>
   <artifactId>openutils-mgnlext</artifactId>
   <name>openutils-mgnlext</name>
-  <version>5.0.0-SNAPSHOT</version>
+  <version>5.0.10-SNAPSHOT</version>
   <scm>
     <connection>scm:svn:svn+ssh://svn.code.sf.net/p/openutils/code/magnoliamodules/trunk/openutils-mgnlext</connection>
     <developerConnection>scm:svn:svn+ssh://svn.code.sf.net/p/openutils/code/magnoliamodules/trunk/openutils-mgnlext</developerConnection>

Modified: magnoliamodules/trunk/openutils-mgnlext/src/main/resources/META-INF/magnolia/ext.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnlext/src/main/resources/META-INF/magnolia/ext.xml	2013-10-20 15:39:10 UTC (rev 4402)
+++ magnoliamodules/trunk/openutils-mgnlext/src/main/resources/META-INF/magnolia/ext.xml	2013-10-20 16:00:37 UTC (rev 4403)
@@ -5,4 +5,10 @@
   <displayName>openutils-mgnlext</displayName>
   <description>A repackaging of ext-js for easier usage into Magnolia</description>
   <version>${project.version}</version>
+  <dependencies>
+    <dependency>
+      <name>core</name>
+      <version>4.5.11/4.5.99</version>
+    </dependency>
+  </dependencies>
 </module>
\ No newline at end of file

Modified: magnoliamodules/trunk/openutils-mgnlgroovy/pom.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnlgroovy/pom.xml	2013-10-20 15:39:10 UTC (rev 4402)
+++ magnoliamodules/trunk/openutils-mgnlgroovy/pom.xml	2013-10-20 16:00:37 UTC (rev 4403)
@@ -10,7 +10,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>5.0.1-SNAPSHOT</version>
+  <version>5.0.10-SNAPSHOT</version>
   <inceptionYear>2008</inceptionYear>
   <licenses>
     <license>
@@ -90,7 +90,7 @@
     <dependency>
       <groupId>net.sourceforge.openutils</groupId>
       <artifactId>openutils-mgnltasks</artifactId>
-      <version>5.0.0</version>
+      <version>5.0.10-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>javax.servlet</groupId>

Modified: magnoliamodules/trunk/openutils-mgnlgroovy/src/main/resources/META-INF/magnolia/groovyshell.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnlgroovy/src/main/resources/META-INF/magnolia/groovyshell.xml	2013-10-20 15:39:10 UTC (rev 4402)
+++ magnoliamodules/trunk/openutils-mgnlgroovy/src/main/resources/META-INF/magnolia/groovyshell.xml	2013-10-20 16:00:37 UTC (rev 4403)
@@ -9,8 +9,16 @@
   <version>${project.version}</version>
   <dependencies>
     <dependency>
+      <name>core</name>
+      <version>4.5.11/4.5.99</version>
+    </dependency>
+    <dependency>
+      <name>mgnlutils</name>
+      <version>5.0.10/*</version>
+    </dependency>
+    <dependency>
       <name>adminInterface</name>
-      <version>4.5/*</version>
+      <version>*</version>
     </dependency>
   </dependencies>
 </module>
\ No newline at end of file

Modified: magnoliamodules/trunk/openutils-mgnllms/pom.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnllms/pom.xml	2013-10-20 15:39:10 UTC (rev 4402)
+++ magnoliamodules/trunk/openutils-mgnllms/pom.xml	2013-10-20 16:00:37 UTC (rev 4403)
@@ -11,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>5.0.0-SNAPSHOT</version>
+  <version>5.0.10-SNAPSHOT</version>
   <inceptionYear>2010</inceptionYear>
   <licenses>
     <license>
@@ -108,17 +108,17 @@
     <dependency>
       <groupId>net.sourceforge.openutils</groupId>
       <artifactId>openutils-mgnltasks</artifactId>
-      <version>5.0.1-SNAPSHOT</version>
+      <version>5.0.10-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>net.sourceforge.openutils</groupId>
       <artifactId>openutils-mgnlcontrols</artifactId>
-      <version>5.0.0</version>
+      <version>5.0.10-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>net.sourceforge.openutils</groupId>
       <artifactId>openutils-mgnlext</artifactId>
-      <version>2.1</version>
+      <version>5.0.10-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>net.sourceforge.openutils</groupId>
@@ -177,7 +177,7 @@
     <dependency>
       <groupId>net.sourceforge.openutils</groupId>
       <artifactId>openutils-mgnlcriteria</artifactId>
-      <version>5.0.1</version>
+      <version>5.0.10-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>javax.servlet</groupId>

Modified: magnoliamodules/trunk/openutils-mgnllms/src/main/resources/META-INF/magnolia/mgnllms.xml
===================================================================
(Binary files differ)

Modified: magnoliamodules/trunk/openutils-mgnlmail/pom.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnlmail/pom.xml	2013-10-20 15:39:10 UTC (rev 4402)
+++ magnoliamodules/trunk/openutils-mgnlmail/pom.xml	2013-10-20 16:00:37 UTC (rev 4403)
@@ -9,7 +9,7 @@
   <packaging>jar</packaging>
   <artifactId>openutils-mgnlmail</artifactId>
   <name>simplemail module for Magnolia CMS</name>
-  <version>5.0.1-SNAPSHOT</version>
+  <version>5.0.10-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>5.0.0</version>
+      <version>5.0.10-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>javax.servlet</groupId>

Modified: magnoliamodules/trunk/openutils-mgnlmail/src/main/resources/META-INF/magnolia/simplemail.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnlmail/src/main/resources/META-INF/magnolia/simplemail.xml	2013-10-20 15:39:10 UTC (rev 4402)
+++ magnoliamodules/trunk/openutils-mgnlmail/src/main/resources/META-INF/magnolia/simplemail.xml	2013-10-20 16:00:37 UTC (rev 4403)
@@ -9,19 +9,23 @@
   <dependencies>
     <dependency>
       <name>core</name>
-      <version>4.5/*</version>
+      <version>4.5.11/4.5.99</version>
     </dependency>
     <dependency>
-      <name>adminInterface</name>
-      <version>4.5/*</version>
+      <name>mgnlutils</name>
+      <version>5.0.10/*</version>
     </dependency>
     <dependency>
       <name>criteria</name>
-      <version>5.0.1/*</version>
+      <version>5.0.10/*</version>
     </dependency>
     <dependency>
+      <name>adminInterface</name>
+      <version>*</version>
+    </dependency>
+    <dependency>
       <name>mail</name>
-      <version>4.5/*</version>
+      <version>*</version>
     </dependency>
   </dependencies>
   <repositories>

Modified: magnoliamodules/trunk/openutils-mgnlmedia/pom.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnlmedia/pom.xml	2013-10-20 15:39:10 UTC (rev 4402)
+++ magnoliamodules/trunk/openutils-mgnlmedia/pom.xml	2013-10-20 16:00:37 UTC (rev 4403)
@@ -10,10 +10,8 @@
   <packaging>jar</packaging>
   <artifactId>openutils-mgnlmedia</artifactId>
   <name>SimpleMedia Module for Magnolia CMS</name>
-  <description>SimpleMedia Module for Magnolia CMS: a module for Magnolia CMS for easier management of multimedia
-    assets.
-  </description>
-  <version>5.0.3-SNAPSHOT</version>
+  <description>SimpleMedia Module for Magnolia CMS: a module for Magnolia CMS for easier management of multimedia assets.</description>
+  <version>5.0.10-SNAPSHOT</version>
   <inceptionYear>2008</inceptionYear>
   <licenses>
     <license>
@@ -117,22 +115,22 @@
     <dependency>
       <groupId>net.sourceforge.openutils</groupId>
       <artifactId>openutils-mgnltasks</artifactId>
-      <version>5.0.1-SNAPSHOT</version>
+      <version>5.0.10-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>net.sourceforge.openutils</groupId>
       <artifactId>openutils-mgnlcontrols</artifactId>
-      <version>5.0.0</version>
+      <version>5.0.10-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>net.sourceforge.openutils</groupId>
       <artifactId>openutils-mgnlext</artifactId>
-      <version>2.1</version>
+      <version>5.0.10-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>net.sourceforge.openutils</groupId>
       <artifactId>openutils-mgnlutils</artifactId>
-      <version>5.0.2-SNAPSHOT</version>
+      <version>5.0.10-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>net.sourceforge.openutils</groupId>
@@ -170,7 +168,7 @@
     <dependency>
       <groupId>net.sourceforge.openutils</groupId>
       <artifactId>openutils-mgnltests</artifactId>
-      <version>5.0.1-SNAPSHOT</version>
+      <version>5.0.10-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
     <dependency>
@@ -181,7 +179,7 @@
     <dependency>
       <groupId>net.sourceforge.openutils</groupId>
       <artifactId>openutils-mgnlcriteria</artifactId>
-      <version>5.0.1</version>
+      <version>5.0.10-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>javax.servlet.jsp</groupId>

Modified: magnoliamodules/trunk/openutils-mgnlmedia/src/main/resources/META-INF/magnolia/media.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnlmedia/src/main/resources/META-INF/magnolia/media.xml	2013-10-20 15:39:10 UTC (rev 4402)
+++ magnoliamodules/trunk/openutils-mgnlmedia/src/main/resources/META-INF/magnolia/media.xml	2013-10-20 16:00:37 UTC (rev 4403)
@@ -31,17 +31,21 @@
   <dependencies>
     <dependency>
       <name>core</name>
-      <version>4.5/*</version>
+      <version>4.5.11/4.5.99</version>
     </dependency>
     <dependency>
-      <name>adminInterface</name>
-      <version>4.5/*</version>
+      <name>mgnlutils</name>
+      <version>5.0.10/*</version>
     </dependency>
     <dependency>
       <name>criteria</name>
-      <version>5.0.1/*</version>
+      <version>5.0.10/*</version>
     </dependency>
     <dependency>
+      <name>adminInterface</name>
+      <version>*</version>
+    </dependency>
+    <dependency>
       <name>standard-templating-kit</name>
       <version>2.0.10/*</version>
       <optional>true</optional>

Modified: magnoliamodules/trunk/openutils-mgnlmessages/pom.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnlmessages/pom.xml	2013-10-20 15:39:10 UTC (rev 4402)
+++ magnoliamodules/trunk/openutils-mgnlmessages/pom.xml	2013-10-20 16:00:37 UTC (rev 4403)
@@ -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>5.0.2-SNAPSHOT</version>
+  <version>5.0.10-SNAPSHOT</version>
   <licenses>
     <license>
       <name>GPLv3</name>
@@ -87,27 +87,27 @@
     <dependency>
       <groupId>net.sourceforge.openutils</groupId>
       <artifactId>openutils-mgnltasks</artifactId>
-      <version>5.0.0</version>
+      <version>5.0.10-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>net.sourceforge.openutils</groupId>
       <artifactId>openutils-mgnlext</artifactId>
-      <version>2.1</version>
+      <version>5.0.10-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>net.sourceforge.openutils</groupId>
       <artifactId>openutils-mgnlcriteria</artifactId>
-      <version>5.0.1</version>
+      <version>5.0.10-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>net.sourceforge.openutils</groupId>
       <artifactId>openutils-mgnlutils</artifactId>
-      <version>5.0.2-SNAPSHOT</version>
+      <version>5.0.10-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>net.sourceforge.openutils</groupId>
       <artifactId>openutils-mgnltests</artifactId>
-      <version>5.0.1-SNAPSHOT</version>
+      <version>5.0.10-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
     <dependency>

Modified: magnoliamodules/trunk/openutils-mgnlmessages/src/main/resources/META-INF/magnolia/messages.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnlmessages/src/main/resources/META-INF/magnolia/messages.xml	2013-10-20 15:39:10 UTC (rev 4402)
+++ magnoliamodules/trunk/openutils-mgnlmessages/src/main/resources/META-INF/magnolia/messages.xml	2013-10-20 16:00:37 UTC (rev 4403)
@@ -30,17 +30,22 @@
   <dependencies>
     <dependency>
       <name>core</name>
-      <version>4.5/*</version>
+      <version>4.5.11/4.5.99</version>
     </dependency>
     <dependency>
-      <name>adminInterface</name>
-      <version>4.5/*</version>
+      <name>mgnlutils</name>
+      <version>5.0.10/*</version>
     </dependency>
     <dependency>
       <name>criteria</name>
-      <version>5.0.1/*</version>
+      <version>5.0.10/*</version>
     </dependency>
+    <dependency>
+      <name>adminInterface</name>
+      <version>*</version>
+    </dependency>
   </dependencies>
+</dependencies>
   <repositories>
     <repository>
       <name>magnolia</name>

Modified: magnoliamodules/trunk/openutils-mgnlrepoutils/pom.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnlrepoutils/pom.xml	2013-10-20 15:39:10 UTC (rev 4402)
+++ magnoliamodules/trunk/openutils-mgnlrepoutils/pom.xml	2013-10-20 16:00:37 UTC (rev 4403)
@@ -10,7 +10,7 @@
   <packaging>jar</packaging>
   <artifactId>openutils-mgnlrepoutils</artifactId>
   <name>Repository tools for Magnolia CMS</name>
-  <version>5.0.0-SNAPSHOT</version>
+  <version>5.0.10-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>
@@ -76,12 +76,12 @@
     <dependency>
       <groupId>net.sourceforge.openutils</groupId>
       <artifactId>openutils-mgnlcriteria</artifactId>
-      <version>5.0.1</version>
+      <version>5.0.10-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>net.sourceforge.openutils</groupId>
       <artifactId>openutils-mgnlutils</artifactId>
-      <version>5.0.2-SNAPSHOT</version>
+      <version>5.0.10-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>javax.servlet</groupId>

Modified: magnoliamodules/trunk/openutils-mgnlrepoutils/src/main/resources/META-INF/magnolia/repoutils.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnlrepoutils/src/main/resources/META-INF/magnolia/repoutils.xml	2013-10-20 15:39:10 UTC (rev 4402)
+++ magnoliamodules/trunk/openutils-mgnlrepoutils/src/main/resources/META-INF/magnolia/repoutils.xml	2013-10-20 16:00:37 UTC (rev 4403)
@@ -8,15 +8,19 @@
   <dependencies>
     <dependency>
       <name>core</name>
-      <version>4.5/*</version>
+      <version>4.5.11/4.5.99</version>
     </dependency>
     <dependency>
-      <name>adminInterface</name>
-      <version>4.5/*</version>
+      <name>mgnlutils</name>
+      <version>5.0.10/*</version>
     </dependency>
     <dependency>
       <name>criteria</name>
-      <version>5.0.1/*</version>
+      <version>5.0.10/*</version>
     </dependency>
+    <dependency>
+      <name>adminInterface</name>
+      <version>*</version>
+    </dependency>
   </dependencies>
 </module>
\ No newline at end of file

Modified: magnoliamodules/trunk/openutils-mgnlrules/pom.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnlrules/pom.xml	2013-10-20 15:39:10 UTC (rev 4402)
+++ magnoliamodules/trunk/openutils-mgnlrules/pom.xml	2013-10-20 16:00:37 UTC (rev 4403)
@@ -11,7 +11,7 @@
   <packaging>jar</packaging>
   <artifactId>openutils-mgnlrules</artifactId>
   <name>Rules module for Magnolia CMS</name>
-  <version>4.5.1-SNAPSHOT</version>
+  <version>5.0.10-SNAPSHOT</version>
   <description>A simple rule engine integrated into Magnolia CMS</description>
   <licenses>
     <license>
@@ -100,12 +100,12 @@
     <dependency>
       <groupId>net.sourceforge.openutils</groupId>
       <artifactId>openutils-mgnlcontrols</artifactId>
-      <version>5.0.0</version>
+      <version>5.0.10-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>net.sourceforge.openutils</groupId>
       <artifactId>openutils-mgnltasks</artifactId>
-      <version>5.0.1-SNAPSHOT</version>
+      <version>5.0.10-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>info.magnolia</groupId>

Modified: magnoliamodules/trunk/openutils-mgnlrules/src/main/resources/META-INF/magnolia/rules.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnlrules/src/main/resources/META-INF/magnolia/rules.xml	2013-10-20 15:39:10 UTC (rev 4402)
+++ magnoliamodules/trunk/openutils-mgnlrules/src/main/resources/META-INF/magnolia/rules.xml	2013-10-20 16:00:37 UTC (rev 4403)
@@ -5,7 +5,7 @@
   <displayName>rules</displayName>
   <description>Openutils - Magnolia Rule Module</description>
   <class>net.sourceforge.openutils.mgnlrules.module.RuleModule</class>
-    <versionHandler>net.sourceforge.openutils.mgnlrules.setup.RuleModuleVersionHandler</versionHandler>
+  <versionHandler>net.sourceforge.openutils.mgnlrules.setup.RuleModuleVersionHandler</versionHandler>
   <version>${project.version}</version>
   <components>
     <id>main</id>
@@ -18,4 +18,18 @@
       <implementation>net.sourceforge.openutils.mgnlrules.configuration.ExpressionFunctionManager</implementation>
     </component>
   </components>
+  <dependencies>
+    <dependency>
+      <name>core</name>
+      <version>4.5.11/4.5.99</version>
+    </dependency>
+    <dependency>
+      <name>mgnlutils</name>
+      <version>5.0.10/*</version>
+    </dependency>
+    <dependency>
+      <name>adminInterface</name>
+      <version>*</version>
+    </dependency>
+  </dependencies>
 </module>
\ No newline at end of file

Modified: magnoliamodules/trunk/openutils-mgnlstripes/pom.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnlstripes/pom.xml	2013-10-20 15:39:10 UTC (rev 4402)
+++ magnoliamodules/trunk/openutils-mgnlstripes/pom.xml	2013-10-20 16:00:37 UTC (rev 4403)
@@ -12,7 +12,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>5.0.1-SNAPSHOT</version>
+  <version>5.0.10-SNAPSHOT</version>
   <licenses>
     <license>
       <name>GPLv3</name>
@@ -72,7 +72,7 @@
     <dependency>
       <groupId>net.sourceforge.openutils</groupId>
       <artifactId>openutils-mgnltasks</artifactId>
-      <version>5.0.0</version>
+      <version>5.0.10-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>info.magnolia</groupId>

Modified: magnoliamodules/trunk/openutils-mgnlstripes/src/main/resources/META-INF/magnolia/stripes.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnlstripes/src/main/resources/META-INF/magnolia/stripes.xml	2013-10-20 15:39:10 UTC (rev 4402)
+++ magnoliamodules/trunk/openutils-mgnlstripes/src/main/resources/META-INF/magnolia/stripes.xml	2013-10-20 16:00:37 UTC (rev 4403)
@@ -9,8 +9,16 @@
   <version>${project.version}</version>
   <dependencies>
     <dependency>
+      <name>core</name>
+      <version>4.5.11/4.5.99</version>
+    </dependency>
+    <dependency>
+      <name>mgnlutils</name>
+      <version>5.0.10/*</version>
+    </dependency>
+    <dependency>
       <name>adminInterface</name>
-      <version>4.5/*</version>
+      <version>*</version>
     </dependency>
   </dependencies>
 </module>
\ No newline at end of file

Modified: magnoliamodules/trunk/openutils-mgnlstruts11/pom.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnlstruts11/pom.xml	2013-10-20 15:39:10 UTC (rev 4402)
+++ magnoliamodules/trunk/openutils-mgnlstruts11/pom.xml	2013-10-20 16:00:37 UTC (rev 4403)
@@ -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>5.0.0-SNAPSHOT</version>
+  <version>5.0.10-SNAPSHOT</version>
   <licenses>
     <license>
       <name>GPLv3</name>
@@ -96,7 +96,7 @@
     <dependency>
       <groupId>net.sourceforge.openutils</groupId>
       <artifactId>openutils-mgnltasks</artifactId>
-      <version>5.0.0</version>
+      <version>5.0.10-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>struts</groupId>

Modified: magnoliamodules/trunk/openutils-mgnlstruts11/src/main/resources/META-INF/magnolia/struts11.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnlstruts11/src/main/resources/META-INF/magnolia/struts11.xml	2013-10-20 15:39:10 UTC (rev 4402)
+++ magnoliamodules/trunk/openutils-mgnlstruts11/src/main/resources/META-INF/magnolia/struts11.xml	2013-10-20 16:00:37 UTC (rev 4403)
@@ -8,12 +8,20 @@
   <version>${project.version}</version>
   <dependencies>
     <dependency>
+      <name>core</name>
+      <version>4.5.11/4.5.99</version>
+    </dependency>
+    <dependency>
+      <name>mgnlutils</name>
+      <version>5.0.10/*</version>
+    </dependency>
+    <dependency>
       <name>adminInterface</name>
-      <version>4.5/*</version>
+      <version>*</version>
     </dependency>
     <dependency>
       <name>templating</name>
-      <version>4.5/*</version>
+      <version>*</version>
     </dependency>
   </dependencies>
 </module>
\ No newline at end of file

Modified: magnoliamodules/trunk/openutils-mgnltagcloud/pom.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnltagcloud/pom.xml	2013-10-20 15:39:10 UTC (rev 4402)
+++ magnoliamodules/trunk/openutils-mgnltagcloud/pom.xml	2013-10-20 16:00:37 UTC (rev 4403)
@@ -11,7 +11,7 @@
   <packaging>jar</packaging>
   <artifactId>openutils-mgnltagcloud</artifactId>
   <name>Tagcloud module for Magnolia CMS</name>
-  <version>5.0.2-SNAPSHOT</version>
+  <version>5.0.10-SNAPSHOT</version>
   <description>A module for managing tag clouds for Magnolia CMS</description>
   <licenses>
     <license>
@@ -173,17 +173,17 @@
     <dependency>
       <groupId>net.sourceforge.openutils</groupId>
       <artifactId>openutils-mgnltasks</artifactId>
-      <version>5.0.1-SNAPSHOT</version>
+      <version>5.0.10-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>net.sourceforge.openutils</groupId>
       <artifactId>openutils-mgnlcontrols</artifactId>
-      <version>5.0.0</version>
+      <version>5.0.10-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>net.sourceforge.openutils</groupId>
       <artifactId>openutils-mgnlutils</artifactId>
-      <version>5.0.2-SNAPSHOT</version>
+      <version>5.0.10-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>org.slf4j</groupId>

Modified: magnoliamodules/trunk/openutils-mgnltagcloud/src/main/resources/META-INF/magnolia/tagcloud.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnltagcloud/src/main/resources/META-INF/magnolia/tagcloud.xml	2013-10-20 15:39:10 UTC (rev 4402)
+++ magnoliamodules/trunk/openutils-mgnltagcloud/src/main/resources/META-INF/magnolia/tagcloud.xml	2013-10-20 16:00:37 UTC (rev 4403)
@@ -26,12 +26,20 @@
   </components>
   <dependencies>
     <dependency>
+      <name>core</name>
+      <version>4.5.11/4.5.99</version>
+    </dependency>
+    <dependency>
+      <name>mgnlutils</name>
+      <version>5.0.10/*</version>
+    </dependency>
+    <dependency>
       <name>adminInterface</name>
-      <version>4.5/*</version>
+      <version>*</version>
     </dependency>
     <dependency>
       <name>templating</name>
-      <version>4.5/*</version>
+      <version>*</version>
     </dependency>
   </dependencies>
 </module>
\ No newline at end of file

Modified: magnoliamodules/trunk/openutils-mgnltasks/pom.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnltasks/pom.xml	2013-10-20 15:39:10 UTC (rev 4402)
+++ magnoliamodules/trunk/openutils-mgnltasks/pom.xml	2013-10-20 16:00:37 UTC (rev 4403)
@@ -11,7 +11,7 @@
   <packaging>jar</packaging>
   <artifactId>openutils-mgnltasks</artifactId>
   <name>Tasks for for Magnolia CMS</name>
-  <version>5.0.1-SNAPSHOT</version>
+  <version>5.0.10-SNAPSHOT</version>
   <description>A collection of useful magnolia update tasks that can be reused in custom modules</description>
   <inceptionYear>2008</inceptionYear>
   <scm>
@@ -71,12 +71,12 @@
     <dependency>
       <groupId>net.sourceforge.openutils</groupId>
       <artifactId>openutils-mgnlutils</artifactId>
-      <version>5.0.2-SNAPSHOT</version>
+      <version>5.0.10-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>net.sourceforge.openutils</groupId>
       <artifactId>openutils-mgnlcriteria</artifactId>
-      <version>5.0.2-SNAPSHOT</version>
+      <version>5.0.10-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>info.magnolia</groupId>

Modified: magnoliamodules/trunk/openutils-mgnltasks/src/main/resources/META-INF/magnolia/tasks.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnltasks/src/main/resources/META-INF/magnolia/tasks.xml	2013-10-20 15:39:10 UTC (rev 4402)
+++ magnoliamodules/trunk/openutils-mgnltasks/src/main/resources/META-INF/magnolia/tasks.xml	2013-10-20 16:00:37 UTC (rev 4403)
@@ -5,4 +5,14 @@
   <displayName>Openutils magnolia tasks</displayName>
   <description>A collection of useful magnolia update tasks that can be reused in custom modules</description>
   <version>${project.version}</version>
+  <dependencies>
+    <dependency>
+      <name>core</name>
+      <version>4.5.11/4.5.99</version>
+    </dependency>
+    <dependency>
+      <name>mgnlutils</name>
+      <version>5.0.10/*</version>
+    </dependency>
+  </dependencies>
 </module>
\ No newline at end of file

Modified: magnoliamodules/trunk/openutils-mgnltests/pom.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnltests/pom.xml	2013-10-20 15:39:10 UTC (rev 4402)
+++ magnoliamodules/trunk/openutils-mgnltests/pom.xml	2013-10-20 16:00:37 UTC (rev 4403)
@@ -9,7 +9,7 @@
   <packaging>jar</packaging>
   <artifactId>openutils-mgnltests</artifactId>
   <name>Test utilities for Magnolia CMS</name>
-  <version>5.0.1-SNAPSHOT</version>
+  <version>5.0.10-SNAPSHOT</version>
   <inceptionYear>2009</inceptionYear>
   <description>A collection of testing utilities for Magnolia CMS</description>
   <url>http://www.openmindlab.com/lab/products/mgnltests.html</url>

Modified: magnoliamodules/trunk/openutils-mgnlutils/pom.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnlutils/pom.xml	2013-10-20 15:39:10 UTC (rev 4402)
+++ magnoliamodules/trunk/openutils-mgnlutils/pom.xml	2013-10-20 16:00:37 UTC (rev 4403)
@@ -10,7 +10,7 @@
   <packaging>jar</packaging>
   <artifactId>openutils-mgnlutils</artifactId>
   <name>Generic utilities for Magnolia CMS</name>
-  <version>5.0.2-SNAPSHOT</version>
+  <version>5.0.10-SNAPSHOT</version>
   <inceptionYear>2009</inceptionYear>
   <description>A collection of Magnolia utilities and extensions</description>
   <url>http://www.openmindlab.com/lab/products/mgnlutils.html</url>
@@ -116,7 +116,7 @@
     <dependency>
       <groupId>net.sourceforge.openutils</groupId>
       <artifactId>openutils-mgnlcriteria</artifactId>
-      <version>5.0.1</version>
+      <version>5.0.10-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>javax.servlet</groupId>
@@ -133,7 +133,7 @@
     <dependency>
       <groupId>net.sourceforge.openutils</groupId>
       <artifactId>openutils-mgnltests</artifactId>
-      <version>5.0.0</version>
+      <version>5.0.10-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
     <dependency>

Modified: magnoliamodules/trunk/openutils-mgnlutils/src/main/resources/META-INF/magnolia/mgnlutils.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnlutils/src/main/resources/META-INF/magnolia/mgnlutils.xml	2013-10-20 15:39:10 UTC (rev 4402)
+++ magnoliamodules/trunk/openutils-mgnlutils/src/main/resources/META-INF/magnolia/mgnlutils.xml	2013-10-20 16:00:37 UTC (rev 4403)
@@ -17,15 +17,15 @@
   <dependencies>
     <dependency>
       <name>core</name>
-      <version>4.5.11/*</version>
+      <version>4.5.11/4.5.99</version>
     </dependency>
     <dependency>
-      <name>criteria</name>
-      <version>5.0.1/*</version>
+      <name>rendering</name>
+      <version>*</version>
     </dependency>
     <dependency>
-      <name>rendering</name>
-      <version>4.5.11/*</version>
+      <name>criteria</name>
+      <version>5.0.10/*</version>
     </dependency>
   </dependencies>
 </module>
\ 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:[4402] magnoliamodules/trunk

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

Revision: 4402
          http://openutils.svn.sourceforge.net/openutils/?rev=4402&view=rev
Author:   fgiust
Date:     2013-10-20 15:39:10 +0000 (Sun, 20 Oct 2013)
Log Message:
-----------
cleanup duplicate code

Modified Paths:
--------------
    magnoliamodules/trunk/openutils-mgnlcontextmenu/pom.xml
    magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/java/net/sourceforge/openutils/mgnlcontextmenu/dialog/EntrySaveHandler.java
    magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/java/net/sourceforge/openutils/mgnlcontextmenu/el/ContextMenuElFunctions.java
    magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/java/net/sourceforge/openutils/mgnlcontextmenu/setup/ContextMenuModuleVersionHandler.java
    magnoliamodules/trunk/openutils-mgnlcontrols/pom.xml
    magnoliamodules/trunk/openutils-mgnllms/pom.xml
    magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/module/LMSModuleVersionHandler.java
    magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/grid/MediaGridColumnType.java
    magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/configuration/DefaultMediaUsedInManager.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/lifecycle/MediaModule.java
    magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/pages/MediaBean.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/MediaModuleVersionHandler.java
    magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/types/impl/DocumentTypeHandler.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/types/impl/VideoTypeHandler.java
    magnoliamodules/trunk/openutils-mgnlrepoutils/src/main/resources/net/sourceforge/openutils/mgnlrepoutils/RepositoryUtilsPage.html
    magnoliamodules/trunk/openutils-mgnlrules/pom.xml
    magnoliamodules/trunk/openutils-mgnlrules/src/main/java/net/sourceforge/openutils/mgnlrules/setup/RuleModuleVersionHandler.java
    magnoliamodules/trunk/openutils-mgnltagcloud/pom.xml
    magnoliamodules/trunk/openutils-mgnltagcloud/src/main/java/net/sourceforge/openutils/mgnltagcloud/setup/TagCloudModuleVersionHandler.java
    magnoliamodules/trunk/openutils-mgnltasks/src/main/java/it/openutils/mgnltasks/SetPropertyTask.java
    magnoliamodules/trunk/openutils-mgnltasks/src/main/java/it/openutils/mgnltasks/SimpleModuleVersionHandler.java
    magnoliamodules/trunk/openutils-mgnlutils/src/main/java/it/openutils/mgnlutils/el/MgnlUtilsElFunctions.java
    magnoliamodules/trunk/openutils-mgnlutils/src/main/java/it/openutils/mgnlutils/util/ClassicRenderExceptionHandler.java
    magnoliamodules/trunk/openutils-mgnlutils/src/test/java/it/openutils/mgnlutils/el/MgnlUtilsElFunctionsTest.java

Added Paths:
-----------
    magnoliamodules/trunk/openutils-mgnltasks/src/main/java/it/openutils/mgnltasks/FilesExtractionTask.java

Removed Paths:
-------------
    magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/java/net/sourceforge/openutils/mgnlcontextmenu/setup/FilesExtractionTask.java
    magnoliamodules/trunk/openutils-mgnlrules/src/main/java/net/sourceforge/openutils/mgnlrules/setup/FilesExtractionTask.java

Modified: magnoliamodules/trunk/openutils-mgnlcontextmenu/pom.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnlcontextmenu/pom.xml	2013-10-20 15:17:25 UTC (rev 4401)
+++ magnoliamodules/trunk/openutils-mgnlcontextmenu/pom.xml	2013-10-20 15:39:10 UTC (rev 4402)
@@ -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>
@@ -96,15 +97,8 @@
         </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>
       <version>${magnolia.version}</version>
     </dependency>
@@ -116,10 +110,15 @@
     <dependency>
       <groupId>net.sourceforge.openutils</groupId>
       <artifactId>openutils-mgnlutils</artifactId>
-      <version>5.0.1</version>
+      <version>5.0.2-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>net.sourceforge.openutils</groupId>
+      <artifactId>openutils-mgnltasks</artifactId>
+      <version>5.0.1-SNAPSHOT</version>
+    </dependency>
+    <dependency>
+      <groupId>net.sourceforge.openutils</groupId>
       <artifactId>openutils-elfunctions</artifactId>
       <version>1.1.1</version>
     </dependency>
@@ -171,4 +170,4 @@
   <properties>
     <magnolia.version>4.5.11</magnolia.version>
   </properties>
-</project>
+</project>
\ No newline at end of file

Modified: magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/java/net/sourceforge/openutils/mgnlcontextmenu/dialog/EntrySaveHandler.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/java/net/sourceforge/openutils/mgnlcontextmenu/dialog/EntrySaveHandler.java	2013-10-20 15:17:25 UTC (rev 4401)
+++ magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/java/net/sourceforge/openutils/mgnlcontextmenu/dialog/EntrySaveHandler.java	2013-10-20 15:39:10 UTC (rev 4402)
@@ -23,7 +23,6 @@
 import info.magnolia.cms.core.Content;
 import info.magnolia.cms.security.AccessDeniedException;
 import info.magnolia.cms.util.NodeDataUtil;
-import info.magnolia.module.ModuleRegistry;
 import info.magnolia.module.admininterface.FieldSaveHandler;
 import info.magnolia.objectfactory.Components;
 

Modified: magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/java/net/sourceforge/openutils/mgnlcontextmenu/el/ContextMenuElFunctions.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/java/net/sourceforge/openutils/mgnlcontextmenu/el/ContextMenuElFunctions.java	2013-10-20 15:17:25 UTC (rev 4401)
+++ magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/java/net/sourceforge/openutils/mgnlcontextmenu/el/ContextMenuElFunctions.java	2013-10-20 15:39:10 UTC (rev 4402)
@@ -20,11 +20,9 @@
 package net.sourceforge.openutils.mgnlcontextmenu.el;
 
 import info.magnolia.cms.security.Permission;
-import info.magnolia.cms.util.DeprecationUtil;
 import info.magnolia.context.MgnlContext;
 import info.magnolia.context.WebContext;
 import info.magnolia.jcr.util.NodeUtil;
-import info.magnolia.jcr.util.PropertyUtil;
 import info.magnolia.jcr.wrapper.HTMLEscapingNodeWrapper;
 import info.magnolia.objectfactory.Components;
 import it.openutils.mgnlutils.el.MgnlUtilsDeprecatedAdapters;

Modified: magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/java/net/sourceforge/openutils/mgnlcontextmenu/setup/ContextMenuModuleVersionHandler.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/java/net/sourceforge/openutils/mgnlcontextmenu/setup/ContextMenuModuleVersionHandler.java	2013-10-20 15:17:25 UTC (rev 4401)
+++ magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/java/net/sourceforge/openutils/mgnlcontextmenu/setup/ContextMenuModuleVersionHandler.java	2013-10-20 15:39:10 UTC (rev 4402)
@@ -25,6 +25,7 @@
 import info.magnolia.objectfactory.Components;
 import info.magnolia.repository.RepositoryConstants;
 import it.openutils.mgnltasks.CreateMissingPropertyTask;
+import it.openutils.mgnltasks.FilesExtractionTask;
 import it.openutils.mgnltasks.SimpleModuleVersionHandler;
 
 import java.util.ArrayList;
@@ -33,9 +34,7 @@
 import net.sourceforge.openutils.mgnlcontextmenu.configuration.DefaultGetGlobalEntriesNodeStrategy;
 import net.sourceforge.openutils.mgnlcontextmenu.configuration.DefaultPersistenceStrategy;
 
-import org.apache.commons.lang.StringUtils;
 
-
 /**
  * @author dschivo
  */
@@ -50,20 +49,9 @@
     {
         List<Task> tasks = new ArrayList<Task>();
 
-        if (Components.getComponent(MagnoliaConfigurationProperties.class).getBooleanProperty("magnolia.bootstrap.samples"))
+        if (samplesEnabled())
         {
-            tasks.add(new FilesExtractionTask("Samples extraction", "Extracts jsp files for samples.")
-            {
-
-                /**
-                 * {@inheritDoc}
-                 */
-                @Override
-                protected boolean accept(String resource)
-                {
-                    return super.accept(resource) && StringUtils.contains(resource, "/samples-contextmenu/");
-                }
-            });
+            tasks.add(new FilesExtractionTask("/samples-contextmenu/"));
         }
 
         tasks.add(new CreateMissingPropertyTask(

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

Modified: magnoliamodules/trunk/openutils-mgnlcontrols/pom.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnlcontrols/pom.xml	2013-10-20 15:17:25 UTC (rev 4401)
+++ magnoliamodules/trunk/openutils-mgnlcontrols/pom.xml	2013-10-20 15:39:10 UTC (rev 4402)
@@ -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>
@@ -99,6 +100,11 @@
       <version>2.2</version>
     </dependency>
     <dependency>
+      <groupId>net.sourceforge.openutils</groupId>
+      <artifactId>openutils-mgnlutils</artifactId>
+      <version>5.0.2-SNAPSHOT</version>
+    </dependency>
+    <dependency>
       <groupId>javax.servlet</groupId>
       <artifactId>servlet-api</artifactId>
       <version>2.5</version>

Modified: magnoliamodules/trunk/openutils-mgnllms/pom.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnllms/pom.xml	2013-10-20 15:17:25 UTC (rev 4401)
+++ magnoliamodules/trunk/openutils-mgnllms/pom.xml	2013-10-20 15:39:10 UTC (rev 4402)
@@ -108,7 +108,7 @@
     <dependency>
       <groupId>net.sourceforge.openutils</groupId>
       <artifactId>openutils-mgnltasks</artifactId>
-      <version>5.0.0</version>
+      <version>5.0.1-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>net.sourceforge.openutils</groupId>

Modified: magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/module/LMSModuleVersionHandler.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/module/LMSModuleVersionHandler.java	2013-10-20 15:17:25 UTC (rev 4401)
+++ magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/module/LMSModuleVersionHandler.java	2013-10-20 15:39:10 UTC (rev 4402)
@@ -19,13 +19,12 @@
 
 package net.sourceforge.openutils.mgnllms.module;
 
-import info.magnolia.cms.core.SystemProperty;
 import info.magnolia.cms.security.Permission;
 import info.magnolia.module.InstallContext;
 import info.magnolia.module.delta.SetPropertyTask;
 import info.magnolia.module.delta.Task;
 import it.openutils.mgnltasks.AddPermissionTask;
-import it.openutils.mgnltasks.SamplesExtractionTask;
+import it.openutils.mgnltasks.FilesExtractionTask;
 import it.openutils.mgnltasks.SimpleModuleVersionHandler;
 
 import java.util.ArrayList;
@@ -58,9 +57,10 @@
     {
         List<Task> tasks = new ArrayList<Task>();
 
-        if (SystemProperty.getBooleanProperty(SystemProperty.MAGNOLIA_BOOTSTRAP_SAMPLES))
+        if (samplesEnabled())
         {
-            tasks.add(new SamplesExtractionTask());
+            tasks.add(new FilesExtractionTask("/samples-lms/"));
+
             tasks.add(new AddPermissionTask("anonymous", "website", "/sample-lms", Permission.READ));
             tasks.add(new AddPermissionTask("anonymous", "website", "/sample-lms/*", Permission.NONE));
             tasks.add(new AddPermissionTask("anonymous", "uri", "/sample-lms.html", Permission.READ));

Modified: magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/grid/MediaGridColumnType.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/grid/MediaGridColumnType.java	2013-10-20 15:17:25 UTC (rev 4401)
+++ magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/grid/MediaGridColumnType.java	2013-10-20 15:39:10 UTC (rev 4402)
@@ -22,7 +22,6 @@
 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.jcr.util.NodeUtil;

Modified: magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/configuration/DefaultMediaUsedInManager.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/configuration/DefaultMediaUsedInManager.java	2013-10-20 15:17:25 UTC (rev 4401)
+++ magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/configuration/DefaultMediaUsedInManager.java	2013-10-20 15:39:10 UTC (rev 4402)
@@ -19,13 +19,6 @@
 
 package net.sourceforge.openutils.mgnlmedia.media.configuration;
 
-import info.magnolia.cms.core.MgnlNodeType;
-import info.magnolia.content2bean.Content2BeanException;
-import info.magnolia.jcr.RuntimeRepositoryException;
-import info.magnolia.jcr.util.NodeUtil;
-import info.magnolia.objectfactory.Components;
-import it.openutils.mgnlutils.util.NodeUtilsExt;
-
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.HashSet;
@@ -35,7 +28,6 @@
 
 import javax.inject.Singleton;
 import javax.jcr.Node;
-import javax.jcr.RepositoryException;
 
 import net.sourceforge.openutils.mgnlcriteria.jcr.query.AdvancedResult;
 import net.sourceforge.openutils.mgnlcriteria.jcr.query.Criteria;

Modified: 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/configuration/UsedInWorkspace.java	2013-10-20 15:17:25 UTC (rev 4401)
+++ magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/configuration/UsedInWorkspace.java	2013-10-20 15:39:10 UTC (rev 4402)
@@ -26,8 +26,6 @@
 
 import org.apache.commons.lang.builder.ToStringBuilder;
 import org.apache.commons.lang.builder.ToStringStyle;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 
 
 /**

Modified: magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/lifecycle/MediaModule.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/lifecycle/MediaModule.java	2013-10-20 15:17:25 UTC (rev 4401)
+++ magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/lifecycle/MediaModule.java	2013-10-20 15:39:10 UTC (rev 4402)
@@ -22,7 +22,6 @@
 import info.magnolia.cms.beans.config.ObservedManager;
 import info.magnolia.module.ModuleLifecycle;
 import info.magnolia.module.ModuleLifecycleContext;
-import info.magnolia.objectfactory.Components;
 
 import java.util.ArrayList;
 import java.util.Collection;
@@ -33,10 +32,8 @@
 import javax.inject.Inject;
 
 import net.sourceforge.openutils.mgnlmedia.media.advancedsearch.configuration.SearchMediaQueryConfiguration;
-import net.sourceforge.openutils.mgnlmedia.media.configuration.ImageProcessorsManager;
 import net.sourceforge.openutils.mgnlmedia.media.configuration.MediaConfigurationManager;
 import net.sourceforge.openutils.mgnlmedia.media.configuration.MediaTypeConfiguration;
-import net.sourceforge.openutils.mgnlmedia.media.configuration.MediaUsedInManager;
 import net.sourceforge.openutils.mgnlmedia.media.utils.LockUtils;
 import net.sourceforge.openutils.mgnlmedia.media.zip.ZipImporter;
 import net.sourceforge.openutils.mgnlmedia.playlist.pages.PlaylistLink;

Modified: magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/pages/MediaBean.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/pages/MediaBean.java	2013-10-20 15:17:25 UTC (rev 4401)
+++ magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/pages/MediaBean.java	2013-10-20 15:39:10 UTC (rev 4402)
@@ -22,7 +22,6 @@
 import info.magnolia.cms.core.MetaData;
 
 import java.util.HashMap;
-import java.util.List;
 import java.util.Map;
 
 import javax.jcr.Node;

Modified: 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/pages/MediaBeanBuilder.java	2013-10-20 15:17:25 UTC (rev 4401)
+++ magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/pages/MediaBeanBuilder.java	2013-10-20 15:39:10 UTC (rev 4402)
@@ -19,7 +19,6 @@
 
 package net.sourceforge.openutils.mgnlmedia.media.pages;
 
-import info.magnolia.cms.beans.config.URI2RepositoryManager;
 import info.magnolia.cms.exchange.ActivationManagerFactory;
 import info.magnolia.cms.security.Permission;
 import info.magnolia.jcr.util.MetaDataUtil;
@@ -28,7 +27,6 @@
 import info.magnolia.objectfactory.Components;
 import info.magnolia.repository.RepositoryConstants;
 
-import java.util.List;
 import java.util.Map;
 
 import javax.jcr.Node;

Modified: magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/setup/MediaModuleVersionHandler.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/setup/MediaModuleVersionHandler.java	2013-10-20 15:17:25 UTC (rev 4401)
+++ magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/setup/MediaModuleVersionHandler.java	2013-10-20 15:39:10 UTC (rev 4402)
@@ -19,7 +19,6 @@
 
 package net.sourceforge.openutils.mgnlmedia.media.setup;
 
-import info.magnolia.init.MagnoliaConfigurationProperties;
 import info.magnolia.module.InstallContext;
 import info.magnolia.module.ModuleRegistry;
 import info.magnolia.module.delta.SetupModuleRepositoriesTask;
@@ -84,8 +83,7 @@
     {
         List<Task> tasks = new ArrayList<Task>();
 
-        if (Components.getComponent(MagnoliaConfigurationProperties.class).getBooleanProperty(
-            "magnolia.bootstrap.samples"))
+        if (samplesEnabled())
         {
             tasks.add(new SamplesExtractionTask());
         }
@@ -243,8 +241,6 @@
             "wildcards",
             Boolean.TRUE));
 
-         
-
         // empty placeholder
         tasks.add(new CreateMissingPropertyTask(RepositoryConstants.CONFIG, "/modules/media/config", "baseurl", ""));
 

Modified: magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/types/impl/DocumentTypeHandler.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/types/impl/DocumentTypeHandler.java	2013-10-20 15:17:25 UTC (rev 4401)
+++ magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/types/impl/DocumentTypeHandler.java	2013-10-20 15:39:10 UTC (rev 4402)
@@ -25,7 +25,6 @@
 import info.magnolia.jcr.util.NodeUtil;
 import info.magnolia.jcr.util.PropertyUtil;
 import info.magnolia.module.admininterface.SaveHandlerImpl;
-import it.openutils.mgnlutils.util.NodeUtilsExt;
 
 import java.awt.image.BufferedImage;
 import java.io.File;
@@ -36,10 +35,7 @@
 
 import javax.imageio.ImageIO;
 import javax.jcr.Node;
-import javax.jcr.Property;
-import javax.jcr.PropertyType;
 import javax.jcr.RepositoryException;
-import javax.jcr.nodetype.NodeType;
 
 import org.apache.commons.io.IOUtils;
 import org.apache.commons.lang.StringUtils;

Modified: 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/types/impl/ImageTypeHandler.java	2013-10-20 15:17:25 UTC (rev 4401)
+++ magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/types/impl/ImageTypeHandler.java	2013-10-20 15:39:10 UTC (rev 4402)
@@ -24,7 +24,6 @@
 import info.magnolia.jcr.util.NodeUtil;
 import info.magnolia.jcr.util.PropertyUtil;
 import info.magnolia.objectfactory.Components;
-import it.openutils.mgnlutils.util.NodeUtilsExt;
 
 import java.awt.image.BufferedImage;
 import java.io.InputStream;

Modified: magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/types/impl/VideoTypeHandler.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/types/impl/VideoTypeHandler.java	2013-10-20 15:17:25 UTC (rev 4401)
+++ magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/types/impl/VideoTypeHandler.java	2013-10-20 15:39:10 UTC (rev 4402)
@@ -22,7 +22,6 @@
 import info.magnolia.cms.beans.runtime.FileProperties;
 import info.magnolia.cms.core.MgnlNodeType;
 import info.magnolia.jcr.util.PropertyUtil;
-import it.openutils.mgnlutils.util.NodeUtilsExt;
 
 import java.io.InputStream;
 

Modified: magnoliamodules/trunk/openutils-mgnlrepoutils/src/main/resources/net/sourceforge/openutils/mgnlrepoutils/RepositoryUtilsPage.html
===================================================================
--- magnoliamodules/trunk/openutils-mgnlrepoutils/src/main/resources/net/sourceforge/openutils/mgnlrepoutils/RepositoryUtilsPage.html	2013-10-20 15:17:25 UTC (rev 4401)
+++ magnoliamodules/trunk/openutils-mgnlrepoutils/src/main/resources/net/sourceforge/openutils/mgnlrepoutils/RepositoryUtilsPage.html	2013-10-20 15:39:10 UTC (rev 4402)
@@ -21,8 +21,7 @@
             <p>
               <strong>Warning:</strong>
               this only works with Jackrabbit, and it works by using private APIs that are not guaranted to work in
-              future versions (this is actually tested with versions from 1.5 to 2.2). The Persistence Manager check
-              only works with "bundle" PMs.
+              future versions. The Persistence Manager check only works with "bundle" PMs.
               <strong>Use it at your own risk.</strong>
             </p>
           </div>

Modified: magnoliamodules/trunk/openutils-mgnlrules/pom.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnlrules/pom.xml	2013-10-20 15:17:25 UTC (rev 4401)
+++ magnoliamodules/trunk/openutils-mgnlrules/pom.xml	2013-10-20 15:39:10 UTC (rev 4402)
@@ -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>
@@ -102,6 +103,11 @@
       <version>5.0.0</version>
     </dependency>
     <dependency>
+      <groupId>net.sourceforge.openutils</groupId>
+      <artifactId>openutils-mgnltasks</artifactId>
+      <version>5.0.1-SNAPSHOT</version>
+    </dependency>
+    <dependency>
       <groupId>info.magnolia</groupId>
       <artifactId>magnolia-module-fckeditor</artifactId>
       <version>${magnolia.version}</version>

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

Modified: magnoliamodules/trunk/openutils-mgnlrules/src/main/java/net/sourceforge/openutils/mgnlrules/setup/RuleModuleVersionHandler.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlrules/src/main/java/net/sourceforge/openutils/mgnlrules/setup/RuleModuleVersionHandler.java	2013-10-20 15:17:25 UTC (rev 4401)
+++ magnoliamodules/trunk/openutils-mgnlrules/src/main/java/net/sourceforge/openutils/mgnlrules/setup/RuleModuleVersionHandler.java	2013-10-20 15:39:10 UTC (rev 4402)
@@ -19,18 +19,15 @@
 
 package net.sourceforge.openutils.mgnlrules.setup;
 
-import info.magnolia.init.MagnoliaConfigurationProperties;
 import info.magnolia.module.InstallContext;
 import info.magnolia.module.delta.Task;
-import info.magnolia.objectfactory.Components;
+import it.openutils.mgnltasks.FilesExtractionTask;
 import it.openutils.mgnltasks.SimpleModuleVersionHandler;
 
 import java.util.ArrayList;
 import java.util.List;
 
-import org.apache.commons.lang.StringUtils;
 
-
 /**
  * @author dschivo
  * @version $Id$
@@ -46,34 +43,11 @@
     {
         List<Task> tasks = new ArrayList<Task>();
 
-        tasks.add(new FilesExtractionTask()
-        {
+        tasks.add(new FilesExtractionTask("/WEB-INF/jsps/"));
 
-            /**
-             * {@inheritDoc}
-             */
-            @Override
-            protected boolean accept(String resource)
-            {
-                return super.accept(resource) && StringUtils.contains(resource, "/WEB-INF/jsps/");
-            }
-        });
-
-        if (Components.getComponent(MagnoliaConfigurationProperties.class).getBooleanProperty(
-            "magnolia.bootstrap.samples"))
+        if (samplesEnabled())
         {
-            tasks.add(new FilesExtractionTask("Samples extraction", "Extracts jsp files for samples.")
-            {
-
-                /**
-                 * {@inheritDoc}
-                 */
-                @Override
-                protected boolean accept(String resource)
-                {
-                    return super.accept(resource) && StringUtils.contains(resource, "/samples-rules/");
-                }
-            });
+            tasks.add(new FilesExtractionTask("/samples-rules/"));
         }
 
         return tasks;

Modified: magnoliamodules/trunk/openutils-mgnltagcloud/pom.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnltagcloud/pom.xml	2013-10-20 15:17:25 UTC (rev 4401)
+++ magnoliamodules/trunk/openutils-mgnltagcloud/pom.xml	2013-10-20 15:39:10 UTC (rev 4402)
@@ -173,7 +173,7 @@
     <dependency>
       <groupId>net.sourceforge.openutils</groupId>
       <artifactId>openutils-mgnltasks</artifactId>
-      <version>5.0.0</version>
+      <version>5.0.1-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>net.sourceforge.openutils</groupId>

Modified: magnoliamodules/trunk/openutils-mgnltagcloud/src/main/java/net/sourceforge/openutils/mgnltagcloud/setup/TagCloudModuleVersionHandler.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnltagcloud/src/main/java/net/sourceforge/openutils/mgnltagcloud/setup/TagCloudModuleVersionHandler.java	2013-10-20 15:17:25 UTC (rev 4401)
+++ magnoliamodules/trunk/openutils-mgnltagcloud/src/main/java/net/sourceforge/openutils/mgnltagcloud/setup/TagCloudModuleVersionHandler.java	2013-10-20 15:39:10 UTC (rev 4402)
@@ -19,10 +19,8 @@
 
 package net.sourceforge.openutils.mgnltagcloud.setup;
 
-import info.magnolia.init.MagnoliaConfigurationProperties;
 import info.magnolia.module.InstallContext;
 import info.magnolia.module.delta.Task;
-import info.magnolia.objectfactory.Components;
 import it.openutils.mgnltasks.CreateMissingPropertyTask;
 import it.openutils.mgnltasks.SamplesExtractionTask;
 import it.openutils.mgnltasks.SimpleModuleVersionHandler;
@@ -49,8 +47,7 @@
 
         List<Task> tasks = new ArrayList<Task>();
 
-        if (Components.getComponent(MagnoliaConfigurationProperties.class).getBooleanProperty(
-            "magnolia.bootstrap.samples"))
+        if (samplesEnabled())
         {
             tasks.add(new SamplesExtractionTask());
         }

Added: magnoliamodules/trunk/openutils-mgnltasks/src/main/java/it/openutils/mgnltasks/FilesExtractionTask.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnltasks/src/main/java/it/openutils/mgnltasks/FilesExtractionTask.java	                        (rev 0)
+++ magnoliamodules/trunk/openutils-mgnltasks/src/main/java/it/openutils/mgnltasks/FilesExtractionTask.java	2013-10-20 15:39:10 UTC (rev 4402)
@@ -0,0 +1,96 @@
+/**
+ *
+ * Tasks for for Magnolia CMS (http://www.openmindlab.com/lab/products/mgnltasks.html)
+ * Copyright(C) 2008-2013, Openmind S.r.l. http://www.openmindonline.it
+ *
+ *  This program is free software: you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation, either version 3 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package it.openutils.mgnltasks;
+
+import info.magnolia.cms.core.HierarchyManager;
+import info.magnolia.cms.core.Path;
+import info.magnolia.module.InstallContext;
+import info.magnolia.module.delta.AbstractTask;
+import info.magnolia.module.delta.TaskExecutionException;
+import info.magnolia.module.files.FileExtractionLogger;
+import info.magnolia.module.files.FileExtractor;
+import info.magnolia.module.files.MD5CheckingFileExtractor;
+
+import java.io.IOException;
+
+import org.apache.commons.lang.StringUtils;
+
+
+/**
+ * Extract files to webapp root. Files must be contained in a /mgnl-files folder in the classpath.
+ * @author fgiust
+ * @author dschivo
+ */
+@SuppressWarnings("deprecation")
+public class FilesExtractionTask extends AbstractTask
+{
+
+    private String path;
+
+    public FilesExtractionTask(String path)
+    {
+        super("Files extraction", "Extracts files from " + path + " to webapp root.");
+        this.path = path;
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public void execute(final InstallContext ctx) throws TaskExecutionException
+    {
+        final HierarchyManager hm = ctx.getConfigHierarchyManager();
+        final MD5CheckingFileExtractor extractor = new MD5CheckingFileExtractor(new FileExtractionLogger()
+        {
+
+            public void error(String message)
+            {
+                ctx.warn(message);
+            }
+        }, hm);
+        try
+        {
+            extractor.extractFiles(new FileExtractor.Transformer()
+            {
+
+                public String accept(String resourcePath)
+                {
+                    if (!FilesExtractionTask.this.accept(resourcePath))
+                    {
+                        return null;
+                    }
+                    final String relTargetPath = StringUtils.removeStart(resourcePath, "/mgnl-files/");
+                    return Path.getAbsoluteFileSystemPath(relTargetPath);
+                }
+
+            });
+        }
+        catch (IOException e)
+        {
+            throw new TaskExecutionException("Could not extract files for module "
+                + ctx.getCurrentModuleDefinition()
+                + ": "
+                + e.getMessage(), e);
+        }
+    }
+
+    protected boolean accept(String resource)
+    {
+        return resource.contains("/mgnl-files/") && StringUtils.contains(resource, path);
+    }
+}


Property changes on: magnoliamodules/trunk/openutils-mgnltasks/src/main/java/it/openutils/mgnltasks/FilesExtractionTask.java
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Added: svn:keywords
## -0,0 +1 ##
+Author Date Id Revision
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Modified: magnoliamodules/trunk/openutils-mgnltasks/src/main/java/it/openutils/mgnltasks/SetPropertyTask.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnltasks/src/main/java/it/openutils/mgnltasks/SetPropertyTask.java	2013-10-20 15:17:25 UTC (rev 4401)
+++ magnoliamodules/trunk/openutils-mgnltasks/src/main/java/it/openutils/mgnltasks/SetPropertyTask.java	2013-10-20 15:39:10 UTC (rev 4402)
@@ -21,7 +21,6 @@
 
 import info.magnolia.cms.core.MgnlNodeType;
 import info.magnolia.jcr.util.NodeUtil;
-import info.magnolia.jcr.util.PropertyUtil;
 import info.magnolia.module.InstallContext;
 import info.magnolia.module.delta.AbstractRepositoryTask;
 import info.magnolia.module.delta.TaskExecutionException;
@@ -31,9 +30,7 @@
 import javax.jcr.RepositoryException;
 import javax.jcr.Session;
 
-import org.apache.commons.lang.StringUtils;
 
-
 /**
  * Change a nodedata value.
  * @author fgiust

Modified: magnoliamodules/trunk/openutils-mgnltasks/src/main/java/it/openutils/mgnltasks/SimpleModuleVersionHandler.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnltasks/src/main/java/it/openutils/mgnltasks/SimpleModuleVersionHandler.java	2013-10-20 15:17:25 UTC (rev 4401)
+++ magnoliamodules/trunk/openutils-mgnltasks/src/main/java/it/openutils/mgnltasks/SimpleModuleVersionHandler.java	2013-10-20 15:39:10 UTC (rev 4402)
@@ -164,4 +164,10 @@
     {
         delta.getTasks().add(new ModuleConfigBootstrapTask(modulename, includedRepositoriesInBootstrap));
     }
+
+    protected boolean samplesEnabled()
+    {
+        return Components.getComponent(MagnoliaConfigurationProperties.class).getBooleanProperty(
+            "magnolia.bootstrap.samples");
+    }
 }

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	2013-10-20 15:17:25 UTC (rev 4401)
+++ magnoliamodules/trunk/openutils-mgnlutils/src/main/java/it/openutils/mgnlutils/el/MgnlUtilsElFunctions.java	2013-10-20 15:39:10 UTC (rev 4402)
@@ -31,7 +31,6 @@
 import info.magnolia.cms.security.User;
 import info.magnolia.context.MgnlContext;
 import info.magnolia.init.MagnoliaConfigurationProperties;
-import info.magnolia.jcr.util.ContentMap;
 import info.magnolia.jcr.util.NodeUtil;
 import info.magnolia.jcr.wrapper.HTMLEscapingNodeWrapper;
 import info.magnolia.link.LinkException;
@@ -55,13 +54,11 @@
 import java.util.Properties;
 import java.util.Set;
 
-import javax.jcr.ItemNotFoundException;
 import javax.jcr.Node;
 import javax.jcr.NodeIterator;
 import javax.jcr.Property;
 import javax.jcr.PropertyIterator;
 import javax.jcr.RepositoryException;
-import javax.jcr.Session;
 import javax.security.auth.Subject;
 import javax.servlet.http.HttpServletRequest;
 

Modified: magnoliamodules/trunk/openutils-mgnlutils/src/main/java/it/openutils/mgnlutils/util/ClassicRenderExceptionHandler.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlutils/src/main/java/it/openutils/mgnlutils/util/ClassicRenderExceptionHandler.java	2013-10-20 15:17:25 UTC (rev 4401)
+++ magnoliamodules/trunk/openutils-mgnlutils/src/main/java/it/openutils/mgnlutils/util/ClassicRenderExceptionHandler.java	2013-10-20 15:39:10 UTC (rev 4402)
@@ -19,7 +19,6 @@
 package it.openutils.mgnlutils.util;
 
 import info.magnolia.cms.beans.config.ServerConfiguration;
-import info.magnolia.context.MgnlContext;
 import info.magnolia.init.MagnoliaConfigurationProperties;
 import info.magnolia.rendering.context.RenderingContext;
 import info.magnolia.rendering.engine.RenderException;

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	2013-10-20 15:17:25 UTC (rev 4401)
+++ magnoliamodules/trunk/openutils-mgnlutils/src/test/java/it/openutils/mgnlutils/el/MgnlUtilsElFunctionsTest.java	2013-10-20 15:39:10 UTC (rev 4402)
@@ -33,7 +33,6 @@
 import it.openutils.mgnlutils.test.TestNgRepositoryTestcase;
 
 import java.lang.reflect.Method;
-import java.util.Locale;
 
 import org.testng.Assert;
 import org.testng.annotations.BeforeClass;

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

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

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

Revision: 4401
          http://openutils.svn.sourceforge.net/openutils/?rev=4401&view=rev
Author:   fgiust
Date:     2013-10-20 15:17:25 +0000 (Sun, 20 Oct 2013)
Log Message:
-----------
fix samples

Modified Paths:
--------------
    magnoliamodules/trunk/openutils-mgnllms/src/main/resources/mgnl-bootstrap/mgnllms/config.modules.mgnllms.dialogs.common.xml
    magnoliamodules/trunk/openutils-mgnllms/src/main/resources/mgnl-bootstrap/mgnllms/config.modules.mgnllms.dialogs.courseDlg.xml
    magnoliamodules/trunk/openutils-mgnllms/src/main/resources/mgnl-bootstrap/mgnllms/config.modules.mgnllms.dialogs.scormDlg.tabScorm.satisfactionRule.xml
    magnoliamodules/trunk/openutils-mgnllms/src/main/resources/mgnl-bootstrap/mgnllms/config.modules.mgnllms.dialogs.scormDlg.xml
    magnoliamodules/trunk/openutils-mgnllms/src/main/resources/mgnl-bootstrap/mgnllms/config.modules.mgnllms.lms-types.course.xml
    magnoliamodules/trunk/openutils-mgnllms/src/main/resources/mgnl-bootstrap/mgnllms/config.modules.mgnllms.lms-types.scorm.xml
    magnoliamodules/trunk/openutils-mgnllms/src/main/resources/mgnl-bootstrap/mgnllms/config.modules.mgnllms.virtualURIMapping.persistence.xml
    magnoliamodules/trunk/openutils-mgnllms/src/main/resources/mgnl-bootstrap/mgnllms/config.modules.mgnllms.virtualURIMapping.player.xml
    magnoliamodules/trunk/openutils-mgnllms/src/main/resources/mgnl-bootstrap/mgnllms/config.server.URI2RepositoryMapping.mappings.mgnllms.xml
    magnoliamodules/trunk/openutils-mgnllms/src/main/resources/mgnl-bootstrap-samples/mgnllms/website.sample-lms.xml

Added Paths:
-----------
    magnoliamodules/trunk/openutils-mgnllms/src/main/resources/mgnl-bootstrap/mgnllms-nooverwrite/
    magnoliamodules/trunk/openutils-mgnllms/src/main/resources/mgnl-bootstrap/mgnllms-nooverwrite/config.modules.adminInterface.config.menu.mgnllms.xml
    magnoliamodules/trunk/openutils-mgnllms/src/main/resources/mgnl-bootstrap/mgnllms-nooverwrite/config.modules.mgnllms.controls.fileCourse.xml
    magnoliamodules/trunk/openutils-mgnllms/src/main/resources/mgnl-bootstrap/mgnllms-nooverwrite/config.modules.mgnllms.controls.fileuri.xml
    magnoliamodules/trunk/openutils-mgnllms/src/main/resources/mgnl-bootstrap/mgnllms-nooverwrite/config.modules.mgnllms.controls.metadata.xml
    magnoliamodules/trunk/openutils-mgnllms/src/main/resources/mgnl-bootstrap/mgnllms-nooverwrite/config.modules.mgnllms.pages.scormcmi.xml
    magnoliamodules/trunk/openutils-mgnllms/src/main/resources/mgnl-bootstrap/mgnllms-nooverwrite/config.modules.mgnllms.pages.scormplayer.xml
    magnoliamodules/trunk/openutils-mgnllms/src/main/resources/mgnl-bootstrap/mgnllms-nooverwrite/config.modules.mgnllms.pages.userReport.xml
    magnoliamodules/trunk/openutils-mgnllms/src/main/resources/mgnl-bootstrap/mgnllms-nooverwrite/config.modules.mgnllms.pages.userReportAdmin.xml
    magnoliamodules/trunk/openutils-mgnllms/src/main/resources/mgnl-bootstrap/mgnllms-nooverwrite/config.modules.mgnllms.trees.lms-jcr.xml
    magnoliamodules/trunk/openutils-mgnllms/src/main/resources/mgnl-bootstrap/mgnllms-nooverwrite/config.modules.mgnllms.trees.lms.xml
    magnoliamodules/trunk/openutils-mgnllms/src/main/resources/mgnl-bootstrap/mgnllms-nooverwrite/userroles.learner.xml
    magnoliamodules/trunk/openutils-mgnllms/src/main/resources/mgnl-bootstrap-samples/mgnllms/config.modules.mgnllms.lms-config.listeners.student-level.xml
    magnoliamodules/trunk/openutils-mgnllms/src/main/resources/mgnl-bootstrap-samples/mgnllms/config.modules.mgnllms.templates.pages.lms-sample-courses.xml
    magnoliamodules/trunk/openutils-mgnllms/src/main/resources/mgnl-bootstrap-samples/mgnllms/config.modules.mgnllms.templates.pages.lms-sample-userreport.xml
    magnoliamodules/trunk/openutils-mgnllms/src/main/resources/mgnl-bootstrap-samples/mgnllms/config.modules.mgnllms.templates.pages.lms-sample.xml

Removed Paths:
-------------
    magnoliamodules/trunk/openutils-mgnllms/src/main/resources/mgnl-bootstrap/mgnllms/config.modules.adminInterface.config.menu.mgnllms.xml
    magnoliamodules/trunk/openutils-mgnllms/src/main/resources/mgnl-bootstrap/mgnllms/config.modules.mgnllms.controls.fileCourse.xml
    magnoliamodules/trunk/openutils-mgnllms/src/main/resources/mgnl-bootstrap/mgnllms/config.modules.mgnllms.controls.fileuri.xml
    magnoliamodules/trunk/openutils-mgnllms/src/main/resources/mgnl-bootstrap/mgnllms/config.modules.mgnllms.controls.metadata.xml
    magnoliamodules/trunk/openutils-mgnllms/src/main/resources/mgnl-bootstrap/mgnllms/config.modules.mgnllms.pages.scormcmi.xml
    magnoliamodules/trunk/openutils-mgnllms/src/main/resources/mgnl-bootstrap/mgnllms/config.modules.mgnllms.pages.scormplayer.xml
    magnoliamodules/trunk/openutils-mgnllms/src/main/resources/mgnl-bootstrap/mgnllms/config.modules.mgnllms.pages.userReport.xml
    magnoliamodules/trunk/openutils-mgnllms/src/main/resources/mgnl-bootstrap/mgnllms/config.modules.mgnllms.pages.userReportAdmin.xml
    magnoliamodules/trunk/openutils-mgnllms/src/main/resources/mgnl-bootstrap/mgnllms/config.modules.mgnllms.trees.lms-jcr.xml
    magnoliamodules/trunk/openutils-mgnllms/src/main/resources/mgnl-bootstrap/mgnllms/config.modules.mgnllms.trees.lms.xml
    magnoliamodules/trunk/openutils-mgnllms/src/main/resources/mgnl-bootstrap/mgnllms/userroles.learner.xml
    magnoliamodules/trunk/openutils-mgnllms/src/main/resources/mgnl-bootstrap-samples/mgnllms/config.modules.lms.lms-config.listeners.student-level.xml
    magnoliamodules/trunk/openutils-mgnllms/src/main/resources/mgnl-bootstrap-samples/mgnllms/config.modules.lms.templates.pages.lms-sample-courses.xml
    magnoliamodules/trunk/openutils-mgnllms/src/main/resources/mgnl-bootstrap-samples/mgnllms/config.modules.lms.templates.pages.lms-sample-userreport.xml
    magnoliamodules/trunk/openutils-mgnllms/src/main/resources/mgnl-bootstrap-samples/mgnllms/config.modules.lms.templates.pages.lms-sample.xml

Deleted: magnoliamodules/trunk/openutils-mgnllms/src/main/resources/mgnl-bootstrap/mgnllms/config.modules.adminInterface.config.menu.mgnllms.xml
===================================================================
(Binary files differ)

Deleted: magnoliamodules/trunk/openutils-mgnllms/src/main/resources/mgnl-bootstrap/mgnllms/config.modules.mgnllms.controls.fileCourse.xml
===================================================================
(Binary files differ)

Deleted: magnoliamodules/trunk/openutils-mgnllms/src/main/resources/mgnl-bootstrap/mgnllms/config.modules.mgnllms.controls.fileuri.xml
===================================================================
(Binary files differ)

Deleted: magnoliamodules/trunk/openutils-mgnllms/src/main/resources/mgnl-bootstrap/mgnllms/config.modules.mgnllms.controls.metadata.xml
===================================================================
(Binary files differ)

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

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

Modified: magnoliamodules/trunk/openutils-mgnllms/src/main/resources/mgnl-bootstrap/mgnllms/config.modules.mgnllms.dialogs.scormDlg.tabScorm.satisfactionRule.xml
===================================================================
(Binary files differ)

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

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

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

Deleted: magnoliamodules/trunk/openutils-mgnllms/src/main/resources/mgnl-bootstrap/mgnllms/config.modules.mgnllms.pages.scormcmi.xml
===================================================================
(Binary files differ)

Deleted: magnoliamodules/trunk/openutils-mgnllms/src/main/resources/mgnl-bootstrap/mgnllms/config.modules.mgnllms.pages.scormplayer.xml
===================================================================
(Binary files differ)

Deleted: magnoliamodules/trunk/openutils-mgnllms/src/main/resources/mgnl-bootstrap/mgnllms/config.modules.mgnllms.pages.userReport.xml
===================================================================
(Binary files differ)

Deleted: magnoliamodules/trunk/openutils-mgnllms/src/main/resources/mgnl-bootstrap/mgnllms/config.modules.mgnllms.pages.userReportAdmin.xml
===================================================================
(Binary files differ)

Deleted: magnoliamodules/trunk/openutils-mgnllms/src/main/resources/mgnl-bootstrap/mgnllms/config.modules.mgnllms.trees.lms-jcr.xml
===================================================================
(Binary files differ)

Deleted: magnoliamodules/trunk/openutils-mgnllms/src/main/resources/mgnl-bootstrap/mgnllms/config.modules.mgnllms.trees.lms.xml
===================================================================
(Binary files differ)

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

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

Modified: magnoliamodules/trunk/openutils-mgnllms/src/main/resources/mgnl-bootstrap/mgnllms/config.server.URI2RepositoryMapping.mappings.mgnllms.xml
===================================================================
(Binary files differ)

Deleted: magnoliamodules/trunk/openutils-mgnllms/src/main/resources/mgnl-bootstrap/mgnllms/userroles.learner.xml
===================================================================
(Binary files differ)

Copied: magnoliamodules/trunk/openutils-mgnllms/src/main/resources/mgnl-bootstrap/mgnllms-nooverwrite/config.modules.adminInterface.config.menu.mgnllms.xml (from rev 4371, magnoliamodules/trunk/openutils-mgnllms/src/main/resources/mgnl-bootstrap/mgnllms/config.modules.adminInterface.config.menu.mgnllms.xml)
===================================================================
(Binary files differ)

Copied: magnoliamodules/trunk/openutils-mgnllms/src/main/resources/mgnl-bootstrap/mgnllms-nooverwrite/config.modules.mgnllms.controls.fileCourse.xml (from rev 4371, magnoliamodules/trunk/openutils-mgnllms/src/main/resources/mgnl-bootstrap/mgnllms/config.modules.mgnllms.controls.fileCourse.xml)
===================================================================
(Binary files differ)

Copied: magnoliamodules/trunk/openutils-mgnllms/src/main/resources/mgnl-bootstrap/mgnllms-nooverwrite/config.modules.mgnllms.controls.fileuri.xml (from rev 4371, magnoliamodules/trunk/openutils-mgnllms/src/main/resources/mgnl-bootstrap/mgnllms/config.modules.mgnllms.controls.fileuri.xml)
===================================================================
(Binary files differ)

Copied: magnoliamodules/trunk/openutils-mgnllms/src/main/resources/mgnl-bootstrap/mgnllms-nooverwrite/config.modules.mgnllms.controls.metadata.xml (from rev 4371, magnoliamodules/trunk/openutils-mgnllms/src/main/resources/mgnl-bootstrap/mgnllms/config.modules.mgnllms.controls.metadata.xml)
===================================================================
(Binary files differ)

Copied: magnoliamodules/trunk/openutils-mgnllms/src/main/resources/mgnl-bootstrap/mgnllms-nooverwrite/config.modules.mgnllms.pages.scormcmi.xml (from rev 4371, magnoliamodules/trunk/openutils-mgnllms/src/main/resources/mgnl-bootstrap/mgnllms/config.modules.mgnllms.pages.scormcmi.xml)
===================================================================
(Binary files differ)

Copied: magnoliamodules/trunk/openutils-mgnllms/src/main/resources/mgnl-bootstrap/mgnllms-nooverwrite/config.modules.mgnllms.pages.scormplayer.xml (from rev 4371, magnoliamodules/trunk/openutils-mgnllms/src/main/resources/mgnl-bootstrap/mgnllms/config.modules.mgnllms.pages.scormplayer.xml)
===================================================================
(Binary files differ)

Copied: magnoliamodules/trunk/openutils-mgnllms/src/main/resources/mgnl-bootstrap/mgnllms-nooverwrite/config.modules.mgnllms.pages.userReport.xml (from rev 4371, magnoliamodules/trunk/openutils-mgnllms/src/main/resources/mgnl-bootstrap/mgnllms/config.modules.mgnllms.pages.userReport.xml)
===================================================================
(Binary files differ)

Copied: magnoliamodules/trunk/openutils-mgnllms/src/main/resources/mgnl-bootstrap/mgnllms-nooverwrite/config.modules.mgnllms.pages.userReportAdmin.xml (from rev 4371, magnoliamodules/trunk/openutils-mgnllms/src/main/resources/mgnl-bootstrap/mgnllms/config.modules.mgnllms.pages.userReportAdmin.xml)
===================================================================
(Binary files differ)

Copied: magnoliamodules/trunk/openutils-mgnllms/src/main/resources/mgnl-bootstrap/mgnllms-nooverwrite/config.modules.mgnllms.trees.lms-jcr.xml (from rev 4371, magnoliamodules/trunk/openutils-mgnllms/src/main/resources/mgnl-bootstrap/mgnllms/config.modules.mgnllms.trees.lms-jcr.xml)
===================================================================
(Binary files differ)

Copied: magnoliamodules/trunk/openutils-mgnllms/src/main/resources/mgnl-bootstrap/mgnllms-nooverwrite/config.modules.mgnllms.trees.lms.xml (from rev 4371, magnoliamodules/trunk/openutils-mgnllms/src/main/resources/mgnl-bootstrap/mgnllms/config.modules.mgnllms.trees.lms.xml)
===================================================================
(Binary files differ)

Copied: magnoliamodules/trunk/openutils-mgnllms/src/main/resources/mgnl-bootstrap/mgnllms-nooverwrite/userroles.learner.xml (from rev 4371, magnoliamodules/trunk/openutils-mgnllms/src/main/resources/mgnl-bootstrap/mgnllms/userroles.learner.xml)
===================================================================
(Binary files differ)

Deleted: magnoliamodules/trunk/openutils-mgnllms/src/main/resources/mgnl-bootstrap-samples/mgnllms/config.modules.lms.lms-config.listeners.student-level.xml
===================================================================
(Binary files differ)

Deleted: magnoliamodules/trunk/openutils-mgnllms/src/main/resources/mgnl-bootstrap-samples/mgnllms/config.modules.lms.templates.pages.lms-sample-courses.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnllms/src/main/resources/mgnl-bootstrap-samples/mgnllms/config.modules.lms.templates.pages.lms-sample-courses.xml	2013-10-20 15:00:28 UTC (rev 4400)
+++ magnoliamodules/trunk/openutils-mgnllms/src/main/resources/mgnl-bootstrap-samples/mgnllms/config.modules.lms.templates.pages.lms-sample-courses.xml	2013-10-20 15:17:25 UTC (rev 4401)
@@ -1,47 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<sv:node sv:name="lms-sample-courses" xmlns:sv="http://www.jcp.org/jcr/sv/1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-  <sv:property sv:name="jcr:primaryType" sv:type="Name">
-    <sv:value>mgnl:contentNode</sv:value>
-  </sv:property>
-  <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
-    <sv:value>mix:lockable</sv:value>
-  </sv:property>
-  <sv:property sv:name="jcr:uuid" sv:type="String">
-    <sv:value>14225b9d-9078-4e79-ab21-53609e330a51</sv:value>
-  </sv:property>
-  <sv:property sv:name="jcr:createdBy" sv:type="String">
-    <sv:value>admin</sv:value>
-  </sv:property>
-  <sv:property sv:name="renderType" sv:type="String">
-    <sv:value>jsp</sv:value>
-  </sv:property>
-  <sv:property sv:name="templateScript" sv:type="String">
-    <sv:value>/templates/samples-lms/courses.jsp</sv:value>
-  </sv:property>
-  <sv:property sv:name="title" sv:type="String">
-    <sv:value>LMS sample: courses</sv:value>
-  </sv:property>
-  <sv:property sv:name="visible" sv:type="String">
-    <sv:value>true</sv:value>
-  </sv:property>
-  <sv:node sv:name="MetaData">
-    <sv:property sv:name="jcr:primaryType" sv:type="Name">
-      <sv:value>mgnl:metaData</sv:value>
-    </sv:property>
-    <sv:property sv:name="jcr:createdBy" sv:type="String">
-      <sv:value>admin</sv:value>
-    </sv:property>
-    <sv:property sv:name="mgnl:activated" sv:type="Boolean">
-      <sv:value>false</sv:value>
-    </sv:property>
-    <sv:property sv:name="mgnl:authorid" sv:type="String">
-      <sv:value>superuser</sv:value>
-    </sv:property>
-    <sv:property sv:name="mgnl:creationdate" sv:type="Date">
-      <sv:value>2010-02-05T14:04:47.884+01:00</sv:value>
-    </sv:property>
-    <sv:property sv:name="mgnl:lastmodified" sv:type="Date">
-      <sv:value>2013-10-19T15:04:14.483+02:00</sv:value>
-    </sv:property>
-  </sv:node>
-</sv:node>

Deleted: magnoliamodules/trunk/openutils-mgnllms/src/main/resources/mgnl-bootstrap-samples/mgnllms/config.modules.lms.templates.pages.lms-sample-userreport.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnllms/src/main/resources/mgnl-bootstrap-samples/mgnllms/config.modules.lms.templates.pages.lms-sample-userreport.xml	2013-10-20 15:00:28 UTC (rev 4400)
+++ magnoliamodules/trunk/openutils-mgnllms/src/main/resources/mgnl-bootstrap-samples/mgnllms/config.modules.lms.templates.pages.lms-sample-userreport.xml	2013-10-20 15:17:25 UTC (rev 4401)
@@ -1,47 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<sv:node sv:name="lms-sample-userreport" xmlns:sv="http://www.jcp.org/jcr/sv/1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-  <sv:property sv:name="jcr:primaryType" sv:type="Name">
-    <sv:value>mgnl:contentNode</sv:value>
-  </sv:property>
-  <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
-    <sv:value>mix:lockable</sv:value>
-  </sv:property>
-  <sv:property sv:name="jcr:uuid" sv:type="String">
-    <sv:value>cda610ec-48ab-4109-8086-a6400122643c</sv:value>
-  </sv:property>
-  <sv:property sv:name="jcr:createdBy" sv:type="String">
-    <sv:value>admin</sv:value>
-  </sv:property>
-  <sv:property sv:name="renderType" sv:type="String">
-    <sv:value>freemarker</sv:value>
-  </sv:property>
-  <sv:property sv:name="templateScript" sv:type="String">
-    <sv:value>/templates/user-report.html</sv:value>
-  </sv:property>
-  <sv:property sv:name="title" sv:type="String">
-    <sv:value>LMS sample: user report</sv:value>
-  </sv:property>
-  <sv:property sv:name="visible" sv:type="String">
-    <sv:value>true</sv:value>
-  </sv:property>
-  <sv:node sv:name="MetaData">
-    <sv:property sv:name="jcr:primaryType" sv:type="Name">
-      <sv:value>mgnl:metaData</sv:value>
-    </sv:property>
-    <sv:property sv:name="jcr:createdBy" sv:type="String">
-      <sv:value>admin</sv:value>
-    </sv:property>
-    <sv:property sv:name="mgnl:activated" sv:type="Boolean">
-      <sv:value>false</sv:value>
-    </sv:property>
-    <sv:property sv:name="mgnl:authorid" sv:type="String">
-      <sv:value>superuser</sv:value>
-    </sv:property>
-    <sv:property sv:name="mgnl:creationdate" sv:type="Date">
-      <sv:value>2009-10-27T16:13:40.663+01:00</sv:value>
-    </sv:property>
-    <sv:property sv:name="mgnl:lastmodified" sv:type="Date">
-      <sv:value>2013-10-19T15:04:25.614+02:00</sv:value>
-    </sv:property>
-  </sv:node>
-</sv:node>

Deleted: magnoliamodules/trunk/openutils-mgnllms/src/main/resources/mgnl-bootstrap-samples/mgnllms/config.modules.lms.templates.pages.lms-sample.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnllms/src/main/resources/mgnl-bootstrap-samples/mgnllms/config.modules.lms.templates.pages.lms-sample.xml	2013-10-20 15:00:28 UTC (rev 4400)
+++ magnoliamodules/trunk/openutils-mgnllms/src/main/resources/mgnl-bootstrap-samples/mgnllms/config.modules.lms.templates.pages.lms-sample.xml	2013-10-20 15:17:25 UTC (rev 4401)
@@ -1,47 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<sv:node sv:name="lms-sample" xmlns:sv="http://www.jcp.org/jcr/sv/1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-  <sv:property sv:name="jcr:primaryType" sv:type="Name">
-    <sv:value>mgnl:contentNode</sv:value>
-  </sv:property>
-  <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
-    <sv:value>mix:lockable</sv:value>
-  </sv:property>
-  <sv:property sv:name="jcr:uuid" sv:type="String">
-    <sv:value>785f8f98-a7ce-406f-ab54-dfd2c21073e9</sv:value>
-  </sv:property>
-  <sv:property sv:name="jcr:createdBy" sv:type="String">
-    <sv:value>admin</sv:value>
-  </sv:property>
-  <sv:property sv:name="renderType" sv:type="String">
-    <sv:value>jsp</sv:value>
-  </sv:property>
-  <sv:property sv:name="templateScript" sv:type="String">
-    <sv:value>/templates/samples-lms/index.jsp</sv:value>
-  </sv:property>
-  <sv:property sv:name="title" sv:type="String">
-    <sv:value>LMS sample: main page</sv:value>
-  </sv:property>
-  <sv:property sv:name="visible" sv:type="String">
-    <sv:value>true</sv:value>
-  </sv:property>
-  <sv:node sv:name="MetaData">
-    <sv:property sv:name="jcr:primaryType" sv:type="Name">
-      <sv:value>mgnl:metaData</sv:value>
-    </sv:property>
-    <sv:property sv:name="jcr:createdBy" sv:type="String">
-      <sv:value>admin</sv:value>
-    </sv:property>
-    <sv:property sv:name="mgnl:activated" sv:type="Boolean">
-      <sv:value>false</sv:value>
-    </sv:property>
-    <sv:property sv:name="mgnl:authorid" sv:type="String">
-      <sv:value>superuser</sv:value>
-    </sv:property>
-    <sv:property sv:name="mgnl:creationdate" sv:type="Date">
-      <sv:value>2010-02-05T14:04:47.884+01:00</sv:value>
-    </sv:property>
-    <sv:property sv:name="mgnl:lastmodified" sv:type="Date">
-      <sv:value>2013-10-19T15:04:06.353+02:00</sv:value>
-    </sv:property>
-  </sv:node>
-</sv:node>

Copied: magnoliamodules/trunk/openutils-mgnllms/src/main/resources/mgnl-bootstrap-samples/mgnllms/config.modules.mgnllms.lms-config.listeners.student-level.xml (from rev 4371, magnoliamodules/trunk/openutils-mgnllms/src/main/resources/mgnl-bootstrap-samples/mgnllms/config.modules.lms.lms-config.listeners.student-level.xml)
===================================================================
(Binary files differ)

Copied: magnoliamodules/trunk/openutils-mgnllms/src/main/resources/mgnl-bootstrap-samples/mgnllms/config.modules.mgnllms.templates.pages.lms-sample-courses.xml (from rev 4387, magnoliamodules/trunk/openutils-mgnllms/src/main/resources/mgnl-bootstrap-samples/mgnllms/config.modules.lms.templates.pages.lms-sample-courses.xml)
===================================================================
--- magnoliamodules/trunk/openutils-mgnllms/src/main/resources/mgnl-bootstrap-samples/mgnllms/config.modules.mgnllms.templates.pages.lms-sample-courses.xml	                        (rev 0)
+++ magnoliamodules/trunk/openutils-mgnllms/src/main/resources/mgnl-bootstrap-samples/mgnllms/config.modules.mgnllms.templates.pages.lms-sample-courses.xml	2013-10-20 15:17:25 UTC (rev 4401)
@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<sv:node sv:name="lms-sample-courses" xmlns:sv="http://www.jcp.org/jcr/sv/1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <sv:property sv:name="jcr:primaryType" sv:type="Name">
+    <sv:value>mgnl:contentNode</sv:value>
+  </sv:property>
+  <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
+    <sv:value>mix:lockable</sv:value>
+  </sv:property>
+  <sv:property sv:name="jcr:uuid" sv:type="String">
+    <sv:value>14225b9d-9078-4e79-ab21-53609e330a51</sv:value>
+  </sv:property>
+  <sv:property sv:name="jcr:createdBy" sv:type="String">
+    <sv:value>admin</sv:value>
+  </sv:property>
+  <sv:property sv:name="renderType" sv:type="String">
+    <sv:value>jsp</sv:value>
+  </sv:property>
+  <sv:property sv:name="templateScript" sv:type="String">
+    <sv:value>/templates/samples-lms/courses.jsp</sv:value>
+  </sv:property>
+  <sv:property sv:name="title" sv:type="String">
+    <sv:value>LMS sample: courses</sv:value>
+  </sv:property>
+  <sv:property sv:name="visible" sv:type="String">
+    <sv:value>true</sv:value>
+  </sv:property>
+  <sv:node sv:name="MetaData">
+    <sv:property sv:name="jcr:primaryType" sv:type="Name">
+      <sv:value>mgnl:metaData</sv:value>
+    </sv:property>
+    <sv:property sv:name="jcr:createdBy" sv:type="String">
+      <sv:value>admin</sv:value>
+    </sv:property>
+    <sv:property sv:name="mgnl:activated" sv:type="Boolean">
+      <sv:value>false</sv:value>
+    </sv:property>
+    <sv:property sv:name="mgnl:authorid" sv:type="String">
+      <sv:value>superuser</sv:value>
+    </sv:property>
+    <sv:property sv:name="mgnl:creationdate" sv:type="Date">
+      <sv:value>2010-02-05T14:04:47.884+01:00</sv:value>
+    </sv:property>
+    <sv:property sv:name="mgnl:lastmodified" sv:type="Date">
+      <sv:value>2013-10-19T15:04:14.483+02:00</sv:value>
+    </sv:property>
+  </sv:node>
+</sv:node>

Copied: magnoliamodules/trunk/openutils-mgnllms/src/main/resources/mgnl-bootstrap-samples/mgnllms/config.modules.mgnllms.templates.pages.lms-sample-userreport.xml (from rev 4387, magnoliamodules/trunk/openutils-mgnllms/src/main/resources/mgnl-bootstrap-samples/mgnllms/config.modules.lms.templates.pages.lms-sample-userreport.xml)
===================================================================
--- magnoliamodules/trunk/openutils-mgnllms/src/main/resources/mgnl-bootstrap-samples/mgnllms/config.modules.mgnllms.templates.pages.lms-sample-userreport.xml	                        (rev 0)
+++ magnoliamodules/trunk/openutils-mgnllms/src/main/resources/mgnl-bootstrap-samples/mgnllms/config.modules.mgnllms.templates.pages.lms-sample-userreport.xml	2013-10-20 15:17:25 UTC (rev 4401)
@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<sv:node sv:name="lms-sample-userreport" xmlns:sv="http://www.jcp.org/jcr/sv/1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <sv:property sv:name="jcr:primaryType" sv:type="Name">
+    <sv:value>mgnl:contentNode</sv:value>
+  </sv:property>
+  <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
+    <sv:value>mix:lockable</sv:value>
+  </sv:property>
+  <sv:property sv:name="jcr:uuid" sv:type="String">
+    <sv:value>cda610ec-48ab-4109-8086-a6400122643c</sv:value>
+  </sv:property>
+  <sv:property sv:name="jcr:createdBy" sv:type="String">
+    <sv:value>admin</sv:value>
+  </sv:property>
+  <sv:property sv:name="renderType" sv:type="String">
+    <sv:value>freemarker</sv:value>
+  </sv:property>
+  <sv:property sv:name="templateScript" sv:type="String">
+    <sv:value>/templates/user-report.html</sv:value>
+  </sv:property>
+  <sv:property sv:name="title" sv:type="String">
+    <sv:value>LMS sample: user report</sv:value>
+  </sv:property>
+  <sv:property sv:name="visible" sv:type="String">
+    <sv:value>true</sv:value>
+  </sv:property>
+  <sv:node sv:name="MetaData">
+    <sv:property sv:name="jcr:primaryType" sv:type="Name">
+      <sv:value>mgnl:metaData</sv:value>
+    </sv:property>
+    <sv:property sv:name="jcr:createdBy" sv:type="String">
+      <sv:value>admin</sv:value>
+    </sv:property>
+    <sv:property sv:name="mgnl:activated" sv:type="Boolean">
+      <sv:value>false</sv:value>
+    </sv:property>
+    <sv:property sv:name="mgnl:authorid" sv:type="String">
+      <sv:value>superuser</sv:value>
+    </sv:property>
+    <sv:property sv:name="mgnl:creationdate" sv:type="Date">
+      <sv:value>2009-10-27T16:13:40.663+01:00</sv:value>
+    </sv:property>
+    <sv:property sv:name="mgnl:lastmodified" sv:type="Date">
+      <sv:value>2013-10-19T15:04:25.614+02:00</sv:value>
+    </sv:property>
+  </sv:node>
+</sv:node>

Copied: magnoliamodules/trunk/openutils-mgnllms/src/main/resources/mgnl-bootstrap-samples/mgnllms/config.modules.mgnllms.templates.pages.lms-sample.xml (from rev 4387, magnoliamodules/trunk/openutils-mgnllms/src/main/resources/mgnl-bootstrap-samples/mgnllms/config.modules.lms.templates.pages.lms-sample.xml)
===================================================================
--- magnoliamodules/trunk/openutils-mgnllms/src/main/resources/mgnl-bootstrap-samples/mgnllms/config.modules.mgnllms.templates.pages.lms-sample.xml	                        (rev 0)
+++ magnoliamodules/trunk/openutils-mgnllms/src/main/resources/mgnl-bootstrap-samples/mgnllms/config.modules.mgnllms.templates.pages.lms-sample.xml	2013-10-20 15:17:25 UTC (rev 4401)
@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<sv:node sv:name="lms-sample" xmlns:sv="http://www.jcp.org/jcr/sv/1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <sv:property sv:name="jcr:primaryType" sv:type="Name">
+    <sv:value>mgnl:contentNode</sv:value>
+  </sv:property>
+  <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
+    <sv:value>mix:lockable</sv:value>
+  </sv:property>
+  <sv:property sv:name="jcr:uuid" sv:type="String">
+    <sv:value>785f8f98-a7ce-406f-ab54-dfd2c21073e9</sv:value>
+  </sv:property>
+  <sv:property sv:name="jcr:createdBy" sv:type="String">
+    <sv:value>admin</sv:value>
+  </sv:property>
+  <sv:property sv:name="renderType" sv:type="String">
+    <sv:value>jsp</sv:value>
+  </sv:property>
+  <sv:property sv:name="templateScript" sv:type="String">
+    <sv:value>/templates/samples-lms/index.jsp</sv:value>
+  </sv:property>
+  <sv:property sv:name="title" sv:type="String">
+    <sv:value>LMS sample: main page</sv:value>
+  </sv:property>
+  <sv:property sv:name="visible" sv:type="String">
+    <sv:value>true</sv:value>
+  </sv:property>
+  <sv:node sv:name="MetaData">
+    <sv:property sv:name="jcr:primaryType" sv:type="Name">
+      <sv:value>mgnl:metaData</sv:value>
+    </sv:property>
+    <sv:property sv:name="jcr:createdBy" sv:type="String">
+      <sv:value>admin</sv:value>
+    </sv:property>
+    <sv:property sv:name="mgnl:activated" sv:type="Boolean">
+      <sv:value>false</sv:value>
+    </sv:property>
+    <sv:property sv:name="mgnl:authorid" sv:type="String">
+      <sv:value>superuser</sv:value>
+    </sv:property>
+    <sv:property sv:name="mgnl:creationdate" sv:type="Date">
+      <sv:value>2010-02-05T14:04:47.884+01:00</sv:value>
+    </sv:property>
+    <sv:property sv:name="mgnl:lastmodified" sv:type="Date">
+      <sv:value>2013-10-19T15:04:06.353+02:00</sv:value>
+    </sv:property>
+  </sv:node>
+</sv:node>

Modified: magnoliamodules/trunk/openutils-mgnllms/src/main/resources/mgnl-bootstrap-samples/mgnllms/website.sample-lms.xml
===================================================================
(Binary files differ)

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

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

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

Revision: 4400
          http://openutils.svn.sourceforge.net/openutils/?rev=4400&view=rev
Author:   fgiust
Date:     2013-10-20 15:00:28 +0000 (Sun, 20 Oct 2013)
Log Message:
-----------
API updates

Modified Paths:
--------------
    magnoliamodules/trunk/openutils-mgnlrepoutils/pom.xml
    magnoliamodules/trunk/openutils-mgnlrepoutils/src/main/java/net/sourceforge/openutils/mgnlrepoutils/Linkfix.java
    magnoliamodules/trunk/openutils-mgnlrepoutils/src/main/java/net/sourceforge/openutils/mgnlrepoutils/LinkfixPage.java
    magnoliamodules/trunk/openutils-mgnlrepoutils/src/main/java/net/sourceforge/openutils/mgnlrepoutils/RepositoryUtilsPage.java
    magnoliamodules/trunk/openutils-mgnltagcloud/src/main/java/net/sourceforge/openutils/mgnltagcloud/util/JackrabbitUtil.java
    magnoliamodules/trunk/openutils-mgnlutils/src/main/java/it/openutils/mgnlutils/el/MgnlUtilsDeprecatedAdapters.java
    magnoliamodules/trunk/openutils-mgnlutils/src/main/java/it/openutils/mgnlutils/el/MgnlUtilsElFunctions.java
    magnoliamodules/trunk/openutils-mgnlutils/src/main/java/it/openutils/mgnlutils/util/NodeUtilsExt.java
    magnoliamodules/trunk/openutils-mgnlutils/src/test/java/it/openutils/mgnlutils/el/MgnlUtilsElFunctionsTest.java

Modified: magnoliamodules/trunk/openutils-mgnlrepoutils/pom.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnlrepoutils/pom.xml	2013-10-20 14:20:48 UTC (rev 4399)
+++ magnoliamodules/trunk/openutils-mgnlrepoutils/pom.xml	2013-10-20 15:00:28 UTC (rev 4400)
@@ -79,6 +79,11 @@
       <version>5.0.1</version>
     </dependency>
     <dependency>
+      <groupId>net.sourceforge.openutils</groupId>
+      <artifactId>openutils-mgnlutils</artifactId>
+      <version>5.0.2-SNAPSHOT</version>
+    </dependency>
+    <dependency>
       <groupId>javax.servlet</groupId>
       <artifactId>servlet-api</artifactId>
       <version>2.5</version>

Modified: magnoliamodules/trunk/openutils-mgnlrepoutils/src/main/java/net/sourceforge/openutils/mgnlrepoutils/Linkfix.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlrepoutils/src/main/java/net/sourceforge/openutils/mgnlrepoutils/Linkfix.java	2013-10-20 14:20:48 UTC (rev 4399)
+++ magnoliamodules/trunk/openutils-mgnlrepoutils/src/main/java/net/sourceforge/openutils/mgnlrepoutils/Linkfix.java	2013-10-20 15:00:28 UTC (rev 4400)
@@ -19,11 +19,10 @@
 
 package net.sourceforge.openutils.mgnlrepoutils;
 
-import info.magnolia.cms.core.Content;
-import info.magnolia.cms.core.Content.ContentFilter;
-import info.magnolia.cms.core.ItemType;
-import info.magnolia.cms.core.NodeData;
 import info.magnolia.context.MgnlContext;
+import info.magnolia.jcr.util.MetaDataUtil;
+import info.magnolia.jcr.util.NodeUtil;
+import it.openutils.mgnlutils.util.NodeUtilsExt;
 
 import java.io.StringWriter;
 import java.util.Collection;
@@ -31,6 +30,9 @@
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
+import javax.jcr.Node;
+import javax.jcr.Property;
+import javax.jcr.PropertyIterator;
 import javax.jcr.PropertyType;
 import javax.jcr.RepositoryException;
 import javax.jcr.Value;
@@ -54,22 +56,6 @@
     private static final Pattern UUID_PATTERN = Pattern
         .compile("([a-f0-9]{8}-[a-f0-9]{4}-[a-f0-9]{4}-[a-f0-9]{4}-[a-f0-9]{12})");
 
-    private static final ContentFilter ACCEPTALL_CONTENTFILTER = new ContentFilter()
-    {
-
-        public boolean accept(Content content)
-        {
-            try
-            {
-                return !ItemType.NT_METADATA.equals(content.getNodeTypeName());
-            }
-            catch (RepositoryException e)
-            {
-                return true;
-            }
-        }
-    };
-
     private Map<String, String> replacements;
 
     private Collection<String> sourceRepositoriesAndPaths;
@@ -153,7 +139,7 @@
 
             log.info("Processing {}", source);
 
-            Content node = MgnlContext.getHierarchyManager(repo).getContent(path);
+            Node node = MgnlContext.getJCRSession(repo).getNode(path);
             processNode(node);
         }
 
@@ -165,26 +151,27 @@
      * @param node
      * @throws RepositoryException
      */
-    private void processNode(Content node) throws RepositoryException
+    private void processNode(Node node) throws RepositoryException
     {
-        log.debug("Processing {}", node.getHandle());
+        log.debug("Processing {}", NodeUtil.getPathIfPossible(node));
         nodesCount++;
 
-        Collection<NodeData> nodedatas = node.getNodeDataCollection();
+        PropertyIterator properties = node.getProperties();
 
         boolean nodeUpdated = false;
-        for (NodeData nodedata : nodedatas)
+        while (properties.hasNext())
         {
-            nodeUpdated = processNodedata(nodedata) || nodeUpdated;
+            nodeUpdated = processProperty(properties.nextProperty()) || nodeUpdated;
         }
 
         if (nodeUpdated)
         {
-            node.updateMetaData();
+            MetaDataUtil.updateMetaData(node);
         }
 
-        Collection<Content> children = node.getChildren(ACCEPTALL_CONTENTFILTER);
-        for (Content child : children)
+        Iterable<Node> children = NodeUtil.getNodes(node, NodeUtil.EXCLUDE_META_DATA_FILTER);
+
+        for (Node child : children)
         {
             processNode(child);
         }
@@ -195,9 +182,9 @@
      * @param nodedata
      * @throws RepositoryException
      */
-    private boolean processNodedata(NodeData data) throws RepositoryException
+    private boolean processProperty(Property data) throws RepositoryException
     {
-        if (data.isMultiValue() == NodeData.MULTIVALUE_TRUE)
+        if (data.isMultiple())
         {
             return processMultiValue(data);
         }
@@ -214,7 +201,7 @@
      * @param data
      * @throws RepositoryException
      */
-    private boolean processString(NodeData data) throws RepositoryException
+    private boolean processString(Property data) throws RepositoryException
     {
         String dataAsString = data.getString();
         if (StringUtils.isEmpty(dataAsString))
@@ -236,10 +223,7 @@
             {
                 log.debug("Replacing UUID {} with {}", uuid, newuuid);
 
-                fullLog.append(String.format(
-                    "%s:%s\n",
-                    data.getHierarchyManager().getWorkspace().getName(),
-                    data.getHandle()));
+                fullLog.append(String.format("%s:%s\n", data.getSession().getWorkspace().getName(), data.getPath()));
 
                 gotMatches = true;
                 substitutionsCount++;
@@ -265,10 +249,7 @@
 
                 log.debug("Replacing text {} with {}", plainpath, repl.getValue());
 
-                fullLog.append(String.format(
-                    "%s:%s\n",
-                    data.getHierarchyManager().getWorkspace().getName(),
-                    data.getHandle()));
+                fullLog.append(String.format("%s:%s\n", data.getSession().getWorkspace().getName(), data.getPath()));
 
                 gotMatches = true;
                 substitutionsCount++;
@@ -283,7 +264,7 @@
         if (gotMatches)
         {
             data.setValue(newString);
-            data.save();
+            data.getSession().save();
             return true;
         }
 
@@ -320,8 +301,12 @@
                         String newhandle = StringUtils.replace(handle, replacement.getKey(), replacement.getValue());
                         try
                         {
-                            Content newcontent = MgnlContext.getHierarchyManager(repo).getContent(newhandle);
-                            return newcontent.getUUID();
+                            Node newcontent = NodeUtilsExt.getNodeIfExists(MgnlContext.getJCRSession(repo), newhandle);
+
+                            if (newcontent != null)
+                            {
+                                return NodeUtil.getNodeIdentifierIfPossible(newcontent);
+                            }
                         }
                         catch (RepositoryException e)
                         {
@@ -339,7 +324,7 @@
      * @param data
      * @throws RepositoryException
      */
-    private boolean processMultiValue(NodeData data) throws RepositoryException
+    private boolean processMultiValue(Property data) throws RepositoryException
     {
         Value[] values = data.getValues();
 
@@ -378,12 +363,7 @@
                 String newString = sb.toString();
                 log.info("Creating value {}", newString);
 
-                values[j] = data
-                    .getHierarchyManager()
-                    .getWorkspace()
-                    .getSession()
-                    .getValueFactory()
-                    .createValue(newString);
+                values[j] = data.getSession().getWorkspace().getSession().getValueFactory().createValue(newString);
 
             }
         }
@@ -394,7 +374,7 @@
             log.debug("Setting value {} {}", values.length, values);
 
             data.setValue(values);
-            data.save();
+            data.getSession().save();
             return true;
         }
 

Modified: magnoliamodules/trunk/openutils-mgnlrepoutils/src/main/java/net/sourceforge/openutils/mgnlrepoutils/LinkfixPage.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlrepoutils/src/main/java/net/sourceforge/openutils/mgnlrepoutils/LinkfixPage.java	2013-10-20 14:20:48 UTC (rev 4399)
+++ magnoliamodules/trunk/openutils-mgnlrepoutils/src/main/java/net/sourceforge/openutils/mgnlrepoutils/LinkfixPage.java	2013-10-20 15:00:28 UTC (rev 4400)
@@ -155,7 +155,7 @@
                 // test it
                 try
                 {
-                    MgnlContext.getHierarchyManager(repo);
+                    MgnlContext.getJCRSession(repo);
                 }
                 catch (IllegalArgumentException e)
                 {

Modified: magnoliamodules/trunk/openutils-mgnlrepoutils/src/main/java/net/sourceforge/openutils/mgnlrepoutils/RepositoryUtilsPage.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlrepoutils/src/main/java/net/sourceforge/openutils/mgnlrepoutils/RepositoryUtilsPage.java	2013-10-20 14:20:48 UTC (rev 4399)
+++ magnoliamodules/trunk/openutils-mgnlrepoutils/src/main/java/net/sourceforge/openutils/mgnlrepoutils/RepositoryUtilsPage.java	2013-10-20 15:00:28 UTC (rev 4400)
@@ -19,12 +19,13 @@
 
 package net.sourceforge.openutils.mgnlrepoutils;
 
-import info.magnolia.cms.beans.config.ContentRepository;
 import info.magnolia.cms.util.AlertUtil;
 import info.magnolia.context.MgnlContext;
 import info.magnolia.module.admininterface.TemplatedMVCHandler;
 import info.magnolia.objectfactory.Components;
 import info.magnolia.repository.RepositoryManager;
+import info.magnolia.repository.definition.WorkspaceMappingDefinition;
+import it.openutils.mgnlutils.util.NodeUtilsExt;
 
 import java.lang.reflect.Field;
 import java.lang.reflect.InvocationTargetException;
@@ -134,7 +135,7 @@
     private SearchIndex getSearchIndex(String repo) throws RepositoryException, NoSuchMethodException,
         IllegalAccessException, InvocationTargetException
     {
-        WorkspaceImpl workspace = (WorkspaceImpl) MgnlContext.getHierarchyManager(repo).getWorkspace();
+        WorkspaceImpl workspace = (WorkspaceImpl) NodeUtilsExt.unwrap(MgnlContext.getJCRSession(repo).getWorkspace());
 
         QueryManagerImpl queryManager = (QueryManagerImpl) workspace.getQueryManager();
 
@@ -144,10 +145,13 @@
 
     private PersistenceManager getPersistenceManager(String repo) throws Exception
     {
-        WorkspaceImpl workspace = (WorkspaceImpl) MgnlContext.getHierarchyManager(repo).getWorkspace();
+        WorkspaceImpl workspace = (WorkspaceImpl) NodeUtilsExt.unwrap(MgnlContext.getJCRSession(repo).getWorkspace());
         Repository repository = workspace.getSession().getRepository();
 
-        String workspaceName = ContentRepository.getMappedWorkspaceName(repo);
+        WorkspaceMappingDefinition mapping = Components.getComponent(RepositoryManager.class).getWorkspaceMapping(repo);
+
+        String workspaceName = mapping != null ? mapping.getPhysicalWorkspaceName() : repo;
+
         return getPM(repository, workspaceName);
     }
 

Modified: magnoliamodules/trunk/openutils-mgnltagcloud/src/main/java/net/sourceforge/openutils/mgnltagcloud/util/JackrabbitUtil.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnltagcloud/src/main/java/net/sourceforge/openutils/mgnltagcloud/util/JackrabbitUtil.java	2013-10-20 14:20:48 UTC (rev 4399)
+++ magnoliamodules/trunk/openutils-mgnltagcloud/src/main/java/net/sourceforge/openutils/mgnltagcloud/util/JackrabbitUtil.java	2013-10-20 15:00:28 UTC (rev 4400)
@@ -21,8 +21,8 @@
 
 import info.magnolia.context.SystemContext;
 import info.magnolia.jcr.RuntimeRepositoryException;
-import info.magnolia.jcr.wrapper.DelegateSessionWrapper;
 import info.magnolia.objectfactory.Components;
+import it.openutils.mgnlutils.util.NodeUtilsExt;
 
 import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
@@ -98,15 +98,8 @@
         Session session;
         try
         {
-            session = Components.getComponent(SystemContext.class).getJCRSession(repository);
-
             // TAGCLOUD-21
-            while (session instanceof DelegateSessionWrapper)
-            {
-                session = ((DelegateSessionWrapper) session).getWrappedSession();
-            }
-
-            return session;
+            return NodeUtilsExt.unwrap(Components.getComponent(SystemContext.class).getJCRSession(repository));
         }
         catch (RepositoryException e)
         {

Modified: magnoliamodules/trunk/openutils-mgnlutils/src/main/java/it/openutils/mgnlutils/el/MgnlUtilsDeprecatedAdapters.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlutils/src/main/java/it/openutils/mgnlutils/el/MgnlUtilsDeprecatedAdapters.java	2013-10-20 14:20:48 UTC (rev 4399)
+++ magnoliamodules/trunk/openutils-mgnlutils/src/main/java/it/openutils/mgnlutils/el/MgnlUtilsDeprecatedAdapters.java	2013-10-20 15:00:28 UTC (rev 4400)
@@ -27,6 +27,7 @@
 import info.magnolia.context.MgnlContext;
 import info.magnolia.context.WebContext;
 import info.magnolia.jcr.util.ContentMap;
+import it.openutils.mgnlutils.util.NodeUtilsExt;
 
 import java.util.Properties;
 
@@ -52,8 +53,7 @@
         AggregationState aggregationState = getAggregationStateIfAvailable();
         if (aggregationState != null)
         {
-            Content mainContent = aggregationState.getCurrentContent();
-            return mainContent != null ? mainContent.getJCRNode() : null;
+            return toNode(aggregationState.getCurrentContent());
         }
         return null;
     }
@@ -63,8 +63,7 @@
         AggregationState aggregationState = getAggregationStateIfAvailable();
         if (aggregationState != null)
         {
-            Content mainContent = aggregationState.getMainContent();
-            return mainContent != null ? mainContent.getJCRNode() : null;
+            return toNode(aggregationState.getMainContent());
         }
         return null;
     }
@@ -95,11 +94,11 @@
         }
         else if (nodeorcontent instanceof Content)
         {
-            return ((Content) nodeorcontent).getJCRNode();
+            return NodeUtilsExt.wrap(((Content) nodeorcontent).getJCRNode());
         }
         else if (nodeorcontent instanceof NodeMapWrapper)
         {
-            return ((NodeMapWrapper) nodeorcontent).getJCRNode();
+            return NodeUtilsExt.wrap(((NodeMapWrapper) nodeorcontent).getJCRNode());
         }
         else if (nodeorcontent instanceof String)
         {

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	2013-10-20 14:20:48 UTC (rev 4399)
+++ magnoliamodules/trunk/openutils-mgnlutils/src/main/java/it/openutils/mgnlutils/el/MgnlUtilsElFunctions.java	2013-10-20 15:00:28 UTC (rev 4400)
@@ -142,22 +142,10 @@
         {
             return null;
         }
-        try
-        {
-            Node node = MgnlContext.getJCRSession(repository).getNode(path);
 
-            return node;
+        Node node = NodeUtilsExt.getNodeByIdOrPath(repository, path);
 
-        }
-        catch (RepositoryException e)
-        {
-            log.debug("{} loading path {} from workspace {}:{}", new Object[]{
-                e.getClass().getName(),
-                path,
-                repository,
-                e.getMessage() });
-        }
-        return null;
+        return node;
     }
 
     /**
@@ -994,31 +982,8 @@
                 return null;
             }
 
-            try
-            {
-                Session session = MgnlContext.getJCRSession(StringUtils.isNotBlank(repo)
-                    ? repo
-                    : RepositoryConstants.WEBSITE);
-                if (identifier.startsWith("/"))
-                {
-                    if (session.nodeExists(identifier))
-                    {
-                        content = session.getNode(identifier);
-                    }
-                }
-                else
-                {
-                    content = session.getNodeByIdentifier(StringUtils.trim(identifier));
-                }
-            }
-            catch (ItemNotFoundException e)
-            {
-                log.debug("Node \"" + identifier + "\" not found");
-            }
-            catch (RepositoryException e)
-            {
-                log.error(e.getClass().getName() + " getting node \"" + identifier + "\"", e);
-            }
+            content = NodeUtilsExt.getNodeByIdOrPath(repo, StringUtils.trim(identifier));
+
         }
         else
         {
@@ -1162,21 +1127,7 @@
             return null;
         }
 
-        Session session;
-        try
-        {
-            session = MgnlContext.getJCRSession(repo);
-            Node loaded = session.getNodeByIdentifier(uuid);
-
-            return loaded;
-
-        }
-        catch (ItemNotFoundException e)
-        {
-            // ignore
-        }
-
-        return null;
+        return NodeUtilsExt.getNodeByIdOrPath(repo, uuid);
     }
 
     /**

Modified: magnoliamodules/trunk/openutils-mgnlutils/src/main/java/it/openutils/mgnlutils/util/NodeUtilsExt.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlutils/src/main/java/it/openutils/mgnlutils/util/NodeUtilsExt.java	2013-10-20 14:20:48 UTC (rev 4399)
+++ magnoliamodules/trunk/openutils-mgnlutils/src/main/java/it/openutils/mgnlutils/util/NodeUtilsExt.java	2013-10-20 15:00:28 UTC (rev 4400)
@@ -21,7 +21,6 @@
 
 import info.magnolia.cms.core.AggregationState;
 import info.magnolia.cms.core.Path;
-import info.magnolia.cms.util.ContentUtil;
 import info.magnolia.content2bean.Content2BeanException;
 import info.magnolia.content2bean.Content2BeanUtil;
 import info.magnolia.context.MgnlContext;
@@ -30,12 +29,12 @@
 import info.magnolia.jcr.util.NodeUtil;
 import info.magnolia.jcr.util.PropertyUtil;
 import info.magnolia.jcr.wrapper.ChannelVisibilityContentDecorator;
+import info.magnolia.jcr.wrapper.DelegateSessionWrapper;
+import info.magnolia.jcr.wrapper.DelegateWorkspaceWrapper;
 import info.magnolia.jcr.wrapper.HTMLEscapingNodeWrapper;
 import info.magnolia.jcr.wrapper.I18nNodeWrapper;
 import info.magnolia.link.LinkFactory;
 import info.magnolia.link.LinkTransformerManager;
-import info.magnolia.link.LinkUtil;
-import info.magnolia.objectfactory.Components;
 
 import java.util.regex.Pattern;
 
@@ -43,10 +42,10 @@
 import javax.jcr.Node;
 import javax.jcr.RepositoryException;
 import javax.jcr.Session;
+import javax.jcr.Workspace;
 
 import org.apache.commons.lang.StringUtils;
 
-
 /**
  * @author fgiust
  * @version $Id: NodeUtilsExt.java 4292 2013-09-12 15:54:10Z fgiust $
@@ -75,7 +74,7 @@
         {
             try
             {
-                return session.getNode(absolutepath);
+                return wrap(session.getNode(absolutepath));
             }
             catch (RepositoryException e)
             {
@@ -153,7 +152,7 @@
         {
             try
             {
-                return NodeUtil.getNodeByIdentifier(workspace, uuidOrPath);
+                return wrap(NodeUtil.getNodeByIdentifier(workspace, uuidOrPath));
             }
             catch (ItemNotFoundException e)
             {
@@ -168,7 +167,7 @@
         {
             try
             {
-                return getNodeIfExists(MgnlContext.getJCRSession(workspace), uuidOrPath);
+                return wrap(getNodeIfExists(MgnlContext.getJCRSession(workspace), uuidOrPath));
             }
             catch (RepositoryException e)
             {
@@ -272,7 +271,35 @@
         return LinkTransformerManager
             .getInstance()
             .getAbsolute(addcontextpath)
-            .transform(LinkFactory.createLink(ContentUtil.asContent(node)));
+            .transform(LinkFactory.createLink(info.magnolia.cms.util.ContentUtil.asContent(node)));
 
     }
+
+    public static Session unwrap(Session session)
+    {
+        if (session == null)
+        {
+            return null;
+        }
+        while (session instanceof DelegateSessionWrapper)
+        {
+            session = ((DelegateSessionWrapper) session).getWrappedSession();
+        }
+
+        return session;
+    }
+
+    public static Workspace unwrap(Workspace workspace)
+    {
+        if (workspace == null)
+        {
+            return null;
+        }
+        while (workspace instanceof DelegateWorkspaceWrapper)
+        {
+            workspace = ((DelegateWorkspaceWrapper) workspace).getWrappedWorkspace();
+        }
+
+        return workspace;
+    }
 }

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	2013-10-20 14:20:48 UTC (rev 4399)
+++ magnoliamodules/trunk/openutils-mgnlutils/src/test/java/it/openutils/mgnlutils/el/MgnlUtilsElFunctionsTest.java	2013-10-20 15:00:28 UTC (rev 4400)
@@ -118,19 +118,12 @@
 
         ((MockWebContext) MgnlContext.getInstance()).setContextPath("/testcontextpath");
         Components.getComponent(ServerConfiguration.class).setDefaultExtension("html");
-        try
-        {
-            Class classI18nContentSupport = Class.forName("info.magnolia.cms.i18n.DefaultI18nContentSupport");
-            Method i18nGetLocale = classI18nContentSupport.getMethod("getDefaultLocale");
-            // Magnolia version >= 4.3.x
-            i18nGetLocale.invoke(i18nSupport, en.getLocale());
-        }
-        catch (Throwable e)
-        {
-            // Magnolia version < 4.3.x
-            MgnlContext.getInstance().setLocale(new Locale(""));
-        }
 
+        Class classI18nContentSupport = Class.forName("info.magnolia.cms.i18n.DefaultI18nContentSupport");
+        Method i18nGetLocale = classI18nContentSupport.getMethod("getDefaultLocale");
+        // Magnolia version >= 4.3.x
+        i18nGetLocale.invoke(i18nSupport, en.getLocale());
+
         // info.magnolia.link.BaseLinkTest.setUp()
         // not configured in the repository
         ComponentsTestUtil.setImplementation(URI2RepositoryManager.class, URI2RepositoryManager.class);

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

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

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

Revision: 4399
          http://openutils.svn.sourceforge.net/openutils/?rev=4399&view=rev
Author:   fgiust
Date:     2013-10-20 14:20:48 +0000 (Sun, 20 Oct 2013)
Log Message:
-----------
cleanup a few functions

Modified Paths:
--------------
    magnoliamodules/trunk/openutils-mgnlutils/src/main/java/it/openutils/mgnlutils/el/MgnlUtilsDeprecatedAdapters.java
    magnoliamodules/trunk/openutils-mgnlutils/src/main/java/it/openutils/mgnlutils/el/MgnlUtilsElFunctions.java
    magnoliamodules/trunk/openutils-mgnlutils/src/main/java/it/openutils/mgnlutils/util/NodeUtilsExt.java
    magnoliamodules/trunk/openutils-mgnlutils/src/main/resources/META-INF/tld/mgnlutils.tld

Modified: magnoliamodules/trunk/openutils-mgnlutils/src/main/java/it/openutils/mgnlutils/el/MgnlUtilsDeprecatedAdapters.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlutils/src/main/java/it/openutils/mgnlutils/el/MgnlUtilsDeprecatedAdapters.java	2013-10-20 12:41:45 UTC (rev 4398)
+++ magnoliamodules/trunk/openutils-mgnlutils/src/main/java/it/openutils/mgnlutils/el/MgnlUtilsDeprecatedAdapters.java	2013-10-20 14:20:48 UTC (rev 4399)
@@ -101,6 +101,11 @@
         {
             return ((NodeMapWrapper) nodeorcontent).getJCRNode();
         }
+        else if (nodeorcontent instanceof String)
+        {
+            // just ignore
+            log.debug("Unable to handle object of type {}", nodeorcontent);
+        }
         else
         {
             log.warn("Unable to handle object of type {}", nodeorcontent);

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	2013-10-20 12:41:45 UTC (rev 4398)
+++ magnoliamodules/trunk/openutils-mgnlutils/src/main/java/it/openutils/mgnlutils/el/MgnlUtilsElFunctions.java	2013-10-20 14:20:48 UTC (rev 4399)
@@ -28,15 +28,17 @@
 import info.magnolia.cms.security.Permission;
 import info.magnolia.cms.security.PermissionUtil;
 import info.magnolia.cms.security.SecurityUtil;
-import info.magnolia.cms.security.User; 
+import info.magnolia.cms.security.User;
 import info.magnolia.context.MgnlContext;
-import info.magnolia.context.WebContext;
-import info.magnolia.init.MagnoliaConfigurationProperties; 
+import info.magnolia.init.MagnoliaConfigurationProperties;
+import info.magnolia.jcr.util.ContentMap;
 import info.magnolia.jcr.util.NodeUtil;
+import info.magnolia.jcr.wrapper.HTMLEscapingNodeWrapper;
 import info.magnolia.link.LinkException;
 import info.magnolia.link.LinkUtil;
 import info.magnolia.objectfactory.Components;
 import info.magnolia.repository.RepositoryConstants;
+import it.openutils.mgnlutils.util.NodeUtilsExt;
 
 import java.io.UnsupportedEncodingException;
 import java.lang.reflect.Field;
@@ -225,7 +227,7 @@
     public static String link(String uuidOrPathOrUrl)
     {
         String cleanedurl = StringUtils.replace(StringUtils.trim(uuidOrPathOrUrl), "&", "&");
-        String contextPath = ((WebContext) MgnlContext.getInstance()).getContextPath();
+        String contextPath = safeContextPath();
 
         if (StringUtils.isBlank(cleanedurl))
         {
@@ -261,8 +263,7 @@
         // Check if uuidOrPathOrUrl is an UUID
         try
         {
-            cleanedurl = MgnlContext.getContextPath()
-                + LinkUtil.convertUUIDtoURI(cleanedurl, RepositoryConstants.WEBSITE);
+            cleanedurl = safeContextPath() + LinkUtil.convertUUIDtoURI(cleanedurl, RepositoryConstants.WEBSITE);
         }
         catch (LinkException e)
         {
@@ -655,7 +656,7 @@
      */
     public static String baseUrl()
     {
-        return baseUrlWithoutContextPath() + MgnlContext.getWebContext().getRequest().getContextPath();
+        return baseUrlWithoutContextPath() + safeContextPath();
     }
 
     /**
@@ -753,27 +754,38 @@
     }
 
     /**
-     * Returns a link from an uuid. Accepts in input uuid. Returns "#" if provided uuid is not found.
+     * Returns a link from an uuid. Accepts an uuid, a path, a Node, Content or ContentMap object. Returns "#" if
+     * provided uuid is not found. Automatically adds the context path.
      * @param uuid uuid to find
      * @param repo repository within search - can be null - default is 'website'
      * @return a link from an uuid.
      */
-    public static String repoUuidLink(String uuid, String repo)
+    public static String repoUuidLink(Object uuid, String repo)
     {
-        String url = "#";
-        try
+        return link(uuid, repo, true);
+    }
+
+    /**
+     * Returns a link from an uuid. Accepts an uuid, a path, a Node, Content or ContentMap object. Returns "#" if
+     * provided uuid is not found. Don't add the context path.
+     * @param uuid uuid to find
+     * @param repo repository within search - can be null - default is 'website'
+     * @return a link from an uuid.
+     */
+    public static String linkNoCtx(Object uuid, String repo)
+    {
+        return link(uuid, repo, false);
+    }
+
+    public static String link(Object uuid, String repo, boolean addcontextpath)
+    {
+        Node node = node(uuid, repo);
+        if (node == null)
         {
-            url = MgnlContext.getContextPath()
-                + LinkUtil.convertUUIDtoURI(uuid, StringUtils.isNotBlank(repo) ? repo : RepositoryConstants.WEBSITE);
+            return "#";
         }
-        catch (LinkException e)
-        {
-            log.debug("Failed to parse links with from "
-                + MgnlContext.getAggregationState().getCurrentURI()
-                + e.getMessage());
-        }
 
-        return url;
+        return NodeUtilsExt.createLink(node, addcontextpath);
     }
 
     /**
@@ -984,7 +996,9 @@
 
             try
             {
-                Session session = MgnlContext.getJCRSession(repo);
+                Session session = MgnlContext.getJCRSession(StringUtils.isNotBlank(repo)
+                    ? repo
+                    : RepositoryConstants.WEBSITE);
                 if (identifier.startsWith("/"))
                 {
                     if (session.nodeExists(identifier))
@@ -1049,7 +1063,8 @@
     {
         Subject subject = MgnlContext.getSubject();
 
-        Set<info.magnolia.cms.security.auth.Entity> principalDetails = subject.getPrincipals(info.magnolia.cms.security.auth.Entity.class);
+        Set<info.magnolia.cms.security.auth.Entity> principalDetails = subject
+            .getPrincipals(info.magnolia.cms.security.auth.Entity.class);
         Iterator<info.magnolia.cms.security.auth.Entity> entityIterator = principalDetails.iterator();
         info.magnolia.cms.security.auth.Entity userDetails = entityIterator.next();
 
@@ -1353,6 +1368,13 @@
         }
     }
 
+    /**
+     * Loads the ancestor of the given jcr Node/ContentMap. Returns null if the object is null or if requested level is
+     * greater than current depth
+     * @param nodeorcontent input Node or ContentMap
+     * @param level ancestor level
+     * @return Node or null
+     */
     public static Node ancestor(Object nodeorcontent, int level)
     {
 
@@ -1385,7 +1407,31 @@
                 e.getMessage() });
             return null;
         }
+    }
 
+    /**
+     * Removes escaping of HTML on properties
+     * @param object Node or ContentMap
+     * @return same Node without wrapping. Null safe
+     */
+    public static Node decode(Object object)
+    {
+        Node node = MgnlUtilsDeprecatedAdapters.toNode(object);
+        if (node == null)
+        {
+            return null;
+        }
+
+        return NodeUtil.deepUnwrap(node, HTMLEscapingNodeWrapper.class);
     }
 
+    private static String safeContextPath()
+    {
+        if (MgnlContext.isWebContext())
+        {
+            return MgnlContext.getContextPath();
+        }
+        return StringUtils.EMPTY;
+    }
+
 }

Modified: magnoliamodules/trunk/openutils-mgnlutils/src/main/java/it/openutils/mgnlutils/util/NodeUtilsExt.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlutils/src/main/java/it/openutils/mgnlutils/util/NodeUtilsExt.java	2013-10-20 12:41:45 UTC (rev 4398)
+++ magnoliamodules/trunk/openutils-mgnlutils/src/main/java/it/openutils/mgnlutils/util/NodeUtilsExt.java	2013-10-20 14:20:48 UTC (rev 4399)
@@ -21,6 +21,7 @@
 
 import info.magnolia.cms.core.AggregationState;
 import info.magnolia.cms.core.Path;
+import info.magnolia.cms.util.ContentUtil;
 import info.magnolia.content2bean.Content2BeanException;
 import info.magnolia.content2bean.Content2BeanUtil;
 import info.magnolia.context.MgnlContext;
@@ -31,6 +32,10 @@
 import info.magnolia.jcr.wrapper.ChannelVisibilityContentDecorator;
 import info.magnolia.jcr.wrapper.HTMLEscapingNodeWrapper;
 import info.magnolia.jcr.wrapper.I18nNodeWrapper;
+import info.magnolia.link.LinkFactory;
+import info.magnolia.link.LinkTransformerManager;
+import info.magnolia.link.LinkUtil;
+import info.magnolia.objectfactory.Components;
 
 import java.util.regex.Pattern;
 
@@ -255,4 +260,19 @@
         }
         return NodeUtil.getPathIfPossible(node) + "/" + PropertyUtil.getString(node, "fileName");
     }
+
+    @SuppressWarnings("deprecation")
+    public static String createLink(Node node, boolean addcontextpath)
+    {
+        if (node == null)
+        {
+            return null;
+        }
+
+        return LinkTransformerManager
+            .getInstance()
+            .getAbsolute(addcontextpath)
+            .transform(LinkFactory.createLink(ContentUtil.asContent(node)));
+
+    }
 }

Modified: magnoliamodules/trunk/openutils-mgnlutils/src/main/resources/META-INF/tld/mgnlutils.tld
===================================================================
--- magnoliamodules/trunk/openutils-mgnlutils/src/main/resources/META-INF/tld/mgnlutils.tld	2013-10-20 12:41:45 UTC (rev 4398)
+++ magnoliamodules/trunk/openutils-mgnlutils/src/main/resources/META-INF/tld/mgnlutils.tld	2013-10-20 14:20:48 UTC (rev 4399)
@@ -241,12 +241,18 @@
     <function-signature>java.lang.String activePageFullUrl()</function-signature>
   </function>
   <function>
-    <description>Returns a link from an uuid. Accepts in input uuid.</description>
+    <description>Returns a link from an uuid. Accepts an uuid, path. Node or ContentMap. Automatically adds the context path.</description>
     <name>repoUuidLink</name>
     <function-class>it.openutils.mgnlutils.el.MgnlUtilsElFunctions</function-class>
-    <function-signature>java.lang.String repoUuidLink(java.lang.String, java.lang.String)</function-signature>
+    <function-signature>java.lang.String repoUuidLink(java.lang.Object, java.lang.String)</function-signature>
   </function>
   <function>
+    <description>Returns a link from an uuid. Accepts an uuid, path. Node or ContentMap. Don't add the context path</description>
+    <name>linkNoCtx</name>
+    <function-class>it.openutils.mgnlutils.el.MgnlUtilsElFunctions</function-class>
+    <function-signature>java.lang.String linkNoCtx(java.lang.Object, java.lang.String)</function-signature>
+  </function>
+  <function>
     <description>Convert a content list into a collection, also wrapping the content inside a I18NNodeMapWrapper</description>
     <name>convertToCollection</name>
     <function-class>it.openutils.mgnlutils.el.MgnlUtilsElFunctions</function-class>
@@ -436,5 +442,11 @@
     <function-class>it.openutils.mgnlutils.el.MgnlUtilsElFunctions</function-class>
     <function-signature>javax.jcr.Node ancestor(java.lang.Object, int)</function-signature>
   </function>
+  <function>
+    <description>Removes escaping of HTML on properties.</description>
+    <name>decode</name>
+    <function-class>it.openutils.mgnlutils.el.MgnlUtilsElFunctions</function-class>
+    <function-signature>javax.jcr.Node decode(java.lang.Object)</function-signature>
+  </function>
   <!-- please don't add new funtions without a meaningfull <description> -->
 </taglib>
\ 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:[4398] magnoliamodules/trunk

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

Revision: 4398
          http://openutils.svn.sourceforge.net/openutils/?rev=4398&view=rev
Author:   fgiust
Date:     2013-10-20 12:41:45 +0000 (Sun, 20 Oct 2013)
Log Message:
-----------
refactorin packages

Modified Paths:
--------------
    magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/configuration/DefaultMediaConfigurationManager.java
    magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/configuration/DefaultMediaUsedInManager.java
    magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/pages/MediaBrowserPage.java
    magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/pages/MediaFolderViewPage.java
    magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/tags/el/MediaEl.java
    magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/types/impl/DocumentTypeHandler.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/types/impl/VideoTypeHandler.java
    magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/uri/MediaURI2RepositoryMapping.java
    magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/utils/MediaLoadUtils.java
    magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/playlist/pages/PlaylistView.java
    magnoliamodules/trunk/openutils-mgnlmessages/src/main/java/net/sourceforge/openutils/mgnlmessages/configuration/MessagesConfigurationManager.java
    magnoliamodules/trunk/openutils-mgnltagcloud/src/main/java/net/sourceforge/openutils/mgnltagcloud/manager/DefaultTagCloudManager.java
    magnoliamodules/trunk/openutils-mgnltasks/src/main/java/it/openutils/mgnltasks/ChangePropertyForEachChildrenTask.java
    magnoliamodules/trunk/openutils-mgnltasks/src/main/java/it/openutils/mgnltasks/DeleteNodeTask.java
    magnoliamodules/trunk/openutils-mgnltasks/src/main/java/it/openutils/mgnltasks/DiffModuleConfigBootstrapTask.java
    magnoliamodules/trunk/openutils-mgnltasks/src/main/java/it/openutils/mgnltasks/DisableSubscribersTask.java
    magnoliamodules/trunk/openutils-mgnltasks/src/main/java/it/openutils/mgnltasks/ExistenceConditionalBootstrapTask.java
    magnoliamodules/trunk/openutils-mgnltasks/src/main/java/it/openutils/mgnltasks/ModuleConfigBootstrapTask.java
    magnoliamodules/trunk/openutils-mgnltasks/src/main/java/it/openutils/mgnltasks/SetPropertyTask.java

Added Paths:
-----------
    magnoliamodules/trunk/openutils-mgnlutils/src/main/java/it/openutils/mgnlutils/util/NodeUtilsExt.java
    magnoliamodules/trunk/openutils-mgnlutils/src/main/java/it/openutils/mgnlutils/util/ObservedManagerAdapter.java

Removed Paths:
-------------
    magnoliamodules/trunk/openutils-mgnlutils/src/main/java/it/openutils/mgnlutils/api/

Modified: magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/configuration/DefaultMediaConfigurationManager.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/configuration/DefaultMediaConfigurationManager.java	2013-10-20 11:08:35 UTC (rev 4397)
+++ magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/configuration/DefaultMediaConfigurationManager.java	2013-10-20 12:41:45 UTC (rev 4398)
@@ -23,8 +23,8 @@
 import info.magnolia.cms.beans.config.URI2RepositoryMapping;
 import info.magnolia.jcr.util.NodeUtil;
 import info.magnolia.jcr.util.PropertyUtil;
-import it.openutils.mgnlutils.api.NodeUtilsExt;
-import it.openutils.mgnlutils.api.ObservedManagerAdapter;
+import it.openutils.mgnlutils.util.NodeUtilsExt;
+import it.openutils.mgnlutils.util.ObservedManagerAdapter;
 
 import java.util.Collection;
 import java.util.Iterator;

Modified: magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/configuration/DefaultMediaUsedInManager.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/configuration/DefaultMediaUsedInManager.java	2013-10-20 11:08:35 UTC (rev 4397)
+++ magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/configuration/DefaultMediaUsedInManager.java	2013-10-20 12:41:45 UTC (rev 4398)
@@ -24,7 +24,7 @@
 import info.magnolia.jcr.RuntimeRepositoryException;
 import info.magnolia.jcr.util.NodeUtil;
 import info.magnolia.objectfactory.Components;
-import it.openutils.mgnlutils.api.NodeUtilsExt;
+import it.openutils.mgnlutils.util.NodeUtilsExt;
 
 import java.util.ArrayList;
 import java.util.HashMap;

Modified: magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/pages/MediaBrowserPage.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/pages/MediaBrowserPage.java	2013-10-20 11:08:35 UTC (rev 4397)
+++ magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/pages/MediaBrowserPage.java	2013-10-20 12:41:45 UTC (rev 4398)
@@ -26,7 +26,7 @@
 import info.magnolia.context.MgnlContext;
 import info.magnolia.jcr.util.NodeUtil;
 import info.magnolia.jcr.util.PropertyUtil;
-import it.openutils.mgnlutils.api.NodeUtilsExt;
+import it.openutils.mgnlutils.util.NodeUtilsExt;
 
 import java.io.File;
 import java.io.FileOutputStream;

Modified: magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/pages/MediaFolderViewPage.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/pages/MediaFolderViewPage.java	2013-10-20 11:08:35 UTC (rev 4397)
+++ magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/pages/MediaFolderViewPage.java	2013-10-20 12:41:45 UTC (rev 4398)
@@ -34,9 +34,9 @@
 import info.magnolia.module.admininterface.commands.ActivationCommand;
 import info.magnolia.objectfactory.Components;
 import info.magnolia.templating.functions.TemplatingFunctions;
-import it.openutils.mgnlutils.api.NodeUtilsExt;
 import it.openutils.mgnlutils.el.MgnlPagingElFunctions;
 import it.openutils.mgnlutils.el.MgnlPagingElFunctions.Page;
+import it.openutils.mgnlutils.util.NodeUtilsExt;
 
 import java.io.IOException;
 import java.util.ArrayList;

Modified: magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/tags/el/MediaEl.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/tags/el/MediaEl.java	2013-10-20 11:08:35 UTC (rev 4397)
+++ magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/tags/el/MediaEl.java	2013-10-20 12:41:45 UTC (rev 4398)
@@ -27,7 +27,7 @@
 import info.magnolia.module.ModuleRegistry;
 import info.magnolia.objectfactory.Components;
 import info.magnolia.repository.RepositoryConstants;
-import it.openutils.mgnlutils.api.NodeUtilsExt;
+import it.openutils.mgnlutils.util.NodeUtilsExt;
 
 import java.awt.Point;
 import java.util.ArrayList;

Modified: magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/types/impl/DocumentTypeHandler.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/types/impl/DocumentTypeHandler.java	2013-10-20 11:08:35 UTC (rev 4397)
+++ magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/types/impl/DocumentTypeHandler.java	2013-10-20 12:41:45 UTC (rev 4398)
@@ -25,7 +25,7 @@
 import info.magnolia.jcr.util.NodeUtil;
 import info.magnolia.jcr.util.PropertyUtil;
 import info.magnolia.module.admininterface.SaveHandlerImpl;
-import it.openutils.mgnlutils.api.NodeUtilsExt;
+import it.openutils.mgnlutils.util.NodeUtilsExt;
 
 import java.awt.image.BufferedImage;
 import java.io.File;

Modified: 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/types/impl/ImageTypeHandler.java	2013-10-20 11:08:35 UTC (rev 4397)
+++ magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/types/impl/ImageTypeHandler.java	2013-10-20 12:41:45 UTC (rev 4398)
@@ -24,7 +24,7 @@
 import info.magnolia.jcr.util.NodeUtil;
 import info.magnolia.jcr.util.PropertyUtil;
 import info.magnolia.objectfactory.Components;
-import it.openutils.mgnlutils.api.NodeUtilsExt;
+import it.openutils.mgnlutils.util.NodeUtilsExt;
 
 import java.awt.image.BufferedImage;
 import java.io.InputStream;

Modified: magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/types/impl/VideoTypeHandler.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/types/impl/VideoTypeHandler.java	2013-10-20 11:08:35 UTC (rev 4397)
+++ magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/types/impl/VideoTypeHandler.java	2013-10-20 12:41:45 UTC (rev 4398)
@@ -22,7 +22,7 @@
 import info.magnolia.cms.beans.runtime.FileProperties;
 import info.magnolia.cms.core.MgnlNodeType;
 import info.magnolia.jcr.util.PropertyUtil;
-import it.openutils.mgnlutils.api.NodeUtilsExt;
+import it.openutils.mgnlutils.util.NodeUtilsExt;
 
 import java.io.InputStream;
 

Modified: magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/uri/MediaURI2RepositoryMapping.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/uri/MediaURI2RepositoryMapping.java	2013-10-20 11:08:35 UTC (rev 4397)
+++ magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/uri/MediaURI2RepositoryMapping.java	2013-10-20 12:41:45 UTC (rev 4398)
@@ -23,7 +23,7 @@
 import info.magnolia.context.MgnlContext;
 import info.magnolia.jcr.util.PropertyUtil;
 import info.magnolia.link.Link;
-import it.openutils.mgnlutils.api.NodeUtilsExt;
+import it.openutils.mgnlutils.util.NodeUtilsExt;
 
 import javax.jcr.Node;
 import javax.jcr.PathNotFoundException;

Modified: magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/utils/MediaLoadUtils.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/utils/MediaLoadUtils.java	2013-10-20 11:08:35 UTC (rev 4397)
+++ magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/utils/MediaLoadUtils.java	2013-10-20 12:41:45 UTC (rev 4398)
@@ -25,7 +25,7 @@
 import info.magnolia.context.SystemContext;
 import info.magnolia.jcr.util.MetaDataUtil;
 import info.magnolia.objectfactory.Components;
-import it.openutils.mgnlutils.api.NodeUtilsExt;
+import it.openutils.mgnlutils.util.NodeUtilsExt;
 
 import java.io.File;
 import java.io.FileOutputStream;

Modified: magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/playlist/pages/PlaylistView.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/playlist/pages/PlaylistView.java	2013-10-20 11:08:35 UTC (rev 4397)
+++ magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/playlist/pages/PlaylistView.java	2013-10-20 12:41:45 UTC (rev 4398)
@@ -24,7 +24,7 @@
 import info.magnolia.jcr.util.PropertyUtil;
 import info.magnolia.module.ModuleRegistry;
 import info.magnolia.objectfactory.Components;
-import it.openutils.mgnlutils.api.NodeUtilsExt;
+import it.openutils.mgnlutils.util.NodeUtilsExt;
 
 import java.io.IOException;
 import java.io.PrintWriter;

Modified: magnoliamodules/trunk/openutils-mgnlmessages/src/main/java/net/sourceforge/openutils/mgnlmessages/configuration/MessagesConfigurationManager.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlmessages/src/main/java/net/sourceforge/openutils/mgnlmessages/configuration/MessagesConfigurationManager.java	2013-10-20 11:08:35 UTC (rev 4397)
+++ magnoliamodules/trunk/openutils-mgnlmessages/src/main/java/net/sourceforge/openutils/mgnlmessages/configuration/MessagesConfigurationManager.java	2013-10-20 12:41:45 UTC (rev 4398)
@@ -26,8 +26,8 @@
 import info.magnolia.jcr.util.PropertyUtil;
 import info.magnolia.objectfactory.Components;
 import info.magnolia.repository.RepositoryConstants;
-import it.openutils.mgnlutils.api.NodeUtilsExt;
-import it.openutils.mgnlutils.api.ObservedManagerAdapter;
+import it.openutils.mgnlutils.util.NodeUtilsExt;
+import it.openutils.mgnlutils.util.ObservedManagerAdapter;
 
 import java.util.ArrayList;
 import java.util.Collections;

Modified: magnoliamodules/trunk/openutils-mgnltagcloud/src/main/java/net/sourceforge/openutils/mgnltagcloud/manager/DefaultTagCloudManager.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnltagcloud/src/main/java/net/sourceforge/openutils/mgnltagcloud/manager/DefaultTagCloudManager.java	2013-10-20 11:08:35 UTC (rev 4397)
+++ magnoliamodules/trunk/openutils-mgnltagcloud/src/main/java/net/sourceforge/openutils/mgnltagcloud/manager/DefaultTagCloudManager.java	2013-10-20 12:41:45 UTC (rev 4398)
@@ -23,8 +23,8 @@
 import info.magnolia.content2bean.Content2BeanException;
 import info.magnolia.jcr.RuntimeRepositoryException;
 import info.magnolia.jcr.util.NodeUtil;
-import it.openutils.mgnlutils.api.NodeUtilsExt;
-import it.openutils.mgnlutils.api.ObservedManagerAdapter;
+import it.openutils.mgnlutils.util.NodeUtilsExt;
+import it.openutils.mgnlutils.util.ObservedManagerAdapter;
 
 import java.io.IOException;
 import java.util.Arrays;

Modified: magnoliamodules/trunk/openutils-mgnltasks/src/main/java/it/openutils/mgnltasks/ChangePropertyForEachChildrenTask.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnltasks/src/main/java/it/openutils/mgnltasks/ChangePropertyForEachChildrenTask.java	2013-10-20 11:08:35 UTC (rev 4397)
+++ magnoliamodules/trunk/openutils-mgnltasks/src/main/java/it/openutils/mgnltasks/ChangePropertyForEachChildrenTask.java	2013-10-20 12:41:45 UTC (rev 4398)
@@ -23,7 +23,7 @@
 import info.magnolia.module.InstallContext;
 import info.magnolia.module.delta.AbstractRepositoryTask;
 import info.magnolia.module.delta.TaskExecutionException;
-import it.openutils.mgnlutils.api.NodeUtilsExt;
+import it.openutils.mgnlutils.util.NodeUtilsExt;
 
 import javax.jcr.Node;
 import javax.jcr.RepositoryException;

Modified: magnoliamodules/trunk/openutils-mgnltasks/src/main/java/it/openutils/mgnltasks/DeleteNodeTask.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnltasks/src/main/java/it/openutils/mgnltasks/DeleteNodeTask.java	2013-10-20 11:08:35 UTC (rev 4397)
+++ magnoliamodules/trunk/openutils-mgnltasks/src/main/java/it/openutils/mgnltasks/DeleteNodeTask.java	2013-10-20 12:41:45 UTC (rev 4398)
@@ -22,7 +22,7 @@
 import info.magnolia.module.InstallContext;
 import info.magnolia.module.delta.AbstractRepositoryTask;
 import info.magnolia.module.delta.TaskExecutionException;
-import it.openutils.mgnlutils.api.NodeUtilsExt;
+import it.openutils.mgnlutils.util.NodeUtilsExt;
 
 import javax.jcr.RepositoryException;
 import javax.jcr.Session;

Modified: magnoliamodules/trunk/openutils-mgnltasks/src/main/java/it/openutils/mgnltasks/DiffModuleConfigBootstrapTask.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnltasks/src/main/java/it/openutils/mgnltasks/DiffModuleConfigBootstrapTask.java	2013-10-20 11:08:35 UTC (rev 4397)
+++ magnoliamodules/trunk/openutils-mgnltasks/src/main/java/it/openutils/mgnltasks/DiffModuleConfigBootstrapTask.java	2013-10-20 12:41:45 UTC (rev 4398)
@@ -24,7 +24,7 @@
 import info.magnolia.jcr.util.NodeUtil;
 import info.magnolia.module.InstallContext;
 import info.magnolia.repository.RepositoryConstants;
-import it.openutils.mgnlutils.api.NodeUtilsExt;
+import it.openutils.mgnlutils.util.NodeUtilsExt;
 
 import java.io.File;
 import java.io.FileInputStream;

Modified: magnoliamodules/trunk/openutils-mgnltasks/src/main/java/it/openutils/mgnltasks/DisableSubscribersTask.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnltasks/src/main/java/it/openutils/mgnltasks/DisableSubscribersTask.java	2013-10-20 11:08:35 UTC (rev 4397)
+++ magnoliamodules/trunk/openutils-mgnltasks/src/main/java/it/openutils/mgnltasks/DisableSubscribersTask.java	2013-10-20 12:41:45 UTC (rev 4398)
@@ -25,7 +25,7 @@
 import info.magnolia.module.delta.AbstractRepositoryTask;
 import info.magnolia.module.delta.TaskExecutionException;
 import info.magnolia.repository.RepositoryConstants;
-import it.openutils.mgnlutils.api.NodeUtilsExt;
+import it.openutils.mgnlutils.util.NodeUtilsExt;
 
 import javax.jcr.Node;
 import javax.jcr.RepositoryException;

Modified: magnoliamodules/trunk/openutils-mgnltasks/src/main/java/it/openutils/mgnltasks/ExistenceConditionalBootstrapTask.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnltasks/src/main/java/it/openutils/mgnltasks/ExistenceConditionalBootstrapTask.java	2013-10-20 11:08:35 UTC (rev 4397)
+++ magnoliamodules/trunk/openutils-mgnltasks/src/main/java/it/openutils/mgnltasks/ExistenceConditionalBootstrapTask.java	2013-10-20 12:41:45 UTC (rev 4398)
@@ -22,7 +22,7 @@
 import info.magnolia.jcr.RuntimeRepositoryException;
 import info.magnolia.module.InstallContext;
 import info.magnolia.module.delta.BootstrapResourcesTask;
-import it.openutils.mgnlutils.api.NodeUtilsExt;
+import it.openutils.mgnlutils.util.NodeUtilsExt;
 
 import javax.jcr.RepositoryException;
 import javax.jcr.Session;

Modified: magnoliamodules/trunk/openutils-mgnltasks/src/main/java/it/openutils/mgnltasks/ModuleConfigBootstrapTask.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnltasks/src/main/java/it/openutils/mgnltasks/ModuleConfigBootstrapTask.java	2013-10-20 11:08:35 UTC (rev 4397)
+++ magnoliamodules/trunk/openutils-mgnltasks/src/main/java/it/openutils/mgnltasks/ModuleConfigBootstrapTask.java	2013-10-20 12:41:45 UTC (rev 4398)
@@ -24,7 +24,7 @@
 import info.magnolia.module.delta.BootstrapResourcesTask;
 import info.magnolia.module.delta.TaskExecutionException;
 import info.magnolia.repository.RepositoryConstants;
-import it.openutils.mgnlutils.api.NodeUtilsExt;
+import it.openutils.mgnlutils.util.NodeUtilsExt;
 
 import java.io.IOException;
 import java.util.ArrayList;

Modified: magnoliamodules/trunk/openutils-mgnltasks/src/main/java/it/openutils/mgnltasks/SetPropertyTask.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnltasks/src/main/java/it/openutils/mgnltasks/SetPropertyTask.java	2013-10-20 11:08:35 UTC (rev 4397)
+++ magnoliamodules/trunk/openutils-mgnltasks/src/main/java/it/openutils/mgnltasks/SetPropertyTask.java	2013-10-20 12:41:45 UTC (rev 4398)
@@ -25,7 +25,7 @@
 import info.magnolia.module.InstallContext;
 import info.magnolia.module.delta.AbstractRepositoryTask;
 import info.magnolia.module.delta.TaskExecutionException;
-import it.openutils.mgnlutils.api.NodeUtilsExt;
+import it.openutils.mgnlutils.util.NodeUtilsExt;
 
 import javax.jcr.Node;
 import javax.jcr.RepositoryException;

Copied: magnoliamodules/trunk/openutils-mgnlutils/src/main/java/it/openutils/mgnlutils/util/NodeUtilsExt.java (from rev 4392, magnoliamodules/trunk/openutils-mgnlutils/src/main/java/it/openutils/mgnlutils/api/NodeUtilsExt.java)
===================================================================
--- magnoliamodules/trunk/openutils-mgnlutils/src/main/java/it/openutils/mgnlutils/util/NodeUtilsExt.java	                        (rev 0)
+++ magnoliamodules/trunk/openutils-mgnlutils/src/main/java/it/openutils/mgnlutils/util/NodeUtilsExt.java	2013-10-20 12:41:45 UTC (rev 4398)
@@ -0,0 +1,258 @@
+/**
+ *
+ * Generic utilities for Magnolia CMS (http://www.openmindlab.com/lab/products/mgnlutils.html)
+ * Copyright(C) 2009-2012, Openmind S.r.l. http://www.openmindonline.it
+ *
+ *  This program is free software: you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation, either version 3 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package it.openutils.mgnlutils.util;
+
+import info.magnolia.cms.core.AggregationState;
+import info.magnolia.cms.core.Path;
+import info.magnolia.content2bean.Content2BeanException;
+import info.magnolia.content2bean.Content2BeanUtil;
+import info.magnolia.context.MgnlContext;
+import info.magnolia.jcr.RuntimeRepositoryException;
+import info.magnolia.jcr.decoration.ContentDecoratorUtil;
+import info.magnolia.jcr.util.NodeUtil;
+import info.magnolia.jcr.util.PropertyUtil;
+import info.magnolia.jcr.wrapper.ChannelVisibilityContentDecorator;
+import info.magnolia.jcr.wrapper.HTMLEscapingNodeWrapper;
+import info.magnolia.jcr.wrapper.I18nNodeWrapper;
+
+import java.util.regex.Pattern;
+
+import javax.jcr.ItemNotFoundException;
+import javax.jcr.Node;
+import javax.jcr.RepositoryException;
+import javax.jcr.Session;
+
+import org.apache.commons.lang.StringUtils;
+
+
+/**
+ * @author fgiust
+ * @version $Id: NodeUtilsExt.java 4292 2013-09-12 15:54:10Z fgiust $
+ */
+public class NodeUtilsExt
+{
+
+    private static Pattern UUID_PATTERN = Pattern
+        .compile("^[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}$");
+
+    public static boolean exists(Session session, String absolutepath)
+    {
+        try
+        {
+            return session.getRootNode().hasNode(StringUtils.stripStart(absolutepath, "/"));
+        }
+        catch (RepositoryException e)
+        {
+            throw new RuntimeRepositoryException(e);
+        }
+    }
+
+    public static Node getNodeIfExists(Session session, String absolutepath)
+    {
+        if (exists(session, absolutepath))
+        {
+            try
+            {
+                return session.getNode(absolutepath);
+            }
+            catch (RepositoryException e)
+            {
+                throw new RuntimeRepositoryException(e);
+            }
+        }
+        return null;
+    }
+
+    public static boolean deleteIfExisting(Session session, String absolutepath)
+    {
+        if (exists(session, absolutepath))
+        {
+            try
+            {
+                session.getNode(absolutepath).remove();
+            }
+            catch (RepositoryException e)
+            {
+                throw new RuntimeRepositoryException(e);
+            }
+            return true;
+        }
+        return false;
+    }
+
+    public static boolean setPropertyIfDifferent(Node node, String propertyname, Object propertyvalue)
+    {
+        return setPropertyIfDifferentFromValue(node, propertyname, propertyvalue, propertyvalue);
+    }
+
+    public static boolean setPropertyIfDifferentFromValue(Node node, String propertyname, Object propertyvalue,
+        Object oldvalue)
+    {
+        try
+        {
+            if (!node.hasProperty(propertyname)
+                || oldvalue == null
+                || !StringUtils.equals(node.getProperty(propertyname).getString(), oldvalue.toString()))
+            {
+                PropertyUtil.setProperty(node, propertyname, propertyvalue);
+                return true;
+            }
+        }
+        catch (RepositoryException e)
+        {
+            throw new RuntimeRepositoryException(e);
+        }
+        return false;
+    }
+
+    public static void deletePropertyIfExist(Node node, String propertyname)
+    {
+        try
+        {
+            if (node != null && node.hasProperty(propertyname))
+            {
+                node.getProperty(propertyname).remove();
+            }
+        }
+        catch (RepositoryException e)
+        {
+            throw new RuntimeRepositoryException(e);
+        }
+    }
+
+    public static Node getNodeByIdOrPath(String workspace, String uuidOrPath)
+    {
+        if (uuidOrPath == null)
+        {
+            return null;
+        }
+
+        if (isUUID(uuidOrPath))
+        {
+            try
+            {
+                return NodeUtil.getNodeByIdentifier(workspace, uuidOrPath);
+            }
+            catch (ItemNotFoundException e)
+            {
+                // ignore
+            }
+            catch (RepositoryException e)
+            {
+                throw new RuntimeRepositoryException(e);
+            }
+        }
+        else
+        {
+            try
+            {
+                return getNodeIfExists(MgnlContext.getJCRSession(workspace), uuidOrPath);
+            }
+            catch (RepositoryException e)
+            {
+                throw new RuntimeRepositoryException(e);
+            }
+        }
+
+        return null;
+    }
+
+    public static boolean isUUID(String string)
+    {
+        // 97ed692a-31a9-4670-9c36-4d8ee8f6128d
+        if (StringUtils.length(string) != 36)
+        {
+            return false;
+        }
+
+        return UUID_PATTERN.matcher(string).find();
+    }
+
+    public static Object toBean(Node node) throws Content2BeanException
+    {
+        return toBean(node, null);
+    }
+
+    public static Object toBean(Node node, Class outclass) throws Content2BeanException
+    {
+        return toBean(node, false, outclass);
+    }
+
+    @SuppressWarnings("deprecation")
+    public static Object toBean(Node node, boolean recursive, Class outclass) throws Content2BeanException
+    {
+        return Content2BeanUtil.toBean(info.magnolia.cms.util.ContentUtil.asContent(node), recursive, outclass);
+    }
+
+    @SuppressWarnings("deprecation")
+    public static String getUniqueLabel(Node parent, String label)
+    {
+        return Path.getUniqueLabel(info.magnolia.cms.util.ContentUtil.asContent(parent), label);
+    }
+
+    public static Node wrap(Node node)
+    {
+        if (node == null)
+        {
+            return null;
+        }
+        node = wrapWithChannelVisibilityWrapper(node);
+        if (!NodeUtil.isWrappedWith(node, I18nNodeWrapper.class))
+        {
+            node = new I18nNodeWrapper(node);
+        }
+        if (!NodeUtil.isWrappedWith(node, HTMLEscapingNodeWrapper.class))
+        {
+            node = new HTMLEscapingNodeWrapper(node, true);
+        }
+
+        return node;
+    }
+
+    private static Node wrapWithChannelVisibilityWrapper(Node content)
+    {
+        if (ContentDecoratorUtil.isDecoratedWith(content, ChannelVisibilityContentDecorator.class)
+            || !MgnlContext.isWebContext())
+        {
+            return content;
+        }
+
+        AggregationState aggregationState = MgnlContext.getAggregationState();
+        if (aggregationState == null)
+        {
+            return content;
+        }
+        String channel = aggregationState.getChannel().getName();
+        if (StringUtils.isEmpty(channel) || StringUtils.equalsIgnoreCase(channel, "all"))
+        {
+            return content;
+        }
+        return new ChannelVisibilityContentDecorator(channel).wrapNode(content);
+    }
+
+    public static String getBinaryPath(Node node)
+    {
+        if (node == null)
+        {
+            return null;
+        }
+        return NodeUtil.getPathIfPossible(node) + "/" + PropertyUtil.getString(node, "fileName");
+    }
+}

Copied: magnoliamodules/trunk/openutils-mgnlutils/src/main/java/it/openutils/mgnlutils/util/ObservedManagerAdapter.java (from rev 4371, magnoliamodules/trunk/openutils-mgnlutils/src/main/java/it/openutils/mgnlutils/api/ObservedManagerAdapter.java)
===================================================================
--- magnoliamodules/trunk/openutils-mgnlutils/src/main/java/it/openutils/mgnlutils/util/ObservedManagerAdapter.java	                        (rev 0)
+++ magnoliamodules/trunk/openutils-mgnlutils/src/main/java/it/openutils/mgnlutils/util/ObservedManagerAdapter.java	2013-10-20 12:41:45 UTC (rev 4398)
@@ -0,0 +1,59 @@
+/**
+ *
+ * Generic utilities for Magnolia CMS (http://www.openmindlab.com/lab/products/mgnlutils.html)
+ * Copyright(C) 2009-2012, Openmind S.r.l. http://www.openmindonline.it
+ *
+ *  This program is free software: you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation, either version 3 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package it.openutils.mgnlutils.util;
+
+import info.magnolia.cms.beans.config.ObservedManager;
+
+import javax.jcr.Node;
+
+
+/**
+ * An adapter for using javax.jcr.Node instead of Content, till Magnolia will cleanup its APIs.
+ * @author fgiust
+ * @version $Id$
+ */
+public abstract class ObservedManagerAdapter extends ObservedManager
+{
+
+    /**
+     * {@inheritDoc}
+     */
+    @SuppressWarnings("deprecation")
+    @Override
+    protected final void onRegister(info.magnolia.cms.core.Content node)
+    {
+        onRegister(node.getJCRNode());
+    }
+
+    @SuppressWarnings("deprecation")
+    @Override
+    protected final void reload(info.magnolia.cms.core.Content node)
+    {
+        reload(node.getJCRNode());
+    }
+
+    protected void reload(Node node)
+    {
+        onRegister(node);
+    }
+
+    protected abstract void onRegister(Node node);
+
+}

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

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

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

Revision: 4397
          http://openutils.svn.sourceforge.net/openutils/?rev=4397&view=rev
Author:   fgiust
Date:     2013-10-20 11:08:35 +0000 (Sun, 20 Oct 2013)
Log Message:
-----------
cleanup bootstrap files

Modified Paths:
--------------
    magnoliamodules/trunk/magnolia-test-webapp/src/main/webapp/WEB-INF/bootstrap/website.test-MEDIA-113.xml
    magnoliamodules/trunk/magnolia5-test-webapp/src/main/webapp/WEB-INF/bootstrap/website.Magnolia-Utils.xml
    magnoliamodules/trunk/magnolia5-test-webapp/src/main/webapp/WEB-INF/bootstrap/website.test-MEDIA-113.xml
    magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/resources/mgnl-bootstrap-samples/contextmenu/website.sample-contextmenu.xml
    magnoliamodules/trunk/openutils-mgnlcontrols/src/main/resources/mgnl-bootstrap-samples/controls/website.sample-controls.xml
    magnoliamodules/trunk/openutils-mgnlcriteria/src/test/resources/crit-bootstrap/website.00000.xml
    magnoliamodules/trunk/openutils-mgnlcriteria/src/test/resources/crit-bootstrap/website.myproject.xml
    magnoliamodules/trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap-samples/media/website.sample-simplemedia.xml
    magnoliamodules/trunk/openutils-mgnlrules/src/main/resources/mgnl-bootstrap-samples/rules/website.sample-rules.xml
    magnoliamodules/trunk/openutils-mgnlstruts11/src/main/resources/mgnl-bootstrap-samples/struts11/website.sample-struts.xml
    magnoliamodules/trunk/openutils-mgnlutils/src/main/resources/mgnl-bootstrap-samples/mgnlutils/website.sample-magnoliautils.xml

Modified: magnoliamodules/trunk/magnolia-test-webapp/src/main/webapp/WEB-INF/bootstrap/website.test-MEDIA-113.xml
===================================================================
--- magnoliamodules/trunk/magnolia-test-webapp/src/main/webapp/WEB-INF/bootstrap/website.test-MEDIA-113.xml	2013-10-20 10:56:50 UTC (rev 4396)
+++ magnoliamodules/trunk/magnolia-test-webapp/src/main/webapp/WEB-INF/bootstrap/website.test-MEDIA-113.xml	2013-10-20 11:08:35 UTC (rev 4397)
@@ -41,34 +41,9 @@
       <sv:value>media:pages/sampleSimpleMedia</sv:value>
     </sv:property>
   </sv:node>
-  <sv:node sv:name="text_files">
-    <sv:property sv:name="jcr:primaryType" sv:type="Name">
-      <sv:value>mgnl:contentNode</sv:value>
-    </sv:property>
-    <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
-      <sv:value>mix:lockable</sv:value>
-    </sv:property>
-    <sv:property sv:name="jcr:uuid" sv:type="String">
-      <sv:value>c7024555-35bc-40e4-b1cb-081462176b3f</sv:value>
-    </sv:property>
-    <sv:property sv:name="jcr:createdBy" sv:type="String">
-      <sv:value>admin</sv:value>
-    </sv:property>
-    <sv:node sv:name="MetaData">
-      <sv:property sv:name="jcr:primaryType" sv:type="Name">
-        <sv:value>mgnl:metaData</sv:value>
-      </sv:property>
-      <sv:property sv:name="jcr:createdBy" sv:type="String">
-        <sv:value>admin</sv:value>
-      </sv:property>
-      <sv:property sv:name="mgnl:creationdate" sv:type="Date">
-        <sv:value>2009-01-16T09:56:40.411+01:00</sv:value>
-      </sv:property>
-    </sv:node>
-  </sv:node>
   <sv:node sv:name="main">
     <sv:property sv:name="jcr:primaryType" sv:type="Name">
-      <sv:value>mgnl:contentNode</sv:value>
+      <sv:value>mgnl:area</sv:value>
     </sv:property>
     <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
       <sv:value>mix:lockable</sv:value>
@@ -98,7 +73,7 @@
     </sv:node>
     <sv:node sv:name="01">
       <sv:property sv:name="jcr:primaryType" sv:type="Name">
-        <sv:value>mgnl:contentNode</sv:value>
+        <sv:value>mgnl:component</sv:value>
       </sv:property>
       <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
         <sv:value>mix:lockable</sv:value>
@@ -170,7 +145,7 @@
     </sv:node>
     <sv:node sv:name="0">
       <sv:property sv:name="jcr:primaryType" sv:type="Name">
-        <sv:value>mgnl:contentNode</sv:value>
+        <sv:value>mgnl:component</sv:value>
       </sv:property>
       <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
         <sv:value>mix:lockable</sv:value>
@@ -242,7 +217,7 @@
     </sv:node>
     <sv:node sv:name="00">
       <sv:property sv:name="jcr:primaryType" sv:type="Name">
-        <sv:value>mgnl:contentNode</sv:value>
+        <sv:value>mgnl:component</sv:value>
       </sv:property>
       <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
         <sv:value>mix:lockable</sv:value>

Modified: magnoliamodules/trunk/magnolia5-test-webapp/src/main/webapp/WEB-INF/bootstrap/website.Magnolia-Utils.xml
===================================================================
--- magnoliamodules/trunk/magnolia5-test-webapp/src/main/webapp/WEB-INF/bootstrap/website.Magnolia-Utils.xml	2013-10-20 10:56:50 UTC (rev 4396)
+++ magnoliamodules/trunk/magnolia5-test-webapp/src/main/webapp/WEB-INF/bootstrap/website.Magnolia-Utils.xml	2013-10-20 11:08:35 UTC (rev 4397)
@@ -116,7 +116,7 @@
     </sv:node>
     <sv:node sv:name="newcontent">
       <sv:property sv:name="jcr:primaryType" sv:type="Name">
-        <sv:value>mgnl:contentNode</sv:value>
+        <sv:value>mgnl:component</sv:value>
       </sv:property>
       <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
         <sv:value>mix:lockable</sv:value>
@@ -146,7 +146,7 @@
       </sv:node>
       <sv:node sv:name="0">
         <sv:property sv:name="jcr:primaryType" sv:type="Name">
-          <sv:value>mgnl:contentNode</sv:value>
+          <sv:value>mgnl:component</sv:value>
         </sv:property>
         <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
           <sv:value>mix:lockable</sv:value>
@@ -183,31 +183,6 @@
             <sv:value>samplesHowToJSP</sv:value>
           </sv:property>
         </sv:node>
-        <sv:node sv:name="text_files">
-          <sv:property sv:name="jcr:primaryType" sv:type="Name">
-            <sv:value>mgnl:contentNode</sv:value>
-          </sv:property>
-          <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
-            <sv:value>mix:lockable</sv:value>
-          </sv:property>
-          <sv:property sv:name="jcr:uuid" sv:type="String">
-            <sv:value>7c158483-8813-47b5-b176-643694dbc857</sv:value>
-          </sv:property>
-          <sv:property sv:name="jcr:createdBy" sv:type="String">
-            <sv:value>admin</sv:value>
-          </sv:property>
-          <sv:node sv:name="MetaData">
-            <sv:property sv:name="jcr:primaryType" sv:type="Name">
-              <sv:value>mgnl:metaData</sv:value>
-            </sv:property>
-            <sv:property sv:name="jcr:createdBy" sv:type="String">
-              <sv:value>admin</sv:value>
-            </sv:property>
-            <sv:property sv:name="mgnl:creationdate" sv:type="Date">
-              <sv:value>2010-01-18T14:11:22.618+01:00</sv:value>
-            </sv:property>
-          </sv:node>
-        </sv:node>
       </sv:node>
     </sv:node>
   </sv:node>

Modified: magnoliamodules/trunk/magnolia5-test-webapp/src/main/webapp/WEB-INF/bootstrap/website.test-MEDIA-113.xml
===================================================================
--- magnoliamodules/trunk/magnolia5-test-webapp/src/main/webapp/WEB-INF/bootstrap/website.test-MEDIA-113.xml	2013-10-20 10:56:50 UTC (rev 4396)
+++ magnoliamodules/trunk/magnolia5-test-webapp/src/main/webapp/WEB-INF/bootstrap/website.test-MEDIA-113.xml	2013-10-20 11:08:35 UTC (rev 4397)
@@ -41,34 +41,9 @@
       <sv:value>media:pages/sampleSimpleMedia</sv:value>
     </sv:property>
   </sv:node>
-  <sv:node sv:name="text_files">
-    <sv:property sv:name="jcr:primaryType" sv:type="Name">
-      <sv:value>mgnl:contentNode</sv:value>
-    </sv:property>
-    <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
-      <sv:value>mix:lockable</sv:value>
-    </sv:property>
-    <sv:property sv:name="jcr:uuid" sv:type="String">
-      <sv:value>c7024555-35bc-40e4-b1cb-081462176b3f</sv:value>
-    </sv:property>
-    <sv:property sv:name="jcr:createdBy" sv:type="String">
-      <sv:value>admin</sv:value>
-    </sv:property>
-    <sv:node sv:name="MetaData">
-      <sv:property sv:name="jcr:primaryType" sv:type="Name">
-        <sv:value>mgnl:metaData</sv:value>
-      </sv:property>
-      <sv:property sv:name="jcr:createdBy" sv:type="String">
-        <sv:value>admin</sv:value>
-      </sv:property>
-      <sv:property sv:name="mgnl:creationdate" sv:type="Date">
-        <sv:value>2009-01-16T09:56:40.411+01:00</sv:value>
-      </sv:property>
-    </sv:node>
-  </sv:node>
   <sv:node sv:name="main">
     <sv:property sv:name="jcr:primaryType" sv:type="Name">
-      <sv:value>mgnl:contentNode</sv:value>
+      <sv:value>mgnl:area</sv:value>
     </sv:property>
     <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
       <sv:value>mix:lockable</sv:value>
@@ -98,7 +73,7 @@
     </sv:node>
     <sv:node sv:name="01">
       <sv:property sv:name="jcr:primaryType" sv:type="Name">
-        <sv:value>mgnl:contentNode</sv:value>
+        <sv:value>mgnl:component</sv:value>
       </sv:property>
       <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
         <sv:value>mix:lockable</sv:value>
@@ -170,7 +145,7 @@
     </sv:node>
     <sv:node sv:name="0">
       <sv:property sv:name="jcr:primaryType" sv:type="Name">
-        <sv:value>mgnl:contentNode</sv:value>
+        <sv:value>mgnl:component</sv:value>
       </sv:property>
       <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
         <sv:value>mix:lockable</sv:value>
@@ -242,7 +217,7 @@
     </sv:node>
     <sv:node sv:name="00">
       <sv:property sv:name="jcr:primaryType" sv:type="Name">
-        <sv:value>mgnl:contentNode</sv:value>
+        <sv:value>mgnl:component</sv:value>
       </sv:property>
       <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
         <sv:value>mix:lockable</sv:value>

Modified: magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/resources/mgnl-bootstrap-samples/contextmenu/website.sample-contextmenu.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/resources/mgnl-bootstrap-samples/contextmenu/website.sample-contextmenu.xml	2013-10-20 10:56:50 UTC (rev 4396)
+++ magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/resources/mgnl-bootstrap-samples/contextmenu/website.sample-contextmenu.xml	2013-10-20 11:08:35 UTC (rev 4397)
@@ -37,7 +37,7 @@
   </sv:node>
   <sv:node sv:name="main">
     <sv:property sv:name="jcr:primaryType" sv:type="Name">
-      <sv:value>mgnl:contentNode</sv:value>
+      <sv:value>mgnl:area</sv:value>
     </sv:property>
     <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
       <sv:value>mix:lockable</sv:value>
@@ -67,7 +67,7 @@
     </sv:node>
     <sv:node sv:name="0">
       <sv:property sv:name="jcr:primaryType" sv:type="Name">
-        <sv:value>mgnl:contentNode</sv:value>
+        <sv:value>mgnl:component</sv:value>
       </sv:property>
       <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
         <sv:value>mix:lockable</sv:value>
@@ -104,7 +104,7 @@
     </sv:node>
     <sv:node sv:name="01">
       <sv:property sv:name="jcr:primaryType" sv:type="Name">
-        <sv:value>mgnl:contentNode</sv:value>
+        <sv:value>mgnl:component</sv:value>
       </sv:property>
       <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
         <sv:value>mix:lockable</sv:value>
@@ -141,35 +141,10 @@
           <sv:value>samples-contextmenu-textmedia</sv:value>
         </sv:property>
       </sv:node>
-      <sv:node sv:name="text_files">
-        <sv:property sv:name="jcr:primaryType" sv:type="Name">
-          <sv:value>mgnl:contentNode</sv:value>
-        </sv:property>
-        <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
-          <sv:value>mix:lockable</sv:value>
-        </sv:property>
-        <sv:property sv:name="jcr:uuid" sv:type="String">
-          <sv:value>60f8214d-64b0-4a4b-b93e-04954864a94d</sv:value>
-        </sv:property>
-        <sv:property sv:name="jcr:createdBy" sv:type="String">
-          <sv:value>admin</sv:value>
-        </sv:property>
-        <sv:node sv:name="MetaData">
-          <sv:property sv:name="jcr:primaryType" sv:type="Name">
-            <sv:value>mgnl:metaData</sv:value>
-          </sv:property>
-          <sv:property sv:name="jcr:createdBy" sv:type="String">
-            <sv:value>admin</sv:value>
-          </sv:property>
-          <sv:property sv:name="mgnl:creationdate" sv:type="Date">
-            <sv:value>2010-05-20T14:52:38.484+02:00</sv:value>
-          </sv:property>
-        </sv:node>
-      </sv:node>
     </sv:node>
     <sv:node sv:name="00">
       <sv:property sv:name="jcr:primaryType" sv:type="Name">
-        <sv:value>mgnl:contentNode</sv:value>
+        <sv:value>mgnl:component</sv:value>
       </sv:property>
       <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
         <sv:value>mix:lockable</sv:value>
@@ -326,31 +301,6 @@
           <sv:value>contextmenu:components/samples-contextmenu-textmedia</sv:value>
         </sv:property>
       </sv:node>
-      <sv:node sv:name="text_files">
-        <sv:property sv:name="jcr:primaryType" sv:type="Name">
-          <sv:value>mgnl:contentNode</sv:value>
-        </sv:property>
-        <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
-          <sv:value>mix:lockable</sv:value>
-        </sv:property>
-        <sv:property sv:name="jcr:uuid" sv:type="String">
-          <sv:value>c0849975-45ec-49ec-8b03-3c9efaae4bfd</sv:value>
-        </sv:property>
-        <sv:property sv:name="jcr:createdBy" sv:type="String">
-          <sv:value>admin</sv:value>
-        </sv:property>
-        <sv:node sv:name="MetaData">
-          <sv:property sv:name="jcr:primaryType" sv:type="Name">
-            <sv:value>mgnl:metaData</sv:value>
-          </sv:property>
-          <sv:property sv:name="jcr:createdBy" sv:type="String">
-            <sv:value>admin</sv:value>
-          </sv:property>
-          <sv:property sv:name="mgnl:creationdate" sv:type="Date">
-            <sv:value>2013-09-13T19:27:55.815+02:00</sv:value>
-          </sv:property>
-        </sv:node>
-      </sv:node>
     </sv:node>
     <sv:node sv:name="02">
       <sv:property sv:name="jcr:primaryType" sv:type="Name">

Modified: magnoliamodules/trunk/openutils-mgnlcontrols/src/main/resources/mgnl-bootstrap-samples/controls/website.sample-controls.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnlcontrols/src/main/resources/mgnl-bootstrap-samples/controls/website.sample-controls.xml	2013-10-20 10:56:50 UTC (rev 4396)
+++ magnoliamodules/trunk/openutils-mgnlcontrols/src/main/resources/mgnl-bootstrap-samples/controls/website.sample-controls.xml	2013-10-20 11:08:35 UTC (rev 4397)
@@ -112,7 +112,7 @@
       </sv:node>
       <sv:node sv:name="grid_files">
         <sv:property sv:name="jcr:primaryType" sv:type="Name">
-          <sv:value>mgnl:contentNode</sv:value>
+          <sv:value>mgnl:component</sv:value>
         </sv:property>
         <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
           <sv:value>mix:lockable</sv:value>

Modified: magnoliamodules/trunk/openutils-mgnlcriteria/src/test/resources/crit-bootstrap/website.00000.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnlcriteria/src/test/resources/crit-bootstrap/website.00000.xml	2013-10-20 10:56:50 UTC (rev 4396)
+++ magnoliamodules/trunk/openutils-mgnlcriteria/src/test/resources/crit-bootstrap/website.00000.xml	2013-10-20 11:08:35 UTC (rev 4397)
@@ -94,7 +94,7 @@
     </sv:node>
     <sv:node sv:name="mainframe">
       <sv:property sv:name="jcr:primaryType" sv:type="Name">
-        <sv:value>mgnl:contentNode</sv:value>
+        <sv:value>mgnl:component</sv:value>
       </sv:property>
       <sv:property sv:name="jcr:mixinTypes" sv:type="Name">
         <sv:value>mix:lockable</sv:value>
@@ -124,7 +124,7 @@
       </sv:node>
       <sv:node sv:name="i1">
         <sv:property sv:name="jcr:primaryType" sv:type="Name">
-          <sv:value>mgnl:contentNode</sv:value>
+          <sv:value>mgnl:component</sv:value>
         </sv:property>
         <sv:property sv:name="jcr:mixinTypes" sv:type="Name">
           <sv:value>mix:lockable</sv:value>
@@ -172,35 +172,10 @@
             <sv:value>p-text-image</sv:value>
           </sv:property>
         </sv:node>
-        <sv:node sv:name="text_files">
-          <sv:property sv:name="jcr:primaryType" sv:type="Name">
-            <sv:value>mgnl:contentNode</sv:value>
-          </sv:property>
-          <sv:property sv:name="jcr:mixinTypes" sv:type="Name">
-            <sv:value>mix:lockable</sv:value>
-          </sv:property>
-          <sv:property sv:name="jcr:uuid" sv:type="String">
-            <sv:value>a9a5bcb5-7027-4acc-ae46-538e00670f4a</sv:value>
-          </sv:property>
-          <sv:property sv:name="jcr:createdBy" sv:type="String">
-            <sv:value>admin</sv:value>
-          </sv:property>
-          <sv:node sv:name="MetaData">
-            <sv:property sv:name="jcr:primaryType" sv:type="Name">
-              <sv:value>mgnl:metaData</sv:value>
-            </sv:property>
-            <sv:property sv:name="jcr:createdBy" sv:type="String">
-              <sv:value>admin</sv:value>
-            </sv:property>
-            <sv:property sv:name="mgnl:creationdate" sv:type="Date">
-              <sv:value>2010-02-05T13:01:41.001+01:00</sv:value>
-            </sv:property>
-          </sv:node>
-        </sv:node>
       </sv:node>
       <sv:node sv:name="999">
         <sv:property sv:name="jcr:primaryType" sv:type="Name">
-          <sv:value>mgnl:contentNode</sv:value>
+          <sv:value>mgnl:component</sv:value>
         </sv:property>
         <sv:property sv:name="jcr:mixinTypes" sv:type="Name">
           <sv:value>mix:lockable</sv:value>
@@ -239,7 +214,7 @@
     </sv:node>
     <sv:node sv:name="columnDx">
       <sv:property sv:name="jcr:primaryType" sv:type="Name">
-        <sv:value>mgnl:contentNode</sv:value>
+        <sv:value>mgnl:component</sv:value>
       </sv:property>
       <sv:property sv:name="jcr:mixinTypes" sv:type="Name">
         <sv:value>mix:lockable</sv:value>
@@ -269,7 +244,7 @@
       </sv:node>
       <sv:node sv:name="1">
         <sv:property sv:name="jcr:primaryType" sv:type="Name">
-          <sv:value>mgnl:contentNode</sv:value>
+          <sv:value>mgnl:component</sv:value>
         </sv:property>
         <sv:property sv:name="jcr:mixinTypes" sv:type="Name">
           <sv:value>mix:lockable</sv:value>
@@ -373,7 +348,7 @@
     </sv:node>
     <sv:node sv:name="mainframe">
       <sv:property sv:name="jcr:primaryType" sv:type="Name">
-        <sv:value>mgnl:contentNode</sv:value>
+        <sv:value>mgnl:component</sv:value>
       </sv:property>
       <sv:property sv:name="jcr:mixinTypes" sv:type="Name">
         <sv:value>mix:lockable</sv:value>
@@ -403,7 +378,7 @@
       </sv:node>
       <sv:node sv:name="i1">
         <sv:property sv:name="jcr:primaryType" sv:type="Name">
-          <sv:value>mgnl:contentNode</sv:value>
+          <sv:value>mgnl:component</sv:value>
         </sv:property>
         <sv:property sv:name="jcr:mixinTypes" sv:type="Name">
           <sv:value>mix:lockable</sv:value>
@@ -450,35 +425,10 @@
             <sv:value>p-text-image</sv:value>
           </sv:property>
         </sv:node>
-        <sv:node sv:name="text_files">
-          <sv:property sv:name="jcr:primaryType" sv:type="Name">
-            <sv:value>mgnl:contentNode</sv:value>
-          </sv:property>
-          <sv:property sv:name="jcr:mixinTypes" sv:type="Name">
-            <sv:value>mix:lockable</sv:value>
-          </sv:property>
-          <sv:property sv:name="jcr:uuid" sv:type="String">
-            <sv:value>5effc461-e4cb-41fd-9a62-af2bc0782897</sv:value>
-          </sv:property>
-          <sv:property sv:name="jcr:createdBy" sv:type="String">
-            <sv:value>admin</sv:value>
-          </sv:property>
-          <sv:node sv:name="MetaData">
-            <sv:property sv:name="jcr:primaryType" sv:type="Name">
-              <sv:value>mgnl:metaData</sv:value>
-            </sv:property>
-            <sv:property sv:name="jcr:createdBy" sv:type="String">
-              <sv:value>admin</sv:value>
-            </sv:property>
-            <sv:property sv:name="mgnl:creationdate" sv:type="Date">
-              <sv:value>2010-02-05T13:01:31.001+01:00</sv:value>
-            </sv:property>
-          </sv:node>
-        </sv:node>
       </sv:node>
       <sv:node sv:name="i2">
         <sv:property sv:name="jcr:primaryType" sv:type="Name">
-          <sv:value>mgnl:contentNode</sv:value>
+          <sv:value>mgnl:component</sv:value>
         </sv:property>
         <sv:property sv:name="jcr:mixinTypes" sv:type="Name">
           <sv:value>mix:lockable</sv:value>
@@ -524,35 +474,10 @@
             <sv:value>p-text-image</sv:value>
           </sv:property>
         </sv:node>
-        <sv:node sv:name="text_files">
-          <sv:property sv:name="jcr:primaryType" sv:type="Name">
-            <sv:value>mgnl:contentNode</sv:value>
-          </sv:property>
-          <sv:property sv:name="jcr:mixinTypes" sv:type="Name">
-            <sv:value>mix:lockable</sv:value>
-          </sv:property>
-          <sv:property sv:name="jcr:uuid" sv:type="String">
-            <sv:value>48998939-d1c9-4607-afb7-3e77d3e3e329</sv:value>
-          </sv:property>
-          <sv:property sv:name="jcr:createdBy" sv:type="String">
-            <sv:value>admin</sv:value>
-          </sv:property>
-          <sv:node sv:name="MetaData">
-            <sv:property sv:name="jcr:primaryType" sv:type="Name">
-              <sv:value>mgnl:metaData</sv:value>
-            </sv:property>
-            <sv:property sv:name="jcr:createdBy" sv:type="String">
-              <sv:value>admin</sv:value>
-            </sv:property>
-            <sv:property sv:name="mgnl:creationdate" sv:type="Date">
-              <sv:value>2010-02-05T13:01:31.001+01:00</sv:value>
-            </sv:property>
-          </sv:node>
-        </sv:node>
       </sv:node>
       <sv:node sv:name="i3">
         <sv:property sv:name="jcr:primaryType" sv:type="Name">
-          <sv:value>mgnl:contentNode</sv:value>
+          <sv:value>mgnl:component</sv:value>
         </sv:property>
         <sv:property sv:name="jcr:mixinTypes" sv:type="Name">
           <sv:value>mix:lockable</sv:value>
@@ -598,35 +523,10 @@
             <sv:value>p-text-image</sv:value>
           </sv:property>
         </sv:node>
-        <sv:node sv:name="text_files">
-          <sv:property sv:name="jcr:primaryType" sv:type="Name">
-            <sv:value>mgnl:contentNode</sv:value>
-          </sv:property>
-          <sv:property sv:name="jcr:mixinTypes" sv:type="Name">
-            <sv:value>mix:lockable</sv:value>
-          </sv:property>
-          <sv:property sv:name="jcr:uuid" sv:type="String">
-            <sv:value>151215ed-6b3c-4cdb-9a06-76ad9186383a</sv:value>
-          </sv:property>
-          <sv:property sv:name="jcr:createdBy" sv:type="String">
-            <sv:value>admin</sv:value>
-          </sv:property>
-          <sv:node sv:name="MetaData">
-            <sv:property sv:name="jcr:primaryType" sv:type="Name">
-              <sv:value>mgnl:metaData</sv:value>
-            </sv:property>
-            <sv:property sv:name="jcr:createdBy" sv:type="String">
-              <sv:value>admin</sv:value>
-            </sv:property>
-            <sv:property sv:name="mgnl:creationdate" sv:type="Date">
-              <sv:value>2010-02-05T13:01:31.001+01:00</sv:value>
-            </sv:property>
-          </sv:node>
-        </sv:node>
       </sv:node>
       <sv:node sv:name="999">
         <sv:property sv:name="jcr:primaryType" sv:type="Name">
-          <sv:value>mgnl:contentNode</sv:value>
+          <sv:value>mgnl:component</sv:value>
         </sv:property>
         <sv:property sv:name="jcr:mixinTypes" sv:type="Name">
           <sv:value>mix:lockable</sv:value>
@@ -666,7 +566,7 @@
     </sv:node>
     <sv:node sv:name="columnDx">
       <sv:property sv:name="jcr:primaryType" sv:type="Name">
-        <sv:value>mgnl:contentNode</sv:value>
+        <sv:value>mgnl:component</sv:value>
       </sv:property>
       <sv:property sv:name="jcr:mixinTypes" sv:type="Name">
         <sv:value>mix:lockable</sv:value>
@@ -696,7 +596,7 @@
       </sv:node>
       <sv:node sv:name="1">
         <sv:property sv:name="jcr:primaryType" sv:type="Name">
-          <sv:value>mgnl:contentNode</sv:value>
+          <sv:value>mgnl:component</sv:value>
         </sv:property>
         <sv:property sv:name="jcr:mixinTypes" sv:type="Name">
           <sv:value>mix:lockable</sv:value>
@@ -799,7 +699,7 @@
     </sv:node>
     <sv:node sv:name="mainframe">
       <sv:property sv:name="jcr:primaryType" sv:type="Name">
-        <sv:value>mgnl:contentNode</sv:value>
+        <sv:value>mgnl:component</sv:value>
       </sv:property>
       <sv:property sv:name="jcr:mixinTypes" sv:type="Name">
         <sv:value>mix:lockable</sv:value>
@@ -829,7 +729,7 @@
       </sv:node>
       <sv:node sv:name="i1">
         <sv:property sv:name="jcr:primaryType" sv:type="Name">
-          <sv:value>mgnl:contentNode</sv:value>
+          <sv:value>mgnl:component</sv:value>
         </sv:property>
         <sv:property sv:name="jcr:mixinTypes" sv:type="Name">
           <sv:value>mix:lockable</sv:value>
@@ -877,35 +777,10 @@
             <sv:value>p-text-image</sv:value>
           </sv:property>
         </sv:node>
-        <sv:node sv:name="text_files">
-          <sv:property sv:name="jcr:primaryType" sv:type="Name">
-            <sv:value>mgnl:contentNode</sv:value>
-          </sv:property>
-          <sv:property sv:name="jcr:mixinTypes" sv:type="Name">
-            <sv:value>mix:lockable</sv:value>
-          </sv:property>
-          <sv:property sv:name="jcr:uuid" sv:type="String">
-            <sv:value>5ee3a345-29f5-4672-b769-9cbd13be2145</sv:value>
-          </sv:property>
-          <sv:property sv:name="jcr:createdBy" sv:type="String">
-            <sv:value>admin</sv:value>
-          </sv:property>
-          <sv:node sv:name="MetaData">
-            <sv:property sv:name="jcr:primaryType" sv:type="Name">
-              <sv:value>mgnl:metaData</sv:value>
-            </sv:property>
-            <sv:property sv:name="jcr:createdBy" sv:type="String">
-              <sv:value>admin</sv:value>
-            </sv:property>
-            <sv:property sv:name="mgnl:creationdate" sv:type="Date">
-              <sv:value>2010-02-05T13:01:41.001+01:00</sv:value>
-            </sv:property>
-          </sv:node>
-        </sv:node>
       </sv:node>
       <sv:node sv:name="999">
         <sv:property sv:name="jcr:primaryType" sv:type="Name">
-          <sv:value>mgnl:contentNode</sv:value>
+          <sv:value>mgnl:component</sv:value>
         </sv:property>
         <sv:property sv:name="jcr:mixinTypes" sv:type="Name">
           <sv:value>mix:lockable</sv:value>
@@ -944,7 +819,7 @@
     </sv:node>
     <sv:node sv:name="columnDx">
       <sv:property sv:name="jcr:primaryType" sv:type="Name">
-        <sv:value>mgnl:contentNode</sv:value>
+        <sv:value>mgnl:component</sv:value>
       </sv:property>
       <sv:property sv:name="jcr:mixinTypes" sv:type="Name">
         <sv:value>mix:lockable</sv:value>
@@ -974,7 +849,7 @@
       </sv:node>
       <sv:node sv:name="1">
         <sv:property sv:name="jcr:primaryType" sv:type="Name">
-          <sv:value>mgnl:contentNode</sv:value>
+          <sv:value>mgnl:component</sv:value>
         </sv:property>
         <sv:property sv:name="jcr:mixinTypes" sv:type="Name">
           <sv:value>mix:lockable</sv:value>
@@ -1077,7 +952,7 @@
     </sv:node>
     <sv:node sv:name="mainframe">
       <sv:property sv:name="jcr:primaryType" sv:type="Name">
-        <sv:value>mgnl:contentNode</sv:value>
+        <sv:value>mgnl:component</sv:value>
       </sv:property>
       <sv:property sv:name="jcr:mixinTypes" sv:type="Name">
         <sv:value>mix:lockable</sv:value>
@@ -1107,7 +982,7 @@
       </sv:node>
       <sv:node sv:name="i1">
         <sv:property sv:name="jcr:primaryType" sv:type="Name">
-          <sv:value>mgnl:contentNode</sv:value>
+          <sv:value>mgnl:component</sv:value>
         </sv:property>
         <sv:property sv:name="jcr:mixinTypes" sv:type="Name">
           <sv:value>mix:lockable</sv:value>
@@ -1155,35 +1030,10 @@
             <sv:value>p-text-image</sv:value>
           </sv:property>
         </sv:node>
-        <sv:node sv:name="text_files">
-          <sv:property sv:name="jcr:primaryType" sv:type="Name">
-            <sv:value>mgnl:contentNode</sv:value>
-          </sv:property>
-          <sv:property sv:name="jcr:mixinTypes" sv:type="Name">
-            <sv:value>mix:lockable</sv:value>
-          </sv:property>
-          <sv:property sv:name="jcr:uuid" sv:type="String">
-            <sv:value>8bbe4b69-2402-4a4b-a8cc-3a12555cbe37</sv:value>
-          </sv:property>
-          <sv:property sv:name="jcr:createdBy" sv:type="String">
-            <sv:value>admin</sv:value>
-          </sv:property>
-          <sv:node sv:name="MetaData">
-            <sv:property sv:name="jcr:primaryType" sv:type="Name">
-              <sv:value>mgnl:metaData</sv:value>
-            </sv:property>
-            <sv:property sv:name="jcr:createdBy" sv:type="String">
-              <sv:value>admin</sv:value>
-            </sv:property>
-            <sv:property sv:name="mgnl:creationdate" sv:type="Date">
-              <sv:value>2010-02-05T13:01:41.001+01:00</sv:value>
-            </sv:property>
-          </sv:node>
-        </sv:node>
       </sv:node>
       <sv:node sv:name="999">
         <sv:property sv:name="jcr:primaryType" sv:type="Name">
-          <sv:value>mgnl:contentNode</sv:value>
+          <sv:value>mgnl:component</sv:value>
         </sv:property>
         <sv:property sv:name="jcr:mixinTypes" sv:type="Name">
           <sv:value>mix:lockable</sv:value>
@@ -1222,7 +1072,7 @@
     </sv:node>
     <sv:node sv:name="columnDx">
       <sv:property sv:name="jcr:primaryType" sv:type="Name">
-        <sv:value>mgnl:contentNode</sv:value>
+        <sv:value>mgnl:component</sv:value>
       </sv:property>
       <sv:property sv:name="jcr:mixinTypes" sv:type="Name">
         <sv:value>mix:lockable</sv:value>
@@ -1252,7 +1102,7 @@
       </sv:node>
       <sv:node sv:name="1">
         <sv:property sv:name="jcr:primaryType" sv:type="Name">
-          <sv:value>mgnl:contentNode</sv:value>
+          <sv:value>mgnl:component</sv:value>
         </sv:property>
         <sv:property sv:name="jcr:mixinTypes" sv:type="Name">
           <sv:value>mix:lockable</sv:value>
@@ -1359,7 +1209,7 @@
     </sv:node>
     <sv:node sv:name="mainframe">
       <sv:property sv:name="jcr:primaryType" sv:type="Name">
-        <sv:value>mgnl:contentNode</sv:value>
+        <sv:value>mgnl:component</sv:value>
       </sv:property>
       <sv:property sv:name="jcr:mixinTypes" sv:type="Name">
         <sv:value>mix:lockable</sv:value>
@@ -1389,7 +1239,7 @@
       </sv:node>
       <sv:node sv:name="i1">
         <sv:property sv:name="jcr:primaryType" sv:type="Name">
-          <sv:value>mgnl:contentNode</sv:value>
+          <sv:value>mgnl:component</sv:value>
         </sv:property>
         <sv:property sv:name="jcr:mixinTypes" sv:type="Name">
           <sv:value>mix:lockable</sv:value>
@@ -1436,35 +1286,10 @@
             <sv:value>p-text-image</sv:value>
           </sv:property>
         </sv:node>
-        <sv:node sv:name="text_files">
-          <sv:property sv:name="jcr:primaryType" sv:type="Name">
-            <sv:value>mgnl:contentNode</sv:value>
-          </sv:property>
-          <sv:property sv:name="jcr:mixinTypes" sv:type="Name">
-            <sv:value>mix:lockable</sv:value>
-          </sv:property>
-          <sv:property sv:name="jcr:uuid" sv:type="String">
-            <sv:value>ae0796e3-1a24-4e20-95cf-47674bcec4f1</sv:value>
-          </sv:property>
-          <sv:property sv:name="jcr:createdBy" sv:type="String">
-            <sv:value>admin</sv:value>
-          </sv:property>
-          <sv:node sv:name="MetaData">
-            <sv:property sv:name="jcr:primaryType" sv:type="Name">
-              <sv:value>mgnl:metaData</sv:value>
-            </sv:property>
-            <sv:property sv:name="jcr:createdBy" sv:type="String">
-              <sv:value>admin</sv:value>
-            </sv:property>
-            <sv:property sv:name="mgnl:creationdate" sv:type="Date">
-              <sv:value>2010-02-05T13:01:31.001+01:00</sv:value>
-            </sv:property>
-          </sv:node>
-        </sv:node>
       </sv:node>
       <sv:node sv:name="i3">
         <sv:property sv:name="jcr:primaryType" sv:type="Name">
-          <sv:value>mgnl:contentNode</sv:value>
+          <sv:value>mgnl:component</sv:value>
         </sv:property>
         <sv:property sv:name="jcr:mixinTypes" sv:type="Name">
           <sv:value>mix:lockable</sv:value>
@@ -1510,35 +1335,10 @@
             <sv:value>p-text-image</sv:value>
           </sv:property>
         </sv:node>
-        <sv:node sv:name="text_files">
-          <sv:property sv:name="jcr:primaryType" sv:type="Name">
-            <sv:value>mgnl:contentNode</sv:value>
-          </sv:property>
-          <sv:property sv:name="jcr:mixinTypes" sv:type="Name">
-            <sv:value>mix:lockable</sv:value>
-          </sv:property>
-          <sv:property sv:name="jcr:uuid" sv:type="String">
-            <sv:value>e77bbcfc-acb5-4073-afc0-e072a06ef3d5</sv:value>
-          </sv:property>
-          <sv:property sv:name="jcr:createdBy" sv:type="String">
-            <sv:value>admin</sv:value>
-          </sv:property>
-          <sv:node sv:name="MetaData">
-            <sv:property sv:name="jcr:primaryType" sv:type="Name">
-              <sv:value>mgnl:metaData</sv:value>
-            </sv:property>
-            <sv:property sv:name="jcr:createdBy" sv:type="String">
-              <sv:value>admin</sv:value>
-            </sv:property>
-            <sv:property sv:name="mgnl:creationdate" sv:type="Date">
-              <sv:value>2010-02-05T13:01:31.001+01:00</sv:value>
-            </sv:property>
-          </sv:node>
-        </sv:node>
       </sv:node>
       <sv:node sv:name="999">
         <sv:property sv:name="jcr:primaryType" sv:type="Name">
-          <sv:value>mgnl:contentNode</sv:value>
+          <sv:value>mgnl:component</sv:value>
         </sv:property>
         <sv:property sv:name="jcr:mixinTypes" sv:type="Name">
           <sv:value>mix:lockable</sv:value>
@@ -1578,7 +1378,7 @@
     </sv:node>
     <sv:node sv:name="columnDx">
       <sv:property sv:name="jcr:primaryType" sv:type="Name">
-        <sv:value>mgnl:contentNode</sv:value>
+        <sv:value>mgnl:component</sv:value>
       </sv:property>
       <sv:property sv:name="jcr:mixinTypes" sv:type="Name">
         <sv:value>mix:lockable</sv:value>
@@ -1608,7 +1408,7 @@
       </sv:node>
       <sv:node sv:name="1">
         <sv:property sv:name="jcr:primaryType" sv:type="Name">
-          <sv:value>mgnl:contentNode</sv:value>
+          <sv:value>mgnl:component</sv:value>
         </sv:property>
         <sv:property sv:name="jcr:mixinTypes" sv:type="Name">
           <sv:value>mix:lockable</sv:value>
@@ -1711,7 +1511,7 @@
     </sv:node>
     <sv:node sv:name="mainframe">
       <sv:property sv:name="jcr:primaryType" sv:type="Name">
-        <sv:value>mgnl:contentNode</sv:value>
+        <sv:value>mgnl:component</sv:value>
       </sv:property>
       <sv:property sv:name="jcr:mixinTypes" sv:type="Name">
         <sv:value>mix:lockable</sv:value>
@@ -1741,7 +1541,7 @@
       </sv:node>
       <sv:node sv:name="i1">
         <sv:property sv:name="jcr:primaryType" sv:type="Name">
-          <sv:value>mgnl:contentNode</sv:value>
+          <sv:value>mgnl:component</sv:value>
         </sv:property>
         <sv:property sv:name="jcr:mixinTypes" sv:type="Name">
           <sv:value>mix:lockable</sv:value>
@@ -1789,35 +1589,10 @@
             <sv:value>p-text-image</sv:value>
           </sv:property>
         </sv:node>
-        <sv:node sv:name="text_files">
-          <sv:property sv:name="jcr:primaryType" sv:type="Name">
-            <sv:value>mgnl:contentNode</sv:value>
-          </sv:property>
-          <sv:property sv:name="jcr:mixinTypes" sv:type="Name">
-            <sv:value>mix:lockable</sv:value>
-          </sv:property>
-          <sv:property sv:name="jcr:uuid" sv:type="String">
-            <sv:value>58d97f89-3e02-43f8-ab40-8c41ed3943a5</sv:value>
-          </sv:property>
-          <sv:property sv:name="jcr:createdBy" sv:type="String">
-            <sv:value>admin</sv:value>
-          </sv:property>
-          <sv:node sv:name="MetaData">
-            <sv:property sv:name="jcr:primaryType" sv:type="Name">
-              <sv:value>mgnl:metaData</sv:value>
-            </sv:property>
-            <sv:property sv:name="jcr:createdBy" sv:type="String">
-              <sv:value>admin</sv:value>
-            </sv:property>
-            <sv:property sv:name="mgnl:creationdate" sv:type="Date">
-              <sv:value>2010-02-05T13:01:41.001+01:00</sv:value>
-            </sv:property>
-          </sv:node>
-        </sv:node>
       </sv:node>
       <sv:node sv:name="999">
         <sv:property sv:name="jcr:primaryType" sv:type="Name">
-          <sv:value>mgnl:contentNode</sv:value>
+          <sv:value>mgnl:component</sv:value>
         </sv:property>
         <sv:property sv:name="jcr:mixinTypes" sv:type="Name">
           <sv:value>mix:lockable</sv:value>
@@ -1856,7 +1631,7 @@
     </sv:node>
     <sv:node sv:name="columnDx">
       <sv:property sv:name="jcr:primaryType" sv:type="Name">
-        <sv:value>mgnl:contentNode</sv:value>
+        <sv:value>mgnl:component</sv:value>
       </sv:property>
       <sv:property sv:name="jcr:mixinTypes" sv:type="Name">
         <sv:value>mix:lockable</sv:value>
@@ -1886,7 +1661,7 @@
       </sv:node>
       <sv:node sv:name="1">
         <sv:property sv:name="jcr:primaryType" sv:type="Name">
-          <sv:value>mgnl:contentNode</sv:value>
+          <sv:value>mgnl:component</sv:value>
         </sv:property>
         <sv:property sv:name="jcr:mixinTypes" sv:type="Name">
           <sv:value>mix:lockable</sv:value>
@@ -1989,7 +1764,7 @@
     </sv:node>
     <sv:node sv:name="mainframe">
       <sv:property sv:name="jcr:primaryType" sv:type="Name">
-        <sv:value>mgnl:contentNode</sv:value>
+        <sv:value>mgnl:component</sv:value>
       </sv:property>
       <sv:property sv:name="jcr:mixinTypes" sv:type="Name">
         <sv:value>mix:lockable</sv:value>
@@ -2019,7 +1794,7 @@
       </sv:node>
       <sv:node sv:name="i1">
         <sv:property sv:name="jcr:primaryType" sv:type="Name">
-          <sv:value>mgnl:contentNode</sv:value>
+          <sv:value>mgnl:component</sv:value>
         </sv:property>
         <sv:property sv:name="jcr:mixinTypes" sv:type="Name">
           <sv:value>mix:lockable</sv:value>
@@ -2065,35 +1840,10 @@
             <sv:value>p-text-image</sv:value>
           </sv:property>
         </sv:node>
-        <sv:node sv:name="text_files">
-          <sv:property sv:name="jcr:primaryType" sv:type="Name">
-            <sv:value>mgnl:contentNode</sv:value>
-          </sv:property>
-          <sv:property sv:name="jcr:mixinTypes" sv:type="Name">
-            <sv:value>mix:lockable</sv:value>
-          </sv:property>
-          <sv:property sv:name="jcr:uuid" sv:type="String">
-            <sv:value>3ab0e97d-9e2d-413c-81d9-a46a9fd2d840</sv:value>
-          </sv:property>
-          <sv:property sv:name="jcr:createdBy" sv:type="String">
-            <sv:value>admin</sv:value>
-          </sv:property>
-          <sv:node sv:name="MetaData">
-            <sv:property sv:name="jcr:primaryType" sv:type="Name">
-              <sv:value>mgnl:metaData</sv:value>
-            </sv:property>
-            <sv:property sv:name="jcr:createdBy" sv:type="String">
-              <sv:value>admin</sv:value>
-            </sv:property>
-            <sv:property sv:name="mgnl:creationdate" sv:type="Date">
-              <sv:value>2010-02-05T13:01:35.001+01:00</sv:value>
-            </sv:property>
-          </sv:node>
-        </sv:node>
       </sv:node>
       <sv:node sv:name="999">
         <sv:property sv:name="jcr:primaryType" sv:type="Name">
-          <sv:value>mgnl:contentNode</sv:value>
+          <sv:value>mgnl:component</sv:value>
         </sv:property>
         <sv:property sv:name="jcr:mixinTypes" sv:type="Name">
           <sv:value>mix:lockable</sv:value>
@@ -2132,7 +1882,7 @@
     </sv:node>
     <sv:node sv:name="columnDx">
       <sv:property sv:name="jcr:primaryType" sv:type="Name">
-        <sv:value>mgnl:contentNode</sv:value>
+        <sv:value>mgnl:component</sv:value>
       </sv:property>
       <sv:property sv:name="jcr:mixinTypes" sv:type="Name">
         <sv:value>mix:lockable</sv:value>
@@ -2224,7 +1974,7 @@
     </sv:node>
     <sv:node sv:name="mainframe">
       <sv:property sv:name="jcr:primaryType" sv:type="Name">
-        <sv:value>mgnl:contentNode</sv:value>
+        <sv:value>mgnl:component</sv:value>
       </sv:property>
       <sv:property sv:name="jcr:mixinTypes" sv:type="Name">
         <sv:value>mix:lockable</sv:value>
@@ -2254,7 +2004,7 @@
       </sv:node>
       <sv:node sv:name="i1">
         <sv:property sv:name="jcr:primaryType" sv:type="Name">
-          <sv:value>mgnl:contentNode</sv:value>
+          <sv:value>mgnl:component</sv:value>
         </sv:property>
         <sv:property sv:name="jcr:mixinTypes" sv:type="Name">
           <sv:value>mix:lockable</sv:value>
@@ -2300,35 +2050,10 @@
             <sv:value>p-text-image</sv:value>
           </sv:property>
         </sv:node>
-        <sv:node sv:name="text_files">
-          <sv:property sv:name="jcr:primaryType" sv:type="Name">
-            <sv:value>mgnl:contentNode</sv:value>
-          </sv:property>
-          <sv:property sv:name="jcr:mixinTypes" sv:type="Name">
-            <sv:value>mix:lockable</sv:value>
-          </sv:property>
-          <sv:property sv:name="jcr:uuid" sv:type="String">
-            <sv:value>46ab32e0-3468-4878-b10a-1eec06bc39dd</sv:value>
-          </sv:property>
-          <sv:property sv:name="jcr:createdBy" sv:type="String">
-            <sv:value>admin</sv:value>
-          </sv:property>
-          <sv:node sv:name="MetaData">
-            <sv:property sv:name="jcr:primaryType" sv:type="Name">
-              <sv:value>mgnl:metaData</sv:value>
-            </sv:property>
-            <sv:property sv:name="jcr:createdBy" sv:type="String">
-              <sv:value>admin</sv:value>
-            </sv:property>
-            <sv:property sv:name="mgnl:creationdate" sv:type="Date">
-              <sv:value>2010-02-05T13:01:35.001+01:00</sv:value>
-            </sv:property>
-          </sv:node>
-        </sv:node>
       </sv:node>
       <sv:node sv:name="999">
         <sv:property sv:name="jcr:primaryType" sv:type="Name">
-          <sv:value>mgnl:contentNode</sv:value>
+          <sv:value>mgnl:component</sv:value>
         </sv:property>
         <sv:property sv:name="jcr:mixinTypes" sv:type="Name">
           <sv:value>mix:lockable</sv:value>
@@ -2367,7 +2092,7 @@
     </sv:node>
     <sv:node sv:name="columnDx">
       <sv:property sv:name="jcr:primaryType" sv:type="Name">
-        <sv:value>mgnl:contentNode</sv:value>
+        <sv:value>mgnl:component</sv:value>
       </sv:property>
       <sv:property sv:name="jcr:mixinTypes" sv:type="Name">
         <sv:value>mix:lockable</sv:value>
@@ -2460,7 +2185,7 @@
     </sv:node>
     <sv:node sv:name="mainframe">
       <sv:property sv:name="jcr:primaryType" sv:type="Name">
-        <sv:value>mgnl:contentNode</sv:value>
+        <sv:value>mgnl:component</sv:value>
       </sv:property>
       <sv:property sv:name="jcr:mixinTypes" sv:type="Name">
         <sv:value>mix:lockable</sv:value>
@@ -2490,7 +2215,7 @@
       </sv:node>
       <sv:node sv:name="i1">
         <sv:property sv:name="jcr:primaryType" sv:type="Name">
-          <sv:value>mgnl:contentNode</sv:value>
+          <sv:value>mgnl:component</sv:value>
         </sv:property>
         <sv:property sv:name="jcr:mixinTypes" sv:type="Name">
           <sv:value>mix:lockable</sv:value>
@@ -2540,35 +2265,10 @@
             <sv:value>p-text-image</sv:value>
           </sv:property>
         </sv:node>
-        <sv:node sv:name="text_files">
-          <sv:property sv:name="jcr:primaryType" sv:type="Name">
-            <sv:value>mgnl:contentNode</sv:value>
-          </sv:property>
-          <sv:property sv:name="jcr:mixinTypes" sv:type="Name">
-            <sv:value>mix:lockable</sv:value>
-          </sv:property>
-          <sv:property sv:name="jcr:uuid" sv:type="String">
-            <sv:value>734f3356-0ac0-40b3-8fda-61046bf805b7</sv:value>
-          </sv:property>
-          <sv:property sv:name="jcr:createdBy" sv:type="String">
-            <sv:value>admin</sv:value>
-          </sv:property>
-          <sv:node sv:name="MetaData">
-            <sv:property sv:name="jcr:primaryType" sv:type="Name">
-              <sv:value>mgnl:metaData</sv:value>
-            </sv:property>
-            <sv:property sv:name="jcr:createdBy" sv:type="String">
-              <sv:value>admin</sv:value>
-            </sv:property>
-            <sv:property sv:name="mgnl:creationdate" sv:type="Date">
-              <sv:value>2010-02-05T13:01:35.001+01:00</sv:value>
-            </sv:property>
-          </sv:node>
-        </sv:node>
       </sv:node>
       <sv:node sv:name="999">
         <sv:property sv:name="jcr:primaryType" sv:type="Name">
-          <sv:value>mgnl:contentNode</sv:value>
+          <sv:value>mgnl:component</sv:value>
         </sv:property>
         <sv:property sv:name="jcr:mixinTypes" sv:type="Name">
           <sv:value>mix:lockable</sv:value>
@@ -2608,7 +2308,7 @@
     </sv:node>
     <sv:node sv:name="columnDx">
       <sv:property sv:name="jcr:primaryType" sv:type="Name">
-        <sv:value>mgnl:contentNode</sv:value>
+        <sv:value>mgnl:component</sv:value>
       </sv:property>
       <sv:property sv:name="jcr:mixinTypes" sv:type="Name">
         <sv:value>mix:lockable</sv:value>
@@ -2638,7 +2338,7 @@
       </sv:node>
       <sv:node sv:name="1">
         <sv:property sv:name="jcr:primaryType" sv:type="Name">
-          <sv:value>mgnl:contentNode</sv:value>
+          <sv:value>mgnl:component</sv:value>
         </sv:property>
         <sv:property sv:name="jcr:mixinTypes" sv:type="Name">
           <sv:value>mix:lockable</sv:value>
@@ -2743,7 +2443,7 @@
     </sv:node>
     <sv:node sv:name="mainframe">
       <sv:property sv:name="jcr:primaryType" sv:type="Name">
-        <sv:value>mgnl:contentNode</sv:value>
+        <sv:value>mgnl:component</sv:value>
       </sv:property>
       <sv:property sv:name="jcr:mixinTypes" sv:type="Name">
         <sv:value>mix:lockable</sv:value>
@@ -2773,7 +2473,7 @@
       </sv:node>
       <sv:node sv:name="i1">
         <sv:property sv:name="jcr:primaryType" sv:type="Name">
-          <sv:value>mgnl:contentNode</sv:value>
+          <sv:value>mgnl:component</sv:value>
         </sv:property>
         <sv:property sv:name="jcr:mixinTypes" sv:type="Name">
           <sv:value>mix:lockable</sv:value>
@@ -2823,35 +2523,10 @@
             <sv:value>p-text-image</sv:value>
           </sv:property>
         </sv:node>
-        <sv:node sv:name="text_files">
-          <sv:property sv:name="jcr:primaryType" sv:type="Name">
-            <sv:value>mgnl:contentNode</sv:value>
-          </sv:property>
-          <sv:property sv:name="jcr:mixinTypes" sv:type="Name">
-            <sv:value>mix:lockable</sv:value>
-          </sv:property>
-          <sv:property sv:name="jcr:uuid" sv:type="String">
-            <sv:value>dbd97fab-80a9-4b6c-8bc4-7f4e1ea01366</sv:value>
-          </sv:property>
-          <sv:property sv:name="jcr:createdBy" sv:type="String">
-            <sv:value>admin</sv:value>
-          </sv:property>
-          <sv:node sv:name="MetaData">
-            <sv:property sv:name="jcr:primaryType" sv:type="Name">
-              <sv:value>mgnl:metaData</sv:value>
-            </sv:property>
-            <sv:property sv:name="jcr:createdBy" sv:type="String">
-              <sv:value>admin</sv:value>
-            </sv:property>
-            <sv:property sv:name="mgnl:creationdate" sv:type="Date">
-              <sv:value>2010-02-05T13:01:35.001+01:00</sv:value>
-            </sv:property>
-          </sv:node>
-        </sv:node>
       </sv:node>
       <sv:node sv:name="999">
         <sv:property sv:name="jcr:primaryType" sv:type="Name">
-          <sv:value>mgnl:contentNode</sv:value>
+          <sv:value>mgnl:component</sv:value>
         </sv:property>
         <sv:property sv:name="jcr:mixinTypes" sv:type="Name">
           <sv:value>mix:lockable</sv:value>
@@ -2891,7 +2566,7 @@
     </sv:node>
     <sv:node sv:name="columnDx">
       <sv:property sv:name="jcr:primaryType" sv:type="Name">
-        <sv:value>mgnl:contentNode</sv:value>
+        <sv:value>mgnl:component</sv:value>
       </sv:property>
       <sv:property sv:name="jcr:mixinTypes" sv:type="Name">
         <sv:value>mix:lockable</sv:value>
@@ -2921,7 +2596,7 @@
       </sv:node>
       <sv:node sv:name="1">
         <sv:property sv:name="jcr:primaryType" sv:type="Name">
-          <sv:value>mgnl:contentNode</sv:value>
+          <sv:value>mgnl:component</sv:value>
         </sv:property>
         <sv:property sv:name="jcr:mixinTypes" sv:type="Name">
           <sv:value>mix:lockable</sv:value>
@@ -3026,7 +2701,7 @@
     </sv:node>
     <sv:node sv:name="mainframe">
       <sv:property sv:name="jcr:primaryType" sv:type="Name">
-        <sv:value>mgnl:contentNode</sv:value>
+        <sv:value>mgnl:component</sv:value>
       </sv:property>
       <sv:property sv:name="jcr:mixinTypes" sv:type="Name">
         <sv:value>mix:lockable</sv:value>
@@ -3056,7 +2731,7 @@
       </sv:node>
       <sv:node sv:name="i1">
         <sv:property sv:name="jcr:primaryType" sv:type="Name">
-          <sv:value>mgnl:contentNode</sv:value>
+          <sv:value>mgnl:component</sv:value>
         </sv:property>
         <sv:property sv:name="jcr:mixinTypes" sv:type="Name">
           <sv:value>mix:lockable</sv:value>
@@ -3106,35 +2781,10 @@
             <sv:value>p-text-image</sv:value>
           </sv:property>
         </sv:node>
-        <sv:node sv:name="text_files">
-          <sv:property sv:name="jcr:primaryType" sv:type="Name">
-            <sv:value>mgnl:contentNode</sv:value>
-          </sv:property>
-          <sv:property sv:name="jcr:mixinTypes" sv:type="Name">
-            <sv:value>mix:lockable</sv:value>
-          </sv:property>
-          <sv:property sv:name="jcr:uuid" sv:type="String">
-            <sv:value>cf760751-40a2-4283-bc48-4211e27ec206</sv:value>
-          </sv:property>
-          <sv:property sv:name="jcr:createdBy" sv:type="String">
-            <sv:value>admin</sv:value>
-          </sv:property>
-          <sv:node sv:name="MetaData">
-            <sv:property sv:name="jcr:primaryType" sv:type="Name">
-              <sv:value>mgnl:metaData</sv:value>
-            </sv:property>
-            <sv:property sv:name="jcr:createdBy" sv:type="String">
-              <sv:value>admin</sv:value>
-            </sv:property>
-            <sv:property sv:name="mgnl:creationdate" sv:type="Date">
-              <sv:value>2010-02-05T13:01:35.001+01:00</sv:value>
-            </sv:property>
-          </sv:node>
-        </sv:node>
       </sv:node>
       <sv:node sv:name="999">
         <sv:property sv:name="jcr:primaryType" sv:type="Name">
-          <sv:value>mgnl:contentNode</sv:value>
+          <sv:value>mgnl:component</sv:value>
         </sv:property>
         <sv:property sv:name="jcr:mixinTypes" sv:type="Name">
           <sv:value>mix:lockable</sv:value>
@@ -3174,7 +2824,7 @@
     </sv:node>
     <sv:node sv:name="columnDx">
       <sv:property sv:name="jcr:primaryType" sv:type="Name">
-        <sv:value>mgnl:contentNode</sv:value>
+        <sv:value>mgnl:component</sv:value>
       </sv:property>
       <sv:property sv:name="jcr:mixinTypes" sv:type="Name">
         <sv:value>mix:lockable</sv:value>
@@ -3204,7 +2854,7 @@
       </sv:node>
       <sv:node sv:name="1">
         <sv:property sv:name="jcr:primaryType" sv:type="Name">
-          <sv:value>mgnl:contentNode</sv:value>
+          <sv:value>mgnl:component</sv:value>
         </sv:property>
         <sv:property sv:name="jcr:mixinTypes" sv:type="Name">
           <sv:value>mix:lockable</sv:value>
@@ -3309,7 +2959,7 @@
     </sv:node>
     <sv:node sv:name="mainframe">
       <sv:property sv:name="jcr:primaryType" sv:type="Name">
-        <sv:value>mgnl:contentNode</sv:value>
+        <sv:value>mgnl:component</sv:value>
       </sv:property>
       <sv:property sv:name="jcr:mixinTypes" sv:type="Name">
         <sv:value>mix:lockable</sv:value>
@@ -3339,7 +2989,7 @@
       </sv:node>
       <sv:node sv:name="i1">
         <sv:property sv:name="jcr:primaryType" sv:type="Name">
-          <sv:value>mgnl:contentNode</sv:value>
+          <sv:value>mgnl:component</sv:value>
         </sv:property>
         <sv:property sv:name="jcr:mixinTypes" sv:type="Name">
           <sv:value>mix:lockable</sv:value>
@@ -3389,35 +3039,10 @@
             <sv:value>p-text-image</sv:value>
           </sv:property>
         </sv:node>
-        <sv:node sv:name="text_files">
-          <sv:property sv:name="jcr:primaryType" sv:type="Name">
-            <sv:value>mgnl:contentNode</sv:value>
-          </sv:property>
-          <sv:property sv:name="jcr:mixinTypes" sv:type="Name">
-            <sv:value>mix:lockable</sv:value>
-          </sv:property>
-          <sv:property sv:name="jcr:uuid" sv:type="String">
-            <sv:value>e0f1e6b5-353f-4c69-ae39-931bbf934efb</sv:value>
-          </sv:property>
-          <sv:property sv:name="jcr:createdBy" sv:type="String">
-            <sv:value>admin</sv:value>
-          </sv:property>
-          <sv:node sv:name="MetaData">
-            <sv:property sv:name="jcr:primaryType" sv:type="Name">
-              <sv:value>mgnl:metaData</sv:value>
-            </sv:property>
-            <sv:property sv:name="jcr:createdBy" sv:type="String">
-              <sv:value>admin</sv:value>
-            </sv:property>
-            <sv:property sv:name="mgnl:creationdate" sv:type="Date">
-              <sv:value>2010-02-05T13:01:35.001+01:00</sv:value>
-            </sv:property>
-          </sv:node>
-        </sv:node>
       </sv:node>
       <sv:node sv:name="999">
         <sv:property sv:name="jcr:primaryType" sv:type="Name">
-          <sv:value>mgnl:contentNode</sv:value>
+          <sv:value>mgnl:component</sv:value>
         </sv:property>
         <sv:property sv:name="jcr:mixinTypes" sv:type="Name">
           <sv:value>mix:lockable</sv:value>
@@ -3457,7 +3082,7 @@
     </sv:node>
     <sv:node sv:name="columnDx">
       <sv:property sv:name="jcr:primaryType" sv:type="Name">
-        <sv:value>mgnl:contentNode</sv:value>
+        <sv:value>mgnl:component</sv:value>
       </sv:property>
       <sv:property sv:name="jcr:mixinTypes" sv:type="Name">
         <sv:value>mix:lockable</sv:value>
@@ -3487,7 +3112,7 @@
       </sv:node>
       <sv:node sv:name="1">
         <sv:property sv:name="jcr:primaryType" sv:type="Name">
-          <sv:value>mgnl:contentNode</sv:value>
+          <sv:value>mgnl:component</sv:value>
         </sv:property>
         <sv:property sv:name="jcr:mixinTypes" sv:type="Name">
           <sv:value>mix:lockable</sv:value>
@@ -3592,7 +3217,7 @@
     </sv:node>
     <sv:node sv:name="mainframe">
       <sv:property sv:name="jcr:primaryType" sv:type="Name">
-        <sv:value>mgnl:contentNode</sv:value>
+        <sv:value>mgnl:component</sv:value>
       </sv:property>
       <sv:property sv:name="jcr:mixinTypes" sv:type="Name">
         <sv:value>mix:lockable</sv:value>
@@ -3622,7 +3247,7 @@
       </sv:node>
       <sv:node sv:name="i1">
         <sv:property sv:name="jcr:primaryType" sv:type="Name">
-          <sv:value>mgnl:contentNode</sv:value>
+          <sv:value>mgnl:component</sv:value>
         </sv:property>
         <sv:property sv:name="jcr:mixinTypes" sv:type="Name">
           <sv:value>mix:lockable</sv:value>
@@ -3672,35 +3297,10 @@
             <sv:value>p-text-image</sv:value>
           </sv:property>
         </sv:node>
-        <sv:node sv:name="text_files">
-          <sv:property sv:name="jcr:primaryType" sv:type="Name">
-            <sv:value>mgnl:contentNode</sv:value>
-          </sv:property>
-          <sv:property sv:name="jcr:mixinTypes" sv:type="Name">
-            <sv:value>mix:lockable</sv:value>
-          </sv:property>
-          <sv:property sv:name="jcr:uuid" sv:type="String">
-            <sv:value>46555ab2-1947-4367-bd25-f04bf94a0640</sv:value>
-          </sv:property>
-          <sv:property sv:name="jcr:createdBy" sv:type="String">
-            <sv:value>admin</sv:value>
-          </sv:property>
-          <sv:node sv:name="MetaData">
-            <sv:property sv:name="jcr:primaryType" sv:type="Name">
-              <sv:value>mgnl:metaData</sv:value>
-            </sv:property>
-            <sv:property sv:name="jcr:createdBy" sv:type="String">
-              <sv:value>admin</sv:value>
-            </sv:property>
-            <sv:property sv:name="mgnl:creationdate" sv:type="Date">
-              <sv:value>2010-02-05T13:01:35.001+01:00</sv:value>
-            </sv:property>
-          </sv:node>
-        </sv:node>
       </sv:node>
       <sv:node sv:name="999">
         <sv:property sv:name="jcr:primaryType" sv:type="Name">
-          <sv:value>mgnl:contentNode</sv:value>
+          <sv:value>mgnl:component</sv:value>
         </sv:property>
         <sv:property sv:name="jcr:mixinTypes" sv:type="Name">
           <sv:value>mix:lockable</sv:value>
@@ -3740,7 +3340,7 @@
     </sv:node>
     <sv:node sv:name="columnDx">
       <sv:property sv:name="jcr:primaryType" sv:type="Name">
-        <sv:value>mgnl:contentNode</sv:value>
+        <sv:value>mgnl:component</sv:value>
       </sv:property>
       <sv:property sv:name="jcr:mixinTypes" sv:type="Name">
         <sv:value>mix:lockable</sv:value>
@@ -3770,7 +3370,7 @@
       </sv:node>
       <sv:node sv:name="1">
         <sv:property sv:name="jcr:primaryType" sv:type="Name">
-          <sv:value>mgnl:contentNode</sv:value>
+          <sv:value>mgnl:component</sv:value>
         </sv:property>
         <sv:property sv:name="jcr:mixinTypes" sv:type="Name">
           <sv:value>mix:lockable</sv:value>
@@ -3877,7 +3477,7 @@
     </sv:node>
     <sv:node sv:name="mainframe">
       <sv:property sv:name="jcr:primaryType" sv:type="Name">
-        <sv:value>mgnl:contentNode</sv:value>
+        <sv:value>mgnl:component</sv:value>
       </sv:property>
       <sv:property sv:name="jcr:mixinTypes" sv:type="Name">
         <sv:value>mix:lockable</sv:value>
@@ -3907,7 +3507,7 @@
       </sv:node>
       <sv:node sv:name="i1">
         <sv:property sv:name="jcr:primaryType" sv:type="Name">
-          <sv:value>mgnl:contentNode</sv:value>
+          <sv:value>mgnl:component</sv:value>
         </sv:property>
         <sv:property sv:name="jcr:mixinTypes" sv:type="Name">
           <sv:value>mix:lockable</sv:value>
@@ -3948,35 +3548,10 @@
             <sv:value>p-text-image</sv:value>
           </sv:property>
         </sv:node>
-        <sv:node sv:name="text_files">
-          <sv:property sv:name="jcr:primaryType" sv:type="Name">
-            <sv:value>mgnl:contentNode</sv:value>
-          </sv:property>
-          <sv:property sv:name="jcr:mixinTypes" sv:type="Name">
-            <sv:value>mix:lockable</sv:value>
-          </sv:property>
-          <sv:property sv:name="jcr:uuid" sv:type="String">
-            <sv:value>fea1bf7a-1b2f-34bc-92c6-75d82978d07f</sv:value>
-          </sv:property>
-          <sv:property sv:name="...
 
[truncated message content]

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

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

Revision: 4396
          http://openutils.svn.sourceforge.net/openutils/?rev=4396&view=rev
Author:   fgiust
Date:     2013-10-20 10:56:50 +0000 (Sun, 20 Oct 2013)
Log Message:
-----------
remove old configuration

Modified Paths:
--------------
    magnoliamodules/trunk/openutils-mgnlmedia/pom.xml
    magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/setup/MediaModuleVersionHandler.java
    magnoliamodules/trunk/openutils-mgnltasks/src/main/java/it/openutils/mgnltasks/DeleteNodeTask.java

Modified: magnoliamodules/trunk/openutils-mgnlmedia/pom.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnlmedia/pom.xml	2013-10-20 10:38:28 UTC (rev 4395)
+++ magnoliamodules/trunk/openutils-mgnlmedia/pom.xml	2013-10-20 10:56:50 UTC (rev 4396)
@@ -117,7 +117,7 @@
     <dependency>
       <groupId>net.sourceforge.openutils</groupId>
       <artifactId>openutils-mgnltasks</artifactId>
-      <version>5.0.0</version>
+      <version>5.0.1-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>net.sourceforge.openutils</groupId>

Modified: magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/setup/MediaModuleVersionHandler.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/setup/MediaModuleVersionHandler.java	2013-10-20 10:38:28 UTC (rev 4395)
+++ magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/setup/MediaModuleVersionHandler.java	2013-10-20 10:56:50 UTC (rev 4396)
@@ -243,12 +243,7 @@
             "wildcards",
             Boolean.TRUE));
 
-        tasks.add(new ChangeExistingPropertyTask(
-            RepositoryConstants.CONFIG,
-            "/modules/media/mediausedin/website",
-            "nodeType",
-            "mgnl:content",
-            "mgnl:page"));
+         
 
         // empty placeholder
         tasks.add(new CreateMissingPropertyTask(RepositoryConstants.CONFIG, "/modules/media/config", "baseurl", ""));
@@ -269,9 +264,24 @@
             "class",
             DefaultMediaUsedInManager.class.getName()));
 
-        // config moved to /modules/media/mediausedin/entries/website
-        tasks.add(new DeleteNodeTask(RepositoryConstants.CONFIG, "/modules/media/mediausedin/website"));
+        tasks
+            .add(new DeleteNodeTask(
+                RepositoryConstants.CONFIG,
+                "/modules/media/mediausedin/website",
+                "Configuration from /modules/media/mediausedin has now been changed and moved to the subnode \"entries\". The configuration has been reverted to the default"));
 
+        tasks
+            .add(new DeleteNodeTask(
+                RepositoryConstants.CONFIG,
+                "/modules/media/processors/image-post",
+                "Configuration node image-post into /modules/media/processors has been renamed to \"postprocessors\". The configuration has been reverted to the default"));
+
+        tasks
+            .add(new DeleteNodeTask(
+                RepositoryConstants.CONFIG,
+                "/modules/media/processors/image-resolution",
+                "Configuration node image-resolution into /modules/media/processors has been renamed to \"resolutionprocessors\". The configuration has been reverted to the default"));
+
         return tasks;
     }
 

Modified: magnoliamodules/trunk/openutils-mgnltasks/src/main/java/it/openutils/mgnltasks/DeleteNodeTask.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnltasks/src/main/java/it/openutils/mgnltasks/DeleteNodeTask.java	2013-10-20 10:38:28 UTC (rev 4395)
+++ magnoliamodules/trunk/openutils-mgnltasks/src/main/java/it/openutils/mgnltasks/DeleteNodeTask.java	2013-10-20 10:56:50 UTC (rev 4396)
@@ -27,7 +27,10 @@
 import javax.jcr.RepositoryException;
 import javax.jcr.Session;
 
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
+
 /**
  * Deletes a node (if existing).
  * @author fgiust
@@ -36,31 +39,50 @@
 public class DeleteNodeTask extends AbstractRepositoryTask
 {
 
-    private final String workspaceName;
+    private String workspaceName;
 
-    private final String nodePath;
+    private String nodePath;
 
+    private String warning;
+
+    private Logger log = LoggerFactory.getLogger(DeleteNodeTask.class);
+
     /**
      * @param workspaceName workspace (for example "config")
      * @param nodePath node path
+     * @param warning optional warning message which will be shown if the node to delete actually exists
      */
-    public DeleteNodeTask(String workspaceName, String nodePath)
+    public DeleteNodeTask(String workspaceName, String nodePath, String warning)
     {
         super("Deleting the node " + nodePath, "Deleting the node " + nodePath);
         this.workspaceName = workspaceName;
         this.nodePath = nodePath;
+        this.warning = warning;
     }
 
     /**
-     * {@inheritDoc}
+     * @param workspaceName workspace (for example "config")
+     * @param nodePath node path
      */
+    public DeleteNodeTask(String workspaceName, String nodePath)
+    {
+        this(workspaceName, nodePath, null);
+    }
+
     @Override
     protected void doExecute(InstallContext installContext) throws RepositoryException, TaskExecutionException
     {
 
-        Session hm = installContext.getJCRSession(workspaceName);
+        Session session = installContext.getJCRSession(workspaceName);
 
-        NodeUtilsExt.deleteIfExisting(hm, nodePath);
+        if (NodeUtilsExt.exists(session, nodePath))
+        {
+            if (warning != null)
+            {
+                installContext.warn(warning);
+            }
+            NodeUtilsExt.deleteIfExisting(session, nodePath);
+        }
     }
 
 }

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

[Openutils-svn] SF.net SVN: openutils:[4395] magnoliamodules/trunk/openutils-mgnlmedia/src/ main/resources/mgnl-bootstrap/media-nooverwrite

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

Revision: 4395
          http://openutils.svn.sourceforge.net/openutils/?rev=4395&view=rev
Author:   fgiust
Date:     2013-10-20 10:38:28 +0000 (Sun, 20 Oct 2013)
Log Message:
-----------
create base nodes on new install if missing

Added Paths:
-----------
    magnoliamodules/trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap/media-nooverwrite/config.modules.media.mediatypes.xml
    magnoliamodules/trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap/media-nooverwrite/config.modules.media.mediausedin.xml
    magnoliamodules/trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap/media-nooverwrite/config.modules.media.processors.xml

Added: magnoliamodules/trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap/media-nooverwrite/config.modules.media.mediatypes.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap/media-nooverwrite/config.modules.media.mediatypes.xml	                        (rev 0)
+++ magnoliamodules/trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap/media-nooverwrite/config.modules.media.mediatypes.xml	2013-10-20 10:38:28 UTC (rev 4395)
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<sv:node sv:name="mediatypes" xmlns:sv="http://www.jcp.org/jcr/sv/1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <sv:property sv:name="jcr:primaryType" sv:type="Name">
+    <sv:value>mgnl:content</sv:value>
+  </sv:property>
+  <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
+    <sv:value>mix:lockable</sv:value>
+  </sv:property>
+  <sv:property sv:name="jcr:uuid" sv:type="String">
+    <sv:value>ecdb6689-add3-43c7-8a19-194c5eb06619</sv:value>
+  </sv:property>
+  <sv:property sv:name="class" sv:type="String">
+    <sv:value>net.sourceforge.openutils.mgnlmedia.media.configuration.DefaultMediaConfigurationManager</sv:value>
+  </sv:property>
+  <sv:property sv:name="jcr:createdBy" sv:type="String">
+    <sv:value>admin</sv:value>
+  </sv:property>
+  <sv:node sv:name="MetaData">
+    <sv:property sv:name="jcr:primaryType" sv:type="Name">
+      <sv:value>mgnl:metaData</sv:value>
+    </sv:property>
+    <sv:property sv:name="jcr:createdBy" sv:type="String">
+      <sv:value>admin</sv:value>
+    </sv:property>
+    <sv:property sv:name="mgnl:creationdate" sv:type="Date">
+      <sv:value>2013-10-20T12:32:21.882+02:00</sv:value>
+    </sv:property>
+  </sv:node>
+</sv:node>


Property changes on: magnoliamodules/trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap/media-nooverwrite/config.modules.media.mediatypes.xml
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+text/xml
\ No newline at end of property
Added: svn:keywords
## -0,0 +1 ##
+Author Date Id Revision
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: magnoliamodules/trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap/media-nooverwrite/config.modules.media.mediausedin.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap/media-nooverwrite/config.modules.media.mediausedin.xml	                        (rev 0)
+++ magnoliamodules/trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap/media-nooverwrite/config.modules.media.mediausedin.xml	2013-10-20 10:38:28 UTC (rev 4395)
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<sv:node sv:name="mediausedin" xmlns:sv="http://www.jcp.org/jcr/sv/1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <sv:property sv:name="jcr:primaryType" sv:type="Name">
+    <sv:value>mgnl:content</sv:value>
+  </sv:property>
+  <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
+    <sv:value>mix:lockable</sv:value>
+  </sv:property>
+  <sv:property sv:name="jcr:uuid" sv:type="String">
+    <sv:value>8a65eb8b-bbfd-4d12-8d79-513335dd0837</sv:value>
+  </sv:property>
+  <sv:property sv:name="class" sv:type="String">
+    <sv:value>net.sourceforge.openutils.mgnlmedia.media.configuration.DefaultMediaUsedInManager</sv:value>
+  </sv:property>
+  <sv:property sv:name="jcr:createdBy" sv:type="String">
+    <sv:value>admin</sv:value>
+  </sv:property>
+  <sv:node sv:name="MetaData">
+    <sv:property sv:name="jcr:primaryType" sv:type="Name">
+      <sv:value>mgnl:metaData</sv:value>
+    </sv:property>
+    <sv:property sv:name="jcr:createdBy" sv:type="String">
+      <sv:value>admin</sv:value>
+    </sv:property>
+    <sv:property sv:name="mgnl:creationdate" sv:type="Date">
+      <sv:value>2013-10-20T12:32:21.949+02:00</sv:value>
+    </sv:property>
+  </sv:node>
+</sv:node>


Property changes on: magnoliamodules/trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap/media-nooverwrite/config.modules.media.mediausedin.xml
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+text/xml
\ No newline at end of property
Added: svn:keywords
## -0,0 +1 ##
+Author Date Id Revision
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: magnoliamodules/trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap/media-nooverwrite/config.modules.media.processors.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap/media-nooverwrite/config.modules.media.processors.xml	                        (rev 0)
+++ magnoliamodules/trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap/media-nooverwrite/config.modules.media.processors.xml	2013-10-20 10:38:28 UTC (rev 4395)
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<sv:node sv:name="processors" xmlns:sv="http://www.jcp.org/jcr/sv/1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <sv:property sv:name="jcr:primaryType" sv:type="Name">
+    <sv:value>mgnl:content</sv:value>
+  </sv:property>
+  <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
+    <sv:value>mix:lockable</sv:value>
+  </sv:property>
+  <sv:property sv:name="jcr:uuid" sv:type="String">
+    <sv:value>8a7d7845-b15d-474a-9043-bc2121fe1b9d</sv:value>
+  </sv:property>
+  <sv:property sv:name="class" sv:type="String">
+    <sv:value>net.sourceforge.openutils.mgnlmedia.media.configuration.DefaultImageProcessorsManager</sv:value>
+  </sv:property>
+  <sv:property sv:name="jcr:createdBy" sv:type="String">
+    <sv:value>admin</sv:value>
+  </sv:property>
+  <sv:node sv:name="MetaData">
+    <sv:property sv:name="jcr:primaryType" sv:type="Name">
+      <sv:value>mgnl:metaData</sv:value>
+    </sv:property>
+    <sv:property sv:name="jcr:createdBy" sv:type="String">
+      <sv:value>admin</sv:value>
+    </sv:property>
+    <sv:property sv:name="mgnl:creationdate" sv:type="Date">
+      <sv:value>2013-10-20T12:32:21.419+02:00</sv:value>
+    </sv:property>
+  </sv:node>
+</sv:node>


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

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

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

Revision: 4394
          http://openutils.svn.sourceforge.net/openutils/?rev=4394&view=rev
Author:   fgiust
Date:     2013-10-20 10:35:42 +0000 (Sun, 20 Oct 2013)
Log Message:
-----------
update page nodetypes in samples/test

Modified Paths:
--------------
    magnoliamodules/trunk/magnolia-test-webapp/src/main/webapp/WEB-INF/bootstrap/website.Criteria.xml
    magnoliamodules/trunk/magnolia-test-webapp/src/main/webapp/WEB-INF/bootstrap/website.test-MEDIA-113.xml
    magnoliamodules/trunk/magnolia5-test-webapp/src/main/webapp/WEB-INF/bootstrap/website.Criteria.xml
    magnoliamodules/trunk/magnolia5-test-webapp/src/main/webapp/WEB-INF/bootstrap/website.Magnolia-Utils.xml
    magnoliamodules/trunk/magnolia5-test-webapp/src/main/webapp/WEB-INF/bootstrap/website.test-MEDIA-113.xml
    magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/resources/mgnl-bootstrap-samples/contextmenu/website.sample-contextmenu.xml
    magnoliamodules/trunk/openutils-mgnlcriteria/src/test/resources/crit-bootstrap/website.00000.xml
    magnoliamodules/trunk/openutils-mgnlcriteria/src/test/resources/crit-bootstrap/website.Criteria.xml
    magnoliamodules/trunk/openutils-mgnlcriteria/src/test/resources/crit-bootstrap/website.Lorem ipsum dolor sit amet.xml
    magnoliamodules/trunk/openutils-mgnlcriteria/src/test/resources/crit-bootstrap/website.contains.xml
    magnoliamodules/trunk/openutils-mgnlcriteria/src/test/resources/crit-bootstrap/website.escape-sign.xml
    magnoliamodules/trunk/openutils-mgnlcriteria/src/test/resources/crit-bootstrap/website.letters.xml
    magnoliamodules/trunk/openutils-mgnlcriteria/src/test/resources/crit-bootstrap/website.myproject.xml
    magnoliamodules/trunk/openutils-mgnlcriteria/src/test/resources/crit-bootstrap/website.pets.xml
    magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/configuration/DefaultMediaUsedInManager.java
    magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/lifecycle/MediaModule.java
    magnoliamodules/trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap/media-nooverwrite/config.modules.media.mediausedin.entries.website.xml
    magnoliamodules/trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap-samples/media/website.sample-simplemedia.xml
    magnoliamodules/trunk/openutils-mgnlrules/src/main/resources/mgnl-bootstrap-samples/rules/website.sample-rules.xml
    magnoliamodules/trunk/openutils-mgnlstruts11/src/main/resources/mgnl-bootstrap-samples/struts11/website.sample-struts.xml
    magnoliamodules/trunk/openutils-mgnltagcloud/src/main/resources/mgnl-bootstrap-samples/tagcloud/website.sample-tagcloud.xml
    magnoliamodules/trunk/openutils-mgnltests/src/test/resources/utils-bootstrap/website.letters.xml
    magnoliamodules/trunk/openutils-mgnltests/src/test/resources/utils-bootstrap/website.pets.xml
    magnoliamodules/trunk/openutils-mgnlutils/src/main/resources/mgnl-bootstrap-samples/mgnlutils/website.sample-magnoliautils.xml
    magnoliamodules/trunk/openutils-mgnlutils/src/test/resources/utils-bootstrap/website.letters.xml
    magnoliamodules/trunk/openutils-mgnlutils/src/test/resources/utils-bootstrap/website.pets.xml

Modified: magnoliamodules/trunk/magnolia-test-webapp/src/main/webapp/WEB-INF/bootstrap/website.Criteria.xml
===================================================================
--- magnoliamodules/trunk/magnolia-test-webapp/src/main/webapp/WEB-INF/bootstrap/website.Criteria.xml	2013-10-20 10:33:54 UTC (rev 4393)
+++ magnoliamodules/trunk/magnolia-test-webapp/src/main/webapp/WEB-INF/bootstrap/website.Criteria.xml	2013-10-20 10:35:42 UTC (rev 4394)
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <sv:node sv:name="Criteria" xmlns:sv="http://www.jcp.org/jcr/sv/1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
   <sv:property sv:name="jcr:primaryType" sv:type="Name">
-    <sv:value>mgnl:content</sv:value>
+    <sv:value>mgnl:page</sv:value>
   </sv:property>
   <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
     <sv:value>mix:lockable</sv:value>
@@ -37,7 +37,7 @@
   </sv:node>
   <sv:node sv:name="pets">
     <sv:property sv:name="jcr:primaryType" sv:type="Name">
-      <sv:value>mgnl:content</sv:value>
+      <sv:value>mgnl:page</sv:value>
     </sv:property>
     <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
       <sv:value>mix:lockable</sv:value>
@@ -73,7 +73,7 @@
     </sv:node>
     <sv:node sv:name="cats">
       <sv:property sv:name="jcr:primaryType" sv:type="Name">
-        <sv:value>mgnl:content</sv:value>
+        <sv:value>mgnl:page</sv:value>
       </sv:property>
       <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
         <sv:value>mix:lockable</sv:value>
@@ -109,7 +109,7 @@
       </sv:node>
       <sv:node sv:name="1">
         <sv:property sv:name="jcr:primaryType" sv:type="Name">
-          <sv:value>mgnl:content</sv:value>
+          <sv:value>mgnl:page</sv:value>
         </sv:property>
         <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
           <sv:value>mix:lockable</sv:value>
@@ -152,7 +152,7 @@
       </sv:node>
       <sv:node sv:name="7">
         <sv:property sv:name="jcr:primaryType" sv:type="Name">
-          <sv:value>mgnl:content</sv:value>
+          <sv:value>mgnl:page</sv:value>
         </sv:property>
         <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
           <sv:value>mix:lockable</sv:value>
@@ -195,7 +195,7 @@
       </sv:node>
       <sv:node sv:name="8">
         <sv:property sv:name="jcr:primaryType" sv:type="Name">
-          <sv:value>mgnl:content</sv:value>
+          <sv:value>mgnl:page</sv:value>
         </sv:property>
         <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
           <sv:value>mix:lockable</sv:value>
@@ -238,7 +238,7 @@
       </sv:node>
       <sv:node sv:name="13">
         <sv:property sv:name="jcr:primaryType" sv:type="Name">
-          <sv:value>mgnl:content</sv:value>
+          <sv:value>mgnl:page</sv:value>
         </sv:property>
         <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
           <sv:value>mix:lockable</sv:value>
@@ -282,7 +282,7 @@
     </sv:node>
     <sv:node sv:name="dogs">
       <sv:property sv:name="jcr:primaryType" sv:type="Name">
-        <sv:value>mgnl:content</sv:value>
+        <sv:value>mgnl:page</sv:value>
       </sv:property>
       <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
         <sv:value>mix:lockable</sv:value>
@@ -318,7 +318,7 @@
       </sv:node>
       <sv:node sv:name="3">
         <sv:property sv:name="jcr:primaryType" sv:type="Name">
-          <sv:value>mgnl:content</sv:value>
+          <sv:value>mgnl:page</sv:value>
         </sv:property>
         <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
           <sv:value>mix:lockable</sv:value>
@@ -361,7 +361,7 @@
       </sv:node>
       <sv:node sv:name="4">
         <sv:property sv:name="jcr:primaryType" sv:type="Name">
-          <sv:value>mgnl:content</sv:value>
+          <sv:value>mgnl:page</sv:value>
         </sv:property>
         <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
           <sv:value>mix:lockable</sv:value>
@@ -404,7 +404,7 @@
       </sv:node>
       <sv:node sv:name="10">
         <sv:property sv:name="jcr:primaryType" sv:type="Name">
-          <sv:value>mgnl:content</sv:value>
+          <sv:value>mgnl:page</sv:value>
         </sv:property>
         <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
           <sv:value>mix:lockable</sv:value>
@@ -447,7 +447,7 @@
       </sv:node>
       <sv:node sv:name="12">
         <sv:property sv:name="jcr:primaryType" sv:type="Name">
-          <sv:value>mgnl:content</sv:value>
+          <sv:value>mgnl:page</sv:value>
         </sv:property>
         <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
           <sv:value>mix:lockable</sv:value>
@@ -491,7 +491,7 @@
     </sv:node>
     <sv:node sv:name="lizards">
       <sv:property sv:name="jcr:primaryType" sv:type="Name">
-        <sv:value>mgnl:content</sv:value>
+        <sv:value>mgnl:page</sv:value>
       </sv:property>
       <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
         <sv:value>mix:lockable</sv:value>
@@ -527,7 +527,7 @@
       </sv:node>
       <sv:node sv:name="5">
         <sv:property sv:name="jcr:primaryType" sv:type="Name">
-          <sv:value>mgnl:content</sv:value>
+          <sv:value>mgnl:page</sv:value>
         </sv:property>
         <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
           <sv:value>mix:lockable</sv:value>
@@ -571,7 +571,7 @@
     </sv:node>
     <sv:node sv:name="snakes">
       <sv:property sv:name="jcr:primaryType" sv:type="Name">
-        <sv:value>mgnl:content</sv:value>
+        <sv:value>mgnl:page</sv:value>
       </sv:property>
       <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
         <sv:value>mix:lockable</sv:value>
@@ -607,7 +607,7 @@
       </sv:node>
       <sv:node sv:name="6">
         <sv:property sv:name="jcr:primaryType" sv:type="Name">
-          <sv:value>mgnl:content</sv:value>
+          <sv:value>mgnl:page</sv:value>
         </sv:property>
         <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
           <sv:value>mix:lockable</sv:value>
@@ -651,7 +651,7 @@
     </sv:node>
     <sv:node sv:name="birds">
       <sv:property sv:name="jcr:primaryType" sv:type="Name">
-        <sv:value>mgnl:content</sv:value>
+        <sv:value>mgnl:page</sv:value>
       </sv:property>
       <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
         <sv:value>mix:lockable</sv:value>
@@ -687,7 +687,7 @@
       </sv:node>
       <sv:node sv:name="9">
         <sv:property sv:name="jcr:primaryType" sv:type="Name">
-          <sv:value>mgnl:content</sv:value>
+          <sv:value>mgnl:page</sv:value>
         </sv:property>
         <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
           <sv:value>mix:lockable</sv:value>
@@ -730,7 +730,7 @@
       </sv:node>
       <sv:node sv:name="11">
         <sv:property sv:name="jcr:primaryType" sv:type="Name">
-          <sv:value>mgnl:content</sv:value>
+          <sv:value>mgnl:page</sv:value>
         </sv:property>
         <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
           <sv:value>mix:lockable</sv:value>
@@ -774,7 +774,7 @@
     </sv:node>
     <sv:node sv:name="hamsters">
       <sv:property sv:name="jcr:primaryType" sv:type="Name">
-        <sv:value>mgnl:content</sv:value>
+        <sv:value>mgnl:page</sv:value>
       </sv:property>
       <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
         <sv:value>mix:lockable</sv:value>
@@ -810,7 +810,7 @@
       </sv:node>
       <sv:node sv:name="2">
         <sv:property sv:name="jcr:primaryType" sv:type="Name">
-          <sv:value>mgnl:content</sv:value>
+          <sv:value>mgnl:page</sv:value>
         </sv:property>
         <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
           <sv:value>mix:lockable</sv:value>

Modified: magnoliamodules/trunk/magnolia-test-webapp/src/main/webapp/WEB-INF/bootstrap/website.test-MEDIA-113.xml
===================================================================
--- magnoliamodules/trunk/magnolia-test-webapp/src/main/webapp/WEB-INF/bootstrap/website.test-MEDIA-113.xml	2013-10-20 10:33:54 UTC (rev 4393)
+++ magnoliamodules/trunk/magnolia-test-webapp/src/main/webapp/WEB-INF/bootstrap/website.test-MEDIA-113.xml	2013-10-20 10:35:42 UTC (rev 4394)
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <sv:node sv:name="test-MEDIA-113" xmlns:sv="http://www.jcp.org/jcr/sv/1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
   <sv:property sv:name="jcr:primaryType" sv:type="Name">
-    <sv:value>mgnl:content</sv:value>
+    <sv:value>mgnl:page</sv:value>
   </sv:property>
   <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
     <sv:value>mix:lockable</sv:value>

Modified: magnoliamodules/trunk/magnolia5-test-webapp/src/main/webapp/WEB-INF/bootstrap/website.Criteria.xml
===================================================================
--- magnoliamodules/trunk/magnolia5-test-webapp/src/main/webapp/WEB-INF/bootstrap/website.Criteria.xml	2013-10-20 10:33:54 UTC (rev 4393)
+++ magnoliamodules/trunk/magnolia5-test-webapp/src/main/webapp/WEB-INF/bootstrap/website.Criteria.xml	2013-10-20 10:35:42 UTC (rev 4394)
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <sv:node sv:name="Criteria" xmlns:sv="http://www.jcp.org/jcr/sv/1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
   <sv:property sv:name="jcr:primaryType" sv:type="Name">
-    <sv:value>mgnl:content</sv:value>
+    <sv:value>mgnl:page</sv:value>
   </sv:property>
   <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
     <sv:value>mix:lockable</sv:value>
@@ -37,7 +37,7 @@
   </sv:node>
   <sv:node sv:name="pets">
     <sv:property sv:name="jcr:primaryType" sv:type="Name">
-      <sv:value>mgnl:content</sv:value>
+      <sv:value>mgnl:page</sv:value>
     </sv:property>
     <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
       <sv:value>mix:lockable</sv:value>
@@ -73,7 +73,7 @@
     </sv:node>
     <sv:node sv:name="cats">
       <sv:property sv:name="jcr:primaryType" sv:type="Name">
-        <sv:value>mgnl:content</sv:value>
+        <sv:value>mgnl:page</sv:value>
       </sv:property>
       <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
         <sv:value>mix:lockable</sv:value>
@@ -109,7 +109,7 @@
       </sv:node>
       <sv:node sv:name="1">
         <sv:property sv:name="jcr:primaryType" sv:type="Name">
-          <sv:value>mgnl:content</sv:value>
+          <sv:value>mgnl:page</sv:value>
         </sv:property>
         <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
           <sv:value>mix:lockable</sv:value>
@@ -152,7 +152,7 @@
       </sv:node>
       <sv:node sv:name="7">
         <sv:property sv:name="jcr:primaryType" sv:type="Name">
-          <sv:value>mgnl:content</sv:value>
+          <sv:value>mgnl:page</sv:value>
         </sv:property>
         <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
           <sv:value>mix:lockable</sv:value>
@@ -195,7 +195,7 @@
       </sv:node>
       <sv:node sv:name="8">
         <sv:property sv:name="jcr:primaryType" sv:type="Name">
-          <sv:value>mgnl:content</sv:value>
+          <sv:value>mgnl:page</sv:value>
         </sv:property>
         <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
           <sv:value>mix:lockable</sv:value>
@@ -238,7 +238,7 @@
       </sv:node>
       <sv:node sv:name="13">
         <sv:property sv:name="jcr:primaryType" sv:type="Name">
-          <sv:value>mgnl:content</sv:value>
+          <sv:value>mgnl:page</sv:value>
         </sv:property>
         <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
           <sv:value>mix:lockable</sv:value>
@@ -282,7 +282,7 @@
     </sv:node>
     <sv:node sv:name="dogs">
       <sv:property sv:name="jcr:primaryType" sv:type="Name">
-        <sv:value>mgnl:content</sv:value>
+        <sv:value>mgnl:page</sv:value>
       </sv:property>
       <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
         <sv:value>mix:lockable</sv:value>
@@ -318,7 +318,7 @@
       </sv:node>
       <sv:node sv:name="3">
         <sv:property sv:name="jcr:primaryType" sv:type="Name">
-          <sv:value>mgnl:content</sv:value>
+          <sv:value>mgnl:page</sv:value>
         </sv:property>
         <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
           <sv:value>mix:lockable</sv:value>
@@ -361,7 +361,7 @@
       </sv:node>
       <sv:node sv:name="4">
         <sv:property sv:name="jcr:primaryType" sv:type="Name">
-          <sv:value>mgnl:content</sv:value>
+          <sv:value>mgnl:page</sv:value>
         </sv:property>
         <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
           <sv:value>mix:lockable</sv:value>
@@ -404,7 +404,7 @@
       </sv:node>
       <sv:node sv:name="10">
         <sv:property sv:name="jcr:primaryType" sv:type="Name">
-          <sv:value>mgnl:content</sv:value>
+          <sv:value>mgnl:page</sv:value>
         </sv:property>
         <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
           <sv:value>mix:lockable</sv:value>
@@ -447,7 +447,7 @@
       </sv:node>
       <sv:node sv:name="12">
         <sv:property sv:name="jcr:primaryType" sv:type="Name">
-          <sv:value>mgnl:content</sv:value>
+          <sv:value>mgnl:page</sv:value>
         </sv:property>
         <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
           <sv:value>mix:lockable</sv:value>
@@ -491,7 +491,7 @@
     </sv:node>
     <sv:node sv:name="lizards">
       <sv:property sv:name="jcr:primaryType" sv:type="Name">
-        <sv:value>mgnl:content</sv:value>
+        <sv:value>mgnl:page</sv:value>
       </sv:property>
       <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
         <sv:value>mix:lockable</sv:value>
@@ -527,7 +527,7 @@
       </sv:node>
       <sv:node sv:name="5">
         <sv:property sv:name="jcr:primaryType" sv:type="Name">
-          <sv:value>mgnl:content</sv:value>
+          <sv:value>mgnl:page</sv:value>
         </sv:property>
         <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
           <sv:value>mix:lockable</sv:value>
@@ -571,7 +571,7 @@
     </sv:node>
     <sv:node sv:name="snakes">
       <sv:property sv:name="jcr:primaryType" sv:type="Name">
-        <sv:value>mgnl:content</sv:value>
+        <sv:value>mgnl:page</sv:value>
       </sv:property>
       <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
         <sv:value>mix:lockable</sv:value>
@@ -607,7 +607,7 @@
       </sv:node>
       <sv:node sv:name="6">
         <sv:property sv:name="jcr:primaryType" sv:type="Name">
-          <sv:value>mgnl:content</sv:value>
+          <sv:value>mgnl:page</sv:value>
         </sv:property>
         <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
           <sv:value>mix:lockable</sv:value>
@@ -651,7 +651,7 @@
     </sv:node>
     <sv:node sv:name="birds">
       <sv:property sv:name="jcr:primaryType" sv:type="Name">
-        <sv:value>mgnl:content</sv:value>
+        <sv:value>mgnl:page</sv:value>
       </sv:property>
       <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
         <sv:value>mix:lockable</sv:value>
@@ -687,7 +687,7 @@
       </sv:node>
       <sv:node sv:name="9">
         <sv:property sv:name="jcr:primaryType" sv:type="Name">
-          <sv:value>mgnl:content</sv:value>
+          <sv:value>mgnl:page</sv:value>
         </sv:property>
         <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
           <sv:value>mix:lockable</sv:value>
@@ -730,7 +730,7 @@
       </sv:node>
       <sv:node sv:name="11">
         <sv:property sv:name="jcr:primaryType" sv:type="Name">
-          <sv:value>mgnl:content</sv:value>
+          <sv:value>mgnl:page</sv:value>
         </sv:property>
         <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
           <sv:value>mix:lockable</sv:value>
@@ -774,7 +774,7 @@
     </sv:node>
     <sv:node sv:name="hamsters">
       <sv:property sv:name="jcr:primaryType" sv:type="Name">
-        <sv:value>mgnl:content</sv:value>
+        <sv:value>mgnl:page</sv:value>
       </sv:property>
       <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
         <sv:value>mix:lockable</sv:value>
@@ -810,7 +810,7 @@
       </sv:node>
       <sv:node sv:name="2">
         <sv:property sv:name="jcr:primaryType" sv:type="Name">
-          <sv:value>mgnl:content</sv:value>
+          <sv:value>mgnl:page</sv:value>
         </sv:property>
         <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
           <sv:value>mix:lockable</sv:value>

Modified: magnoliamodules/trunk/magnolia5-test-webapp/src/main/webapp/WEB-INF/bootstrap/website.Magnolia-Utils.xml
===================================================================
--- magnoliamodules/trunk/magnolia5-test-webapp/src/main/webapp/WEB-INF/bootstrap/website.Magnolia-Utils.xml	2013-10-20 10:33:54 UTC (rev 4393)
+++ magnoliamodules/trunk/magnolia5-test-webapp/src/main/webapp/WEB-INF/bootstrap/website.Magnolia-Utils.xml	2013-10-20 10:35:42 UTC (rev 4394)
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <sv:node sv:name="Magnolia-Utils" xmlns:sv="http://www.jcp.org/jcr/sv/1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
   <sv:property sv:name="jcr:primaryType" sv:type="Name">
-    <sv:value>mgnl:content</sv:value>
+    <sv:value>mgnl:page</sv:value>
   </sv:property>
   <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
     <sv:value>mix:lockable</sv:value>
@@ -37,7 +37,7 @@
   </sv:node>
   <sv:node sv:name="Magnolia-Utils">
     <sv:property sv:name="jcr:primaryType" sv:type="Name">
-      <sv:value>mgnl:content</sv:value>
+      <sv:value>mgnl:page</sv:value>
     </sv:property>
     <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
       <sv:value>mix:lockable</sv:value>
@@ -76,7 +76,7 @@
     </sv:node>
     <sv:node sv:name="Magnolia-Utils0">
       <sv:property sv:name="jcr:primaryType" sv:type="Name">
-        <sv:value>mgnl:content</sv:value>
+        <sv:value>mgnl:page</sv:value>
       </sv:property>
       <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
         <sv:value>mix:lockable</sv:value>
@@ -213,7 +213,7 @@
   </sv:node>
   <sv:node sv:name="Magnolia-Utils-page2">
     <sv:property sv:name="jcr:primaryType" sv:type="Name">
-      <sv:value>mgnl:content</sv:value>
+      <sv:value>mgnl:page</sv:value>
     </sv:property>
     <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
       <sv:value>mix:lockable</sv:value>

Modified: magnoliamodules/trunk/magnolia5-test-webapp/src/main/webapp/WEB-INF/bootstrap/website.test-MEDIA-113.xml
===================================================================
--- magnoliamodules/trunk/magnolia5-test-webapp/src/main/webapp/WEB-INF/bootstrap/website.test-MEDIA-113.xml	2013-10-20 10:33:54 UTC (rev 4393)
+++ magnoliamodules/trunk/magnolia5-test-webapp/src/main/webapp/WEB-INF/bootstrap/website.test-MEDIA-113.xml	2013-10-20 10:35:42 UTC (rev 4394)
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <sv:node sv:name="test-MEDIA-113" xmlns:sv="http://www.jcp.org/jcr/sv/1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
   <sv:property sv:name="jcr:primaryType" sv:type="Name">
-    <sv:value>mgnl:content</sv:value>
+    <sv:value>mgnl:page</sv:value>
   </sv:property>
   <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
     <sv:value>mix:lockable</sv:value>

Modified: magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/resources/mgnl-bootstrap-samples/contextmenu/website.sample-contextmenu.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/resources/mgnl-bootstrap-samples/contextmenu/website.sample-contextmenu.xml	2013-10-20 10:33:54 UTC (rev 4393)
+++ magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/resources/mgnl-bootstrap-samples/contextmenu/website.sample-contextmenu.xml	2013-10-20 10:35:42 UTC (rev 4394)
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <sv:node sv:name="sample-contextmenu" xmlns:sv="http://www.jcp.org/jcr/sv/1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
   <sv:property sv:name="jcr:primaryType" sv:type="Name">
-    <sv:value>mgnl:content</sv:value>
+    <sv:value>mgnl:page</sv:value>
   </sv:property>
   <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
     <sv:value>mix:lockable</sv:value>

Modified: magnoliamodules/trunk/openutils-mgnlcriteria/src/test/resources/crit-bootstrap/website.00000.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnlcriteria/src/test/resources/crit-bootstrap/website.00000.xml	2013-10-20 10:33:54 UTC (rev 4393)
+++ magnoliamodules/trunk/openutils-mgnlcriteria/src/test/resources/crit-bootstrap/website.00000.xml	2013-10-20 10:35:42 UTC (rev 4394)
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <sv:node sv:name="00000" xmlns:sv="http://www.jcp.org/jcr/sv/1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
   <sv:property sv:name="jcr:primaryType" sv:type="Name">
-    <sv:value>mgnl:content</sv:value>
+    <sv:value>mgnl:page</sv:value>
   </sv:property>
   <sv:property sv:name="jcr:mixinTypes" sv:type="Name">
     <sv:value>mix:lockable</sv:value>
@@ -34,7 +34,7 @@
   </sv:node>
   <sv:node sv:name="900580">
     <sv:property sv:name="jcr:primaryType" sv:type="Name">
-      <sv:value>mgnl:content</sv:value>
+      <sv:value>mgnl:page</sv:value>
     </sv:property>
     <sv:property sv:name="jcr:mixinTypes" sv:type="Name">
       <sv:value>mix:lockable</sv:value>
@@ -312,7 +312,7 @@
   </sv:node>
   <sv:node sv:name="900300">
     <sv:property sv:name="jcr:primaryType" sv:type="Name">
-      <sv:value>mgnl:content</sv:value>
+      <sv:value>mgnl:page</sv:value>
     </sv:property>
     <sv:property sv:name="jcr:mixinTypes" sv:type="Name">
       <sv:value>mix:lockable</sv:value>
@@ -739,7 +739,7 @@
   </sv:node>
   <sv:node sv:name="900581">
     <sv:property sv:name="jcr:primaryType" sv:type="Name">
-      <sv:value>mgnl:content</sv:value>
+      <sv:value>mgnl:page</sv:value>
     </sv:property>
     <sv:property sv:name="jcr:mixinTypes" sv:type="Name">
       <sv:value>mix:lockable</sv:value>
@@ -1017,7 +1017,7 @@
   </sv:node>
   <sv:node sv:name="900582">
     <sv:property sv:name="jcr:primaryType" sv:type="Name">
-      <sv:value>mgnl:content</sv:value>
+      <sv:value>mgnl:page</sv:value>
     </sv:property>
     <sv:property sv:name="jcr:mixinTypes" sv:type="Name">
       <sv:value>mix:lockable</sv:value>
@@ -1295,7 +1295,7 @@
   </sv:node>
   <sv:node sv:name="900301">
     <sv:property sv:name="jcr:primaryType" sv:type="Name">
-      <sv:value>mgnl:content</sv:value>
+      <sv:value>mgnl:page</sv:value>
     </sv:property>
     <sv:property sv:name="jcr:mixinTypes" sv:type="Name">
       <sv:value>mix:lockable</sv:value>
@@ -1651,7 +1651,7 @@
   </sv:node>
   <sv:node sv:name="900583">
     <sv:property sv:name="jcr:primaryType" sv:type="Name">
-      <sv:value>mgnl:content</sv:value>
+      <sv:value>mgnl:page</sv:value>
     </sv:property>
     <sv:property sv:name="jcr:mixinTypes" sv:type="Name">
       <sv:value>mix:lockable</sv:value>
@@ -1929,7 +1929,7 @@
   </sv:node>
   <sv:node sv:name="900396">
     <sv:property sv:name="jcr:primaryType" sv:type="Name">
-      <sv:value>mgnl:content</sv:value>
+      <sv:value>mgnl:page</sv:value>
     </sv:property>
     <sv:property sv:name="jcr:mixinTypes" sv:type="Name">
       <sv:value>mix:lockable</sv:value>
@@ -2164,7 +2164,7 @@
   </sv:node>
   <sv:node sv:name="900397">
     <sv:property sv:name="jcr:primaryType" sv:type="Name">
-      <sv:value>mgnl:content</sv:value>
+      <sv:value>mgnl:page</sv:value>
     </sv:property>
     <sv:property sv:name="jcr:mixinTypes" sv:type="Name">
       <sv:value>mix:lockable</sv:value>
@@ -2399,7 +2399,7 @@
   </sv:node>
   <sv:node sv:name="9003810">
     <sv:property sv:name="jcr:primaryType" sv:type="Name">
-      <sv:value>mgnl:content</sv:value>
+      <sv:value>mgnl:page</sv:value>
     </sv:property>
     <sv:property sv:name="jcr:mixinTypes" sv:type="Name">
       <sv:value>mix:lockable</sv:value>
@@ -2682,7 +2682,7 @@
   </sv:node>
   <sv:node sv:name="900386">
     <sv:property sv:name="jcr:primaryType" sv:type="Name">
-      <sv:value>mgnl:content</sv:value>
+      <sv:value>mgnl:page</sv:value>
     </sv:property>
     <sv:property sv:name="jcr:mixinTypes" sv:type="Name">
       <sv:value>mix:lockable</sv:value>
@@ -2965,7 +2965,7 @@
   </sv:node>
   <sv:node sv:name="900387">
     <sv:property sv:name="jcr:primaryType" sv:type="Name">
-      <sv:value>mgnl:content</sv:value>
+      <sv:value>mgnl:page</sv:value>
     </sv:property>
     <sv:property sv:name="jcr:mixinTypes" sv:type="Name">
       <sv:value>mix:lockable</sv:value>
@@ -3248,7 +3248,7 @@
   </sv:node>
   <sv:node sv:name="900388">
     <sv:property sv:name="jcr:primaryType" sv:type="Name">
-      <sv:value>mgnl:content</sv:value>
+      <sv:value>mgnl:page</sv:value>
     </sv:property>
     <sv:property sv:name="jcr:mixinTypes" sv:type="Name">
       <sv:value>mix:lockable</sv:value>
@@ -3531,7 +3531,7 @@
   </sv:node>
   <sv:node sv:name="900389">
     <sv:property sv:name="jcr:primaryType" sv:type="Name">
-      <sv:value>mgnl:content</sv:value>
+      <sv:value>mgnl:page</sv:value>
     </sv:property>
     <sv:property sv:name="jcr:mixinTypes" sv:type="Name">
       <sv:value>mix:lockable</sv:value>
@@ -3814,7 +3814,7 @@
   </sv:node>
   <sv:node sv:name="1025978">
     <sv:property sv:name="jcr:primaryType" sv:type="Name">
-      <sv:value>mgnl:content</sv:value>
+      <sv:value>mgnl:page</sv:value>
     </sv:property>
     <sv:property sv:name="jcr:mixinTypes" sv:type="Name">
       <sv:value>mix:lockable</sv:value>
@@ -4088,7 +4088,7 @@
   </sv:node>
   <sv:node sv:name="900398">
     <sv:property sv:name="jcr:primaryType" sv:type="Name">
-      <sv:value>mgnl:content</sv:value>
+      <sv:value>mgnl:page</sv:value>
     </sv:property>
     <sv:property sv:name="jcr:mixinTypes" sv:type="Name">
       <sv:value>mix:lockable</sv:value>
@@ -4323,7 +4323,7 @@
   </sv:node>
   <sv:node sv:name="900399">
     <sv:property sv:name="jcr:primaryType" sv:type="Name">
-      <sv:value>mgnl:content</sv:value>
+      <sv:value>mgnl:page</sv:value>
     </sv:property>
     <sv:property sv:name="jcr:mixinTypes" sv:type="Name">
       <sv:value>mix:lockable</sv:value>
@@ -4558,7 +4558,7 @@
   </sv:node>
   <sv:node sv:name="1025979">
     <sv:property sv:name="jcr:primaryType" sv:type="Name">
-      <sv:value>mgnl:content</sv:value>
+      <sv:value>mgnl:page</sv:value>
     </sv:property>
     <sv:property sv:name="jcr:mixinTypes" sv:type="Name">
       <sv:value>mix:lockable</sv:value>
@@ -4832,7 +4832,7 @@
   </sv:node>
   <sv:node sv:name="10259710">
     <sv:property sv:name="jcr:primaryType" sv:type="Name">
-      <sv:value>mgnl:content</sv:value>
+      <sv:value>mgnl:page</sv:value>
     </sv:property>
     <sv:property sv:name="jcr:mixinTypes" sv:type="Name">
       <sv:value>mix:lockable</sv:value>

Modified: magnoliamodules/trunk/openutils-mgnlcriteria/src/test/resources/crit-bootstrap/website.Criteria.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnlcriteria/src/test/resources/crit-bootstrap/website.Criteria.xml	2013-10-20 10:33:54 UTC (rev 4393)
+++ magnoliamodules/trunk/openutils-mgnlcriteria/src/test/resources/crit-bootstrap/website.Criteria.xml	2013-10-20 10:35:42 UTC (rev 4394)
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <sv:node sv:name="Criteria" xmlns:sv="http://www.jcp.org/jcr/sv/1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
   <sv:property sv:name="jcr:primaryType" sv:type="Name">
-    <sv:value>mgnl:content</sv:value>
+    <sv:value>mgnl:page</sv:value>
   </sv:property>
   <sv:property sv:name="jcr:mixinTypes" sv:type="Name">
     <sv:value>mix:lockable</sv:value>
@@ -37,7 +37,7 @@
   </sv:node>
   <sv:node sv:name="AbstractCriteriaImpl">
     <sv:property sv:name="jcr:primaryType" sv:type="Name">
-      <sv:value>mgnl:content</sv:value>
+      <sv:value>mgnl:page</sv:value>
     </sv:property>
     <sv:property sv:name="jcr:mixinTypes" sv:type="Name">
       <sv:value>mix:lockable</sv:value>
@@ -73,7 +73,7 @@
     </sv:node>
     <sv:node sv:name="AbstractMagnoliaCriteriaImpl">
       <sv:property sv:name="jcr:primaryType" sv:type="Name">
-        <sv:value>mgnl:content</sv:value>
+        <sv:value>mgnl:page</sv:value>
       </sv:property>
       <sv:property sv:name="jcr:mixinTypes" sv:type="Name">
         <sv:value>mix:lockable</sv:value>
@@ -109,7 +109,7 @@
       </sv:node>
       <sv:node sv:name="MagnoliaCriteriaImpl">
         <sv:property sv:name="jcr:primaryType" sv:type="Name">
-          <sv:value>mgnl:content</sv:value>
+          <sv:value>mgnl:page</sv:value>
         </sv:property>
         <sv:property sv:name="jcr:mixinTypes" sv:type="Name">
           <sv:value>mix:lockable</sv:value>
@@ -145,7 +145,7 @@
         </sv:node>
         <sv:node sv:name="MagnoliaCriteriaWithLimitImpl">
           <sv:property sv:name="jcr:primaryType" sv:type="Name">
-            <sv:value>mgnl:content</sv:value>
+            <sv:value>mgnl:page</sv:value>
           </sv:property>
           <sv:property sv:name="jcr:mixinTypes" sv:type="Name">
             <sv:value>mix:lockable</sv:value>
@@ -184,7 +184,7 @@
     </sv:node>
     <sv:node sv:name="AdvancedCriteriaImpl">
       <sv:property sv:name="jcr:primaryType" sv:type="Name">
-        <sv:value>mgnl:content</sv:value>
+        <sv:value>mgnl:page</sv:value>
       </sv:property>
       <sv:property sv:name="jcr:mixinTypes" sv:type="Name">
         <sv:value>mix:lockable</sv:value>
@@ -222,7 +222,7 @@
   </sv:node>
   <sv:node sv:name="AdvancedCriteriaImpl">
     <sv:property sv:name="jcr:primaryType" sv:type="Name">
-      <sv:value>mgnl:content</sv:value>
+      <sv:value>mgnl:page</sv:value>
     </sv:property>
     <sv:property sv:name="jcr:mixinTypes" sv:type="Name">
       <sv:value>mix:lockable</sv:value>
@@ -259,7 +259,7 @@
   </sv:node>
   <sv:node sv:name="TranslatableCriteria">
     <sv:property sv:name="jcr:primaryType" sv:type="Name">
-      <sv:value>mgnl:content</sv:value>
+      <sv:value>mgnl:page</sv:value>
     </sv:property>
     <sv:property sv:name="jcr:mixinTypes" sv:type="Name">
       <sv:value>mix:lockable</sv:value>
@@ -295,7 +295,7 @@
     </sv:node>
     <sv:node sv:name="AbstractCriteriaImpl">
       <sv:property sv:name="jcr:primaryType" sv:type="Name">
-        <sv:value>mgnl:content</sv:value>
+        <sv:value>mgnl:page</sv:value>
       </sv:property>
       <sv:property sv:name="jcr:mixinTypes" sv:type="Name">
         <sv:value>mix:lockable</sv:value>
@@ -331,7 +331,7 @@
       </sv:node>
       <sv:node sv:name="AbstractMagnoliaCriteriaImpl">
         <sv:property sv:name="jcr:primaryType" sv:type="Name">
-          <sv:value>mgnl:content</sv:value>
+          <sv:value>mgnl:page</sv:value>
         </sv:property>
         <sv:property sv:name="jcr:mixinTypes" sv:type="Name">
           <sv:value>mix:lockable</sv:value>
@@ -367,7 +367,7 @@
         </sv:node>
         <sv:node sv:name="MagnoliaCriteriaImpl">
           <sv:property sv:name="jcr:primaryType" sv:type="Name">
-            <sv:value>mgnl:content</sv:value>
+            <sv:value>mgnl:page</sv:value>
           </sv:property>
           <sv:property sv:name="jcr:mixinTypes" sv:type="Name">
             <sv:value>mix:lockable</sv:value>
@@ -403,7 +403,7 @@
           </sv:node>
           <sv:node sv:name="MagnoliaCriteriaWithLimitImpl">
             <sv:property sv:name="jcr:primaryType" sv:type="Name">
-              <sv:value>mgnl:content</sv:value>
+              <sv:value>mgnl:page</sv:value>
             </sv:property>
             <sv:property sv:name="jcr:mixinTypes" sv:type="Name">
               <sv:value>mix:lockable</sv:value>
@@ -442,7 +442,7 @@
       </sv:node>
       <sv:node sv:name="AdvancedCriteriaImpl">
         <sv:property sv:name="jcr:primaryType" sv:type="Name">
-          <sv:value>mgnl:content</sv:value>
+          <sv:value>mgnl:page</sv:value>
         </sv:property>
         <sv:property sv:name="jcr:mixinTypes" sv:type="Name">
           <sv:value>mix:lockable</sv:value>

Modified: magnoliamodules/trunk/openutils-mgnlcriteria/src/test/resources/crit-bootstrap/website.Lorem ipsum dolor sit amet.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnlcriteria/src/test/resources/crit-bootstrap/website.Lorem ipsum dolor sit amet.xml	2013-10-20 10:33:54 UTC (rev 4393)
+++ magnoliamodules/trunk/openutils-mgnlcriteria/src/test/resources/crit-bootstrap/website.Lorem ipsum dolor sit amet.xml	2013-10-20 10:35:42 UTC (rev 4394)
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <sv:node sv:name="Lorem ipsum dolor sit amet" xmlns:sv="http://www.jcp.org/jcr/sv/1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
   <sv:property sv:name="jcr:primaryType" sv:type="Name">
-    <sv:value>mgnl:content</sv:value>
+    <sv:value>mgnl:page</sv:value>
   </sv:property>
   <sv:property sv:name="jcr:mixinTypes" sv:type="Name">
     <sv:value>mix:lockable</sv:value>
@@ -34,7 +34,7 @@
   </sv:node>
   <sv:node sv:name="consectetur adipisici elit">
     <sv:property sv:name="jcr:primaryType" sv:type="Name">
-      <sv:value>mgnl:content</sv:value>
+      <sv:value>mgnl:page</sv:value>
     </sv:property>
     <sv:property sv:name="jcr:mixinTypes" sv:type="Name">
       <sv:value>mix:lockable</sv:value>

Modified: magnoliamodules/trunk/openutils-mgnlcriteria/src/test/resources/crit-bootstrap/website.contains.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnlcriteria/src/test/resources/crit-bootstrap/website.contains.xml	2013-10-20 10:33:54 UTC (rev 4393)
+++ magnoliamodules/trunk/openutils-mgnlcriteria/src/test/resources/crit-bootstrap/website.contains.xml	2013-10-20 10:35:42 UTC (rev 4394)
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <sv:node sv:name="contains" xmlns:sv="http://www.jcp.org/jcr/sv/1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
   <sv:property sv:name="jcr:primaryType" sv:type="Name">
-    <sv:value>mgnl:content</sv:value>
+    <sv:value>mgnl:page</sv:value>
   </sv:property>
   <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
     <sv:value>mix:lockable</sv:value>
@@ -34,7 +34,7 @@
   </sv:node>
   <sv:node sv:name="test1">
     <sv:property sv:name="jcr:primaryType" sv:type="Name">
-      <sv:value>mgnl:content</sv:value>
+      <sv:value>mgnl:page</sv:value>
     </sv:property>
     <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
       <sv:value>mix:lockable</sv:value>
@@ -74,7 +74,7 @@
   </sv:node>
   <sv:node sv:name="test2">
     <sv:property sv:name="jcr:primaryType" sv:type="Name">
-      <sv:value>mgnl:content</sv:value>
+      <sv:value>mgnl:page</sv:value>
     </sv:property>
     <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
       <sv:value>mix:lockable</sv:value>
@@ -114,7 +114,7 @@
   </sv:node>
   <sv:node sv:name="milano">
     <sv:property sv:name="jcr:primaryType" sv:type="Name">
-      <sv:value>mgnl:content</sv:value>
+      <sv:value>mgnl:page</sv:value>
     </sv:property>
     <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
       <sv:value>mix:lockable</sv:value>
@@ -154,7 +154,7 @@
   </sv:node>
   <sv:node sv:name="lorem">
     <sv:property sv:name="jcr:primaryType" sv:type="Name">
-      <sv:value>mgnl:content</sv:value>
+      <sv:value>mgnl:page</sv:value>
     </sv:property>
     <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
       <sv:value>mix:lockable</sv:value>
@@ -191,7 +191,7 @@
   </sv:node>
   <sv:node sv:name="lorem-ipsum">
     <sv:property sv:name="jcr:primaryType" sv:type="Name">
-      <sv:value>mgnl:content</sv:value>
+      <sv:value>mgnl:page</sv:value>
     </sv:property>
     <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
       <sv:value>mix:lockable</sv:value>
@@ -237,7 +237,7 @@
   </sv:node>
   <sv:node sv:name="dolor-sit">
     <sv:property sv:name="jcr:primaryType" sv:type="Name">
-      <sv:value>mgnl:content</sv:value>
+      <sv:value>mgnl:page</sv:value>
     </sv:property>
     <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
       <sv:value>mix:lockable</sv:value>
@@ -277,7 +277,7 @@
   </sv:node>
   <sv:node sv:name="dolor-sit-amet">
     <sv:property sv:name="jcr:primaryType" sv:type="Name">
-      <sv:value>mgnl:content</sv:value>
+      <sv:value>mgnl:page</sv:value>
     </sv:property>
     <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
       <sv:value>mix:lockable</sv:value>
@@ -317,7 +317,7 @@
   </sv:node>
   <sv:node sv:name="colon">
     <sv:property sv:name="jcr:primaryType" sv:type="Name">
-      <sv:value>mgnl:content</sv:value>
+      <sv:value>mgnl:page</sv:value>
     </sv:property>
     <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
       <sv:value>mix:lockable</sv:value>

Modified: magnoliamodules/trunk/openutils-mgnlcriteria/src/test/resources/crit-bootstrap/website.escape-sign.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnlcriteria/src/test/resources/crit-bootstrap/website.escape-sign.xml	2013-10-20 10:33:54 UTC (rev 4393)
+++ magnoliamodules/trunk/openutils-mgnlcriteria/src/test/resources/crit-bootstrap/website.escape-sign.xml	2013-10-20 10:35:42 UTC (rev 4394)
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <sv:node sv:name="escape-sign" xmlns:sv="http://www.jcp.org/jcr/sv/1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
   <sv:property sv:name="jcr:primaryType" sv:type="Name">
-    <sv:value>mgnl:content</sv:value>
+    <sv:value>mgnl:page</sv:value>
   </sv:property>
   <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
     <sv:value>mix:lockable</sv:value>
@@ -34,7 +34,7 @@
   </sv:node>
   <sv:node sv:name="fo°o">
     <sv:property sv:name="jcr:primaryType" sv:type="Name">
-      <sv:value>mgnl:content</sv:value>
+      <sv:value>mgnl:page</sv:value>
     </sv:property>
     <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
       <sv:value>mix:lockable</sv:value>
@@ -67,7 +67,7 @@
     </sv:node>
     <sv:node sv:name="bar">
       <sv:property sv:name="jcr:primaryType" sv:type="Name">
-        <sv:value>mgnl:content</sv:value>
+        <sv:value>mgnl:page</sv:value>
       </sv:property>
       <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
         <sv:value>mix:lockable</sv:value>
@@ -102,7 +102,7 @@
   </sv:node>
   <sv:node sv:name="fo$o">
     <sv:property sv:name="jcr:primaryType" sv:type="Name">
-      <sv:value>mgnl:content</sv:value>
+      <sv:value>mgnl:page</sv:value>
     </sv:property>
     <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
       <sv:value>mix:lockable</sv:value>
@@ -138,7 +138,7 @@
     </sv:node>
     <sv:node sv:name="baz">
       <sv:property sv:name="jcr:primaryType" sv:type="Name">
-        <sv:value>mgnl:content</sv:value>
+        <sv:value>mgnl:page</sv:value>
       </sv:property>
       <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
         <sv:value>mix:lockable</sv:value>

Modified: magnoliamodules/trunk/openutils-mgnlcriteria/src/test/resources/crit-bootstrap/website.letters.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnlcriteria/src/test/resources/crit-bootstrap/website.letters.xml	2013-10-20 10:33:54 UTC (rev 4393)
+++ magnoliamodules/trunk/openutils-mgnlcriteria/src/test/resources/crit-bootstrap/website.letters.xml	2013-10-20 10:35:42 UTC (rev 4394)
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <sv:node sv:name="letters" xmlns:sv="http://www.jcp.org/jcr/sv/1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
   <sv:property sv:name="jcr:primaryType" sv:type="Name">
-    <sv:value>mgnl:content</sv:value>
+    <sv:value>mgnl:page</sv:value>
   </sv:property>
   <sv:property sv:name="jcr:mixinTypes" sv:type="Name">
     <sv:value>mix:lockable</sv:value>
@@ -37,7 +37,7 @@
   </sv:node>
   <sv:node sv:name="a">
     <sv:property sv:name="jcr:primaryType" sv:type="Name">
-      <sv:value>mgnl:content</sv:value>
+      <sv:value>mgnl:page</sv:value>
     </sv:property>
     <sv:property sv:name="jcr:mixinTypes" sv:type="Name">
       <sv:value>mix:lockable</sv:value>
@@ -74,7 +74,7 @@
   </sv:node>
   <sv:node sv:name="b">
     <sv:property sv:name="jcr:primaryType" sv:type="Name">
-      <sv:value>mgnl:content</sv:value>
+      <sv:value>mgnl:page</sv:value>
     </sv:property>
     <sv:property sv:name="jcr:mixinTypes" sv:type="Name">
       <sv:value>mix:lockable</sv:value>
@@ -114,7 +114,7 @@
   </sv:node>
   <sv:node sv:name="c">
     <sv:property sv:name="jcr:primaryType" sv:type="Name">
-      <sv:value>mgnl:content</sv:value>
+      <sv:value>mgnl:page</sv:value>
     </sv:property>
     <sv:property sv:name="jcr:mixinTypes" sv:type="Name">
       <sv:value>mix:lockable</sv:value>
@@ -154,7 +154,7 @@
   </sv:node>
   <sv:node sv:name="d">
     <sv:property sv:name="jcr:primaryType" sv:type="Name">
-      <sv:value>mgnl:content</sv:value>
+      <sv:value>mgnl:page</sv:value>
     </sv:property>
     <sv:property sv:name="jcr:mixinTypes" sv:type="Name">
       <sv:value>mix:lockable</sv:value>
@@ -194,7 +194,7 @@
   </sv:node>
   <sv:node sv:name="e">
     <sv:property sv:name="jcr:primaryType" sv:type="Name">
-      <sv:value>mgnl:content</sv:value>
+      <sv:value>mgnl:page</sv:value>
     </sv:property>
     <sv:property sv:name="jcr:mixinTypes" sv:type="Name">
       <sv:value>mix:lockable</sv:value>
@@ -234,7 +234,7 @@
   </sv:node>
   <sv:node sv:name="f">
     <sv:property sv:name="jcr:primaryType" sv:type="Name">
-      <sv:value>mgnl:content</sv:value>
+      <sv:value>mgnl:page</sv:value>
     </sv:property>
     <sv:property sv:name="jcr:mixinTypes" sv:type="Name">
       <sv:value>mix:lockable</sv:value>
@@ -274,7 +274,7 @@
   </sv:node>
   <sv:node sv:name="g">
     <sv:property sv:name="jcr:primaryType" sv:type="Name">
-      <sv:value>mgnl:content</sv:value>
+      <sv:value>mgnl:page</sv:value>
     </sv:property>
     <sv:property sv:name="jcr:mixinTypes" sv:type="Name">
       <sv:value>mix:lockable</sv:value>
@@ -314,7 +314,7 @@
   </sv:node>
   <sv:node sv:name="h">
     <sv:property sv:name="jcr:primaryType" sv:type="Name">
-      <sv:value>mgnl:content</sv:value>
+      <sv:value>mgnl:page</sv:value>
     </sv:property>
     <sv:property sv:name="jcr:mixinTypes" sv:type="Name">
       <sv:value>mix:lockable</sv:value>
@@ -354,7 +354,7 @@
   </sv:node>
   <sv:node sv:name="i">
     <sv:property sv:name="jcr:primaryType" sv:type="Name">
-      <sv:value>mgnl:content</sv:value>
+      <sv:value>mgnl:page</sv:value>
     </sv:property>
     <sv:property sv:name="jcr:mixinTypes" sv:type="Name">
       <sv:value>mix:lockable</sv:value>
@@ -394,7 +394,7 @@
   </sv:node>
   <sv:node sv:name="j">
     <sv:property sv:name="jcr:primaryType" sv:type="Name">
-      <sv:value>mgnl:content</sv:value>
+      <sv:value>mgnl:page</sv:value>
     </sv:property>
     <sv:property sv:name="jcr:mixinTypes" sv:type="Name">
       <sv:value>mix:lockable</sv:value>
@@ -434,7 +434,7 @@
   </sv:node>
   <sv:node sv:name="k">
     <sv:property sv:name="jcr:primaryType" sv:type="Name">
-      <sv:value>mgnl:content</sv:value>
+      <sv:value>mgnl:page</sv:value>
     </sv:property>
     <sv:property sv:name="jcr:mixinTypes" sv:type="Name">
       <sv:value>mix:lockable</sv:value>
@@ -471,7 +471,7 @@
   </sv:node>
   <sv:node sv:name="l">
     <sv:property sv:name="jcr:primaryType" sv:type="Name">
-      <sv:value>mgnl:content</sv:value>
+      <sv:value>mgnl:page</sv:value>
     </sv:property>
     <sv:property sv:name="jcr:mixinTypes" sv:type="Name">
       <sv:value>mix:lockable</sv:value>
@@ -508,7 +508,7 @@
   </sv:node>
   <sv:node sv:name="m">
     <sv:property sv:name="jcr:primaryType" sv:type="Name">
-      <sv:value>mgnl:content</sv:value>
+      <sv:value>mgnl:page</sv:value>
     </sv:property>
     <sv:property sv:name="jcr:mixinTypes" sv:type="Name">
       <sv:value>mix:lockable</sv:value>
@@ -545,7 +545,7 @@
   </sv:node>
   <sv:node sv:name="n">
     <sv:property sv:name="jcr:primaryType" sv:type="Name">
-      <sv:value>mgnl:content</sv:value>
+      <sv:value>mgnl:page</sv:value>
     </sv:property>
     <sv:property sv:name="jcr:mixinTypes" sv:type="Name">
       <sv:value>mix:lockable</sv:value>
@@ -582,7 +582,7 @@
   </sv:node>
   <sv:node sv:name="o">
     <sv:property sv:name="jcr:primaryType" sv:type="Name">
-      <sv:value>mgnl:content</sv:value>
+      <sv:value>mgnl:page</sv:value>
     </sv:property>
     <sv:property sv:name="jcr:mixinTypes" sv:type="Name">
       <sv:value>mix:lockable</sv:value>
@@ -619,7 +619,7 @@
   </sv:node>
   <sv:node sv:name="p">
     <sv:property sv:name="jcr:primaryType" sv:type="Name">
-      <sv:value>mgnl:content</sv:value>
+      <sv:value>mgnl:page</sv:value>
     </sv:property>
     <sv:property sv:name="jcr:mixinTypes" sv:type="Name">
       <sv:value>mix:lockable</sv:value>
@@ -656,7 +656,7 @@
   </sv:node>
   <sv:node sv:name="q">
     <sv:property sv:name="jcr:primaryType" sv:type="Name">
-      <sv:value>mgnl:content</sv:value>
+      <sv:value>mgnl:page</sv:value>
     </sv:property>
     <sv:property sv:name="jcr:mixinTypes" sv:type="Name">
       <sv:value>mix:lockable</sv:value>
@@ -693,7 +693,7 @@
   </sv:node>
   <sv:node sv:name="r">
     <sv:property sv:name="jcr:primaryType" sv:type="Name">
-      <sv:value>mgnl:content</sv:value>
+      <sv:value>mgnl:page</sv:value>
     </sv:property>
     <sv:property sv:name="jcr:mixinTypes" sv:type="Name">
       <sv:value>mix:lockable</sv:value>
@@ -730,7 +730,7 @@
   </sv:node>
   <sv:node sv:name="s">
     <sv:property sv:name="jcr:primaryType" sv:type="Name">
-      <sv:value>mgnl:content</sv:value>
+      <sv:value>mgnl:page</sv:value>
     </sv:property>
     <sv:property sv:name="jcr:mixinTypes" sv:type="Name">
       <sv:value>mix:lockable</sv:value>
@@ -770,7 +770,7 @@
   </sv:node>
   <sv:node sv:name="t">
     <sv:property sv:name="jcr:primaryType" sv:type="Name">
-      <sv:value>mgnl:content</sv:value>
+      <sv:value>mgnl:page</sv:value>
     </sv:property>
     <sv:property sv:name="jcr:mixinTypes" sv:type="Name">
       <sv:value>mix:lockable</sv:value>
@@ -810,7 +810,7 @@
   </sv:node>
   <sv:node sv:name="u">
     <sv:property sv:name="jcr:primaryType" sv:type="Name">
-      <sv:value>mgnl:content</sv:value>
+      <sv:value>mgnl:page</sv:value>
     </sv:property>
     <sv:property sv:name="jcr:mixinTypes" sv:type="Name">
       <sv:value>mix:lockable</sv:value>
@@ -850,7 +850,7 @@
   </sv:node>
   <sv:node sv:name="v">
     <sv:property sv:name="jcr:primaryType" sv:type="Name">
-      <sv:value>mgnl:content</sv:value>
+      <sv:value>mgnl:page</sv:value>
     </sv:property>
     <sv:property sv:name="jcr:mixinTypes" sv:type="Name">
       <sv:value>mix:lockable</sv:value>
@@ -890,7 +890,7 @@
   </sv:node>
   <sv:node sv:name="w">
     <sv:property sv:name="jcr:primaryType" sv:type="Name">
-      <sv:value>mgnl:content</sv:value>
+      <sv:value>mgnl:page</sv:value>
     </sv:property>
     <sv:property sv:name="jcr:mixinTypes" sv:type="Name">
       <sv:value>mix:lockable</sv:value>
@@ -930,7 +930,7 @@
   </sv:node>
   <sv:node sv:name="x">
     <sv:property sv:name="jcr:primaryType" sv:type="Name">
-      <sv:value>mgnl:content</sv:value>
+      <sv:value>mgnl:page</sv:value>
     </sv:property>
     <sv:property sv:name="jcr:mixinTypes" sv:type="Name">
       <sv:value>mix:lockable</sv:value>
@@ -970,7 +970,7 @@
   </sv:node>
   <sv:node sv:name="y">
     <sv:property sv:name="jcr:primaryType" sv:type="Name">
-      <sv:value>mgnl:content</sv:value>
+      <sv:value>mgnl:page</sv:value>
     </sv:property>
     <sv:property sv:name="jcr:mixinTypes" sv:type="Name">
       <sv:value>mix:lockable</sv:value>
@@ -1010,7 +1010,7 @@
   </sv:node>
   <sv:node sv:name="z">
     <sv:property sv:name="jcr:primaryType" sv:type="Name">
-      <sv:value>mgnl:content</sv:value>
+      <sv:value>mgnl:page</sv:value>
     </sv:property>
     <sv:property sv:name="jcr:mixinTypes" sv:type="Name">
       <sv:value>mix:lockable</sv:value>

Modified: magnoliamodules/trunk/openutils-mgnlcriteria/src/test/resources/crit-bootstrap/website.myproject.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnlcriteria/src/test/resources/crit-bootstrap/website.myproject.xml	2013-10-20 10:33:54 UTC (rev 4393)
+++ magnoliamodules/trunk/openutils-mgnlcriteria/src/test/resources/crit-bootstrap/website.myproject.xml	2013-10-20 10:35:42 UTC (rev 4394)
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <sv:node sv:name="myproject" xmlns:sv="http://www.jcp.org/jcr/sv/1.0">
   <sv:property sv:name="jcr:primaryType" sv:type="Name">
-    <sv:value>mgnl:content</sv:value>
+    <sv:value>mgnl:page</sv:value>
   </sv:property>
   <sv:property sv:name="jcr:mixinTypes" sv:type="Name">
     <sv:value>mix:lockable</sv:value>
@@ -31,7 +31,7 @@
   </sv:node>
   <sv:node sv:name="Notizie-Meteo">
     <sv:property sv:name="jcr:primaryType" sv:type="Name">
-      <sv:value>mgnl:content</sv:value>
+      <sv:value>mgnl:page</sv:value>
     </sv:property>
     <sv:property sv:name="jcr:mixinTypes" sv:type="Name">
       <sv:value>mix:lockable</sv:value>
@@ -62,7 +62,7 @@
   </sv:node>
   <sv:node sv:name="Sport">
     <sv:property sv:name="jcr:primaryType" sv:type="Name">
-      <sv:value>mgnl:content</sv:value>
+      <sv:value>mgnl:page</sv:value>
     </sv:property>
     <sv:property sv:name="jcr:mixinTypes" sv:type="Name">
       <sv:value>mix:lockable</sv:value>
@@ -92,7 +92,7 @@
     </sv:node>
     <sv:node sv:name="F1">
       <sv:property sv:name="jcr:primaryType" sv:type="Name">
-        <sv:value>mgnl:content</sv:value>
+        <sv:value>mgnl:page</sv:value>
       </sv:property>
       <sv:property sv:name="jcr:mixinTypes" sv:type="Name">
         <sv:value>mix:lockable</sv:value>
@@ -207,7 +207,7 @@
     </sv:node>
     <sv:node sv:name="Tennis">
       <sv:property sv:name="jcr:primaryType" sv:type="Name">
-        <sv:value>mgnl:content</sv:value>
+        <sv:value>mgnl:page</sv:value>
       </sv:property>
       <sv:property sv:name="jcr:mixinTypes" sv:type="Name">
         <sv:value>mix:lockable</sv:value>
@@ -238,7 +238,7 @@
     </sv:node>
     <sv:node sv:name="Calcio">
       <sv:property sv:name="jcr:primaryType" sv:type="Name">
-        <sv:value>mgnl:content</sv:value>
+        <sv:value>mgnl:page</sv:value>
       </sv:property>
       <sv:property sv:name="jcr:mixinTypes" sv:type="Name">
         <sv:value>mix:lockable</sv:value>
@@ -269,7 +269,7 @@
     </sv:node>
     <sv:node sv:name="Atletica">
       <sv:property sv:name="jcr:primaryType" sv:type="Name">
-        <sv:value>mgnl:content</sv:value>
+        <sv:value>mgnl:page</sv:value>
       </sv:property>
       <sv:property sv:name="jcr:mixinTypes" sv:type="Name">
         <sv:value>mix:lockable</sv:value>
@@ -300,7 +300,7 @@
     </sv:node>
     <sv:node sv:name="Basket">
       <sv:property sv:name="jcr:primaryType" sv:type="Name">
-        <sv:value>mgnl:content</sv:value>
+        <sv:value>mgnl:page</sv:value>
       </sv:property>
       <sv:property sv:name="jcr:mixinTypes" sv:type="Name">
         <sv:value>mix:lockable</sv:value>
@@ -332,7 +332,7 @@
   </sv:node>
   <sv:node sv:name="Divertimento">
     <sv:property sv:name="jcr:primaryType" sv:type="Name">
-      <sv:value>mgnl:content</sv:value>
+      <sv:value>mgnl:page</sv:value>
     </sv:property>
     <sv:property sv:name="jcr:mixinTypes" sv:type="Name">
       <sv:value>mix:lockable</sv:value>

Modified: magnoliamodules/trunk/openutils-mgnlcriteria/src/test/resources/crit-bootstrap/website.pets.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnlcriteria/src/test/resources/crit-bootstrap/website.pets.xml	2013-10-20 10:33:54 UTC (rev 4393)
+++ magnoliamodules/trunk/openutils-mgnlcriteria/src/test/resources/crit-bootstrap/website.pets.xml	2013-10-20 10:35:42 UTC (rev 4394)
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <sv:node sv:name="pets" xmlns:sv="http://www.jcp.org/jcr/sv/1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
   <sv:property sv:name="jcr:primaryType" sv:type="Name">
-    <sv:value>mgnl:content</sv:value>
+    <sv:value>mgnl:page</sv:value>
   </sv:property>
   <sv:property sv:name="jcr:mixinTypes" sv:type="Name">
     <sv:value>mix:lockable</sv:value>
@@ -37,7 +37,7 @@
   </sv:node>
   <sv:node sv:name="cats">
     <sv:property sv:name="jcr:primaryType" sv:type="Name">
-      <sv:value>mgnl:content</sv:value>
+      <sv:value>mgnl:page</sv:value>
     </sv:property>
     <sv:property sv:name="jcr:mixinTypes" sv:type="Name">
       <sv:value>mix:lockable</sv:value>
@@ -67,7 +67,7 @@
     </sv:node>
     <sv:node sv:name="1">
       <sv:property sv:name="jcr:primaryType" sv:type="Name">
-        <sv:value>mgnl:content</sv:value>
+        <sv:value>mgnl:page</sv:value>
       </sv:property>
       <sv:property sv:name="jcr:mixinTypes" sv:type="Name">
         <sv:value>mix:lockable</sv:value>
@@ -110,7 +110,7 @@
     </sv:node>
     <sv:node sv:name="7">
       <sv:property sv:name="jcr:primaryType" sv:type="Name">
-        <sv:value>mgnl:content</sv:value>
+        <sv:value>mgnl:page</sv:value>
       </sv:property>
       <sv:property sv:name="jcr:mixinTypes" sv:type="Name">
         <sv:value>mix:lockable</sv:value>
@@ -153,7 +153,7 @@
     </sv:node>
     <sv:node sv:name="8">
       <sv:property sv:name="jcr:primaryType" sv:type="Name">
-        <sv:value>mgnl:content</sv:value>
+        <sv:value>mgnl:page</sv:value>
       </sv:property>
       <sv:property sv:name="jcr:mixinTypes" sv:type="Name">
         <sv:value>mix:lockable</sv:value>
@@ -196,7 +196,7 @@
     </sv:node>
     <sv:node sv:name="13">
       <sv:property sv:name="jcr:primaryType" sv:type="Name">
-        <sv:value>mgnl:content</sv:value>
+        <sv:value>mgnl:page</sv:value>
       </sv:property>
       <sv:property sv:name="jcr:mixinTypes" sv:type="Name">
         <sv:value>mix:lockable</sv:value>
@@ -240,7 +240,7 @@
   </sv:node>
   <sv:node sv:name="dogs">
     <sv:property sv:name="jcr:primaryType" sv:type="Name">
-      <sv:value>mgnl:content</sv:value>
+      <sv:value>mgnl:page</sv:value>
     </sv:property>
     <sv:property sv:name="jcr:mixinTypes" sv:type="Name">
       <sv:value>mix:lockable</sv:value>
@@ -270,7 +270,7 @@
     </sv:node>
     <sv:node sv:name="3">
       <sv:property sv:name="jcr:primaryType" sv:type="Name">
-        <sv:value>mgnl:content</sv:value>
+        <sv:value>mgnl:page</sv:value>
       </sv:property>
       <sv:property sv:name="jcr:mixinTypes" sv:type="Name">
         <sv:value>mix:lockable</sv:value>
@@ -313,7 +313,7 @@
     </sv:node>
     <sv:node sv:name="4">
       <sv:property sv:name="jcr:primaryType" sv:type="Name">
-        <sv:value>mgnl:content</sv:value>
+        <sv:value>mgnl:page</sv:value>
       </sv:property>
       <sv:property sv:name="jcr:mixinTypes" sv:type="Name">
         <sv:value>mix:lockable</sv:value>
@@ -356,7 +356,7 @@
     </sv:node>
     <sv:node sv:name="10">
       <sv:property sv:name="jcr:primaryType" sv:type="Name">
-        <sv:value>mgnl:content</sv:value>
+        <sv:value>mgnl:page</sv:value>
       </sv:property>
       <sv:property sv:name="jcr:mixinTypes" sv:type="Name">
         <sv:value>mix:lockable</sv:value>
@@ -399,7 +399,7 @@
     </sv:node>
     <sv:node sv:name="12">
       <sv:property sv:name="jcr:primaryType" sv:type="Name">
-        <sv:value>mgnl:content</sv:value>
+        <sv:value>mgnl:page</sv:value>
       </sv:property>
       <sv:property sv:name="jcr:mixinTypes" sv:type="Name">
         <sv:value>mix:lockable</sv:value>
@@ -443,7 +443,7 @@
   </sv:node>
   <sv:node sv:name="lizards">
     <sv:property sv:name="jcr:primaryType" sv:type="Name">
-      <sv:value>mgnl:content</sv:value>
+      <sv:value>mgnl:page</sv:value>
     </s...
 
[truncated message content]

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

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

Revision: 4393
          http://openutils.svn.sourceforge.net/openutils/?rev=4393&view=rev
Author:   fgiust
Date:     2013-10-20 10:33:54 +0000 (Sun, 20 Oct 2013)
Log Message:
-----------
remove duplicate contextpath

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

Modified: magnoliamodules/trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/media/pages/MediaFolderViewPage.html
===================================================================
--- magnoliamodules/trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/media/pages/MediaFolderViewPage.html	2013-10-20 08:31:41 UTC (rev 4392)
+++ magnoliamodules/trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/media/pages/MediaFolderViewPage.html	2013-10-20 10:33:54 UTC (rev 4393)
@@ -547,7 +547,7 @@
                 [#list media.usedInNodes?values[key_index].items as node]
                 <li>
                   [#assign link = this.link(node)]
-                  <a href="${this.request.contextPath}${link}" target="_blank">
+                  <a href="${link}" target="_blank">
                     ${link}
                   </a>
                 </li>

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

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

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

Revision: 4392
          http://openutils.svn.sourceforge.net/openutils/?rev=4392&view=rev
Author:   fgiust
Date:     2013-10-20 08:31:41 +0000 (Sun, 20 Oct 2013)
Log Message:
-----------
working node wrapping, refactored list of references in media interface

Modified Paths:
--------------
    magnoliamodules/trunk/magnolia-test-webapp/src/main/java/info/magnolia/module/development/DevModuleVersionHandler.java
    magnoliamodules/trunk/openutils-mgnllms/src/main/resources/mgnl-bootstrap-samples/mgnllms/website.sample-lms.xml
    magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/pages/MediaBean.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/pages/MediaFolderViewPage.java
    magnoliamodules/trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap-samples/media/config.modules.media.dialogs.samples-media.xml
    magnoliamodules/trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap-samples/media/config.modules.media.dialogs.samples-mediatag.xml
    magnoliamodules/trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/media/pages/MediaFolderViewPage.html
    magnoliamodules/trunk/openutils-mgnlutils/src/main/java/it/openutils/mgnlutils/api/NodeUtilsExt.java

Added Paths:
-----------
    magnoliamodules/trunk/openutils-mgnltagcloud/src/main/resources/mgnl-bootstrap-samples/tagcloud/config.modules.tagcloud.clouds.tags.xml
    magnoliamodules/trunk/openutils-mgnltagcloud/src/main/resources/mgnl-bootstrap-samples/tagcloud/config.modules.tagcloud.dialogs.sample-tagcloud.xml

Removed Paths:
-------------
    magnoliamodules/trunk/openutils-mgnltagcloud/src/main/resources/mgnl-bootstrap-samples/tagcloud/config.modules.tagcloud.clouds.xml
    magnoliamodules/trunk/openutils-mgnltagcloud/src/main/resources/mgnl-bootstrap-samples/tagcloud/config.modules.tagcloud.dialogs.xml

Modified: magnoliamodules/trunk/magnolia-test-webapp/src/main/java/info/magnolia/module/development/DevModuleVersionHandler.java
===================================================================
--- magnoliamodules/trunk/magnolia-test-webapp/src/main/java/info/magnolia/module/development/DevModuleVersionHandler.java	2013-10-19 21:38:17 UTC (rev 4391)
+++ magnoliamodules/trunk/magnolia-test-webapp/src/main/java/info/magnolia/module/development/DevModuleVersionHandler.java	2013-10-20 08:31:41 UTC (rev 4392)
@@ -1,10 +1,11 @@
 package info.magnolia.module.development;
 
-import info.magnolia.cms.core.SystemProperty;
+import info.magnolia.init.MagnoliaConfigurationProperties;
 import info.magnolia.module.DefaultModuleVersionHandler;
 import info.magnolia.module.InstallContext;
 import info.magnolia.module.delta.SetPropertyTask;
 import info.magnolia.module.delta.Task;
+import info.magnolia.objectfactory.Components;
 import info.magnolia.repository.RepositoryConstants;
 import it.openutils.mgnltasks.NodeSortTask;
 
@@ -28,7 +29,8 @@
     {
         List<Task> tasks = new ArrayList<Task>();
 
-        boolean develop = SystemProperty.getBooleanProperty("magnolia.develop");
+        boolean develop = Components.getComponent(MagnoliaConfigurationProperties.class).getBooleanProperty(
+            "magnolia.develop");
 
         if (develop)
         {
@@ -37,12 +39,13 @@
                 "/server/activation/subscribers/magnoliaPublic8080",
                 "active",
                 "false"));
-
         }
 
         // I hate spending time in looking through the unsorted list of modules...
         tasks.add(new NodeSortTask(RepositoryConstants.CONFIG, "/modules"));
 
+       // tasks.add(new SetPropertyTask("config", "/server/1i8n/content", "enabled", "true"));
+
         return tasks;
     }
 }

Modified: magnoliamodules/trunk/openutils-mgnllms/src/main/resources/mgnl-bootstrap-samples/mgnllms/website.sample-lms.xml
===================================================================
(Binary files differ)

Modified: magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/pages/MediaBean.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/pages/MediaBean.java	2013-10-19 21:38:17 UTC (rev 4391)
+++ magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/pages/MediaBean.java	2013-10-20 08:31:41 UTC (rev 4392)
@@ -68,6 +68,8 @@
 
     private Map<String, AdvancedResult> usedInNodes = new HashMap<String, AdvancedResult>();
 
+    private Integer numberOfReferences;
+
     private boolean canPublish;
 
     private boolean writable;
@@ -409,4 +411,15 @@
     {
         this.icon = icon;
     }
+
+    public Integer getNumberOfReferences()
+    {
+        return numberOfReferences;
+    }
+
+    public void setNumberOfReferences(Integer numberOfReferences)
+    {
+        this.numberOfReferences = numberOfReferences;
+    }
+
 }
\ No newline at end of file

Modified: 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/pages/MediaBeanBuilder.java	2013-10-19 21:38:17 UTC (rev 4391)
+++ magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/pages/MediaBeanBuilder.java	2013-10-20 08:31:41 UTC (rev 4392)
@@ -108,6 +108,13 @@
             mb.setUsedInWebPages(workspacePaths.get(RepositoryConstants.WEBSITE));
             mb.setUsedInNodes(workspacePaths);
 
+            int count = 0;
+            for (AdvancedResult wp : workspacePaths.values())
+            {
+                count += wp.getTotalSize();
+            }
+            mb.setNumberOfReferences(count);
+
         }
         catch (RepositoryException ex)
         {

Modified: magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/pages/MediaFolderViewPage.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/pages/MediaFolderViewPage.java	2013-10-19 21:38:17 UTC (rev 4391)
+++ magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/pages/MediaFolderViewPage.java	2013-10-20 08:31:41 UTC (rev 4392)
@@ -33,6 +33,7 @@
 import info.magnolia.jcr.util.NodeUtil;
 import info.magnolia.module.admininterface.commands.ActivationCommand;
 import info.magnolia.objectfactory.Components;
+import info.magnolia.templating.functions.TemplatingFunctions;
 import it.openutils.mgnlutils.api.NodeUtilsExt;
 import it.openutils.mgnlutils.el.MgnlPagingElFunctions;
 import it.openutils.mgnlutils.el.MgnlPagingElFunctions.Page;
@@ -511,7 +512,9 @@
         {
             return null;
         }
-        MediaTypeConfiguration mtc = Components.getComponent(MediaConfigurationManager.class).getMediaTypeConfigurationFromMedia(media);
+        MediaTypeConfiguration mtc = Components
+            .getComponent(MediaConfigurationManager.class)
+            .getMediaTypeConfigurationFromMedia(media);
         String url = mtc.getHandler().getUrl(media);
 
         String filename = mtc.getHandler().getFullFilename(media);
@@ -896,4 +899,9 @@
     {
         return MediaEl.module().getVersion();
     }
+
+    public String link(Node node)
+    {
+        return Components.getComponent(TemplatingFunctions.class).link(node);
+    }
 }

Modified: magnoliamodules/trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap-samples/media/config.modules.media.dialogs.samples-media.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap-samples/media/config.modules.media.dialogs.samples-media.xml	2013-10-19 21:38:17 UTC (rev 4391)
+++ magnoliamodules/trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap-samples/media/config.modules.media.dialogs.samples-media.xml	2013-10-20 08:31:41 UTC (rev 4392)
@@ -6,10 +6,16 @@
   <sv:property sv:name="jcr:uuid" sv:type="String">
     <sv:value>60c72833-f536-47e1-949e-9056d9df234b</sv:value>
   </sv:property>
+  <sv:property sv:name="jcr:createdBy" sv:type="String">
+    <sv:value>admin</sv:value>
+  </sv:property>
   <sv:node sv:name="MetaData">
     <sv:property sv:name="jcr:primaryType" sv:type="Name">
       <sv:value>mgnl:metaData</sv:value>
     </sv:property>
+    <sv:property sv:name="jcr:createdBy" sv:type="String">
+      <sv:value>admin</sv:value>
+    </sv:property>
     <sv:property sv:name="mgnl:Data" sv:type="String">
       <sv:value>MetaData</sv:value>
     </sv:property>
@@ -45,6 +51,9 @@
     <sv:property sv:name="controlType" sv:type="String">
       <sv:value>tab</sv:value>
     </sv:property>
+    <sv:property sv:name="jcr:createdBy" sv:type="String">
+      <sv:value>admin</sv:value>
+    </sv:property>
     <sv:property sv:name="label" sv:type="String">
       <sv:value>Media</sv:value>
     </sv:property>
@@ -52,6 +61,9 @@
       <sv:property sv:name="jcr:primaryType" sv:type="Name">
         <sv:value>mgnl:metaData</sv:value>
       </sv:property>
+      <sv:property sv:name="jcr:createdBy" sv:type="String">
+        <sv:value>admin</sv:value>
+      </sv:property>
       <sv:property sv:name="mgnl:Data" sv:type="String">
         <sv:value>MetaData</sv:value>
       </sv:property>
@@ -82,8 +94,11 @@
         <sv:value>f18a9c1e-3318-469b-ba2a-32304dee949b</sv:value>
       </sv:property>
       <sv:property sv:name="controlType" sv:type="String">
-        <sv:value>mediaSelection</sv:value>
+        <sv:value>media</sv:value>
       </sv:property>
+      <sv:property sv:name="jcr:createdBy" sv:type="String">
+        <sv:value>admin</sv:value>
+      </sv:property>
       <sv:property sv:name="label" sv:type="String">
         <sv:value>Media</sv:value>
       </sv:property>
@@ -94,6 +109,9 @@
         <sv:property sv:name="jcr:primaryType" sv:type="Name">
           <sv:value>mgnl:metaData</sv:value>
         </sv:property>
+        <sv:property sv:name="jcr:createdBy" sv:type="String">
+          <sv:value>admin</sv:value>
+        </sv:property>
         <sv:property sv:name="mgnl:Data" sv:type="String">
           <sv:value>MetaData</sv:value>
         </sv:property>
@@ -113,7 +131,7 @@
           <sv:value>2008-07-07T14:56:33.437+02:00</sv:value>
         </sv:property>
         <sv:property sv:name="mgnl:lastmodified" sv:type="Date">
-          <sv:value>2009-12-30T16:10:29.544+01:00</sv:value>
+          <sv:value>2013-10-19T23:54:25.789+02:00</sv:value>
         </sv:property>
       </sv:node>
     </sv:node>

Modified: magnoliamodules/trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap-samples/media/config.modules.media.dialogs.samples-mediatag.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap-samples/media/config.modules.media.dialogs.samples-mediatag.xml	2013-10-19 21:38:17 UTC (rev 4391)
+++ magnoliamodules/trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap-samples/media/config.modules.media.dialogs.samples-mediatag.xml	2013-10-20 08:31:41 UTC (rev 4392)
@@ -6,10 +6,16 @@
   <sv:property sv:name="jcr:uuid" sv:type="String">
     <sv:value>fc6446c7-1f4a-4256-9435-d0fb708abad8</sv:value>
   </sv:property>
+  <sv:property sv:name="jcr:createdBy" sv:type="String">
+    <sv:value>admin</sv:value>
+  </sv:property>
   <sv:node sv:name="MetaData">
     <sv:property sv:name="jcr:primaryType" sv:type="Name">
       <sv:value>mgnl:metaData</sv:value>
     </sv:property>
+    <sv:property sv:name="jcr:createdBy" sv:type="String">
+      <sv:value>admin</sv:value>
+    </sv:property>
     <sv:property sv:name="mgnl:Data" sv:type="String">
       <sv:value>MetaData</sv:value>
     </sv:property>
@@ -45,6 +51,9 @@
     <sv:property sv:name="controlType" sv:type="String">
       <sv:value>tab</sv:value>
     </sv:property>
+    <sv:property sv:name="jcr:createdBy" sv:type="String">
+      <sv:value>admin</sv:value>
+    </sv:property>
     <sv:property sv:name="label" sv:type="String">
       <sv:value>Media</sv:value>
     </sv:property>
@@ -52,6 +61,9 @@
       <sv:property sv:name="jcr:primaryType" sv:type="Name">
         <sv:value>mgnl:metaData</sv:value>
       </sv:property>
+      <sv:property sv:name="jcr:createdBy" sv:type="String">
+        <sv:value>admin</sv:value>
+      </sv:property>
       <sv:property sv:name="mgnl:Data" sv:type="String">
         <sv:value>MetaData</sv:value>
       </sv:property>
@@ -82,8 +94,11 @@
         <sv:value>5bdc5aea-5de8-4ef4-9a80-0aa7140241c0</sv:value>
       </sv:property>
       <sv:property sv:name="controlType" sv:type="String">
-        <sv:value>mediaSelection</sv:value>
+        <sv:value>media</sv:value>
       </sv:property>
+      <sv:property sv:name="jcr:createdBy" sv:type="String">
+        <sv:value>admin</sv:value>
+      </sv:property>
       <sv:property sv:name="label" sv:type="String">
         <sv:value>Media</sv:value>
       </sv:property>
@@ -97,6 +112,9 @@
         <sv:property sv:name="jcr:primaryType" sv:type="Name">
           <sv:value>mgnl:metaData</sv:value>
         </sv:property>
+        <sv:property sv:name="jcr:createdBy" sv:type="String">
+          <sv:value>admin</sv:value>
+        </sv:property>
         <sv:property sv:name="mgnl:Data" sv:type="String">
           <sv:value>MetaData</sv:value>
         </sv:property>
@@ -116,7 +134,7 @@
           <sv:value>2008-07-07T14:56:33.437+02:00</sv:value>
         </sv:property>
         <sv:property sv:name="mgnl:lastmodified" sv:type="Date">
-          <sv:value>2010-02-18T16:41:03.781+01:00</sv:value>
+          <sv:value>2013-10-19T23:54:19.766+02:00</sv:value>
         </sv:property>
       </sv:node>
     </sv:node>

Modified: magnoliamodules/trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/media/pages/MediaFolderViewPage.html
===================================================================
--- magnoliamodules/trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/media/pages/MediaFolderViewPage.html	2013-10-19 21:38:17 UTC (rev 4391)
+++ magnoliamodules/trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/media/pages/MediaFolderViewPage.html	2013-10-20 08:31:41 UTC (rev 4392)
@@ -5,7 +5,7 @@
     <title>${this.path!?html!""}</title>
     <link rel="stylesheet" type="text/css" href="${this.request.contextPath}/.resources/media/css/multibox.css" />
     <link rel="stylesheet" type="text/css" href="${this.request.contextPath}/.resources/media/css/sexy-tooltips/msn.css" />
-    <link rel="stylesheet" type="text/css" href="${this.request.contextPath}/.resources/media/css/folderView.css?version=${this.moduleVersion}" />
+    <link rel="stylesheet" type="text/css" href="${this.request.contextPath}/.resources/media/css/folderView.css?version=${this.moduleVersion!}" />
     <link rel="stylesheet" type="text/css" href="${this.request.contextPath}/.resources/media/css/mooSelecta.css" />
     <!--[if lte IE 7]>
     <link rel="stylesheet" type="text/css" href="${this.request.contextPath}/.resources/media/css/ie-fix.css" />
@@ -537,18 +537,21 @@
               [/#if]
             </ul>
           </div>
-          [#if media.usedInWebPages?size = 0]
+          [#if media.numberOfReferences = 0]
           <span>${this.msgs.get('media.nopages')}</span>
           [#else]
-          <span class="tips menuitem">${this.msgs.get('media.pages')} (${media.usedInWebPages?size})</span>
+          <span class="tips menuitem">${this.msgs.get('media.pages')} (${media.usedInWebPages.totalSize})</span>
           <div class="pages menu" style="display: none;">
             <ul class="mediamenu medialinks">
-              [#list media.usedInUris as uri]
-              <li>
-                <a href="${this.request.contextPath}${uri}" target="_blank">
-                  ${uri}
-                </a>
-              </li>
+              [#list media.usedInNodes?keys as key]
+                [#list media.usedInNodes?values[key_index].items as node]
+                <li>
+                  [#assign link = this.link(node)]
+                  <a href="${this.request.contextPath}${link}" target="_blank">
+                    ${link}
+                  </a>
+                </li>
+                [/#list]
               [/#list]
             </ul>
           </div>

Added: magnoliamodules/trunk/openutils-mgnltagcloud/src/main/resources/mgnl-bootstrap-samples/tagcloud/config.modules.tagcloud.clouds.tags.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnltagcloud/src/main/resources/mgnl-bootstrap-samples/tagcloud/config.modules.tagcloud.clouds.tags.xml	                        (rev 0)
+++ magnoliamodules/trunk/openutils-mgnltagcloud/src/main/resources/mgnl-bootstrap-samples/tagcloud/config.modules.tagcloud.clouds.tags.xml	2013-10-20 08:31:41 UTC (rev 4392)
@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<sv:node sv:name="tags" xmlns:sv="http://www.jcp.org/jcr/sv/1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <sv:property sv:name="jcr:primaryType" sv:type="Name">
+    <sv:value>mgnl:contentNode</sv:value>
+  </sv:property>
+  <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
+    <sv:value>mix:lockable</sv:value>
+  </sv:property>
+  <sv:property sv:name="jcr:uuid" sv:type="String">
+    <sv:value>94da4810-7417-43eb-b39b-010e8e1dbe63</sv:value>
+  </sv:property>
+  <sv:property sv:name="jcr:createdBy" sv:type="String">
+    <sv:value>admin</sv:value>
+  </sv:property>
+  <sv:property sv:name="path" sv:type="String">
+    <sv:value>/</sv:value>
+  </sv:property>
+  <sv:property sv:name="propertyName" sv:type="String">
+    <sv:value>tags</sv:value>
+  </sv:property>
+  <sv:property sv:name="repository" sv:type="String">
+    <sv:value>website</sv:value>
+  </sv:property>
+  <sv:node sv:name="MetaData">
+    <sv:property sv:name="jcr:primaryType" sv:type="Name">
+      <sv:value>mgnl:metaData</sv:value>
+    </sv:property>
+    <sv:property sv:name="jcr:createdBy" sv:type="String">
+      <sv:value>admin</sv:value>
+    </sv:property>
+    <sv:property sv:name="mgnl:authorid" sv:type="String">
+      <sv:value>superuser</sv:value>
+    </sv:property>
+    <sv:property sv:name="mgnl:creationdate" sv:type="Date">
+      <sv:value>2010-02-02T17:58:45.701+01:00</sv:value>
+    </sv:property>
+    <sv:property sv:name="mgnl:lastmodified" sv:type="Date">
+      <sv:value>2010-06-01T09:44:39.510+02:00</sv:value>
+    </sv:property>
+  </sv:node>
+</sv:node>


Property changes on: magnoliamodules/trunk/openutils-mgnltagcloud/src/main/resources/mgnl-bootstrap-samples/tagcloud/config.modules.tagcloud.clouds.tags.xml
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+text/xml
\ No newline at end of property
Added: svn:keywords
## -0,0 +1 ##
+Author Date Id Revision
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Deleted: magnoliamodules/trunk/openutils-mgnltagcloud/src/main/resources/mgnl-bootstrap-samples/tagcloud/config.modules.tagcloud.clouds.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnltagcloud/src/main/resources/mgnl-bootstrap-samples/tagcloud/config.modules.tagcloud.clouds.xml	2013-10-19 21:38:17 UTC (rev 4391)
+++ magnoliamodules/trunk/openutils-mgnltagcloud/src/main/resources/mgnl-bootstrap-samples/tagcloud/config.modules.tagcloud.clouds.xml	2013-10-20 08:31:41 UTC (rev 4392)
@@ -1,72 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<sv:node sv:name="clouds" xmlns:sv="http://www.jcp.org/jcr/sv/1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-  <sv:property sv:name="jcr:primaryType" sv:type="Name">
-    <sv:value>mgnl:content</sv:value>
-  </sv:property>
-  <sv:property sv:name="jcr:mixinTypes" sv:type="Name">
-    <sv:value>mix:lockable</sv:value>
-  </sv:property>
-  <sv:property sv:name="jcr:uuid" sv:type="String">
-    <sv:value>4730afb7-3548-4026-997b-0f2df4ad8357</sv:value>
-  </sv:property>
-  <sv:property sv:name="jcr:createdBy" sv:type="String">
-    <sv:value>admin</sv:value>
-  </sv:property>
-  <sv:node sv:name="MetaData">
-    <sv:property sv:name="jcr:primaryType" sv:type="Name">
-      <sv:value>mgnl:metaData</sv:value>
-    </sv:property>
-    <sv:property sv:name="jcr:createdBy" sv:type="String">
-      <sv:value>admin</sv:value>
-    </sv:property>
-    <sv:property sv:name="mgnl:authorid" sv:type="String">
-      <sv:value>superuser</sv:value>
-    </sv:property>
-    <sv:property sv:name="mgnl:creationdate" sv:type="Date">
-      <sv:value>2010-03-09T16:04:19.602+01:00</sv:value>
-    </sv:property>
-    <sv:property sv:name="mgnl:lastmodified" sv:type="Date">
-      <sv:value>2010-03-09T16:04:23.928+01:00</sv:value>
-    </sv:property>
-  </sv:node>
-  <sv:node sv:name="tags">
-    <sv:property sv:name="jcr:primaryType" sv:type="Name">
-      <sv:value>mgnl:contentNode</sv:value>
-    </sv:property>
-    <sv:property sv:name="jcr:mixinTypes" sv:type="Name">
-      <sv:value>mix:lockable</sv:value>
-    </sv:property>
-    <sv:property sv:name="jcr:uuid" sv:type="String">
-      <sv:value>94da4810-7417-43eb-b39b-010e8e1dbe63</sv:value>
-    </sv:property>
-    <sv:property sv:name="jcr:createdBy" sv:type="String">
-      <sv:value>admin</sv:value>
-    </sv:property>
-    <sv:property sv:name="path" sv:type="String">
-      <sv:value>/</sv:value>
-    </sv:property>
-    <sv:property sv:name="propertyName" sv:type="String">
-      <sv:value>tags</sv:value>
-    </sv:property>
-    <sv:property sv:name="repository" sv:type="String">
-      <sv:value>website</sv:value>
-    </sv:property>
-    <sv:node sv:name="MetaData">
-      <sv:property sv:name="jcr:primaryType" sv:type="Name">
-        <sv:value>mgnl:metaData</sv:value>
-      </sv:property>
-      <sv:property sv:name="jcr:createdBy" sv:type="String">
-        <sv:value>admin</sv:value>
-      </sv:property>
-      <sv:property sv:name="mgnl:authorid" sv:type="String">
-        <sv:value>superuser</sv:value>
-      </sv:property>
-      <sv:property sv:name="mgnl:creationdate" sv:type="Date">
-        <sv:value>2010-02-02T17:58:45.701+01:00</sv:value>
-      </sv:property>
-      <sv:property sv:name="mgnl:lastmodified" sv:type="Date">
-        <sv:value>2010-06-01T09:44:39.510+02:00</sv:value>
-      </sv:property>
-    </sv:node>
-  </sv:node>
-</sv:node>

Added: magnoliamodules/trunk/openutils-mgnltagcloud/src/main/resources/mgnl-bootstrap-samples/tagcloud/config.modules.tagcloud.dialogs.sample-tagcloud.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnltagcloud/src/main/resources/mgnl-bootstrap-samples/tagcloud/config.modules.tagcloud.dialogs.sample-tagcloud.xml	                        (rev 0)
+++ magnoliamodules/trunk/openutils-mgnltagcloud/src/main/resources/mgnl-bootstrap-samples/tagcloud/config.modules.tagcloud.dialogs.sample-tagcloud.xml	2013-10-20 08:31:41 UTC (rev 4392)
@@ -0,0 +1,170 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<sv:node sv:name="sample-tagcloud" xmlns:sv="http://www.jcp.org/jcr/sv/1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <sv:property sv:name="jcr:primaryType" sv:type="Name">
+    <sv:value>mgnl:contentNode</sv:value>
+  </sv:property>
+  <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
+    <sv:value>mix:lockable</sv:value>
+  </sv:property>
+  <sv:property sv:name="jcr:uuid" sv:type="String">
+    <sv:value>dfdabce9-2d1a-4606-90f8-e627bee271c2</sv:value>
+  </sv:property>
+  <sv:property sv:name="height" sv:type="String">
+    <sv:value>800</sv:value>
+  </sv:property>
+  <sv:property sv:name="jcr:createdBy" sv:type="String">
+    <sv:value>admin</sv:value>
+  </sv:property>
+  <sv:property sv:name="label" sv:type="String">
+    <sv:value>General</sv:value>
+  </sv:property>
+  <sv:property sv:name="width" sv:type="String">
+    <sv:value>800</sv:value>
+  </sv:property>
+  <sv:node sv:name="MetaData">
+    <sv:property sv:name="jcr:primaryType" sv:type="Name">
+      <sv:value>mgnl:metaData</sv:value>
+    </sv:property>
+    <sv:property sv:name="jcr:createdBy" sv:type="String">
+      <sv:value>admin</sv:value>
+    </sv:property>
+    <sv:property sv:name="mgnl:activated" sv:type="Boolean">
+      <sv:value>false</sv:value>
+    </sv:property>
+    <sv:property sv:name="mgnl:authorid" sv:type="String">
+      <sv:value>superuser</sv:value>
+    </sv:property>
+    <sv:property sv:name="mgnl:creationdate" sv:type="Date">
+      <sv:value>2009-03-19T09:55:33.575+01:00</sv:value>
+    </sv:property>
+    <sv:property sv:name="mgnl:lastmodified" sv:type="Date">
+      <sv:value>2010-03-09T16:37:52.622+01:00</sv:value>
+    </sv:property>
+  </sv:node>
+  <sv:node sv:name="tabGeneral">
+    <sv:property sv:name="jcr:primaryType" sv:type="Name">
+      <sv:value>mgnl:contentNode</sv:value>
+    </sv:property>
+    <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
+      <sv:value>mix:lockable</sv:value>
+    </sv:property>
+    <sv:property sv:name="jcr:uuid" sv:type="String">
+      <sv:value>ee025e3f-6ee0-45cb-9400-ee0391fb5ff2</sv:value>
+    </sv:property>
+    <sv:property sv:name="controlType" sv:type="String">
+      <sv:value>tab</sv:value>
+    </sv:property>
+    <sv:property sv:name="jcr:createdBy" sv:type="String">
+      <sv:value>admin</sv:value>
+    </sv:property>
+    <sv:property sv:name="label" sv:type="String">
+      <sv:value>Properties</sv:value>
+    </sv:property>
+    <sv:node sv:name="MetaData">
+      <sv:property sv:name="jcr:primaryType" sv:type="Name">
+        <sv:value>mgnl:metaData</sv:value>
+      </sv:property>
+      <sv:property sv:name="jcr:createdBy" sv:type="String">
+        <sv:value>admin</sv:value>
+      </sv:property>
+      <sv:property sv:name="mgnl:authorid" sv:type="String">
+        <sv:value>superuser</sv:value>
+      </sv:property>
+      <sv:property sv:name="mgnl:creationdate" sv:type="Date">
+        <sv:value>2009-03-19T09:55:51.980+01:00</sv:value>
+      </sv:property>
+      <sv:property sv:name="mgnl:lastmodified" sv:type="Date">
+        <sv:value>2010-03-09T16:37:57.194+01:00</sv:value>
+      </sv:property>
+    </sv:node>
+    <sv:node sv:name="title">
+      <sv:property sv:name="jcr:primaryType" sv:type="Name">
+        <sv:value>mgnl:contentNode</sv:value>
+      </sv:property>
+      <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
+        <sv:value>mix:lockable</sv:value>
+      </sv:property>
+      <sv:property sv:name="jcr:uuid" sv:type="String">
+        <sv:value>d5003a4c-76fd-4b4d-8aba-e471ff7fee80</sv:value>
+      </sv:property>
+      <sv:property sv:name="controlType" sv:type="String">
+        <sv:value>edit</sv:value>
+      </sv:property>
+      <sv:property sv:name="i18n" sv:type="String">
+        <sv:value>true</sv:value>
+      </sv:property>
+      <sv:property sv:name="jcr:createdBy" sv:type="String">
+        <sv:value>superuser</sv:value>
+      </sv:property>
+      <sv:property sv:name="label" sv:type="String">
+        <sv:value>Title</sv:value>
+      </sv:property>
+      <sv:node sv:name="MetaData">
+        <sv:property sv:name="jcr:primaryType" sv:type="Name">
+          <sv:value>mgnl:metaData</sv:value>
+        </sv:property>
+        <sv:property sv:name="jcr:createdBy" sv:type="String">
+          <sv:value>superuser</sv:value>
+        </sv:property>
+        <sv:property sv:name="mgnl:authorid" sv:type="String">
+          <sv:value>superuser</sv:value>
+        </sv:property>
+        <sv:property sv:name="mgnl:creationdate" sv:type="Date">
+          <sv:value>2013-10-19T23:59:00.811+02:00</sv:value>
+        </sv:property>
+        <sv:property sv:name="mgnl:lastmodified" sv:type="Date">
+          <sv:value>2013-10-20T00:00:01.025+02:00</sv:value>
+        </sv:property>
+      </sv:node>
+    </sv:node>
+    <sv:node sv:name="tags">
+      <sv:property sv:name="jcr:primaryType" sv:type="Name">
+        <sv:value>mgnl:contentNode</sv:value>
+      </sv:property>
+      <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
+        <sv:value>mix:lockable</sv:value>
+      </sv:property>
+      <sv:property sv:name="jcr:uuid" sv:type="String">
+        <sv:value>0b3d54fb-17ee-469b-b731-834ea2ae8755</sv:value>
+      </sv:property>
+      <sv:property sv:name="controlType" sv:type="String">
+        <sv:value>tagcloud</sv:value>
+      </sv:property>
+      <sv:property sv:name="description" sv:type="String">
+        <sv:value>Start insert your tags</sv:value>
+      </sv:property>
+      <sv:property sv:name="jcr:createdBy" sv:type="String">
+        <sv:value>admin</sv:value>
+      </sv:property>
+      <sv:property sv:name="label" sv:type="String">
+        <sv:value>Tags</sv:value>
+      </sv:property>
+      <sv:property sv:name="tagCloudName" sv:type="String">
+        <sv:value>tags</sv:value>
+      </sv:property>
+      <sv:property sv:name="width" sv:type="String">
+        <sv:value>300</sv:value>
+      </sv:property>
+      <sv:node sv:name="MetaData">
+        <sv:property sv:name="jcr:primaryType" sv:type="Name">
+          <sv:value>mgnl:metaData</sv:value>
+        </sv:property>
+        <sv:property sv:name="jcr:createdBy" sv:type="String">
+          <sv:value>admin</sv:value>
+        </sv:property>
+        <sv:property sv:name="mgnl:activated" sv:type="Boolean">
+          <sv:value>false</sv:value>
+        </sv:property>
+        <sv:property sv:name="mgnl:authorid" sv:type="String">
+          <sv:value>superuser</sv:value>
+        </sv:property>
+        <sv:property sv:name="mgnl:creationdate" sv:type="Date">
+          <sv:value>2009-03-26T11:53:31.667+01:00</sv:value>
+        </sv:property>
+        <sv:property sv:name="mgnl:lastmodified" sv:type="Date">
+          <sv:value>2010-03-09T17:20:33.703+01:00</sv:value>
+        </sv:property>
+      </sv:node>
+    </sv:node>
+  </sv:node>
+</sv:node>


Property changes on: magnoliamodules/trunk/openutils-mgnltagcloud/src/main/resources/mgnl-bootstrap-samples/tagcloud/config.modules.tagcloud.dialogs.sample-tagcloud.xml
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+text/xml
\ No newline at end of property
Added: svn:keywords
## -0,0 +1 ##
+Author Date Id Revision
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Deleted: magnoliamodules/trunk/openutils-mgnltagcloud/src/main/resources/mgnl-bootstrap-samples/tagcloud/config.modules.tagcloud.dialogs.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnltagcloud/src/main/resources/mgnl-bootstrap-samples/tagcloud/config.modules.tagcloud.dialogs.xml	2013-10-19 21:38:17 UTC (rev 4391)
+++ magnoliamodules/trunk/openutils-mgnltagcloud/src/main/resources/mgnl-bootstrap-samples/tagcloud/config.modules.tagcloud.dialogs.xml	2013-10-20 08:31:41 UTC (rev 4392)
@@ -1,158 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<sv:node sv:name="dialogs" xmlns:sv="http://www.jcp.org/jcr/sv/1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-  <sv:property sv:name="jcr:primaryType" sv:type="Name">
-    <sv:value>mgnl:content</sv:value>
-  </sv:property>
-  <sv:property sv:name="jcr:mixinTypes" sv:type="Name">
-    <sv:value>mix:lockable</sv:value>
-  </sv:property>
-  <sv:property sv:name="jcr:uuid" sv:type="String">
-    <sv:value>51b6bd61-5dde-49fb-b548-7dbfa3edacf5</sv:value>
-  </sv:property>
-  <sv:node sv:name="MetaData">
-    <sv:property sv:name="jcr:primaryType" sv:type="Name">
-      <sv:value>mgnl:metaData</sv:value>
-    </sv:property>
-    <sv:property sv:name="mgnl:activated" sv:type="Boolean">
-      <sv:value>false</sv:value>
-    </sv:property>
-    <sv:property sv:name="mgnl:authorid" sv:type="String">
-      <sv:value>superuser</sv:value>
-    </sv:property>
-    <sv:property sv:name="mgnl:creationdate" sv:type="Date">
-      <sv:value>2010-03-09T16:26:39.067+01:00</sv:value>
-    </sv:property>
-    <sv:property sv:name="mgnl:lastmodified" sv:type="Date">
-      <sv:value>2010-03-09T16:34:38.761+01:00</sv:value>
-    </sv:property>
-  </sv:node>
-  <sv:node sv:name="sample-tagcloud">
-    <sv:property sv:name="jcr:primaryType" sv:type="Name">
-      <sv:value>mgnl:contentNode</sv:value>
-    </sv:property>
-    <sv:property sv:name="jcr:mixinTypes" sv:type="Name">
-      <sv:value>mix:lockable</sv:value>
-    </sv:property>
-    <sv:property sv:name="jcr:uuid" sv:type="String">
-      <sv:value>dfdabce9-2d1a-4606-90f8-e627bee271c2</sv:value>
-    </sv:property>
-    <sv:property sv:name="height" sv:type="String">
-      <sv:value>800</sv:value>
-    </sv:property>
-    <sv:property sv:name="jcr:createdBy" sv:type="String">
-      <sv:value>admin</sv:value>
-    </sv:property>
-    <sv:property sv:name="label" sv:type="String">
-      <sv:value>General</sv:value>
-    </sv:property>
-    <sv:property sv:name="width" sv:type="String">
-      <sv:value>800</sv:value>
-    </sv:property>
-    <sv:node sv:name="MetaData">
-      <sv:property sv:name="jcr:primaryType" sv:type="Name">
-        <sv:value>mgnl:metaData</sv:value>
-      </sv:property>
-      <sv:property sv:name="jcr:createdBy" sv:type="String">
-        <sv:value>admin</sv:value>
-      </sv:property>
-      <sv:property sv:name="mgnl:activated" sv:type="Boolean">
-        <sv:value>false</sv:value>
-      </sv:property>
-      <sv:property sv:name="mgnl:authorid" sv:type="String">
-        <sv:value>superuser</sv:value>
-      </sv:property>
-      <sv:property sv:name="mgnl:creationdate" sv:type="Date">
-        <sv:value>2009-03-19T09:55:33.575+01:00</sv:value>
-      </sv:property>
-      <sv:property sv:name="mgnl:lastmodified" sv:type="Date">
-        <sv:value>2010-03-09T16:37:52.622+01:00</sv:value>
-      </sv:property>
-    </sv:node>
-    <sv:node sv:name="tabGeneral">
-      <sv:property sv:name="jcr:primaryType" sv:type="Name">
-        <sv:value>mgnl:contentNode</sv:value>
-      </sv:property>
-      <sv:property sv:name="jcr:mixinTypes" sv:type="Name">
-        <sv:value>mix:lockable</sv:value>
-      </sv:property>
-      <sv:property sv:name="jcr:uuid" sv:type="String">
-        <sv:value>ee025e3f-6ee0-45cb-9400-ee0391fb5ff2</sv:value>
-      </sv:property>
-      <sv:property sv:name="controlType" sv:type="String">
-        <sv:value>tab</sv:value>
-      </sv:property>
-      <sv:property sv:name="jcr:createdBy" sv:type="String">
-        <sv:value>admin</sv:value>
-      </sv:property>
-      <sv:property sv:name="label" sv:type="String">
-        <sv:value>Properties</sv:value>
-      </sv:property>
-      <sv:node sv:name="MetaData">
-        <sv:property sv:name="jcr:primaryType" sv:type="Name">
-          <sv:value>mgnl:metaData</sv:value>
-        </sv:property>
-        <sv:property sv:name="jcr:createdBy" sv:type="String">
-          <sv:value>admin</sv:value>
-        </sv:property>
-        <sv:property sv:name="mgnl:authorid" sv:type="String">
-          <sv:value>superuser</sv:value>
-        </sv:property>
-        <sv:property sv:name="mgnl:creationdate" sv:type="Date">
-          <sv:value>2009-03-19T09:55:51.980+01:00</sv:value>
-        </sv:property>
-        <sv:property sv:name="mgnl:lastmodified" sv:type="Date">
-          <sv:value>2010-03-09T16:37:57.194+01:00</sv:value>
-        </sv:property>
-      </sv:node>
-      <sv:node sv:name="tags">
-        <sv:property sv:name="jcr:primaryType" sv:type="Name">
-          <sv:value>mgnl:contentNode</sv:value>
-        </sv:property>
-        <sv:property sv:name="jcr:mixinTypes" sv:type="Name">
-          <sv:value>mix:lockable</sv:value>
-        </sv:property>
-        <sv:property sv:name="jcr:uuid" sv:type="String">
-          <sv:value>0b3d54fb-17ee-469b-b731-834ea2ae8755</sv:value>
-        </sv:property>
-        <sv:property sv:name="controlType" sv:type="String">
-          <sv:value>tagcloud</sv:value>
-        </sv:property>
-        <sv:property sv:name="description" sv:type="String">
-          <sv:value>Start insert your tags</sv:value>
-        </sv:property>
-        <sv:property sv:name="jcr:createdBy" sv:type="String">
-          <sv:value>admin</sv:value>
-        </sv:property>
-        <sv:property sv:name="label" sv:type="String">
-          <sv:value>Tags</sv:value>
-        </sv:property>
-        <sv:property sv:name="tagCloudName" sv:type="String">
-          <sv:value>tags</sv:value>
-        </sv:property>
-        <sv:property sv:name="width" sv:type="String">
-          <sv:value>300</sv:value>
-        </sv:property>
-        <sv:node sv:name="MetaData">
-          <sv:property sv:name="jcr:primaryType" sv:type="Name">
-            <sv:value>mgnl:metaData</sv:value>
-          </sv:property>
-          <sv:property sv:name="jcr:createdBy" sv:type="String">
-            <sv:value>admin</sv:value>
-          </sv:property>
-          <sv:property sv:name="mgnl:activated" sv:type="Boolean">
-            <sv:value>false</sv:value>
-          </sv:property>
-          <sv:property sv:name="mgnl:authorid" sv:type="String">
-            <sv:value>superuser</sv:value>
-          </sv:property>
-          <sv:property sv:name="mgnl:creationdate" sv:type="Date">
-            <sv:value>2009-03-26T11:53:31.667+01:00</sv:value>
-          </sv:property>
-          <sv:property sv:name="mgnl:lastmodified" sv:type="Date">
-            <sv:value>2010-03-09T17:20:33.703+01:00</sv:value>
-          </sv:property>
-        </sv:node>
-      </sv:node>
-    </sv:node>
-  </sv:node>
-</sv:node>

Modified: magnoliamodules/trunk/openutils-mgnlutils/src/main/java/it/openutils/mgnlutils/api/NodeUtilsExt.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlutils/src/main/java/it/openutils/mgnlutils/api/NodeUtilsExt.java	2013-10-19 21:38:17 UTC (rev 4391)
+++ magnoliamodules/trunk/openutils-mgnlutils/src/main/java/it/openutils/mgnlutils/api/NodeUtilsExt.java	2013-10-20 08:31:41 UTC (rev 4392)
@@ -19,13 +19,18 @@
 
 package it.openutils.mgnlutils.api;
 
+import info.magnolia.cms.core.AggregationState;
 import info.magnolia.cms.core.Path;
 import info.magnolia.content2bean.Content2BeanException;
 import info.magnolia.content2bean.Content2BeanUtil;
 import info.magnolia.context.MgnlContext;
 import info.magnolia.jcr.RuntimeRepositoryException;
+import info.magnolia.jcr.decoration.ContentDecoratorUtil;
 import info.magnolia.jcr.util.NodeUtil;
 import info.magnolia.jcr.util.PropertyUtil;
+import info.magnolia.jcr.wrapper.ChannelVisibilityContentDecorator;
+import info.magnolia.jcr.wrapper.HTMLEscapingNodeWrapper;
+import info.magnolia.jcr.wrapper.I18nNodeWrapper;
 
 import java.util.regex.Pattern;
 
@@ -208,10 +213,40 @@
         {
             return null;
         }
-        // TODO introduce configured wrapping
+        node = wrapWithChannelVisibilityWrapper(node);
+        if (!NodeUtil.isWrappedWith(node, I18nNodeWrapper.class))
+        {
+            node = new I18nNodeWrapper(node);
+        }
+        if (!NodeUtil.isWrappedWith(node, HTMLEscapingNodeWrapper.class))
+        {
+            node = new HTMLEscapingNodeWrapper(node, true);
+        }
+
         return node;
     }
 
+    private static Node wrapWithChannelVisibilityWrapper(Node content)
+    {
+        if (ContentDecoratorUtil.isDecoratedWith(content, ChannelVisibilityContentDecorator.class)
+            || !MgnlContext.isWebContext())
+        {
+            return content;
+        }
+
+        AggregationState aggregationState = MgnlContext.getAggregationState();
+        if (aggregationState == null)
+        {
+            return content;
+        }
+        String channel = aggregationState.getChannel().getName();
+        if (StringUtils.isEmpty(channel) || StringUtils.equalsIgnoreCase(channel, "all"))
+        {
+            return content;
+        }
+        return new ChannelVisibilityContentDecorator(channel).wrapNode(content);
+    }
+
     public static String getBinaryPath(Node node)
     {
         if (node == null)

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

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

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

Revision: 4391
          http://openutils.svn.sourceforge.net/openutils/?rev=4391&view=rev
Author:   fgiust
Date:     2013-10-19 21:38:17 +0000 (Sat, 19 Oct 2013)
Log Message:
-----------
refactoring ImageProcessorsManager

Modified Paths:
--------------
    magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/configuration/DefaultImageProcessorsManager.java
    magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/configuration/ImageProcessorsManager.java
    magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/lifecycle/MediaModule.java
    magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/utils/ImageUtils.java
    magnoliamodules/trunk/openutils-mgnlmedia/src/main/resources/META-INF/magnolia/media.xml
    magnoliamodules/trunk/openutils-mgnlmedia/src/test/java/net/sourceforge/openutils/mgnlmedia/media/utils/ImageProcessorsManagerMock.java

Added Paths:
-----------
    magnoliamodules/trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap/media/config.modules.media.processors.postprocessors.bw.xml
    magnoliamodules/trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap/media/config.modules.media.processors.postprocessors.logsize.xml
    magnoliamodules/trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap/media/config.modules.media.processors.postprocessors.rc.xml
    magnoliamodules/trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap/media/config.modules.media.processors.resolutionprocessors.c.xml
    magnoliamodules/trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap/media/config.modules.media.processors.resolutionprocessors.default.xml
    magnoliamodules/trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap/media/config.modules.media.processors.resolutionprocessors.l.xml
    magnoliamodules/trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap/media/config.modules.media.processors.resolutionprocessors.n.xml
    magnoliamodules/trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap/media/config.modules.media.processors.resolutionprocessors.o.xml
    magnoliamodules/trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap/media/config.modules.media.processors.resolutionprocessors.p.xml

Removed Paths:
-------------
    magnoliamodules/trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap/media/config.modules.media.processors.image-post.bw.xml
    magnoliamodules/trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap/media/config.modules.media.processors.image-post.logsize.xml
    magnoliamodules/trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap/media/config.modules.media.processors.image-post.rc.xml
    magnoliamodules/trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap/media/config.modules.media.processors.image-resolution.default.xml
    magnoliamodules/trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap/media/config.modules.media.processors.image-resolution.l.xml
    magnoliamodules/trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap/media/config.modules.media.processors.image-resolution.n.xml
    magnoliamodules/trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap/media/config.modules.media.processors.image-resolution.o.xml
    magnoliamodules/trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap/media/config.modules.media.processors.image-resolution.p.xml

Modified: magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/configuration/DefaultImageProcessorsManager.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/configuration/DefaultImageProcessorsManager.java	2013-10-19 20:58:36 UTC (rev 4390)
+++ magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/configuration/DefaultImageProcessorsManager.java	2013-10-19 21:38:17 UTC (rev 4391)
@@ -19,17 +19,10 @@
 
 package net.sourceforge.openutils.mgnlmedia.media.configuration;
 
-import info.magnolia.jcr.util.NodeUtil;
-import info.magnolia.jcr.util.PropertyUtil;
-import it.openutils.mgnlutils.api.ObservedManagerAdapter;
-
-import java.util.Collection;
-import java.util.HashMap;
+import java.util.LinkedHashMap;
 import java.util.Map;
 
 import javax.inject.Singleton;
-import javax.jcr.Node;
-import javax.jcr.RepositoryException;
 
 import net.sourceforge.openutils.mgnlmedia.media.processors.FitInAndFillWithBandsImageResolutionProcessor;
 import net.sourceforge.openutils.mgnlmedia.media.processors.FitInImageResolutionProcessor;
@@ -39,6 +32,8 @@
 import net.sourceforge.openutils.mgnlmedia.media.processors.ResizeNoCropImageResolutionProcessor;
 
 import org.apache.commons.lang.StringUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 
 /**
@@ -78,153 +73,33 @@
  * @version $Id: $
  */
 @Singleton
-public class DefaultImageProcessorsManager extends ObservedManagerAdapter implements ImageProcessorsManager
+public class DefaultImageProcessorsManager implements ImageProcessorsManager
 {
 
-    private static final String IMAGE_RESOLUTION_PROCESSORS_NAME = "image-resolution";
+    private Map<String, ImageResolutionProcessor> resolutionprocessors = new LinkedHashMap<String, ImageResolutionProcessor>();
 
-    private static final String IMAGE_POST_PROCESSORS_NAME = "image-post";
+    private Map<String, ImagePostProcessor> postprocessors = new LinkedHashMap<String, ImagePostProcessor>();
 
-    private Map<String, ImageResolutionProcessor> imageResProcs = new HashMap<String, ImageResolutionProcessor>();
-
-    private Map<String, ImagePostProcessor> imagePostProcs = new HashMap<String, ImagePostProcessor>();
-
     /**
-     * {@inheritDoc}
+     * Logger.
      */
-    @Override
-    protected void onClear()
-    {
-        imageResProcs.clear();
-        imagePostProcs.clear();
-    }
+    private Logger log = LoggerFactory.getLogger(DefaultImageProcessorsManager.class);
 
     /**
-     * {@inheritDoc}
-     */
-    @SuppressWarnings("unchecked")
-    @Override
-    protected void onRegister(Node parentNode)
-    {
-
-        Iterable<Node> nodes;
-        try
-        {
-            nodes = NodeUtil.getNodes(parentNode, NodeUtil.EXCLUDE_META_DATA_FILTER);
-        }
-        catch (RepositoryException e)
-        {
-            log.error("Error initializing image processor configuration", e);
-            return;
-        }
-
-        for (Node processorsNode : nodes)
-        {
-
-            Iterable<Node> processors;
-            try
-            {
-                processors = NodeUtil.getNodes(processorsNode, NodeUtil.EXCLUDE_META_DATA_FILTER);
-            }
-            catch (RepositoryException e)
-            {
-                log
-                    .error(
-                        "Error initializing image processor configuration for " + NodeUtil.getName(processorsNode),
-                        e);
-                continue;
-            }
-
-            for (Node node : processors)
-            {
-                try
-                {
-
-                    if (IMAGE_POST_PROCESSORS_NAME.equals(NodeUtil.getName(processorsNode)))
-                    {
-                        String classNameHandler = PropertyUtil.getString(node, "class");
-                        Class classHandler = Class.forName(classNameHandler);
-                        if (!ImagePostProcessor.class.isAssignableFrom(classHandler))
-                        {
-                            log.error(
-                                "Error getting post processor for {}: class {} not implements ImagePostProcessor",
-                                NodeUtil.getPathIfPossible(node),
-                                classHandler);
-                            continue;
-                        }
-
-                        ImagePostProcessor imagePostProcessor = (ImagePostProcessor) classHandler.newInstance();
-                        imagePostProcs.put(NodeUtil.getName(node), imagePostProcessor);
-                    }
-
-                    if (IMAGE_RESOLUTION_PROCESSORS_NAME.equals(NodeUtil.getName(processorsNode)))
-                    {
-                        String controlChar = NodeUtil.getName(node);
-
-                        String classNameHandler = PropertyUtil.getString(node, "class");
-                        Class classHandler = Class.forName(classNameHandler);
-                        if (!ImageResolutionProcessor.class.isAssignableFrom(classHandler))
-                        {
-                            log
-                                .error(
-                                    "Error getting resolution processor for {}: class {} not implements ImageResolutionProcessor",
-                                    NodeUtil.getPathIfPossible(node),
-                                    classHandler);
-                            continue;
-                        }
-
-                        ImageResolutionProcessor imageResolutionProcessor = (ImageResolutionProcessor) classHandler
-                            .newInstance();
-                        if (!controlChar.equals("default"))
-                        {
-                            controlChar = controlChar.substring(0, 1);
-                        }
-                        imageResProcs.put(controlChar, imageResolutionProcessor);
-                        try
-                        {
-                            if (node.hasProperty("aliases"))
-                            {
-                                String[] aliases = StringUtils.split(PropertyUtil.getString(node, "aliases"), ",");
-                                for (String alias : aliases)
-                                {
-                                    imageResProcs.put(alias, imageResolutionProcessor);
-                                }
-                            }
-                        }
-                        catch (RepositoryException ex)
-                        {
-                            // go on
-                        }
-                    }
-                }
-                catch (InstantiationException ex)
-                {
-                    log.error("Error getting media type configuration for {}", NodeUtil.getPathIfPossible(node), ex);
-                }
-                catch (IllegalAccessException ex)
-                {
-                    log.error("Error getting media type configuration for {}", NodeUtil.getPathIfPossible(node), ex);
-                }
-                catch (ClassNotFoundException ex)
-                {
-                    log.error("Error getting media type configuration for {}", NodeUtil.getPathIfPossible(node), ex);
-                }
-                catch (RuntimeException ex)
-                {
-                    log.error("Error getting media type configuration for {}", NodeUtil.getPathIfPossible(node), ex);
-                }
-            }
-        }
-    }
-
-    /**
      * Get image resolution processor for a given control char
      * @param controlChar resolution control char
      * @return image resolution processor for a given control char
      */
     public ImageResolutionProcessor getImageResolutionProcessor(char controlChar)
     {
-        return imageResProcs.get(String.valueOf(controlChar));
+        String key = String.valueOf(controlChar);
+        if (StringUtils.equals(key, "<"))
+        {
+            log.warn("Deprecated: please use \"l\" instead of \"<\" for FitInImageResolutionProcessor");
+            key = "l";
+        }
+
+        return resolutionprocessors.get(key);
     }
 
     /**
@@ -234,7 +109,7 @@
      */
     public boolean isValidControlChar(char controlChar)
     {
-        return imageResProcs.keySet().contains(String.valueOf(controlChar));
+        return resolutionprocessors.keySet().contains(String.valueOf(controlChar));
     }
 
     /**
@@ -242,9 +117,9 @@
      * {@link ResizeCropCenteredImageResolutionProcessor})
      * @return the default image resolution processor
      */
-    public ImageResolutionProcessor getDefaultImageResolutionProcessor()
+    public ImageResolutionProcessor getDefaultResolutionProcessor()
     {
-        return imageResProcs.get("default");
+        return resolutionprocessors.get("default");
     }
 
     /**
@@ -254,24 +129,38 @@
      */
     public ImagePostProcessor getImagePostProcessor(String name)
     {
-        return imagePostProcs.get(name);
+        return postprocessors.get(name);
     }
 
     /**
-     * Get all image post processors
-     * @return image post processors list
+     * Get the map of image post processors
+     * @return image post processors map
      */
-    public Collection<ImagePostProcessor> getImagePostProcessorsList()
+    public Map<String, ImagePostProcessor> getPostprocessors()
     {
-        return imagePostProcs.values();
+        return postprocessors;
     }
 
+    public void setPostprocessors(Map<String, ImagePostProcessor> postprocessors)
+    {
+        this.postprocessors = postprocessors;
+    }
+
     /**
-     * Get the map of image post processors
-     * @return image post processors map
+     * Returns the resolutionprocessors.
+     * @return the resolutionprocessors
      */
-    public Map<String, ImagePostProcessor> getImagePostProcessorsMap()
+    public Map<String, ImageResolutionProcessor> getResolutionprocessors()
     {
-        return imagePostProcs;
+        return resolutionprocessors;
     }
+
+    /**
+     * Sets the resolutionprocessors.
+     * @param resolutionprocessors the resolutionprocessors to set
+     */
+    public void setResolutionprocessors(Map<String, ImageResolutionProcessor> resolutionprocessors)
+    {
+        this.resolutionprocessors = resolutionprocessors;
+    }
 }

Modified: magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/configuration/ImageProcessorsManager.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/configuration/ImageProcessorsManager.java	2013-10-19 20:58:36 UTC (rev 4390)
+++ magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/configuration/ImageProcessorsManager.java	2013-10-19 21:38:17 UTC (rev 4391)
@@ -19,7 +19,6 @@
 
 package net.sourceforge.openutils.mgnlmedia.media.configuration;
 
-import java.util.Collection;
 import java.util.Map;
 
 import net.sourceforge.openutils.mgnlmedia.media.processors.ImagePostProcessor;
@@ -37,12 +36,12 @@
 
     boolean isValidControlChar(char controlChar);
 
-    ImageResolutionProcessor getDefaultImageResolutionProcessor();
+    ImageResolutionProcessor getDefaultResolutionProcessor();
 
     ImagePostProcessor getImagePostProcessor(String name);
 
-    Collection<ImagePostProcessor> getImagePostProcessorsList();
+    Map<String, ImagePostProcessor> getPostprocessors();
 
-    Map<String, ImagePostProcessor> getImagePostProcessorsMap();
+    Map<String, ImageResolutionProcessor> getResolutionprocessors();
 
 }

Modified: magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/lifecycle/MediaModule.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/lifecycle/MediaModule.java	2013-10-19 20:58:36 UTC (rev 4390)
+++ magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/lifecycle/MediaModule.java	2013-10-19 21:38:17 UTC (rev 4391)
@@ -134,24 +134,6 @@
     }
 
     /**
-     * @deprecated use singleinstance
-     */
-    @Deprecated
-    public boolean isAutoactivate()
-    {
-        return singleinstance;
-    }
-
-    /**
-     * @deprecated use singleinstance
-     */
-    @Deprecated
-    public void setAutoactivate(boolean autoactivate)
-    {
-        this.singleinstance = autoactivate;
-    }
-
-    /**
      * If the singleinstance flag is set, the media module expect that no activation is needed (usually it means the
      * media repository is shared between the author and public instances).
      * @return the value of the singleinstance property

Modified: magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/utils/ImageUtils.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/utils/ImageUtils.java	2013-10-19 20:58:36 UTC (rev 4390)
+++ magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/utils/ImageUtils.java	2013-10-19 21:38:17 UTC (rev 4391)
@@ -1185,13 +1185,14 @@
         {
             img = Components
                 .getComponent(ImageProcessorsManager.class)
-                .getDefaultImageResolutionProcessor()
+                .getDefaultResolutionProcessor()
                 .getImageForResolution(original, size.x, size.y, params);
         }
 
         for (ImagePostProcessor ipp : Components
             .getComponent(ImageProcessorsManager.class)
-            .getImagePostProcessorsList())
+            .getPostprocessors()
+            .values())
         {
             img = ipp.processImage(img, size.x, size.y, params);
         }

Modified: magnoliamodules/trunk/openutils-mgnlmedia/src/main/resources/META-INF/magnolia/media.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnlmedia/src/main/resources/META-INF/magnolia/media.xml	2013-10-19 20:58:36 UTC (rev 4390)
+++ magnoliamodules/trunk/openutils-mgnlmedia/src/main/resources/META-INF/magnolia/media.xml	2013-10-19 21:38:17 UTC (rev 4391)
@@ -15,7 +15,10 @@
     </component>
     <component>
       <type>net.sourceforge.openutils.mgnlmedia.media.configuration.ImageProcessorsManager</type>
-      <implementation>net.sourceforge.openutils.mgnlmedia.media.configuration.DefaultImageProcessorsManager</implementation>
+      <workspace>config</workspace>
+      <path>/modules/media/processors</path>
+      <observed>true</observed>
+      <scope>singleton</scope>
     </component>
     <component>
       <type>net.sourceforge.openutils.mgnlmedia.media.configuration.MediaUsedInManager</type>

Deleted: magnoliamodules/trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap/media/config.modules.media.processors.image-post.bw.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap/media/config.modules.media.processors.image-post.bw.xml	2013-10-19 20:58:36 UTC (rev 4390)
+++ magnoliamodules/trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap/media/config.modules.media.processors.image-post.bw.xml	2013-10-19 21:38:17 UTC (rev 4391)
@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<sv:node sv:name="bw" xmlns:sv="http://www.jcp.org/jcr/sv/1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-  <sv:property sv:name="jcr:primaryType" sv:type="Name">
-    <sv:value>mgnl:contentNode</sv:value>
-  </sv:property>
-  <sv:property sv:name="jcr:mixinTypes" sv:type="Name">
-    <sv:value>mix:lockable</sv:value>
-  </sv:property>
-  <sv:property sv:name="jcr:uuid" sv:type="String">
-    <sv:value>fc5d140b-2123-4ebc-b30b-5d4176e9424b</sv:value>
-  </sv:property>
-  <sv:property sv:name="class" sv:type="String">
-    <sv:value>net.sourceforge.openutils.mgnlmedia.media.processors.BlackAndWhitePostProcessor</sv:value>
-  </sv:property>
-  <sv:node sv:name="MetaData">
-    <sv:property sv:name="jcr:primaryType" sv:type="Name">
-      <sv:value>mgnl:metaData</sv:value>
-    </sv:property>
-    <sv:property sv:name="mgnl:activated" sv:type="Boolean">
-      <sv:value>false</sv:value>
-    </sv:property>
-    <sv:property sv:name="mgnl:authorid" sv:type="String">
-      <sv:value>superuser</sv:value>
-    </sv:property>
-    <sv:property sv:name="mgnl:creationdate" sv:type="Date">
-      <sv:value>2009-09-03T18:28:30.446+02:00</sv:value>
-    </sv:property>
-    <sv:property sv:name="mgnl:lastmodified" sv:type="Date">
-      <sv:value>2009-09-09T10:15:47.224+02:00</sv:value>
-    </sv:property>
-  </sv:node>
-</sv:node>

Deleted: magnoliamodules/trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap/media/config.modules.media.processors.image-post.logsize.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap/media/config.modules.media.processors.image-post.logsize.xml	2013-10-19 20:58:36 UTC (rev 4390)
+++ magnoliamodules/trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap/media/config.modules.media.processors.image-post.logsize.xml	2013-10-19 21:38:17 UTC (rev 4391)
@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<sv:node sv:name="logsize" xmlns:sv="http://www.jcp.org/jcr/sv/1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-  <sv:property sv:name="jcr:primaryType" sv:type="Name">
-    <sv:value>mgnl:contentNode</sv:value>
-  </sv:property>
-  <sv:property sv:name="jcr:mixinTypes" sv:type="Name">
-    <sv:value>mix:lockable</sv:value>
-  </sv:property>
-  <sv:property sv:name="jcr:uuid" sv:type="String">
-    <sv:value>213314a3-cd2f-49bf-bf24-8639478664d4</sv:value>
-  </sv:property>
-  <sv:property sv:name="class" sv:type="String">
-    <sv:value>net.sourceforge.openutils.mgnlmedia.media.processors.LogSizePostProcessor</sv:value>
-  </sv:property>
-  <sv:node sv:name="MetaData">
-    <sv:property sv:name="jcr:primaryType" sv:type="Name">
-      <sv:value>mgnl:metaData</sv:value>
-    </sv:property>
-    <sv:property sv:name="mgnl:activated" sv:type="Boolean">
-      <sv:value>false</sv:value>
-    </sv:property>
-    <sv:property sv:name="mgnl:authorid" sv:type="String">
-      <sv:value>admin</sv:value>
-    </sv:property>
-    <sv:property sv:name="mgnl:creationdate" sv:type="Date">
-      <sv:value>2009-09-03T18:28:30.446+02:00</sv:value>
-    </sv:property>
-    <sv:property sv:name="mgnl:lastmodified" sv:type="Date">
-      <sv:value>2009-09-04T13:01:42.001+02:00</sv:value>
-    </sv:property>
-  </sv:node>
-</sv:node>

Deleted: magnoliamodules/trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap/media/config.modules.media.processors.image-post.rc.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap/media/config.modules.media.processors.image-post.rc.xml	2013-10-19 20:58:36 UTC (rev 4390)
+++ magnoliamodules/trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap/media/config.modules.media.processors.image-post.rc.xml	2013-10-19 21:38:17 UTC (rev 4391)
@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<sv:node sv:name="rc" xmlns:sv="http://www.jcp.org/jcr/sv/1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-  <sv:property sv:name="jcr:primaryType" sv:type="Name">
-    <sv:value>mgnl:contentNode</sv:value>
-  </sv:property>
-  <sv:property sv:name="jcr:mixinTypes" sv:type="Name">
-    <sv:value>mix:lockable</sv:value>
-  </sv:property>
-  <sv:property sv:name="jcr:uuid" sv:type="String">
-    <sv:value>fc6d140b-2133-4abc-b30b-5d4a76e9424b</sv:value>
-  </sv:property>
-  <sv:property sv:name="class" sv:type="String">
-    <sv:value>net.sourceforge.openutils.mgnlmedia.media.processors.RoundedCornersProcessor</sv:value>
-  </sv:property>
-  <sv:node sv:name="MetaData">
-    <sv:property sv:name="jcr:primaryType" sv:type="Name">
-      <sv:value>mgnl:metaData</sv:value>
-    </sv:property>
-    <sv:property sv:name="mgnl:activated" sv:type="Boolean">
-      <sv:value>false</sv:value>
-    </sv:property>
-    <sv:property sv:name="mgnl:authorid" sv:type="String">
-      <sv:value>superuser</sv:value>
-    </sv:property>
-    <sv:property sv:name="mgnl:creationdate" sv:type="Date">
-      <sv:value>2009-09-03T18:28:30.446+02:00</sv:value>
-    </sv:property>
-    <sv:property sv:name="mgnl:lastmodified" sv:type="Date">
-      <sv:value>2009-09-09T10:15:47.224+02:00</sv:value>
-    </sv:property>
-  </sv:node>
-</sv:node>

Deleted: magnoliamodules/trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap/media/config.modules.media.processors.image-resolution.default.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap/media/config.modules.media.processors.image-resolution.default.xml	2013-10-19 20:58:36 UTC (rev 4390)
+++ magnoliamodules/trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap/media/config.modules.media.processors.image-resolution.default.xml	2013-10-19 21:38:17 UTC (rev 4391)
@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<sv:node sv:name="default" xmlns:sv="http://www.jcp.org/jcr/sv/1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-  <sv:property sv:name="jcr:primaryType" sv:type="Name">
-    <sv:value>mgnl:contentNode</sv:value>
-  </sv:property>
-  <sv:property sv:name="jcr:mixinTypes" sv:type="Name">
-    <sv:value>mix:lockable</sv:value>
-  </sv:property>
-  <sv:property sv:name="jcr:uuid" sv:type="String">
-    <sv:value>6dbc524e-4d6a-450e-9646-1147a2767118</sv:value>
-  </sv:property>
-  <sv:property sv:name="aliases" sv:type="String">
-    <sv:value>c</sv:value>
-  </sv:property>
-  <sv:property sv:name="class" sv:type="String">
-    <sv:value>net.sourceforge.openutils.mgnlmedia.media.processors.ResizeCropCenteredImageResolutionProcessor</sv:value>
-  </sv:property>
-  <sv:node sv:name="MetaData">
-    <sv:property sv:name="jcr:primaryType" sv:type="Name">
-      <sv:value>mgnl:metaData</sv:value>
-    </sv:property>
-    <sv:property sv:name="mgnl:authorid" sv:type="String">
-      <sv:value>admin</sv:value>
-    </sv:property>
-    <sv:property sv:name="mgnl:creationdate" sv:type="Date">
-      <sv:value>2009-09-03T18:25:55.848+02:00</sv:value>
-    </sv:property>
-    <sv:property sv:name="mgnl:lastmodified" sv:type="Date">
-      <sv:value>2009-09-03T18:28:25.707+02:00</sv:value>
-    </sv:property>
-  </sv:node>
-</sv:node>

Deleted: magnoliamodules/trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap/media/config.modules.media.processors.image-resolution.l.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap/media/config.modules.media.processors.image-resolution.l.xml	2013-10-19 20:58:36 UTC (rev 4390)
+++ magnoliamodules/trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap/media/config.modules.media.processors.image-resolution.l.xml	2013-10-19 21:38:17 UTC (rev 4391)
@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<sv:node sv:name="l" xmlns:sv="http://www.jcp.org/jcr/sv/1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-  <sv:property sv:name="jcr:primaryType" sv:type="Name">
-    <sv:value>mgnl:contentNode</sv:value>
-  </sv:property>
-  <sv:property sv:name="jcr:mixinTypes" sv:type="Name">
-    <sv:value>mix:lockable</sv:value>
-  </sv:property>
-  <sv:property sv:name="jcr:uuid" sv:type="String">
-    <sv:value>d54f74a4-bdce-492f-8a3c-50e9a7dd6ff6</sv:value>
-  </sv:property>
-  <sv:property sv:name="aliases" sv:type="String">
-    <sv:value>&lt;</sv:value>
-  </sv:property>
-  <sv:property sv:name="class" sv:type="String">
-    <sv:value>net.sourceforge.openutils.mgnlmedia.media.processors.FitInImageResolutionProcessor</sv:value>
-  </sv:property>
-  <sv:node sv:name="MetaData">
-    <sv:property sv:name="jcr:primaryType" sv:type="Name">
-      <sv:value>mgnl:metaData</sv:value>
-    </sv:property>
-    <sv:property sv:name="mgnl:authorid" sv:type="String">
-      <sv:value>admin</sv:value>
-    </sv:property>
-    <sv:property sv:name="mgnl:creationdate" sv:type="Date">
-      <sv:value>2009-09-03T18:28:30.446+02:00</sv:value>
-    </sv:property>
-    <sv:property sv:name="mgnl:lastmodified" sv:type="Date">
-      <sv:value>2009-09-03T18:30:24.699+02:00</sv:value>
-    </sv:property>
-  </sv:node>
-</sv:node>

Deleted: magnoliamodules/trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap/media/config.modules.media.processors.image-resolution.n.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap/media/config.modules.media.processors.image-resolution.n.xml	2013-10-19 20:58:36 UTC (rev 4390)
+++ magnoliamodules/trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap/media/config.modules.media.processors.image-resolution.n.xml	2013-10-19 21:38:17 UTC (rev 4391)
@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<sv:node sv:name="n" xmlns:sv="http://www.jcp.org/jcr/sv/1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-  <sv:property sv:name="jcr:primaryType" sv:type="Name">
-    <sv:value>mgnl:contentNode</sv:value>
-  </sv:property>
-  <sv:property sv:name="jcr:mixinTypes" sv:type="Name">
-    <sv:value>mix:lockable</sv:value>
-  </sv:property>
-  <sv:property sv:name="jcr:uuid" sv:type="String">
-    <sv:value>e625c6d1-c2d2-4eb4-97c1-eda7f5d34dd1</sv:value>
-  </sv:property>
-  <sv:property sv:name="class" sv:type="String">
-    <sv:value>net.sourceforge.openutils.mgnlmedia.media.processors.ResizeNoCropImageResolutionProcessor</sv:value>
-  </sv:property>
-  <sv:node sv:name="MetaData">
-    <sv:property sv:name="jcr:primaryType" sv:type="Name">
-      <sv:value>mgnl:metaData</sv:value>
-    </sv:property>
-    <sv:property sv:name="mgnl:activated" sv:type="Boolean">
-      <sv:value>false</sv:value>
-    </sv:property>
-    <sv:property sv:name="mgnl:authorid" sv:type="String">
-      <sv:value>admin</sv:value>
-    </sv:property>
-    <sv:property sv:name="mgnl:creationdate" sv:type="Date">
-      <sv:value>2009-09-03T18:25:55.848+02:00</sv:value>
-    </sv:property>
-    <sv:property sv:name="mgnl:lastmodified" sv:type="Date">
-      <sv:value>2009-09-03T18:31:07.041+02:00</sv:value>
-    </sv:property>
-  </sv:node>
-</sv:node>

Deleted: magnoliamodules/trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap/media/config.modules.media.processors.image-resolution.o.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap/media/config.modules.media.processors.image-resolution.o.xml	2013-10-19 20:58:36 UTC (rev 4390)
+++ magnoliamodules/trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap/media/config.modules.media.processors.image-resolution.o.xml	2013-10-19 21:38:17 UTC (rev 4391)
@@ -1,35 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<sv:node sv:name="o" xmlns:sv="http://www.jcp.org/jcr/sv/1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-  <sv:property sv:name="jcr:primaryType" sv:type="Name">
-    <sv:value>mgnl:contentNode</sv:value>
-  </sv:property>
-  <sv:property sv:name="jcr:mixinTypes" sv:type="Name">
-    <sv:value>mix:lockable</sv:value>
-  </sv:property>
-  <sv:property sv:name="jcr:uuid" sv:type="String">
-    <sv:value>a8f16f13-bdf2-4a3b-b766-721c048836bb</sv:value>
-  </sv:property>
-  <sv:property sv:name="aliases" sv:type="String">
-    <sv:value>o</sv:value>
-  </sv:property>
-  <sv:property sv:name="class" sv:type="String">
-    <sv:value>net.sourceforge.openutils.mgnlmedia.media.processors.FitInAndFillWithBandsImageResolutionProcessor</sv:value>
-  </sv:property>
-  <sv:node sv:name="MetaData">
-    <sv:property sv:name="jcr:primaryType" sv:type="Name">
-      <sv:value>mgnl:metaData</sv:value>
-    </sv:property>
-    <sv:property sv:name="mgnl:activated" sv:type="Boolean">
-      <sv:value>false</sv:value>
-    </sv:property>
-    <sv:property sv:name="mgnl:authorid" sv:type="String">
-      <sv:value>admin</sv:value>
-    </sv:property>
-    <sv:property sv:name="mgnl:creationdate" sv:type="Date">
-      <sv:value>2009-09-03T18:28:30.446+02:00</sv:value>
-    </sv:property>
-    <sv:property sv:name="mgnl:lastmodified" sv:type="Date">
-      <sv:value>2009-09-03T18:30:00.776+02:00</sv:value>
-    </sv:property>
-  </sv:node>
-</sv:node>

Deleted: magnoliamodules/trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap/media/config.modules.media.processors.image-resolution.p.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap/media/config.modules.media.processors.image-resolution.p.xml	2013-10-19 20:58:36 UTC (rev 4390)
+++ magnoliamodules/trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap/media/config.modules.media.processors.image-resolution.p.xml	2013-10-19 21:38:17 UTC (rev 4391)
@@ -1,38 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<sv:node sv:name="p" xmlns:sv="http://www.jcp.org/jcr/sv/1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-  <sv:property sv:name="jcr:primaryType" sv:type="Name">
-    <sv:value>mgnl:contentNode</sv:value>
-  </sv:property>
-  <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
-    <sv:value>mix:lockable</sv:value>
-  </sv:property>
-  <sv:property sv:name="jcr:uuid" sv:type="String">
-    <sv:value>c10d7b60-efc1-4078-9039-4f432f2792bf</sv:value>
-  </sv:property>
-  <sv:property sv:name="class" sv:type="String">
-    <sv:value>net.sourceforge.openutils.mgnlmedia.media.crop.PzcImageProcessor</sv:value>
-  </sv:property>
-  <sv:property sv:name="jcr:createdBy" sv:type="String">
-    <sv:value>admin</sv:value>
-  </sv:property>
-  <sv:node sv:name="MetaData">
-    <sv:property sv:name="jcr:primaryType" sv:type="Name">
-      <sv:value>mgnl:metaData</sv:value>
-    </sv:property>
-    <sv:property sv:name="jcr:createdBy" sv:type="String">
-      <sv:value>admin</sv:value>
-    </sv:property>
-    <sv:property sv:name="mgnl:activated" sv:type="Boolean">
-      <sv:value>false</sv:value>
-    </sv:property>
-    <sv:property sv:name="mgnl:authorid" sv:type="String">
-      <sv:value>superuser</sv:value>
-    </sv:property>
-    <sv:property sv:name="mgnl:creationdate" sv:type="Date">
-      <sv:value>2009-09-03T18:28:30.446+02:00</sv:value>
-    </sv:property>
-    <sv:property sv:name="mgnl:lastmodified" sv:type="Date">
-      <sv:value>2010-10-28T18:51:53.752+02:00</sv:value>
-    </sv:property>
-  </sv:node>
-</sv:node>

Added: magnoliamodules/trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap/media/config.modules.media.processors.postprocessors.bw.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap/media/config.modules.media.processors.postprocessors.bw.xml	                        (rev 0)
+++ magnoliamodules/trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap/media/config.modules.media.processors.postprocessors.bw.xml	2013-10-19 21:38:17 UTC (rev 4391)
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<sv:node sv:name="bw" xmlns:sv="http://www.jcp.org/jcr/sv/1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <sv:property sv:name="jcr:primaryType" sv:type="Name">
+    <sv:value>mgnl:contentNode</sv:value>
+  </sv:property>
+  <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
+    <sv:value>mix:lockable</sv:value>
+  </sv:property>
+  <sv:property sv:name="jcr:uuid" sv:type="String">
+    <sv:value>b3258444-6292-43e5-a412-76a8106275a3</sv:value>
+  </sv:property>
+  <sv:property sv:name="class" sv:type="String">
+    <sv:value>net.sourceforge.openutils.mgnlmedia.media.processors.BlackAndWhitePostProcessor</sv:value>
+  </sv:property>
+  <sv:property sv:name="jcr:createdBy" sv:type="String">
+    <sv:value>admin</sv:value>
+  </sv:property>
+  <sv:node sv:name="MetaData">
+    <sv:property sv:name="jcr:primaryType" sv:type="Name">
+      <sv:value>mgnl:metaData</sv:value>
+    </sv:property>
+    <sv:property sv:name="jcr:createdBy" sv:type="String">
+      <sv:value>admin</sv:value>
+    </sv:property>
+    <sv:property sv:name="mgnl:activated" sv:type="Boolean">
+      <sv:value>false</sv:value>
+    </sv:property>
+    <sv:property sv:name="mgnl:authorid" sv:type="String">
+      <sv:value>superuser</sv:value>
+    </sv:property>
+    <sv:property sv:name="mgnl:creationdate" sv:type="Date">
+      <sv:value>2009-09-03T18:28:30.446+02:00</sv:value>
+    </sv:property>
+    <sv:property sv:name="mgnl:lastmodified" sv:type="Date">
+      <sv:value>2009-09-09T10:15:47.224+02:00</sv:value>
+    </sv:property>
+  </sv:node>
+</sv:node>


Property changes on: magnoliamodules/trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap/media/config.modules.media.processors.postprocessors.bw.xml
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+text/xml
\ No newline at end of property
Added: svn:keywords
## -0,0 +1 ##
+Author Date Id Revision
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: magnoliamodules/trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap/media/config.modules.media.processors.postprocessors.logsize.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap/media/config.modules.media.processors.postprocessors.logsize.xml	                        (rev 0)
+++ magnoliamodules/trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap/media/config.modules.media.processors.postprocessors.logsize.xml	2013-10-19 21:38:17 UTC (rev 4391)
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<sv:node sv:name="logsize" xmlns:sv="http://www.jcp.org/jcr/sv/1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <sv:property sv:name="jcr:primaryType" sv:type="Name">
+    <sv:value>mgnl:contentNode</sv:value>
+  </sv:property>
+  <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
+    <sv:value>mix:lockable</sv:value>
+  </sv:property>
+  <sv:property sv:name="jcr:uuid" sv:type="String">
+    <sv:value>a5f39e3b-4364-487c-915a-aaad00535bff</sv:value>
+  </sv:property>
+  <sv:property sv:name="class" sv:type="String">
+    <sv:value>net.sourceforge.openutils.mgnlmedia.media.processors.LogSizePostProcessor</sv:value>
+  </sv:property>
+  <sv:property sv:name="jcr:createdBy" sv:type="String">
+    <sv:value>admin</sv:value>
+  </sv:property>
+  <sv:node sv:name="MetaData">
+    <sv:property sv:name="jcr:primaryType" sv:type="Name">
+      <sv:value>mgnl:metaData</sv:value>
+    </sv:property>
+    <sv:property sv:name="jcr:createdBy" sv:type="String">
+      <sv:value>admin</sv:value>
+    </sv:property>
+    <sv:property sv:name="mgnl:activated" sv:type="Boolean">
+      <sv:value>false</sv:value>
+    </sv:property>
+    <sv:property sv:name="mgnl:authorid" sv:type="String">
+      <sv:value>admin</sv:value>
+    </sv:property>
+    <sv:property sv:name="mgnl:creationdate" sv:type="Date">
+      <sv:value>2009-09-03T18:28:30.446+02:00</sv:value>
+    </sv:property>
+    <sv:property sv:name="mgnl:lastmodified" sv:type="Date">
+      <sv:value>2009-09-04T13:01:42.001+02:00</sv:value>
+    </sv:property>
+  </sv:node>
+</sv:node>


Property changes on: magnoliamodules/trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap/media/config.modules.media.processors.postprocessors.logsize.xml
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+text/xml
\ No newline at end of property
Added: svn:keywords
## -0,0 +1 ##
+Author Date Id Revision
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: magnoliamodules/trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap/media/config.modules.media.processors.postprocessors.rc.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap/media/config.modules.media.processors.postprocessors.rc.xml	                        (rev 0)
+++ magnoliamodules/trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap/media/config.modules.media.processors.postprocessors.rc.xml	2013-10-19 21:38:17 UTC (rev 4391)
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<sv:node sv:name="rc" xmlns:sv="http://www.jcp.org/jcr/sv/1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <sv:property sv:name="jcr:primaryType" sv:type="Name">
+    <sv:value>mgnl:contentNode</sv:value>
+  </sv:property>
+  <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
+    <sv:value>mix:lockable</sv:value>
+  </sv:property>
+  <sv:property sv:name="jcr:uuid" sv:type="String">
+    <sv:value>8071597c-3c20-46ef-9b98-01fbc68f8dad</sv:value>
+  </sv:property>
+  <sv:property sv:name="class" sv:type="String">
+    <sv:value>net.sourceforge.openutils.mgnlmedia.media.processors.RoundedCornersProcessor</sv:value>
+  </sv:property>
+  <sv:property sv:name="jcr:createdBy" sv:type="String">
+    <sv:value>admin</sv:value>
+  </sv:property>
+  <sv:node sv:name="MetaData">
+    <sv:property sv:name="jcr:primaryType" sv:type="Name">
+      <sv:value>mgnl:metaData</sv:value>
+    </sv:property>
+    <sv:property sv:name="jcr:createdBy" sv:type="String">
+      <sv:value>admin</sv:value>
+    </sv:property>
+    <sv:property sv:name="mgnl:activated" sv:type="Boolean">
+      <sv:value>false</sv:value>
+    </sv:property>
+    <sv:property sv:name="mgnl:authorid" sv:type="String">
+      <sv:value>superuser</sv:value>
+    </sv:property>
+    <sv:property sv:name="mgnl:creationdate" sv:type="Date">
+      <sv:value>2009-09-03T18:28:30.446+02:00</sv:value>
+    </sv:property>
+    <sv:property sv:name="mgnl:lastmodified" sv:type="Date">
+      <sv:value>2009-09-09T10:15:47.224+02:00</sv:value>
+    </sv:property>
+  </sv:node>
+</sv:node>


Property changes on: magnoliamodules/trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap/media/config.modules.media.processors.postprocessors.rc.xml
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+text/xml
\ No newline at end of property
Added: svn:keywords
## -0,0 +1 ##
+Author Date Id Revision
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: magnoliamodules/trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap/media/config.modules.media.processors.resolutionprocessors.c.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap/media/config.modules.media.processors.resolutionprocessors.c.xml	                        (rev 0)
+++ magnoliamodules/trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap/media/config.modules.media.processors.resolutionprocessors.c.xml	2013-10-19 21:38:17 UTC (rev 4391)
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<sv:node sv:name="c" xmlns:sv="http://www.jcp.org/jcr/sv/1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <sv:property sv:name="jcr:primaryType" sv:type="Name">
+    <sv:value>mgnl:contentNode</sv:value>
+  </sv:property>
+  <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
+    <sv:value>mix:lockable</sv:value>
+  </sv:property>
+  <sv:property sv:name="jcr:uuid" sv:type="String">
+    <sv:value>739e404e-49ab-4654-98c2-c40974b0cc47</sv:value>
+  </sv:property>
+  <sv:property sv:name="class" sv:type="String">
+    <sv:value>net.sourceforge.openutils.mgnlmedia.media.processors.ResizeCropCenteredImageResolutionProcessor</sv:value>
+  </sv:property>
+  <sv:property sv:name="jcr:createdBy" sv:type="String">
+    <sv:value>admin</sv:value>
+  </sv:property>
+  <sv:node sv:name="MetaData">
+    <sv:property sv:name="jcr:primaryType" sv:type="Name">
+      <sv:value>mgnl:metaData</sv:value>
+    </sv:property>
+    <sv:property sv:name="jcr:createdBy" sv:type="String">
+      <sv:value>admin</sv:value>
+    </sv:property>
+    <sv:property sv:name="mgnl:activated" sv:type="Boolean">
+      <sv:value>false</sv:value>
+    </sv:property>
+    <sv:property sv:name="mgnl:authorid" sv:type="String">
+      <sv:value>superuser</sv:value>
+    </sv:property>
+    <sv:property sv:name="mgnl:creationdate" sv:type="Date">
+      <sv:value>2009-09-03T18:25:55.848+02:00</sv:value>
+    </sv:property>
+    <sv:property sv:name="mgnl:lastmodified" sv:type="Date">
+      <sv:value>2013-10-19T23:33:36.115+02:00</sv:value>
+    </sv:property>
+  </sv:node>
+</sv:node>


Property changes on: magnoliamodules/trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap/media/config.modules.media.processors.resolutionprocessors.c.xml
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+text/xml
\ No newline at end of property
Added: svn:keywords
## -0,0 +1 ##
+Author Date Id Revision
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: magnoliamodules/trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap/media/config.modules.media.processors.resolutionprocessors.default.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap/media/config.modules.media.processors.resolutionprocessors.default.xml	                        (rev 0)
+++ magnoliamodules/trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap/media/config.modules.media.processors.resolutionprocessors.default.xml	2013-10-19 21:38:17 UTC (rev 4391)
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<sv:node sv:name="default" xmlns:sv="http://www.jcp.org/jcr/sv/1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <sv:property sv:name="jcr:primaryType" sv:type="Name">
+    <sv:value>mgnl:contentNode</sv:value>
+  </sv:property>
+  <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
+    <sv:value>mix:lockable</sv:value>
+  </sv:property>
+  <sv:property sv:name="jcr:uuid" sv:type="String">
+    <sv:value>7998b2ee-1429-4bd2-bf51-27c4b5cc3095</sv:value>
+  </sv:property>
+  <sv:property sv:name="class" sv:type="String">
+    <sv:value>net.sourceforge.openutils.mgnlmedia.media.processors.ResizeCropCenteredImageResolutionProcessor</sv:value>
+  </sv:property>
+  <sv:property sv:name="jcr:createdBy" sv:type="String">
+    <sv:value>admin</sv:value>
+  </sv:property>
+  <sv:node sv:name="MetaData">
+    <sv:property sv:name="jcr:primaryType" sv:type="Name">
+      <sv:value>mgnl:metaData</sv:value>
+    </sv:property>
+    <sv:property sv:name="jcr:createdBy" sv:type="String">
+      <sv:value>admin</sv:value>
+    </sv:property>
+    <sv:property sv:name="mgnl:authorid" sv:type="String">
+      <sv:value>admin</sv:value>
+    </sv:property>
+    <sv:property sv:name="mgnl:creationdate" sv:type="Date">
+      <sv:value>2009-09-03T18:25:55.848+02:00</sv:value>
+    </sv:property>
+    <sv:property sv:name="mgnl:lastmodified" sv:type="Date">
+      <sv:value>2009-09-03T18:28:25.707+02:00</sv:value>
+    </sv:property>
+  </sv:node>
+</sv:node>


Property changes on: magnoliamodules/trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap/media/config.modules.media.processors.resolutionprocessors.default.xml
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+text/xml
\ No newline at end of property
Added: svn:keywords
## -0,0 +1 ##
+Author Date Id Revision
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: magnoliamodules/trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap/media/config.modules.media.processors.resolutionprocessors.l.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap/media/config.modules.media.processors.resolutionprocessors.l.xml	                        (rev 0)
+++ magnoliamodules/trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap/media/config.modules.media.processors.resolutionprocessors.l.xml	2013-10-19 21:38:17 UTC (rev 4391)
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<sv:node sv:name="l" xmlns:sv="http://www.jcp.org/jcr/sv/1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <sv:property sv:name="jcr:primaryType" sv:type="Name">
+    <sv:value>mgnl:contentNode</sv:value>
+  </sv:property>
+  <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
+    <sv:value>mix:lockable</sv:value>
+  </sv:property>
+  <sv:property sv:name="jcr:uuid" sv:type="String">
+    <sv:value>3ab8b913-d8ab-4811-a5a7-50c2a608b0f1</sv:value>
+  </sv:property>
+  <sv:property sv:name="aliases" sv:type="String">
+    <sv:value>&lt;</sv:value>
+  </sv:property>
+  <sv:property sv:name="class" sv:type="String">
+    <sv:value>net.sourceforge.openutils.mgnlmedia.media.processors.FitInImageResolutionProcessor</sv:value>
+  </sv:property>
+  <sv:property sv:name="jcr:createdBy" sv:type="String">
+    <sv:value>admin</sv:value>
+  </sv:property>
+  <sv:node sv:name="MetaData">
+    <sv:property sv:name="jcr:primaryType" sv:type="Name">
+      <sv:value>mgnl:metaData</sv:value>
+    </sv:property>
+    <sv:property sv:name="jcr:createdBy" sv:type="String">
+      <sv:value>admin</sv:value>
+    </sv:property>
+    <sv:property sv:name="mgnl:authorid" sv:type="String">
+      <sv:value>admin</sv:value>
+    </sv:property>
+    <sv:property sv:name="mgnl:creationdate" sv:type="Date">
+      <sv:value>2009-09-03T18:28:30.446+02:00</sv:value>
+    </sv:property>
+    <sv:property sv:name="mgnl:lastmodified" sv:type="Date">
+      <sv:value>2009-09-03T18:30:24.699+02:00</sv:value>
+    </sv:property>
+  </sv:node>
+</sv:node>


Property changes on: magnoliamodules/trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap/media/config.modules.media.processors.resolutionprocessors.l.xml
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+text/xml
\ No newline at end of property
Added: svn:keywords
## -0,0 +1 ##
+Author Date Id Revision
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: magnoliamodules/trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap/media/config.modules.media.processors.resolutionprocessors.n.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap/media/config.modules.media.processors.resolutionprocessors.n.xml	                        (rev 0)
+++ magnoliamodules/trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap/media/config.modules.media.processors.resolutionprocessors.n.xml	2013-10-19 21:38:17 UTC (rev 4391)
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<sv:node sv:name="n" xmlns:sv="http://www.jcp.org/jcr/sv/1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <sv:property sv:name="jcr:primaryType" sv:type="Name">
+    <sv:value>mgnl:contentNode</sv:value>
+  </sv:property>
+  <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
+    <sv:value>mix:lockable</sv:value>
+  </sv:property>
+  <sv:property sv:name="jcr:uuid" sv:type="String">
+    <sv:value>548599ee-b91f-43e0-aae3-7a7bf3f3aca2</sv:value>
+  </sv:property>
+  <sv:property sv:name="class" sv:type="String">
+    <sv:value>net.sourceforge.openutils.mgnlmedia.media.processors.ResizeNoCropImageResolutionProcessor</sv:value>
+  </sv:property>
+  <sv:property sv:name="jcr:createdBy" sv:type="String">
+    <sv:value>admin</sv:value>
+  </sv:property>
+  <sv:node sv:name="MetaData">
+    <sv:property sv:name="jcr:primaryType" sv:type="Name">
+      <sv:value>mgnl:metaData</sv:value>
+    </sv:property>
+    <sv:property sv:name="jcr:createdBy" sv:type="String">
+      <sv:value>admin</sv:value>
+    </sv:property>
+    <sv:property sv:name="mgnl:activated" sv:type="Boolean">
+      <sv:value>false</sv:value>
+    </sv:property>
+    <sv:property sv:name="mgnl:authorid" sv:type="String">
+      <sv:value>admin</sv:value>
+    </sv:property>
+    <sv:property sv:name="mgnl:creationdate" sv:type="Date">
+      <sv:value>2009-09-03T18:25:55.848+02:00</sv:value>
+    </sv:property>
+    <sv:property sv:name="mgnl:lastmodified" sv:type="Date">
+      <sv:value>2009-09-03T18:31:07.041+02:00</sv:value>
+    </sv:property>
+  </sv:node>
+</sv:node>


Property changes on: magnoliamodules/trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap/media/config.modules.media.processors.resolutionprocessors.n.xml
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+text/xml
\ No newline at end of property
Added: svn:keywords
## -0,0 +1 ##
+Author Date Id Revision
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: magnoliamodules/trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap/media/config.modules.media.processors.resolutionprocessors.o.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap/media/config.modules.media.processors.resolutionprocessors.o.xml	                        (rev 0)
+++ magnoliamodules/trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap/media/config.modules.media.processors.resolutionprocessors.o.xml	2013-10-19 21:38:17 UTC (rev 4391)
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<sv:node sv:name="o" xmlns:sv="http://www.jcp.org/jcr/sv/1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <sv:property sv:name="jcr:primaryType" sv:type="Name">
+    <sv:value>mgnl:contentNode</sv:value>
+  </sv:property>
+  <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
+    <sv:value>mix:lockable</sv:value>
+  </sv:property>
+  <sv:property sv:name="jcr:uuid" sv:type="String">
+    <sv:value>00ceabca-e778-45ce-a2d8-4da039d0b91e</sv:value>
+  </sv:property>
+  <sv:property sv:name="class" sv:type="String">
+    <sv:value>net.sourceforge.openutils.mgnlmedia.media.processors.FitInAndFillWithBandsImageResolutionProcessor</sv:value>
+  </sv:property>
+  <sv:property sv:name="jcr:createdBy" sv:type="String">
+    <sv:value>admin</sv:value>
+  </sv:property>
+  <sv:node sv:name="MetaData">
+    <sv:property sv:name="jcr:primaryType" sv:type="Name">
+      <sv:value>mgnl:metaData</sv:value>
+    </sv:property>
+    <sv:property sv:name="jcr:createdBy" sv:type="String">
+      <sv:value>admin</sv:value>
+    </sv:property>
+    <sv:property sv:name="mgnl:activated" sv:type="Boolean">
+      <sv:value>false</sv:value>
+    </sv:property>
+    <sv:property sv:name="mgnl:authorid" sv:type="String">
+      <sv:value>admin</sv:value>
+    </sv:property>
+    <sv:property sv:name="mgnl:creationdate" sv:type="Date">
+      <sv:value>2009-09-03T18:28:30.446+02:00</sv:value>
+    </sv:property>
+    <sv:property sv:name="mgnl:lastmodified" sv:type="Date">
+      <sv:value>2009-09-03T18:30:00.776+02:00</sv:value>
+    </sv:property>
+  </sv:node>
+</sv:node>


Property changes on: magnoliamodules/trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap/media/config.modules.media.processors.resolutionprocessors.o.xml
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+text/xml
\ No newline at end of property
Added: svn:keywords
## -0,0 +1 ##
+Author Date Id Revision
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: magnoliamodules/trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap/media/config.modules.media.processors.resolutionprocessors.p.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap/media/config.modules.media.processors.resolutionprocessors.p.xml	                        (rev 0)
+++ magnoliamodules/trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap/media/config.modules.media.processors.resolutionprocessors.p.xml	2013-10-19 21:38:17 UTC (rev 4391)
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<sv:node sv:name="p" xmlns:sv="http://www.jcp.org/jcr/sv/1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <sv:property sv:name="jcr:primaryType" sv:type="Name">
+    <sv:value>mgnl:contentNode</sv:value>
+  </sv:property>
+  <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
+    <sv:value>mix:lockable</sv:value>
+  </sv:property>
+  <sv:property sv:name="jcr:uuid" sv:type="String">
+    <sv:value>c97d6259-c109-4929-bea9-f42b5592dec7</sv:value>
+  </sv:property>
+  <sv:property sv:name="class" sv:type="String">
+    <sv:value>net.sourceforge.openutils.mgnlmedia.media.crop.PzcImageProcessor</sv:value>
+  </sv:property>
+  <sv:property sv:name="jcr:createdBy" sv:type="String">
+    <sv:value>admin</sv:value>
+  </sv:property>
+  <sv:node sv:name="MetaData">
+    <sv:property sv:name="jcr:primaryType" sv:type="Name">
+      <sv:value>mgnl:metaData</sv:value>
+    </sv:property>
+    <sv:property sv:name="jcr:createdBy" sv:type="String">
+      <sv:value>admin</sv:value>
+    </sv:property>
+    <sv:property sv:name="mgnl:activated" sv:type="Boolean">
+      <sv:value>false</sv:value>
+    </sv:property>
+    <sv:property sv:name="mgnl:authorid" sv:type="String">
+      <sv:value>superuser</sv:value>
+    </sv:property>
+    <sv:property sv:name="mgnl:creationdate" sv:type="Date">
+      <sv:value>2009-09-03T18:28:30.446+02:00</sv:value>
+    </sv:property>
+    <sv:property sv:name="mgnl:lastmodified" sv:type="Date">
+      <sv:value>2010-10-28T18:51:53.752+02:00</sv:value>
+    </sv:property>
+  </sv:node>
+</sv:node>


Property changes on: magnoliamodules/trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap/media/config.modules.media.processors.resolutionprocessors.p.xml
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+text/xml
\ No newline at end of property
Added: svn:keywords
## -0,0 +1 ##
+Author Date Id Revision
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Modified: magnoliamodules/trunk/openutils-mgnlmedia/src/test/java/net/sourceforge/openutils/mgnlmedia/media/utils/ImageProcessorsManagerMock.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlmedia/src/test/java/net/sourceforge/openutils/mgnlmedia/media/utils/ImageProcessorsManagerMock.java	2013-10-19 20:58:36 UTC (rev 4390)
+++ magnoliamodules/trunk/openutils-mgnlmedia/src/test/java/net/sourceforge/openutils/mgnlmedia/media/utils/ImageProcessorsManagerMock.java	2013-10-19 21:38:17 UTC (rev 4391)
@@ -42,7 +42,7 @@
      * {@inheritDoc}
      */
     @Override
-    public ImageResolutionProcessor getDefaultImageResolutionProcessor()
+    public ImageResolutionProcessor getDefaultResolutionProcessor()
     {
         return new ResizeCropCenteredImageResolutionProcessor();
     }

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