Menu
▾
▴
openutils-svn
|
From: <fg...@us...> - 2013-02-04 15:51:26
|
Revision: 4187
http://openutils.svn.sourceforge.net/openutils/?rev=4187&view=rev
Author: fgiust
Date: 2013-02-04 15:51:16 +0000 (Mon, 04 Feb 2013)
Log Message:
-----------
MEDIA-297 Add a configurable base url/host for generated resource urls
Modified Paths:
--------------
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/tags/el/MediaEl.java
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-02-04 15:44:03 UTC (rev 4186)
+++ magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/lifecycle/MediaModule.java 2013-02-04 15:51:16 UTC (rev 4187)
@@ -85,6 +85,8 @@
private LockUtils locks = new LockUtils(4);
+ private String baseurl;
+
/**
* Constructor
*/
@@ -343,4 +345,23 @@
{
return locks;
}
+
+ /**
+ * Returns the baseurl.
+ * @return the baseurl
+ */
+ public String getBaseurl()
+ {
+ return baseurl;
+ }
+
+ /**
+ * Sets the baseurl.
+ * @param baseurl the baseurl to set
+ */
+ public void setBaseurl(String baseurl)
+ {
+ this.baseurl = baseurl;
+ }
+
}
Modified: magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/tags/el/MediaEl.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/tags/el/MediaEl.java 2013-02-04 15:44:03 UTC (rev 4186)
+++ magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/tags/el/MediaEl.java 2013-02-04 15:51:16 UTC (rev 4187)
@@ -200,7 +200,7 @@
{
return null;
}
- return mtc.getHandler().getUrl(media, options);
+ return appendBaseUrl(mtc.getHandler().getUrl(media, options));
}
/**
@@ -299,7 +299,7 @@
Point size = ImageUtils.parseForSize(resolution);
if (width == size.x && height == size.y)
{
- return mcm.getURIMappingPrefix() + prop.getProperty(FileProperties.PATH);
+ return appendBaseUrl(mcm.getURIMappingPrefix() + prop.getProperty(FileProperties.PATH));
}
}
@@ -317,7 +317,7 @@
{
String resPath = new FileProperties(resolutions, resString).getProperty(FileProperties.PATH);
- return mcm.getURIMappingPrefix() + resPath;
+ return appendBaseUrl(mcm.getURIMappingPrefix() + resPath);
}
}
@@ -361,7 +361,7 @@
}
catch (RepositoryException e)
{
- res = null;
+ // do nothing
}
}
}
@@ -922,4 +922,14 @@
return tagsLoc(media, null);
}
+ private static String appendBaseUrl(String url)
+ {
+ String baseurl = module().getBaseurl();
+ if (baseurl != null && StringUtils.isNotEmpty(url) && !StringUtils.contains(url, "://"))
+ {
+ return baseurl + url;
+ }
+ return url;
+ }
+
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
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.
|
|
From: <luc...@us...> - 2013-09-26 13:23:42
|
Revision: 4343
http://openutils.svn.sourceforge.net/openutils/?rev=4343&view=rev
Author: lucaboati
Date: 2013-09-26 13:23:38 +0000 (Thu, 26 Sep 2013)
Log Message:
-----------
remove deprecations, content to node, setAttribute addAttribute removed
Modified Paths:
--------------
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/uri/MediaURI2RepositoryMapping.java
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-25 17:22:52 UTC (rev 4342)
+++ magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/setup/RenameThumbToImageTask.java 2013-09-26 13:23:38 UTC (rev 4343)
@@ -19,25 +19,24 @@
package net.sourceforge.openutils.mgnlmedia.media.setup;
+import java.io.InputStream;
+
import info.magnolia.cms.beans.runtime.FileProperties;
-import info.magnolia.cms.core.HierarchyManager;
-import info.magnolia.cms.core.search.Query;
-import info.magnolia.cms.core.search.QueryManager;
-import info.magnolia.cms.core.search.QueryResult;
+import info.magnolia.cms.core.MgnlNodeType;
+import info.magnolia.jcr.util.NodeUtil;
+import info.magnolia.jcr.util.PropertyUtil;
import info.magnolia.module.InstallContext;
import info.magnolia.module.delta.AbstractTask;
import info.magnolia.module.delta.TaskExecutionException;
import it.openutils.mgnlutils.api.NodeUtilsExt;
-import java.util.Collection;
-
-import javax.jcr.Binary;
import javax.jcr.Node;
-import javax.jcr.Property;
-import javax.jcr.PropertyType;
import javax.jcr.RepositoryException;
import javax.jcr.Session;
+import javax.jcr.nodetype.NodeType;
+import org.apache.jackrabbit.value.BinaryValue;
+
import net.sourceforge.openutils.mgnlcriteria.jcr.query.AdvancedResult;
import net.sourceforge.openutils.mgnlcriteria.jcr.query.AdvancedResultItem;
import net.sourceforge.openutils.mgnlcriteria.jcr.query.Criteria;
@@ -70,7 +69,7 @@
{
try
{
- // [LB] FIXME
+ // [LB] FIXME?
Session hm = installContext.getJCRSession(MediaModule.REPO);
Criteria criteria = JCRCriteriaFactory
.createCriteria()
@@ -81,42 +80,37 @@
AdvancedResult result = criteria.execute();
for (AdvancedResultItem node : result.getItems())
{
- if (node.hasProperty("thumbnail"))
+ if (node.hasNode("thumbnail"))
{
- Property thumbnail = node.getProperty("thumbnail");
- if (thumbnail.getType() == PropertyType.BINARY)
+ Node thumbnail = node.getNode("thumbnail");
+ if (NodeUtil.isNodeType(thumbnail, NodeType.NT_RESOURCE))
{
- // [LB] FIXME
- NodeUtilsExt.setAttribute(
- thumbnail,
- "image",
+ Node image = node.addNode("image", NodeType.NT_RESOURCE);
+ InputStream stream = node.getProperty(MgnlNodeType.JCR_DATA).getValue().getBinary().getStream();
+ try
+ {
+ image.setProperty(MgnlNodeType.JCR_DATA, new BinaryValue(stream));
+ }
+ catch (RepositoryException e)
+ {
+ log.error(e.getMessage(), e);
+ }
+
+ image.setProperty(
FileProperties.PROPERTY_EXTENSION,
- NodeUtilsExt.getAttribute(thumbnail, FileProperties.PROPERTY_EXTENSION));
- NodeUtilsExt.setAttribute(
- thumbnail,
- "image",
+ PropertyUtil.getString(thumbnail, FileProperties.PROPERTY_EXTENSION));
+ image.setProperty(
FileProperties.PROPERTY_FILENAME,
- NodeUtilsExt.getAttribute(thumbnail, FileProperties.PROPERTY_FILENAME));
- NodeUtilsExt.setAttribute(
- thumbnail,
- "image",
- FileProperties.PROPERTY_CONTENTTYPE,
- NodeUtilsExt.getAttribute(thumbnail, FileProperties.PROPERTY_CONTENTTYPE));
- NodeUtilsExt.setAttribute(
- thumbnail,
- "image",
+ PropertyUtil.getString(thumbnail, FileProperties.PROPERTY_FILENAME));
+ image.setProperty(
FileProperties.PROPERTY_LASTMODIFIED,
- NodeUtilsExt.getAttribute(thumbnail, FileProperties.PROPERTY_LASTMODIFIED));
- NodeUtilsExt.setAttribute(
- thumbnail,
- "image",
+ PropertyUtil.getString(thumbnail, FileProperties.PROPERTY_LASTMODIFIED));
+ image.setProperty(
FileProperties.PROPERTY_WIDTH,
- NodeUtilsExt.getAttribute(thumbnail, FileProperties.PROPERTY_WIDTH));
- NodeUtilsExt.setAttribute(
- thumbnail,
- "image",
+ PropertyUtil.getString(thumbnail, FileProperties.PROPERTY_WIDTH));
+ image.setProperty(
FileProperties.PROPERTY_HEIGHT,
- NodeUtilsExt.getAttribute(thumbnail, FileProperties.PROPERTY_HEIGHT));
+ PropertyUtil.getString(thumbnail, FileProperties.PROPERTY_HEIGHT));
thumbnail.remove();
}
Modified: magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/tags/el/MediaEl.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/tags/el/MediaEl.java 2013-09-25 17:22:52 UTC (rev 4342)
+++ magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/tags/el/MediaEl.java 2013-09-26 13:23:38 UTC (rev 4343)
@@ -314,52 +314,53 @@
if (media != null)
{
-
- Property res = null;
- if ("original".equals(resolution))
+ try
{
- res = PropertyUtil.getPropertyOrNull(media, "original");
- }
- else
- {
- Node resolutions = getResolutionsNode(media);
- if (resolutions != null)
+ Node res = null;
+ if ("original".equals(resolution))
{
- try
+ res = media.getNode("original");
+ }
+ else
+ {
+ Node resolutions = getResolutionsNode(media);
+ if (resolutions != null)
{
- if (resolutions.hasProperty(ImageUtils.getResolutionPath("res-" + resolution)))
+
+ if (resolutions.hasNode(ImageUtils.getResolutionPath("res-" + resolution)))
{
- res = resolutions.getProperty(ImageUtils.getResolutionPath("res-" + resolution));
+ res = resolutions.getNode(ImageUtils.getResolutionPath("res-" + resolution));
}
+
}
- catch (RepositoryException e)
- {
- // do nothing
- }
}
- }
- if (res != null)
- {
- return new int[]{
- NumberUtils.toInt(NodeUtilsExt.getAttribute(res, FileProperties.PROPERTY_WIDTH)),
- NumberUtils.toInt(NodeUtilsExt.getAttribute(res, FileProperties.PROPERTY_HEIGHT)) };
- }
- else
- {
- // MEDIA-231
- res = PropertyUtil.getPropertyOrNull(media, "original");
if (res != null)
{
- Point size = ImageUtils.parseForSize(resolution);
- if (NumberUtils.toInt(NodeUtilsExt.getAttribute(res, FileProperties.PROPERTY_WIDTH)) == size.x
- && NumberUtils.toInt(NodeUtilsExt.getAttribute(res, FileProperties.PROPERTY_HEIGHT)) == size.y)
+ return new int[]{
+ NumberUtils.toInt(PropertyUtil.getString(res, FileProperties.PROPERTY_WIDTH)),
+ NumberUtils.toInt(PropertyUtil.getString(res, FileProperties.PROPERTY_HEIGHT)) };
+ }
+ else
+ {
+ // MEDIA-231
+ res = media.getNode("original");
+ if (res != null)
{
- return new int[]{size.x, size.y };
+ Point size = ImageUtils.parseForSize(resolution);
+ if (NumberUtils.toInt(PropertyUtil.getString(res, FileProperties.PROPERTY_WIDTH)) == size.x
+ && NumberUtils.toInt(PropertyUtil.getString(res, FileProperties.PROPERTY_HEIGHT)) == size.y)
+ {
+ return new int[]{size.x, size.y };
+ }
}
+
}
-
}
+ catch (RepositoryException e)
+ {
+ // do nothing
+ }
}
return new int[]{-1, -1 };
Modified: magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/uri/MediaURI2RepositoryMapping.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/uri/MediaURI2RepositoryMapping.java 2013-09-25 17:22:52 UTC (rev 4342)
+++ magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/uri/MediaURI2RepositoryMapping.java 2013-09-26 13:23:38 UTC (rev 4343)
@@ -21,12 +21,12 @@
import info.magnolia.cms.beans.config.URI2RepositoryMapping;
import info.magnolia.context.MgnlContext;
+import info.magnolia.jcr.util.PropertyUtil;
import info.magnolia.link.Link;
import it.openutils.mgnlutils.api.NodeUtilsExt;
import javax.jcr.Node;
import javax.jcr.PathNotFoundException;
-import javax.jcr.Property;
import javax.jcr.RepositoryException;
import net.sourceforge.openutils.mgnlmedia.media.lifecycle.MediaModule;
@@ -127,8 +127,8 @@
String ndName = StringUtils.substringBefore(handle.substring(p + search.length()), "/");
if (resolutionsNode != null && !StringUtils.isEmpty(ndName))
{
- Property nd = resolutionsNode.getProperty(ndName);
- String resolution = NodeUtilsExt.getAttribute(nd, "resolutionNotYetCreated");
+ Node nd = resolutionsNode.getNode(ndName);
+ String resolution = PropertyUtil.getString(nd, "resolutionNotYetCreated");
if (!StringUtils.isEmpty(resolution))
{
ImageUtils.checkOrCreateResolution(mediaNode, resolution, null);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
Thanks for helping keep SourceForge clean.
X