Menu
▾
▴
openutils-svn
|
From: <fg...@us...> - 2013-09-20 12:38:43
|
Revision: 4331
http://openutils.svn.sourceforge.net/openutils/?rev=4331&view=rev
Author: fgiust
Date: 2013-09-20 12:38:39 +0000 (Fri, 20 Sep 2013)
Log Message:
-----------
less Content (and more broken)
Modified Paths:
--------------
magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/dam/SimpleMediaAsset.java
magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/dam/SimpleMediaContentHandler.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/advancedsearch/SearchFilterOptionProvider.java
magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/commands/MediaActivationCommand.java
magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/configuration/MediaConfigurationManager.java
magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/crop/PzcServlet.java
magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/dialog/DialogHiddenParameters.java
magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/dialog/LayerDialogMVC.java
magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/pages/MediaAdvancedSearchPage.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/pages/MediaBrowserPage.java
magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/pages/MediaSearchPage.java
magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/setup/AddExtensionToType.java
magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/setup/ConditionallySubscribeMediaRepositoriesTask.java
magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/setup/MoveHandlerNodedataToNode.java
magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/setup/RemoveExtensionFromType.java
magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/setup/RemoveResolutionsNodeTask.java
magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/setup/RenameThumbToImageTask.java
magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/tree/JcrBrowserWithNodeTypeTreeConfiguration.java
magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/tree/MediaBrowserConfiguration.java
magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/tree/MediaModuleTree.java
magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/types/impl/BaseTypeHandler.java
magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/types/impl/ImageTypeHandler.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/ImageUtils.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/dialog/PlaylistEntryDialogMVC.java
magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/playlist/dialog/SearchBasedPlaylistDialogMVC.java
magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/playlist/pages/DefaultPlaylistTrackExtensionContributor.java
magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/playlist/pages/PlaylistView.java
magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/playlist/tree/PlaylistsTree.java
magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/playlist/tree/PlaylistsTreeMVCHandler.java
magnoliamodules/trunk/openutils-mgnlmedia/src/test/java/net/sourceforge/openutils/mgnlmedia/media/repotests/MediaTests.java
magnoliamodules/trunk/openutils-mgnlmedia/src/test/java/net/sourceforge/openutils/mgnlmedia/media/utils/FileNodeData.java
Modified: magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/dam/SimpleMediaAsset.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/dam/SimpleMediaAsset.java 2013-09-19 14:32:06 UTC (rev 4330)
+++ magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/dam/SimpleMediaAsset.java 2013-09-20 12:38:39 UTC (rev 4331)
@@ -19,6 +19,7 @@
package net.sourceforge.openutils.mgnlmedia.dam;
+
import info.magnolia.cms.core.Content;
import info.magnolia.cms.core.NodeData;
import info.magnolia.module.templatingkit.dam.AssetNotFoundException;
Modified: magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/dam/SimpleMediaContentHandler.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/dam/SimpleMediaContentHandler.java 2013-09-19 14:32:06 UTC (rev 4330)
+++ magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/dam/SimpleMediaContentHandler.java 2013-09-20 12:38:39 UTC (rev 4331)
@@ -19,6 +19,7 @@
package net.sourceforge.openutils.mgnlmedia.dam;
+
import info.magnolia.cms.core.Content;
import info.magnolia.cms.core.HierarchyManager;
import info.magnolia.cms.core.NodeData;
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-09-19 14:32:06 UTC (rev 4330)
+++ magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/grid/MediaGridColumnType.java 2013-09-20 12:38:39 UTC (rev 4331)
@@ -19,6 +19,7 @@
package net.sourceforge.openutils.mgnlmedia.grid;
+
import info.magnolia.cms.core.Content;
import info.magnolia.cms.i18n.Messages;
import info.magnolia.cms.security.AccessDeniedException;
Modified: magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/advancedsearch/SearchFilterOptionProvider.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/advancedsearch/SearchFilterOptionProvider.java 2013-09-19 14:32:06 UTC (rev 4330)
+++ magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/advancedsearch/SearchFilterOptionProvider.java 2013-09-20 12:38:39 UTC (rev 4331)
@@ -19,13 +19,14 @@
package net.sourceforge.openutils.mgnlmedia.media.advancedsearch;
-import info.magnolia.cms.core.Content;
+
import info.magnolia.context.MgnlContext;
import java.util.ArrayList;
import java.util.Collection;
import java.util.List;
+import javax.jcr.Node;
import javax.jcr.RepositoryException;
import org.apache.commons.lang.StringUtils;
@@ -112,7 +113,7 @@
{
try
{
- Collection<Content> referenceOptions = MgnlContext
+ Collection<Node> referenceOptions = MgnlContext
.getHierarchyManager("config")
.getContent(reference)
.getChildren();
@@ -126,7 +127,7 @@
addOptions(opt);
}
- for (Content content : referenceOptions)
+ for (Node content : referenceOptions)
{
opt = new Option();
opt.setLabel(content.getNodeData("label").getString());
Modified: magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/commands/MediaActivationCommand.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/commands/MediaActivationCommand.java 2013-09-19 14:32:06 UTC (rev 4330)
+++ magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/commands/MediaActivationCommand.java 2013-09-20 12:38:39 UTC (rev 4331)
@@ -19,6 +19,7 @@
package net.sourceforge.openutils.mgnlmedia.media.commands;
+
import info.magnolia.cms.core.Content;
import info.magnolia.cms.core.ItemType;
import info.magnolia.cms.exchange.ExchangeException;
Modified: magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/configuration/MediaConfigurationManager.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/configuration/MediaConfigurationManager.java 2013-09-19 14:32:06 UTC (rev 4330)
+++ magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/configuration/MediaConfigurationManager.java 2013-09-20 12:38:39 UTC (rev 4331)
@@ -114,9 +114,7 @@
{
Node node = content.getJCRNode();
-
-
-
+
for (Iterator iter = ContentUtil.getAllChildren(node).iterator(); iter.hasNext();)
{
Node typeNode = iter.next();
@@ -147,7 +145,7 @@
}
catch (Throwable e)
{
- log.error("Error getting media type configuration for {}", typeNode.getHandle(), e);
+ log.error("Error getting media type configuration for {}", NodeUtil.getPathIfPossible(typeNode), e);
}
}
}
Modified: magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/crop/PzcServlet.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/crop/PzcServlet.java 2013-09-19 14:32:06 UTC (rev 4330)
+++ magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/crop/PzcServlet.java 2013-09-20 12:38:39 UTC (rev 4331)
@@ -19,7 +19,7 @@
package net.sourceforge.openutils.mgnlmedia.media.crop;
-import info.magnolia.cms.core.Content;
+
import info.magnolia.cms.core.HierarchyManager;
import info.magnolia.cms.core.NodeData;
import info.magnolia.cms.util.NodeDataUtil;
@@ -28,6 +28,7 @@
import java.io.IOException;
+import javax.jcr.Node;
import javax.jcr.RepositoryException;
import javax.servlet.ServletException;
import javax.servlet.http.HttpServlet;
@@ -73,7 +74,7 @@
try
{
- final Content node = hm.getContent(handle);
+ final Node node = hm.getContent(handle);
if ("delete".equals(command))
{
NodeData nd = node.getNodeData(id);
@@ -95,7 +96,7 @@
HierarchyManager hm = MgnlContext.getHierarchyManager(systemRepository);
try
{
- Content systemNode = hm.getContent(node.getHandle());
+ Node systemNode = hm.getContent(node.getHandle());
NodeDataUtil.getOrCreateAndSet(systemNode, id, new StringBuffer()
.append(zoom)
.append("|")
Modified: magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/dialog/DialogHiddenParameters.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/dialog/DialogHiddenParameters.java 2013-09-19 14:32:06 UTC (rev 4330)
+++ magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/dialog/DialogHiddenParameters.java 2013-09-20 12:38:39 UTC (rev 4331)
@@ -19,6 +19,8 @@
package net.sourceforge.openutils.mgnlmedia.media.dialog;
+
+
import info.magnolia.cms.core.Content;
import javax.jcr.RepositoryException;
Modified: magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/dialog/LayerDialogMVC.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/dialog/LayerDialogMVC.java 2013-09-19 14:32:06 UTC (rev 4330)
+++ magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/dialog/LayerDialogMVC.java 2013-09-20 12:38:39 UTC (rev 4331)
@@ -19,6 +19,7 @@
package net.sourceforge.openutils.mgnlmedia.media.dialog;
+
import info.magnolia.cms.core.Content;
import info.magnolia.cms.core.HierarchyManager;
import info.magnolia.cms.core.Path;
Modified: magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/pages/MediaAdvancedSearchPage.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/pages/MediaAdvancedSearchPage.java 2013-09-19 14:32:06 UTC (rev 4330)
+++ magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/pages/MediaAdvancedSearchPage.java 2013-09-20 12:38:39 UTC (rev 4331)
@@ -19,7 +19,7 @@
package net.sourceforge.openutils.mgnlmedia.media.pages;
-import info.magnolia.cms.core.Content;
+
import info.magnolia.context.MgnlContext;
import info.magnolia.freemarker.FreemarkerUtil;
@@ -27,6 +27,7 @@
import java.util.LinkedHashMap;
import java.util.Map;
+import javax.jcr.Node;
import javax.jcr.RepositoryException;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
@@ -214,15 +215,15 @@
return metas;
}
- public Iterator<Content> getMediaContentList()
+ public Iterator<Node> getMediaContentList()
{
- return Iterators.transform(searchResult.getItems(), new Function<AdvancedResultItem, Content>()
+ return Iterators.transform(searchResult.getItems(), new Function<AdvancedResultItem, Node>()
{
/**
* {@inheritDoc}
*/
- public Content apply(AdvancedResultItem from)
+ public Node apply(AdvancedResultItem from)
{
try
{
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-09-19 14:32:06 UTC (rev 4330)
+++ magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/pages/MediaBean.java 2013-09-20 12:38:39 UTC (rev 4331)
@@ -19,14 +19,16 @@
package net.sourceforge.openutils.mgnlmedia.media.pages;
-import info.magnolia.cms.core.Content;
+
import info.magnolia.cms.core.MetaData;
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
+import javax.jcr.Node;
+
/**
* Store media info for rendering in {@link MediaFolderViewPage}
* @author molaschi
@@ -51,7 +53,7 @@
private String dialog;
- private Content content;
+ private Node content;
private MetaData metaData;
@@ -203,7 +205,7 @@
* Returns the content.
* @return the content
*/
- public Content getContent()
+ public Node getContent()
{
return content;
}
@@ -212,7 +214,7 @@
* Sets the content.
* @param content the content to set
*/
- public void setContent(Content content)
+ public void setContent(Node content)
{
this.content = content;
}
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-09-19 14:32:06 UTC (rev 4330)
+++ magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/pages/MediaBeanBuilder.java 2013-09-20 12:38:39 UTC (rev 4331)
@@ -20,7 +20,6 @@
package net.sourceforge.openutils.mgnlmedia.media.pages;
import info.magnolia.cms.beans.config.URI2RepositoryManager;
-import info.magnolia.cms.core.Content;
import info.magnolia.cms.exchange.ActivationManagerFactory;
import info.magnolia.cms.security.Permission;
import info.magnolia.cms.util.NodeDataUtil;
@@ -29,6 +28,7 @@
import java.util.List;
import java.util.Map;
+import javax.jcr.Node;
import javax.jcr.RepositoryException;
import net.sourceforge.openutils.mgnlmedia.media.configuration.MediaConfigurationManager;
@@ -48,7 +48,7 @@
* @author dschivo
* @version $Id$
*/
-public class MediaBeanBuilder implements Function<Content, MediaBean>
+public class MediaBeanBuilder implements Function<Node, MediaBean>
{
/**
@@ -59,7 +59,7 @@
/**
* {@inheritDoc}
*/
- public MediaBean apply(Content media)
+ public MediaBean apply(Node media)
{
String mediatype = media.getNodeData("type").getString();
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-09-19 14:32:06 UTC (rev 4330)
+++ magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/pages/MediaBrowserPage.java 2013-09-20 12:38:39 UTC (rev 4331)
@@ -20,7 +20,6 @@
package net.sourceforge.openutils.mgnlmedia.media.pages;
import info.magnolia.cms.beans.runtime.Document;
-import info.magnolia.cms.core.Content;
import info.magnolia.cms.core.HierarchyManager;
import info.magnolia.cms.i18n.Messages;
import info.magnolia.cms.util.AlertUtil;
@@ -39,6 +38,7 @@
import java.util.List;
import java.util.zip.ZipFile;
+import javax.jcr.Node;
import javax.jcr.RepositoryException;
import javax.servlet.http.Cookie;
import javax.servlet.http.HttpServletRequest;
@@ -116,7 +116,7 @@
HierarchyManager mgr = MgnlContext.getHierarchyManager(MediaModule.REPO);
try
{
- Content media = mgr.getContentByUUID(actMedia);
+ Node media = mgr.getContentByUUID(actMedia);
openPath = media.getParent().getHandle();
actMediaHandle = media.getHandle();
}
@@ -127,13 +127,13 @@
}
if (!StringUtils.isEmpty(playlistHandle))
{
- Content playlistContent = ContentUtil.getContent(PlaylistConstants.REPO, playlistHandle);
+ Node playlistContent = ContentUtil.getContent(PlaylistConstants.REPO, playlistHandle);
try
{
if (playlistContent.hasContent("search"))
{
List<String> params = new ArrayList<String>();
- for (Content content : playlistContent.getContent("search").getChildren())
+ for (Node content : playlistContent.getContent("search").getChildren())
{
String paramName = NodeDataUtil.getString(content, "name");
String paramValue = NodeDataUtil.getString(content, "value");
Modified: magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/pages/MediaSearchPage.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/pages/MediaSearchPage.java 2013-09-19 14:32:06 UTC (rev 4330)
+++ magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/pages/MediaSearchPage.java 2013-09-20 12:38:39 UTC (rev 4331)
@@ -19,7 +19,7 @@
package net.sourceforge.openutils.mgnlmedia.media.pages;
-import info.magnolia.cms.core.Content;
+
import info.magnolia.cms.core.HierarchyManager;
import info.magnolia.context.MgnlContext;
@@ -28,6 +28,7 @@
import java.util.List;
import java.util.Map;
+import javax.jcr.Node;
import javax.jcr.RepositoryException;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
@@ -95,9 +96,9 @@
HierarchyManager mgr = MgnlContext.getHierarchyManager(MediaModule.REPO);
try
{
- Collection<Content> contents = mgr.getRoot().getChildren(MediaConfigurationManager.FOLDER);
+ Collection<Node> contents = mgr.getRoot().getChildren(MediaConfigurationManager.FOLDER);
List<String> tmpPaths = new ArrayList<String>();
- for (Content c : contents)
+ for (Node c : contents)
{
tmpPaths.add(c.getName());
}
Modified: magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/setup/AddExtensionToType.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/setup/AddExtensionToType.java 2013-09-19 14:32:06 UTC (rev 4330)
+++ magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/setup/AddExtensionToType.java 2013-09-20 12:38:39 UTC (rev 4331)
@@ -19,13 +19,14 @@
package net.sourceforge.openutils.mgnlmedia.media.setup;
-import info.magnolia.cms.core.Content;
+
import info.magnolia.cms.core.HierarchyManager;
import info.magnolia.module.InstallContext;
import info.magnolia.module.delta.AbstractRepositoryTask;
import info.magnolia.module.delta.TaskExecutionException;
import info.magnolia.repository.RepositoryConstants;
+import javax.jcr.Node;
import javax.jcr.RepositoryException;
import org.apache.commons.lang.StringUtils;
@@ -71,7 +72,7 @@
try
{
- final Content mediatypenode = hm.getContent(nodePath);
+ final Node mediatypenode = hm.getContent(nodePath);
String extensions = mediatypenode.getNodeData("extensions").getString();
if (!StringUtils.contains(extensions, this.extension))
{
@@ -85,7 +86,7 @@
try
{
- final Content mediatypenode = hm.getContent(control);
+ final Node mediatypenode = hm.getContent(control);
String extensions = mediatypenode.getNodeData("extensions").getString();
if (!StringUtils.contains(extensions, this.extension))
{
Modified: magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/setup/ConditionallySubscribeMediaRepositoriesTask.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/setup/ConditionallySubscribeMediaRepositoriesTask.java 2013-09-19 14:32:06 UTC (rev 4330)
+++ magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/setup/ConditionallySubscribeMediaRepositoriesTask.java 2013-09-20 12:38:39 UTC (rev 4331)
@@ -19,7 +19,7 @@
package net.sourceforge.openutils.mgnlmedia.media.setup;
-import info.magnolia.cms.core.Content;
+
import info.magnolia.cms.core.ItemType;
import info.magnolia.cms.exchange.ActivationManager;
import info.magnolia.cms.exchange.ActivationManagerFactory;
@@ -35,6 +35,7 @@
import java.util.Collection;
import java.util.List;
+import javax.jcr.Node;
import javax.jcr.RepositoryException;
@@ -59,7 +60,7 @@
// check for the sigleinstance flag directly in jcr, the module is not started yet
boolean singleinstance = false;
- Content moduleConfigNode = ContentUtil.getContent(RepositoryConstants.CONFIG, "/modules/media/config");
+ Node moduleConfigNode = ContentUtil.getContent(RepositoryConstants.CONFIG, "/modules/media/config");
if (moduleConfigNode != null)
{
singleinstance = moduleConfigNode.getNodeData("singleinstance").getBoolean();
@@ -95,13 +96,13 @@
{
if (!subscriber.isSubscribed("/", repository))
{
- Content subscriptionsNode = ContentUtil.getContent(RepositoryConstants.CONFIG, sManager.getConfigPath()
+ Node subscriptionsNode = ContentUtil.getContent(RepositoryConstants.CONFIG, sManager.getConfigPath()
+ "/"
+ subscriber.getName()
+ "/subscriptions");
try
{
- Content newSubscription = subscriptionsNode.createContent(repository, ItemType.CONTENTNODE);
+ Node newSubscription = subscriptionsNode.createContent(repository, ItemType.CONTENTNODE);
newSubscription.createNodeData("toURI").setValue("/");
newSubscription.createNodeData("repository").setValue(repository);
newSubscription.createNodeData("fromURI").setValue("/");
Modified: magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/setup/MoveHandlerNodedataToNode.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/setup/MoveHandlerNodedataToNode.java 2013-09-19 14:32:06 UTC (rev 4330)
+++ magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/setup/MoveHandlerNodedataToNode.java 2013-09-20 12:38:39 UTC (rev 4331)
@@ -19,6 +19,7 @@
package net.sourceforge.openutils.mgnlmedia.media.setup;
+
import info.magnolia.cms.core.Content;
import info.magnolia.cms.core.ItemType;
import info.magnolia.cms.core.NodeData;
Modified: magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/setup/RemoveExtensionFromType.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/setup/RemoveExtensionFromType.java 2013-09-19 14:32:06 UTC (rev 4330)
+++ magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/setup/RemoveExtensionFromType.java 2013-09-20 12:38:39 UTC (rev 4331)
@@ -19,6 +19,7 @@
package net.sourceforge.openutils.mgnlmedia.media.setup;
+
import info.magnolia.cms.core.Content;
import info.magnolia.cms.core.HierarchyManager;
import info.magnolia.module.InstallContext;
Modified: magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/setup/RemoveResolutionsNodeTask.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/setup/RemoveResolutionsNodeTask.java 2013-09-19 14:32:06 UTC (rev 4330)
+++ magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/setup/RemoveResolutionsNodeTask.java 2013-09-20 12:38:39 UTC (rev 4331)
@@ -19,6 +19,7 @@
package net.sourceforge.openutils.mgnlmedia.media.setup;
+
import info.magnolia.cms.core.Content;
import info.magnolia.cms.core.HierarchyManager;
import info.magnolia.cms.core.ItemType;
Modified: magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/setup/RenameThumbToImageTask.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/setup/RenameThumbToImageTask.java 2013-09-19 14:32:06 UTC (rev 4330)
+++ magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/setup/RenameThumbToImageTask.java 2013-09-20 12:38:39 UTC (rev 4331)
@@ -20,7 +20,6 @@
package net.sourceforge.openutils.mgnlmedia.media.setup;
import info.magnolia.cms.beans.runtime.FileProperties;
-import info.magnolia.cms.core.Content;
import info.magnolia.cms.core.HierarchyManager;
import info.magnolia.cms.core.NodeData;
import info.magnolia.cms.core.search.Query;
@@ -32,6 +31,7 @@
import java.util.Collection;
+import javax.jcr.Node;
import javax.jcr.PropertyType;
import javax.jcr.RepositoryException;
@@ -66,8 +66,8 @@
{
Query query = mgr.createQuery("//*", Query.XPATH);
QueryResult result = query.execute();
- Collection<Content> medias = result.getContent(MediaConfigurationManager.MEDIA.getSystemName());
...
[truncated message content] |
|
From: <luc...@us...> - 2013-09-25 17:22:58
|
Revision: 4342
http://openutils.svn.sourceforge.net/openutils/?rev=4342&view=rev
Author: lucaboati
Date: 2013-09-25 17:22:52 +0000 (Wed, 25 Sep 2013)
Log Message:
-----------
remove deprecations, content to node, simplemedia back to work!
Modified Paths:
--------------
magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/dialog/DialogSelectMedia.java
magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/dialog/LayerDialogMVC.java
magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/pages/MediaAdvancedSearchPage.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/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/pages/MediaSearchPage.java
magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/save/MediaCustomSaveHandler.java
magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/setup/AddExtensionToType.java
magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/setup/ConditionallySubscribeMediaRepositoriesTask.java
magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/setup/RenameThumbToImageTask.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/BaseTypeHandler.java
magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/types/impl/BaseVideoTypeHandler.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/ExternalVideoTypeHandler.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/MediaWithPreviewImageTypeHandler.java
magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/types/impl/SwfTypeHandler.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/IcoUtils.java
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/JpegUtils.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/dialog/PlaylistEntryDialogMVC.java
magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/playlist/pages/DefaultPlaylistTrackExtensionContributor.java
magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/playlist/pages/PlaylistView.java
magnoliamodules/trunk/openutils-mgnlmedia/src/test/java/net/sourceforge/openutils/mgnlmedia/media/repotests/MediaTests.java
magnoliamodules/trunk/openutils-mgnlmedia/src/test/java/net/sourceforge/openutils/mgnlmedia/media/utils/FileNodeData.java
magnoliamodules/trunk/openutils-mgnlmedia/src/test/java/net/sourceforge/openutils/mgnlmedia/media/utils/ImageUtilsTest.java
Added Paths:
-----------
magnoliamodules/trunk/openutils-mgnlmedia/src/test/java/net/sourceforge/openutils/mgnlmedia/media/utils/FileNode.java
Modified: magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/dialog/DialogSelectMedia.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/dialog/DialogSelectMedia.java 2013-09-24 17:06:28 UTC (rev 4341)
+++ magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/dialog/DialogSelectMedia.java 2013-09-25 17:22:52 UTC (rev 4342)
@@ -21,7 +21,6 @@
import info.magnolia.cms.beans.runtime.FileProperties;
import info.magnolia.cms.core.Content;
-import info.magnolia.cms.core.HierarchyManager;
import info.magnolia.cms.core.NodeData;
import info.magnolia.cms.i18n.Messages;
import info.magnolia.cms.i18n.MessagesUtil;
@@ -33,9 +32,11 @@
import java.util.Map;
import javax.jcr.ItemNotFoundException;
+import javax.jcr.Node;
import javax.jcr.PathNotFoundException;
import javax.jcr.PropertyType;
import javax.jcr.RepositoryException;
+import javax.jcr.Session;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
@@ -121,7 +122,7 @@
@Override
protected void addToParameters(Map<String, Object> parameters)
{
- Content media = null;
+ Node media = null;
NodeData nd = null;
if (getStorageNode() != null)
@@ -139,8 +140,8 @@
{
try
{
- HierarchyManager hm = MgnlContext.getHierarchyManager(MediaModule.REPO);
- media = hm.getContentByUUID(this.getValue());
+ Session hm = MgnlContext.getJCRSession(MediaModule.REPO);
+ media = hm.getNodeByIdentifier(this.getValue());
}
catch (ItemNotFoundException ex)
{
@@ -156,8 +157,16 @@
parameters.put("thumbnailUrl", this.getThumbnailUrl(media, nd));
parameters.put("msgs", this.getMessages());
parameters.put("filename", this.getFilename(media, nd));
- parameters.put("handle", media != null ? media.getHandle() : null);
+ try
+ {
+ parameters.put("handle", media != null ? media.getPath() : null);
+ }
+ catch (RepositoryException e)
+ {
+ log.error("RepositoryException {}", e);
+ }
+
if ("true".equals(this.getConfigValue("resizing")))
{
parameters.put("width", this.getWidth());
@@ -185,12 +194,12 @@
* @return media content
* @throws RepositoryException exception retrieving media
*/
- protected Content getMedia() throws RepositoryException
+ protected Node getMedia() throws RepositoryException
{
if (this.getValue() != null && this.getValue().length() > 0)
{
- HierarchyManager hm = MgnlContext.getHierarchyManager(MediaModule.REPO);
- return hm.getContentByUUID(this.getValue());
+ Session hm = MgnlContext.getJCRSession(MediaModule.REPO);
+ return hm.getNodeByIdentifier(this.getValue());
}
return null;
}
@@ -201,7 +210,7 @@
* @param nd
* @return thumbnail url
*/
- public String getThumbnailUrl(Content media, NodeData nd)
+ public String getThumbnailUrl(Node media, NodeData nd)
{
if (nd != null && nd.getType() == PropertyType.BINARY)
@@ -252,7 +261,7 @@
* @param media2
* @return filename
*/
- public String getFilename(Content media, NodeData nd)
+ public String getFilename(Node media, NodeData nd)
{
if (nd != null && nd.getType() == PropertyType.BINARY)
Modified: magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/dialog/LayerDialogMVC.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/dialog/LayerDialogMVC.java 2013-09-24 17:06:28 UTC (rev 4341)
+++ magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/dialog/LayerDialogMVC.java 2013-09-25 17:22:52 UTC (rev 4342)
@@ -150,7 +150,7 @@
// TODO rename dei nodi in base al filename?
- return MediaConfigurationManager.getInstance().getTypes().get(type).getHandler().onPostSave(node);
+ return MediaConfigurationManager.getInstance().getTypes().get(type).getHandler().onPostSave(node.getJCRNode());
}
/**
Modified: magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/pages/MediaAdvancedSearchPage.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/pages/MediaAdvancedSearchPage.java 2013-09-24 17:06:28 UTC (rev 4341)
+++ magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/pages/MediaAdvancedSearchPage.java 2013-09-25 17:22:52 UTC (rev 4342)
@@ -19,7 +19,6 @@
package net.sourceforge.openutils.mgnlmedia.media.pages;
-
import info.magnolia.context.MgnlContext;
import info.magnolia.freemarker.FreemarkerUtil;
@@ -227,7 +226,7 @@
{
try
{
- return MgnlContext.getHierarchyManager(MediaModule.REPO).getContentByUUID(from.getUUID());
+ return MgnlContext.getJCRSession(MediaModule.REPO).getNodeByIdentifier(from.getUUID());
}
catch (RepositoryException e)
{
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-09-24 17:06:28 UTC (rev 4341)
+++ magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/pages/MediaBeanBuilder.java 2013-09-25 17:22:52 UTC (rev 4342)
@@ -22,7 +22,9 @@
import info.magnolia.cms.beans.config.URI2RepositoryManager;
import info.magnolia.cms.exchange.ActivationManagerFactory;
import info.magnolia.cms.security.Permission;
-import info.magnolia.cms.util.NodeDataUtil;
+import info.magnolia.jcr.util.MetaDataUtil;
+import info.magnolia.jcr.util.NodeUtil;
+import info.magnolia.jcr.util.PropertyUtil;
import info.magnolia.repository.RepositoryConstants;
import java.util.List;
@@ -62,44 +64,44 @@
public MediaBean apply(Node media)
{
- String mediatype = media.getNodeData("type").getString();
+ String mediatype = PropertyUtil.getString(media, "type");
MediaTypeConfiguration mtc = MediaConfigurationManager.getInstance().getTypes().get(mediatype);
-
- if (mtc == null)
- {
- log.warn("Skipping media {} with invalid media type \"{}\"", media.getHandle(), mediatype);
- return null;
- }
-
MediaBean mb = new MediaBean();
- mb.setContent(media);
- mb.setMetaData(media.getMetaData());
- mb.setHandle(media.getHandle());
- mb.setName(NodeDataUtil.getString(media, MediaTypeHandler.METADATA_NAME));
- mb.setFilename(mtc.getHandler().getFilename(media));
- // backward compatibility
- if (StringUtils.isEmpty(mb.getName()) && !StringUtils.isEmpty(mb.getFilename()))
+ try
{
- int p = StringUtils.lastIndexOf(mb.getFilename(), '/');
- mb.setName(p != -1 ? mb.getFilename().substring(p + 1) : mb.getFilename());
- }
- mb.setTitle(mtc.getHandler().getTitle(media));
- mb.setThumbnailUrl(mtc.getHandler().getThumbnailUrl(media));
- mb.setPreviewUrl(mtc.getHandler().getPreviewUrl(media));
- mb.setDescription(mtc.getHandler().getDescription(media));
- mb.setDialog(mtc.getDialog());
- mb.setUuid(media.getUUID());
- mb.setType(mediatype);
- mb.setIcon(mtc.getMenuIcon());
+ if (mtc == null)
+ {
+ log.warn("Skipping media {} with invalid media type \"{}\"", media.getPath(), mediatype);
+ return null;
+ }
- try
- {
- mb.setWritable(media.getParent().isGranted(Permission.WRITE));
+ mb.setContent(media);
+ mb.setMetaData(MetaDataUtil.getMetaData(media));
+ mb.setHandle(media.getPath());
+ mb.setName(PropertyUtil.getString(media, MediaTypeHandler.METADATA_NAME));
+ mb.setFilename(mtc.getHandler().getFilename(media));
+ // backward compatibility
+ if (StringUtils.isEmpty(mb.getName()) && !StringUtils.isEmpty(mb.getFilename()))
+ {
+ int p = StringUtils.lastIndexOf(mb.getFilename(), '/');
+ mb.setName(p != -1 ? mb.getFilename().substring(p + 1) : mb.getFilename());
+ }
+ mb.setTitle(mtc.getHandler().getTitle(media));
+ mb.setThumbnailUrl(mtc.getHandler().getThumbnailUrl(media));
+ mb.setPreviewUrl(mtc.getHandler().getPreviewUrl(media));
+ mb.setDescription(mtc.getHandler().getDescription(media));
+ mb.setDialog(mtc.getDialog());
+ mb.setUuid(media.getIdentifier());
+ mb.setType(mediatype);
+ mb.setIcon(mtc.getMenuIcon());
+
+ mb.setWritable(NodeUtil.isGranted(media.getParent(), Permission.SET));
mb.setCanPublish(!MediaEl.module().isSingleinstance()
&& mb.isWritable()
&& ActivationManagerFactory.getActivationManager().hasAnyActiveSubscriber());
- Map<String, List<String>> workspacePaths = MediaUsedInManager.getInstance().getUsedInPaths(media.getUUID());
+ Map<String, List<String>> workspacePaths = MediaUsedInManager.getInstance().getUsedInPaths(
+ media.getIdentifier());
mb.getUsedInWebPages().addAll(workspacePaths.get(RepositoryConstants.WEBSITE));
for (Map.Entry<String, List<String>> entry : workspacePaths.entrySet())
{
@@ -115,11 +117,9 @@
{
log.error("Exception caught", ex);
}
-
mb.setMediaInfo(mtc.getHandler().getMediaInfo(media));
mb.setExternal(mtc.getHandler().isExternal(media));
return mb;
}
-
}
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-09-24 17:06:28 UTC (rev 4341)
+++ magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/pages/MediaBrowserPage.java 2013-09-25 17:22:52 UTC (rev 4342)
@@ -20,12 +20,13 @@
package net.sourceforge.openutils.mgnlmedia.media.pages;
import info.magnolia.cms.beans.runtime.Document;
-import info.magnolia.cms.core.HierarchyManager;
+import info.magnolia.cms.core.MgnlNodeType;
import info.magnolia.cms.i18n.Messages;
import info.magnolia.cms.util.AlertUtil;
-import info.magnolia.cms.util.ContentUtil;
-import info.magnolia.cms.util.NodeDataUtil;
import info.magnolia.context.MgnlContext;
+import info.magnolia.jcr.util.NodeUtil;
+import info.magnolia.jcr.util.PropertyUtil;
+import it.openutils.mgnlutils.api.NodeUtilsExt;
import java.io.File;
import java.io.FileOutputStream;
@@ -40,6 +41,7 @@
import javax.jcr.Node;
import javax.jcr.RepositoryException;
+import javax.jcr.Session;
import javax.servlet.http.Cookie;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
@@ -113,12 +115,12 @@
super.init();
if (StringUtils.isNotBlank(actMedia))
{
- HierarchyManager mgr = MgnlContext.getHierarchyManager(MediaModule.REPO);
try
{
- Node media = mgr.getContentByUUID(actMedia);
- openPath = media.getParent().getHandle();
- actMediaHandle = media.getHandle();
+ Session mgr = MgnlContext.getJCRSession(MediaModule.REPO);
+ Node media = mgr.getNodeByIdentifier(actMedia);
+ openPath = media.getParent().getPath();
+ actMediaHandle = media.getPath();
}
catch (RepositoryException ex)
{
@@ -127,16 +129,18 @@
}
if (!StringUtils.isEmpty(playlistHandle))
{
- Node playlistContent = ContentUtil.getContent(PlaylistConstants.REPO, playlistHandle);
+ Node playlistContent = NodeUtilsExt.getNodeByIdOrPath(PlaylistConstants.REPO, playlistHandle);
try
{
- if (playlistContent.hasContent("search"))
+ if (playlistContent.hasNode("search"))
{
List<String> params = new ArrayList<String>();
- for (Node content : playlistContent.getContent("search").getChildren())
+ Node search = playlistContent.getNode("search");
+ Iterable<Node> nodes = NodeUtil.getNodes(search, MgnlNodeType.NT_CONTENTNODE);
+ for (Node content : nodes)
{
- String paramName = NodeDataUtil.getString(content, "name");
- String paramValue = NodeDataUtil.getString(content, "value");
+ String paramName = PropertyUtil.getString(content, "name");
+ String paramValue = PropertyUtil.getString(content, "value");
params.add(paramName + "=" + paramValue);
}
playlistSearch = StringUtils.join(params, '&');
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-09-24 17:06:28 UTC (rev 4341)
+++ magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/pages/MediaFolderViewPage.java 2013-09-25 17:22:52 UTC (rev 4342)
@@ -19,6 +19,7 @@
package net.sourceforge.openutils.mgnlmedia.media.pages;
+import info.magnolia.cms.core.Content;
import info.magnolia.cms.core.HierarchyManager;
import info.magnolia.cms.core.ItemType;
import info.magnolia.cms.core.Path;
@@ -26,7 +27,6 @@
import info.magnolia.cms.exchange.ExchangeException;
import info.magnolia.cms.security.Permission;
import info.magnolia.cms.util.AlertUtil;
-import info.magnolia.cms.util.ContentUtil;
import info.magnolia.commands.CommandsManager;
import info.magnolia.context.Context;
import info.magnolia.context.MgnlContext;
@@ -65,7 +65,6 @@
import org.apache.commons.lang.StringUtils;
import com.google.common.collect.Iterators;
-import com.sun.xml.internal.ws.util.MetadataUtil;
/**
@@ -226,7 +225,8 @@
{
return null;
}
- writable = folder.isGranted(Permission.WRITE);
+
+ writable = NodeUtil.isGranted(folder, Permission.SET);
canPublish = writable && ActivationManagerFactory.getActivationManager().hasAnyActiveSubscriber();
MediaModule module = MediaEl.module();
Integer itemsPerPage = module.getFolderViewPageSizes().get(pagesizeSelector);
@@ -417,11 +417,11 @@
// copy
hm.copyTo(source, goTo);
}
- Node newContent = hm.getNode(destination);
+ Content newContent = hm.getContent(destination);
try
{
- MetaDataUtil.updateMetaData(newContent);
- MetaDataUtil.getMetaData(newContent).setUnActivated();
+ MetaDataUtil.updateMetaData(newContent.getJCRNode());
+ MetaDataUtil.getMetaData(newContent.getJCRNode()).setUnActivated();
}
catch (Exception e)
{
@@ -431,7 +431,7 @@
}
}
newContent.save();
- return newContent;
+ return newContent.getJCRNode();
}
/**
Modified: magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/pages/MediaSearchPage.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/pages/MediaSearchPage.java 2013-09-24 17:06:28 UTC (rev 4341)
+++ magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/pages/MediaSearchPage.java 2013-09-25 17:22:52 UTC (rev 4342)
@@ -19,17 +19,16 @@
package net.sourceforge.openutils.mgnlmedia.media.pages;
-
-import info.magnolia.cms.core.HierarchyManager;
import info.magnolia.context.MgnlContext;
+import info.magnolia.jcr.util.NodeUtil;
import java.util.ArrayList;
-import java.util.Collection;
import java.util.List;
import java.util.Map;
import javax.jcr.Node;
import javax.jcr.RepositoryException;
+import javax.jcr.Session;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
@@ -93,12 +92,14 @@
mtc.add(entry.getValue());
}
- HierarchyManager mgr = MgnlContext.getHierarchyManager(MediaModule.REPO);
try
{
- Collection<Node> contents = mgr.getRoot().getChildren(MediaConfigurationManager.FOLDER);
+ Session session = MgnlContext.getJCRSession(MediaModule.REPO);
+ Iterable<Node> nodes = NodeUtil.getNodes(
+ session.getRootNode(),
+ MediaConfigurationManager.FOLDER.getSystemName());
List<String> tmpPaths = new ArrayList<String>();
- for (Node c : contents)
+ for (Node c : nodes)
{
tmpPaths.add(c.getName());
}
Modified: magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/save/MediaCustomSaveHandler.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/save/MediaCustomSaveHandler.java 2013-09-24 17:06:28 UTC (rev 4341)
+++ magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/save/MediaCustomSaveHandler.java 2013-09-25 17:22:52 UTC (rev 4342)
@@ -21,15 +21,16 @@
import info.magnolia.cms.beans.runtime.MultipartForm;
import info.magnolia.cms.core.Content;
-import info.magnolia.cms.core.HierarchyManager;
import info.magnolia.cms.security.AccessDeniedException;
import info.magnolia.cms.util.NodeDataUtil;
import info.magnolia.context.MgnlContext;
import info.magnolia.module.admininterface.FieldSaveHandler;
import javax.jcr.ItemNotFoundException;
+import javax.jcr.Node;
import javax.jcr.PropertyType;
import javax.jcr.RepositoryException;
+import javax.jcr.Session;
import javax.servlet.http.HttpServletRequest;
import net.sourceforge.openutils.mgnlmedia.media.configuration.MediaConfigurationManager;
@@ -83,19 +84,19 @@
else
{
- HierarchyManager hm = MgnlContext.getHierarchyManager(MediaModule.REPO);
+ Session hm = MgnlContext.getJCRSession(MediaModule.REPO);
try
{
- Content media = hm.getContentByUUID(value);
+ Node media = hm.getNodeByIdentifier(value);
MediaTypeConfiguration mtc = MediaConfigurationManager
.getInstance()
.getMediaTypeConfigurationFromMedia(media);
mtc.getHandler().onSavingPropertyMedia(
media,
- parentNode,
- configNode,
+ parentNode.getJCRNode(),
+ configNode.getJCRNode(),
name,
request,
form,
Modified: magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/setup/AddExtensionToType.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/setup/AddExtensionToType.java 2013-09-24 17:06:28 UTC (rev 4341)
+++ magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/setup/AddExtensionToType.java 2013-09-25 17:22:52 UTC (rev 4342)
@@ -19,15 +19,18 @@
package net.sourceforge.openutils.mgnlmedia.media.setup;
-
-import info.magnolia.cms.core.HierarchyManager;
+import info.magnolia.jcr.util.PropertyUtil;
import info.magnolia.module.InstallContext;
import info.magnolia.module.delta.AbstractRepositoryTask;
import info.magnolia.module.delta.TaskExecutionException;
-import info.magnolia.repository.RepositoryConstants;
import javax.jcr.Node;
import javax.jcr.RepositoryException;
+import javax.jcr.Session;
+import javax.jcr.ValueFormatException;
+import javax.jcr.lock.LockException;
+import javax.jcr.nodetype.ConstraintViolationException;
+import javax.jcr.version.VersionException;
import org.apache.commons.lang.StringUtils;
@@ -67,17 +70,13 @@
protected void doExecute(InstallContext ctx) throws RepositoryException, TaskExecutionException
{
- final HierarchyManager hm = ctx.getHierarchyManager(RepositoryConstants.CONFIG);
+ final Session hm = ctx.getConfigJCRSession();
String nodePath = "/modules/media/mediatypes/" + this.mediatype;
try
{
- final Node mediatypenode = hm.getContent(nodePath);
- String extensions = mediatypenode.getNodeData("extensions").getString();
- if (!StringUtils.contains(extensions, this.extension))
- {
- mediatypenode.setNodeData("extensions", extensions + "," + this.extension);
- }
+ final Node mediatypenode = hm.getNode(nodePath);
+ setExtensions(mediatypenode);
}
catch (RepositoryException e)
{
@@ -86,12 +85,8 @@
try
{
- final Node mediatypenode = hm.getContent(control);
- String extensions = mediatypenode.getNodeData("extensions").getString();
- if (!StringUtils.contains(extensions, this.extension))
- {
- mediatypenode.setNodeData("extensions", extensions + "," + this.extension);
- }
+ final Node mediatypenode = hm.getNode(control);
+ setExtensions(mediatypenode);
}
catch (RepositoryException e)
{
@@ -100,4 +95,22 @@
}
+ /**
+ * @param mediatypenode
+ * @throws ValueFormatException
+ * @throws VersionException
+ * @throws LockException
+ * @throws ConstraintViolationException
+ * @throws RepositoryException
+ */
+ private void setExtensions(final Node mediatypenode) throws ValueFormatException, VersionException, LockException,
+ ConstraintViolationException, RepositoryException
+ {
+ String extensions = PropertyUtil.getString(mediatypenode, "extensions");
+ if (!StringUtils.contains(extensions, this.extension))
+ {
+ mediatypenode.setProperty("extensions", extensions + "," + this.extension);
+ }
+ }
+
}
Modified: magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/setup/ConditionallySubscribeMediaRepositoriesTask.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/setup/ConditionallySubscribeMediaRepositoriesTask.java 2013-09-24 17:06:28 UTC (rev 4341)
+++ magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/setup/ConditionallySubscribeMediaRepositoriesTask.java 2013-09-25 17:22:52 UTC (rev 4342)
@@ -19,12 +19,14 @@
package net.sourceforge.openutils.mgnlmedia.media.setup;
-
import info.magnolia.cms.core.ItemType;
+import info.magnolia.cms.core.MgnlNodeType;
import info.magnolia.cms.exchange.ActivationManager;
import info.magnolia.cms.exchange.ActivationManagerFactory;
import info.magnolia.cms.exchange.Subscriber;
import info.magnolia.cms.util.ContentUtil;
+import info.magnolia.context.MgnlContext;
+import info.magnolia.jcr.util.PropertyUtil;
import info.magnolia.module.InstallContext;
import info.magnolia.module.delta.AbstractTask;
import info.magnolia.module.delta.TaskExecutionException;
@@ -60,27 +62,34 @@
// check for the sigleinstance flag directly in jcr, the module is not started yet
boolean singleinstance = false;
- Node moduleConfigNode = ContentUtil.getContent(RepositoryConstants.CONFIG, "/modules/media/config");
- if (moduleConfigNode != null)
+ try
{
- singleinstance = moduleConfigNode.getNodeData("singleinstance").getBoolean();
- }
- if (singleinstance)
- {
- return;
- }
+ Node moduleConfigNode = ctx.getConfigJCRSession().getNode("/modules/media/config");
+ if (moduleConfigNode != null)
+ {
+ singleinstance = PropertyUtil.getBoolean(moduleConfigNode, "singleinstance", false);
+ ...
[truncated message content] |
|
From: <fg...@us...> - 2013-10-19 20:58:12
|
Revision: 4388
http://openutils.svn.sourceforge.net/openutils/?rev=4388&view=rev
Author: fgiust
Date: 2013-10-19 20:58:07 +0000 (Sat, 19 Oct 2013)
Log Message:
-----------
refactoring observedManagers
Modified Paths:
--------------
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/media/advancedsearch/SearchFilterSpecFieldMedia.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/configuration/MediaConfigurationManager.java
magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/configuration/MediaUsedInManager.java
magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/configuration/UsedInWorkspace.java
magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/dialog/DialogFileAudio.java
magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/dialog/DialogFileImage.java
magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/dialog/DialogFileVideo.java
magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/dialog/DialogSelectMedia.java
magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/dialog/LayerDialogMVC.java
magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/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/pages/MediaFolderViewPage.java
magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/pages/MessagesTemplatedMVCHandler.java
magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/save/MediaCustomSaveHandler.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/tags/el/MediaEl.java
magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/tree/MediaModuleTreeConfiguration.java
magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/types/impl/BaseTypeHandler.java
magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/types/impl/ImageTypeHandler.java
magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/types/impl/MediaWithPreviewImageTypeHandler.java
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/MediaLoadUtils.java
magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/playlist/pages/PlaylistView.java
magnoliamodules/trunk/openutils-mgnlmedia/src/main/resources/META-INF/magnolia/media.xml
magnoliamodules/trunk/openutils-mgnlmedia/src/main/resources/META-INF/media.tld
magnoliamodules/trunk/openutils-mgnlmedia/src/test/java/net/sourceforge/openutils/mgnlmedia/media/utils/ImageProcessorsManagerMock.java
Added 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/DefaultMediaConfigurationManager.java
magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/configuration/DefaultMediaUsedInManager.java
magnoliamodules/trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap/media-nooverwrite/config.modules.media.mediausedin.entries.website.xml
Removed Paths:
-------------
magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/pages/MediaSearchPage.java
magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/types/impl/YouTubeVideoTypeHandler.java
magnoliamodules/trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap/media-nooverwrite/config.modules.media.mediausedin.website.xml
magnoliamodules/trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/media/pages/MediaSearchPage.html
Modified: 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/ExternalVideoTypeHandler.java 2013-10-19 13:13:31 UTC (rev 4387)
+++ magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/externalvideo/ExternalVideoTypeHandler.java 2013-10-19 20:58:07 UTC (rev 4388)
@@ -21,6 +21,7 @@
import info.magnolia.cms.beans.runtime.MultipartForm;
import info.magnolia.jcr.util.PropertyUtil;
+import info.magnolia.objectfactory.Components;
import java.io.File;
import java.util.HashMap;
@@ -45,8 +46,8 @@
public static ExternalVideoProvider getExternalVideoProvider(Node media)
{
- MediaTypeHandler mth = MediaConfigurationManager
- .getInstance()
+ MediaTypeHandler mth = Components
+ .getComponent(MediaConfigurationManager.class)
.getMediaTypeConfigurationFromMedia(media)
.getHandler();
if (mth.getClass().isAssignableFrom(ExternalVideoTypeHandler.class))
Modified: magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/advancedsearch/SearchFilterSpecFieldMedia.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/advancedsearch/SearchFilterSpecFieldMedia.java 2013-10-19 13:13:31 UTC (rev 4387)
+++ magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/advancedsearch/SearchFilterSpecFieldMedia.java 2013-10-19 20:58:07 UTC (rev 4388)
@@ -19,6 +19,8 @@
package net.sourceforge.openutils.mgnlmedia.media.advancedsearch;
+import info.magnolia.objectfactory.Components;
+
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
@@ -45,7 +47,9 @@
return super.getOptions();
}
List<Option> options = new ArrayList<Option>();
- Map<String, MediaTypeConfiguration> mediatype = MediaConfigurationManager.getInstance().getTypes();
+ Map<String, MediaTypeConfiguration> mediatype = Components
+ .getComponent(MediaConfigurationManager.class)
+ .getTypes();
Option option;
for (String media : mediatype.keySet())
{
Copied: magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/configuration/DefaultImageProcessorsManager.java (from rev 4371, 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/DefaultImageProcessorsManager.java (rev 0)
+++ magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/configuration/DefaultImageProcessorsManager.java 2013-10-19 20:58:07 UTC (rev 4388)
@@ -0,0 +1,277 @@
+/**
+ *
+ * SimpleMedia Module for Magnolia CMS (http://www.openmindlab.com/lab/products/media.html)
+ * Copyright(C) 2008-2013, Openmind S.r.l. http://www.openmindonline.it
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package net.sourceforge.openutils.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.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;
+import net.sourceforge.openutils.mgnlmedia.media.processors.ImagePostProcessor;
+import net.sourceforge.openutils.mgnlmedia.media.processors.ImageResolutionProcessor;
+import net.sourceforge.openutils.mgnlmedia.media.processors.ResizeCropCenteredImageResolutionProcessor;
+import net.sourceforge.openutils.mgnlmedia.media.processors.ResizeNoCropImageResolutionProcessor;
+
+import org.apache.commons.lang.StringUtils;
+
+
+/**
+ * ObservedManager that manages the maps of processors that handle images resize and processors that do operation on
+ * images after the resize. <br/>
+ * default image resolution processors:
+ * <table>
+ * <tbody>
+ * <tr>
+ * <td>control chars</td>
+ * <td>image resolution processor</td>
+ * <td>description</td>
+ * </tr>
+ * <tr>
+ * <td>b, o</td>
+ * <td>{@link FitInAndFillWithBandsImageResolutionProcessor}</td>
+ * <td>resize image to fit in required resolution and fills empty areas by color passed in parameters as "background"</td>
+ * </tr>
+ * <tr>
+ * <td>l</td>
+ * <td>{@link FitInImageResolutionProcessor}</td>
+ * <td>resize image to fit in required resolution</td>
+ * </tr>
+ * <tr>
+ * <td>x</td>
+ * <td>{@link ResizeNoCropImageResolutionProcessor}</td>
+ * <td>resize image to contain required resolution</td>
+ * </tr>
+ * <tr>
+ * <td>no control char (default), c</td>
+ * <td>{@link ResizeCropCenteredImageResolutionProcessor}</td>
+ * <td>resize image to contain required resolution, and crop simmetric bands that outfits the required resolution rect</td>
+ * </tr>
+ * </tbody>
+ * </table>
+ * @author molaschi
+ * @version $Id: $
+ */
+@Singleton
+public class DefaultImageProcessorsManager extends ObservedManagerAdapter implements ImageProcessorsManager
+{
+
+ private static final String IMAGE_RESOLUTION_PROCESSORS_NAME = "image-resolution";
+
+ private static final String IMAGE_POST_PROCESSORS_NAME = "image-post";
+
+ private Map<String, ImageResolutionProcessor> imageResProcs = new HashMap<String, ImageResolutionProcessor>();
+
+ private Map<String, ImagePostProcessor> imagePostProcs = new HashMap<String, ImagePostProcessor>();
+
+ /**
+ * {@inheritDoc}
+ */
+ @Override
+ protected void onClear()
+ {
+ imageResProcs.clear();
+ imagePostProcs.clear();
+ }
+
+ /**
+ * {@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));
+ }
+
+ /**
+ * Check if control char is registered
+ * @param controlChar control char to check
+ * @return true if control char is registered
+ */
+ public boolean isValidControlChar(char controlChar)
+ {
+ return imageResProcs.keySet().contains(String.valueOf(controlChar));
+ }
+
+ /**
+ * Get the default image resolution processor (by default config is
+ * {@link ResizeCropCenteredImageResolutionProcessor})
+ * @return the default image resolution processor
+ */
+ public ImageResolutionProcessor getDefaultImageResolutionProcessor()
+ {
+ return imageResProcs.get("default");
+ }
+
+ /**
+ * Get image post processor by its name
+ * @param name image post processor name
+ * @return image post processor
+ */
+ public ImagePostProcessor getImagePostProcessor(String name)
+ {
+ return imagePostProcs.get(name);
+ }
+
+ /**
+ * Get all image post processors
+ * @return image post processors list
+ */
+ public Collection<ImagePostProcessor> getImagePostProcessorsList()
+ {
+ return imagePostProcs.values();
+ }
+
+ /**
+ * Get the map of image post processors
+ * @return image post processors map
+ */
+ public Map<String, ImagePostProcessor> getImagePostProcessorsMap()
+ {
+ return imagePostProcs;
+ }
+}
Copied: magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/configuration/DefaultMediaConfigurationManager.java (from rev 4371, magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/configuration/MediaConfigurationManager.java)
===================================================================
--- magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/configuration/DefaultMediaConfigurationManager.java (rev 0)
+++ magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/configuration/DefaultMediaConfigurationManager.java 2013-10-19 20:58:07 UTC (rev 4388)
@@ -0,0 +1,209 @@
+/**
+ *
+ * SimpleMedia Module for Magnolia CMS (http://www.openmindlab.com/lab/products/media.html)
+ * Copyright(C) 2008-2013, Openmind S.r.l. http://www.openmindonline.it
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package net.sourceforge.openutils.mgnlmedia.media.configuration;
+
+import info.magnolia.cms.beans.config.URI2RepositoryManager;
+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 java.util.Collection;
+import java.util.Iterator;
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Map;
+
+import javax.inject.Inject;
+import javax.inject.Singleton;
+import javax.jcr.Node;
+import javax.jcr.RepositoryException;
+
+import net.sourceforge.openutils.mgnlmedia.media.lifecycle.MediaModule;
+
+import org.apache.commons.lang.StringUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+
+/**
+ * ObservedManager that keeps that media types configuration.<br/>
+ * Each media type is defined under the mediatypes contentnode in /modules/media.<br/>
+ * I.e.<br/>
+ * /modules/media/mediatypes/pdf<br/>
+ * <ul>
+ * <li>label = pdf file</li>
+ * <li>handler = info.acme.PdfTypeHandler</li>
+ * <li>menuIcon = .resources/pdf/icons/pdf16.gif</li>
+ * <li>extensions = pdf</li>
+ * </ul>
+ * @author molaschi
+ */
+@Singleton
+public class DefaultMediaConfigurationManager extends ObservedManagerAdapter implements MediaConfigurationManager
+{
+
+ private Logger log = LoggerFactory.getLogger(MediaConfigurationManager.class);
+
+ private Map<String, MediaTypeConfiguration> types = new LinkedHashMap<String, MediaTypeConfiguration>();
+
+ @Inject
+ private URI2RepositoryManager uri2RepositoryManager;
+
+ /**
+ * {@inheritDoc}
+ */
+ @Override
+ protected void onClear()
+ {
+ types.clear();
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ @Override
+ @SuppressWarnings("unchecked")
+ protected void onRegister(Node node)
+ {
+
+ try
+ {
+ for (Iterator<Node> iter = NodeUtil.getNodes(node, NodeUtil.EXCLUDE_META_DATA_FILTER).iterator(); iter
+ .hasNext();)
+ {
+ Node typeNode = iter.next();
+
+ if (!PropertyUtil.getBoolean(typeNode, "enabled", true))
+ {
+ continue;
+ }
+
+ try
+ {
+ MediaTypeConfiguration conf = (MediaTypeConfiguration) NodeUtilsExt.toBean(
+ typeNode,
+ true,
+ MediaTypeConfiguration.class);
+
+ if (conf.getHandler() != null)
+ {
+ conf.getHandler().init(typeNode);
+ }
+ else
+ {
+ log.error("Missing handler for media type {}", typeNode.getName());
+ continue;
+ }
+
+ types.put(typeNode.getName(), conf);
+ }
+ catch (Throwable e)
+ {
+ log.error("Error getting media type configuration for {}", NodeUtil.getPathIfPossible(typeNode), e);
+ }
+ }
+ }
+ catch (RepositoryException e)
+ {
+ log.error("Error getting nodes for {}", NodeUtil.getPathIfPossible(node), e);
+ }
+ }
+
+ /**
+ * Get the media type from a file extension
+ * @param extension file extension
+ * @return media type
+ */
+ public MediaTypeConfiguration getMediaHandlerFromExtension(String extension)
+ {
+ if (extension == null)
+ {
+ return null;
+ }
+
+ String lowerCasedExtension = extension.toLowerCase();
+ for (Map.Entry<String, MediaTypeConfiguration> entry : getTypes().entrySet())
+ {
+
+ MediaTypeConfiguration value = entry.getValue();
+
+ List<String> extensionsList = value.getExtensionsList();
+
+ if (extensionsList != null && extensionsList.contains(lowerCasedExtension))
+ {
+ return entry.getValue();
+ }
+ }
+
+ return null;
+ }
+
+ /**
+ * Get all media type map
+ * @return media type map
+ */
+ public Map<String, MediaTypeConfiguration> getTypes()
+ {
+ return types;
+ }
+
+ /**
+ * Get the type configuration for a media
+ * @param media media
+ * @return type configuration
+ */
+ public MediaTypeConfiguration getMediaTypeConfigurationFromMedia(Node media)
+ {
+ try
+ {
+ if (!StringUtils.equals(media.getPrimaryNodeType().getName(), NT_MEDIA))
+ {
+ return null;
+ }
+ }
+ catch (RepositoryException e)
+ {
+ log.error("Error getting item type on node {} module media", NodeUtil.getPathIfPossible(media), e);
+ return null;
+ }
+
+ return types.get(PropertyUtil.getString(media, "type"));
+ }
+
+ /**
+ * Get uri mapping for repo
+ * @return uri mapping for repo
+ */
+ @Override
+ public String getURIMappingPrefix()
+ {
+ Collection<URI2RepositoryMapping> mappings = uri2RepositoryManager.getMappings();
+ for (URI2RepositoryMapping mapping : mappings)
+ {
+ if (mapping.getRepository().equals(MediaModule.REPO))
+ {
+ return mapping.getURIPrefix();
+ }
+ }
+ return StringUtils.EMPTY;
+ }
+}
Copied: magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/configuration/DefaultMediaUsedInManager.java (from rev 4371, magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/configuration/MediaUsedInManager.java)
===================================================================
--- magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/configuration/DefaultMediaUsedInManager.java (rev 0)
+++ magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/configuration/DefaultMediaUsedInManager.java 2013-10-19 20:58:07 UTC (rev 4388)
@@ -0,0 +1,130 @@
+/**
+ *
+ * SimpleMedia Module for Magnolia CMS (http://www.openmindlab.com/lab/products/media.html)
+ * Copyright(C) 2008-2013, Openmind S.r.l. http://www.openmindonline.it
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package net.sourceforge.openutils.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.api.NodeUtilsExt;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+
+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;
+import net.sourceforge.openutils.mgnlcriteria.jcr.query.JCRCriteriaFactory;
+import net.sourceforge.openutils.mgnlcriteria.jcr.query.criterion.Disjunction;
+import net.sourceforge.openutils.mgnlcriteria.jcr.query.criterion.Order;
+import net.sourceforge.openutils.mgnlcriteria.jcr.query.criterion.Restrictions;
+
+import org.apache.commons.lang.StringUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+
+/**
+ * @author dschivo
+ * @version $Id$
+ */
+@Singleton
+public class DefaultMediaUsedInManager implements MediaUsedInManager
+{
+
+ private static Logger log = LoggerFactory.getLogger(MediaUsedInManager.class);
+
+ private Map<String, UsedInWorkspace> usedInWorkspaceMap = new HashMap<String, UsedInWorkspace>();
+
+ public Map<String, UsedInWorkspace> getEntries()
+ {
+ return usedInWorkspaceMap;
+ }
+
+ public void setEntries(Map<String, UsedInWorkspace> entries)
+ {
+ this.usedInWorkspaceMap = entries;
+ }
+
+ public Map<String, AdvancedResult> getUsedIn(String mediaUUID)
+ {
+ Map<String, AdvancedResult> map = new HashMap<String, AdvancedResult>(usedInWorkspaceMap.size());
+ for (String workspaceName : usedInWorkspaceMap.keySet())
+ {
+ map.put(workspaceName, getUsedInWorkspace(mediaUUID, workspaceName));
+ }
+ return map;
+ }
+
+ public AdvancedResult getUsedInWorkspace(String mediaUUID, String workspaceName)
+ {
+ UsedInWorkspace uiw = usedInWorkspaceMap.get(workspaceName);
+ if (uiw == null)
+ {
+ return AdvancedResult.EMPTY_RESULT;
+ }
+
+ return getUsedInWorkspaceNodes(mediaUUID, uiw);
+ }
+
+ private AdvancedResult getUsedInWorkspaceNodes(String mediaUUID, UsedInWorkspace uiw)
+
+ ...
[truncated message content] |
|
From: <fg...@us...> - 2013-10-19 21:38:21
|
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><</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:0...
[truncated message content] |
Thanks for helping keep SourceForge clean.
X