Menu
▾
▴
[Openutils-svn] SF.net SVN: openutils:[4341] magnoliamodules/trunk/openutils-mgnlmedia/src/ main/java/net/sourceforge/openutils/mgnlmedia/media
|
From: <luc...@us...> - 2013-09-24 17:06:31
|
Revision: 4341
http://openutils.svn.sourceforge.net/openutils/?rev=4341&view=rev
Author: lucaboati
Date: 2013-09-24 17:06:28 +0000 (Tue, 24 Sep 2013)
Log Message:
-----------
remove deprecations, content to node
Modified Paths:
--------------
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/MediaDeactivationCommand.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/crop/PzcServlet.java
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-20 15:54:59 UTC (rev 4340)
+++ magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/advancedsearch/SearchFilterOptionProvider.java 2013-09-24 17:06:28 UTC (rev 4341)
@@ -19,15 +19,17 @@
package net.sourceforge.openutils.mgnlmedia.media.advancedsearch;
-
+import info.magnolia.cms.core.MgnlNodeType;
import info.magnolia.context.MgnlContext;
+import info.magnolia.jcr.util.NodeUtil;
+import info.magnolia.repository.RepositoryConstants;
import java.util.ArrayList;
-import java.util.Collection;
import java.util.List;
import javax.jcr.Node;
import javax.jcr.RepositoryException;
+import javax.jcr.Session;
import org.apache.commons.lang.StringUtils;
import org.apache.commons.lang.builder.ToStringBuilder;
@@ -113,10 +115,9 @@
{
try
{
- Collection<Node> referenceOptions = MgnlContext
- .getHierarchyManager("config")
- .getContent(reference)
- .getChildren();
+ Session session = MgnlContext.getJCRSession(RepositoryConstants.CONFIG);
+ Node node = session.getNode(reference);
+ Iterable<Node> referenceOptions = NodeUtil.getNodes(node, MgnlNodeType.NT_CONTENTNODE);
Option opt = new Option();
@@ -127,11 +128,11 @@
addOptions(opt);
}
- for (Node content : referenceOptions)
+ for (Node option : referenceOptions)
{
opt = new Option();
- opt.setLabel(content.getNodeData("label").getString());
- opt.setValue(content.getNodeData("value").getString());
+ opt.setLabel(option.getProperty("label").getString());
+ opt.setValue(option.getProperty("value").getString());
addOptions(opt);
}
}
Modified: magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/commands/MediaDeactivationCommand.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/commands/MediaDeactivationCommand.java 2013-09-20 15:54:59 UTC (rev 4340)
+++ magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/commands/MediaDeactivationCommand.java 2013-09-24 17:06:28 UTC (rev 4341)
@@ -22,6 +22,7 @@
import info.magnolia.commands.CommandsManager;
import info.magnolia.context.Context;
import info.magnolia.module.admininterface.commands.BaseRepositoryCommand;
+import info.magnolia.objectfactory.Components;
import net.sourceforge.openutils.mgnlmedia.media.tags.el.MediaEl;
import org.apache.commons.chain.Command;
@@ -42,7 +43,9 @@
{
if (!MediaEl.module().isSingleinstance())
{
- Command cmd = CommandsManager.getInstance().getCommand(CommandsManager.DEFAULT_CATALOG, "deactivate");
+ Command cmd = Components.getSingleton(CommandsManager.class).getCommand(
+ CommandsManager.DEFAULT_CATALOG,
+ "deactivate");
return cmd.execute(context);
}
return true;
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-09-20 15:54:59 UTC (rev 4340)
+++ magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/configuration/ImageProcessorsManager.java 2013-09-24 17:06:28 UTC (rev 4341)
@@ -22,8 +22,8 @@
import info.magnolia.cms.beans.config.ObservedManager;
import info.magnolia.cms.core.Content;
import info.magnolia.cms.util.ContentUtil;
-import info.magnolia.cms.util.FactoryUtil;
import info.magnolia.cms.util.NodeDataUtil;
+import info.magnolia.objectfactory.Components;
import java.util.Collection;
import java.util.HashMap;
@@ -97,7 +97,7 @@
*/
public static ImageProcessorsManager getInstance()
{
- return (ImageProcessorsManager) FactoryUtil.getSingleton(ImageProcessorsManager.class);
+ return Components.getSingleton(ImageProcessorsManager.class);
}
/**
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-20 15:54:59 UTC (rev 4340)
+++ magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/configuration/MediaConfigurationManager.java 2013-09-24 17:06:28 UTC (rev 4341)
@@ -115,39 +115,48 @@
Node node = content.getJCRNode();
- for (Iterator iter = ContentUtil.getAllChildren(node).iterator(); iter.hasNext();)
+ try
{
- Node typeNode = iter.next();
-
- if (!NodeDataUtil.getBoolean(typeNode, "enabled", true))
+ for (Iterator<Node> iter = NodeUtil.getNodes(node, NodeUtil.EXCLUDE_META_DATA_FILTER).iterator(); iter
+ .hasNext();)
{
- continue;
- }
+ Node typeNode = iter.next();
- try
- {
- MediaTypeConfiguration conf = (MediaTypeConfiguration) Content2BeanUtil.toBean(
- typeNode,
- true,
- MediaTypeConfiguration.class);
+ if (!PropertyUtil.getBoolean(typeNode, "enabled", true))
+ {
+ continue;
+ }
- if (conf.getHandler() != null)
+ try
{
- conf.getHandler().init(typeNode);
+ Content typeContent = ContentUtil.asContent(typeNode);
+ MediaTypeConfiguration conf = (MediaTypeConfiguration) Content2BeanUtil.toBean(
+ typeContent,
+ 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);
}
- else
+ catch (Throwable e)
{
- log.error("Missing handler for media type {}", typeNode.getName());
- continue;
+ log.error("Error getting media type configuration for {}", NodeUtil.getPathIfPossible(typeNode), e);
}
-
- 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);
+ }
}
/**
Modified: magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/configuration/MediaUsedInManager.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/configuration/MediaUsedInManager.java 2013-09-20 15:54:59 UTC (rev 4340)
+++ magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/configuration/MediaUsedInManager.java 2013-09-24 17:06:28 UTC (rev 4341)
@@ -22,9 +22,9 @@
import info.magnolia.cms.beans.config.ObservedManager;
import info.magnolia.cms.core.Content;
import info.magnolia.cms.core.ItemType;
-import info.magnolia.cms.util.FactoryUtil;
import info.magnolia.content2bean.Content2BeanException;
import info.magnolia.content2bean.Content2BeanUtil;
+import info.magnolia.objectfactory.Components;
import info.magnolia.repository.RepositoryConstants;
import java.util.ArrayList;
@@ -62,7 +62,7 @@
public static MediaUsedInManager getInstance()
{
- return (MediaUsedInManager) FactoryUtil.getSingleton(MediaUsedInManager.class);
+ return Components.getSingleton(MediaUsedInManager.class);
}
private static Logger log = LoggerFactory.getLogger(MediaUsedInManager.class);
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-20 15:54:59 UTC (rev 4340)
+++ magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/crop/PzcServlet.java 2013-09-24 17:06:28 UTC (rev 4341)
@@ -19,7 +19,6 @@
package net.sourceforge.openutils.mgnlmedia.media.crop;
-
import info.magnolia.cms.core.HierarchyManager;
import info.magnolia.cms.core.NodeData;
import info.magnolia.cms.util.NodeDataUtil;
@@ -30,6 +29,7 @@
import javax.jcr.Node;
import javax.jcr.RepositoryException;
+import javax.jcr.Session;
import javax.servlet.ServletException;
import javax.servlet.http.HttpServlet;
import javax.servlet.http.HttpServletRequest;
@@ -70,19 +70,17 @@
repository = RepositoryConstants.WEBSITE;
}
- HierarchyManager hm = MgnlContext.getHierarchyManager(repository);
-
try
{
- final Node node = hm.getContent(handle);
+ Session hm = MgnlContext.getJCRSession(repository);
+ final Node node = hm.getNode(handle);
if ("delete".equals(command))
{
- NodeData nd = node.getNodeData(id);
- if (nd != null)
+ if (node != null && node.hasProperty(id))
{
- nd.delete();
- node.save();
+ node.getProperty(id).remove();
}
+ hm.save();
resp.getWriter().println("true");
}
else
@@ -93,11 +91,11 @@
public Void exec() throws RepositoryException
{
- HierarchyManager hm = MgnlContext.getHierarchyManager(systemRepository);
+ Session session = MgnlContext.getJCRSession(systemRepository);
try
{
- Node systemNode = hm.getContent(node.getHandle());
- NodeDataUtil.getOrCreateAndSet(systemNode, id, new StringBuffer()
+ Node systemNode = session.getNode(node.getPath());
+ systemNode.setProperty(id, new StringBuffer()
.append(zoom)
.append("|")
.append(x)
@@ -111,7 +109,8 @@
}
return null;
}
- }, true);
+ },
+ true);
resp.getWriter().println("true");
}
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
