Menu
▾
▴
[Openutils-svn] SF.net SVN: openutils:[1198] trunk/openutils-mgnlmedia/src
|
From: <fg...@us...> - 2009-05-11 17:51:24
|
Revision: 1198
http://openutils.svn.sourceforge.net/openutils/?rev=1198&view=rev
Author: fgiust
Date: 2009-05-11 17:51:11 +0000 (Mon, 11 May 2009)
Log Message:
-----------
ignore (log) missing media in MediaCustomSaveHandler
Modified Paths:
--------------
trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/save/MediaCustomSaveHandler.java
trunk/openutils-mgnlmedia/src/site/changes/changes.xml
Modified: trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/save/MediaCustomSaveHandler.java
===================================================================
--- trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/save/MediaCustomSaveHandler.java 2009-05-11 17:22:11 UTC (rev 1197)
+++ trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/save/MediaCustomSaveHandler.java 2009-05-11 17:51:11 UTC (rev 1198)
@@ -24,6 +24,7 @@
import info.magnolia.context.MgnlContext;
import info.magnolia.module.admininterface.FieldSaveHandler;
+import javax.jcr.ItemNotFoundException;
import javax.jcr.RepositoryException;
import net.sourceforge.openutils.mgnlmedia.media.configuration.MediaConfigurationManager;
@@ -31,6 +32,8 @@
import net.sourceforge.openutils.mgnlmedia.media.lifecycle.MediaModule;
import org.apache.commons.lang.StringUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
@@ -41,6 +44,11 @@
{
/**
+ * Logger.
+ */
+ private Logger log = LoggerFactory.getLogger(MediaCustomSaveHandler.class);
+
+ /**
* {@inheritDoc}
*/
public void save(Content parentNode, Content configNode, String name, MultipartForm form, int type, int valueType,
@@ -61,19 +69,27 @@
HierarchyManager hm = MgnlContext.getHierarchyManager(MediaModule.REPO);
- Content media = hm.getContentByUUID(value);
+ try
+ {
+ Content media = hm.getContentByUUID(value);
- MediaTypeConfiguration mtc = MediaConfigurationManager.getInstance().getMediaTypeConfigurationFromMedia(media);
- mtc.getHandler().onSavingPropertyMedia(
- media,
- parentNode,
- configNode,
- name,
- form,
- type,
- valueType,
- isRichEditValue,
- encoding);
+ MediaTypeConfiguration mtc = MediaConfigurationManager.getInstance().getMediaTypeConfigurationFromMedia(
+ media);
+ mtc.getHandler().onSavingPropertyMedia(
+ media,
+ parentNode,
+ configNode,
+ name,
+ form,
+ type,
+ valueType,
+ isRichEditValue,
+ encoding);
+ }
+ catch (ItemNotFoundException e)
+ {
+ log.warn("Missing media {} referenced in node {}", value, parentNode.getHandle());
+ }
}
Modified: trunk/openutils-mgnlmedia/src/site/changes/changes.xml
===================================================================
--- trunk/openutils-mgnlmedia/src/site/changes/changes.xml 2009-05-11 17:22:11 UTC (rev 1197)
+++ trunk/openutils-mgnlmedia/src/site/changes/changes.xml 2009-05-11 17:51:11 UTC (rev 1198)
@@ -8,6 +8,10 @@
<author email="fgiust(at)users.sourceforge.net">Fabrizio Giustina</author>
</properties>
<body>
+ <release version="4.0-b5" date="in svn" description="">
+ <action type="fix" dev="fgiust">MediaCustomSaveHandler now only warns about missing referenced media without
+ blocking</action>
+ </release>
<release version="4.0-b4" date="2009-04-29" description="">
<action type="update" dev="fgiust">YouTubeVideoTypeHandler modified in order to work with generic external urls (not
only youtube)</action>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
