Menu
▾
▴
[Openutils-svn] SF.net SVN: openutils:[4328] magnoliamodules/trunk/openutils-mgnlmedia/src/ main
|
From: <fg...@us...> - 2013-09-19 09:45:45
|
Revision: 4328
http://openutils.svn.sourceforge.net/openutils/?rev=4328&view=rev
Author: fgiust
Date: 2013-09-19 09:45:42 +0000 (Thu, 19 Sep 2013)
Log Message:
-----------
badly breaking everything by replacing Content with node :) stay away from this version until the upgrade is completed
Modified Paths:
--------------
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/MediaTypeHandler.java
magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/types/impl/AudioTypeHandler.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/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/playlist/utils/PlaylistIterateUtils.java
magnoliamodules/trunk/openutils-mgnlmedia/src/main/resources/META-INF/media.tld
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-18 21:04:37 UTC (rev 4327)
+++ magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/tags/el/MediaEl.java 2013-09-19 09:45:42 UTC (rev 4328)
@@ -20,15 +20,13 @@
package net.sourceforge.openutils.mgnlmedia.media.tags.el;
import info.magnolia.cms.beans.runtime.FileProperties;
-import info.magnolia.cms.core.Content;
-import info.magnolia.cms.core.DefaultContent;
import info.magnolia.cms.core.NodeData;
-import info.magnolia.cms.i18n.I18nContentWrapper;
-import info.magnolia.cms.util.NodeDataUtil;
-import info.magnolia.cms.util.NodeMapWrapper;
import info.magnolia.context.MgnlContext;
import info.magnolia.jcr.util.ContentMap;
+import info.magnolia.jcr.util.PropertyUtil;
+import info.magnolia.jcr.wrapper.NodeWrapperFactory;
import info.magnolia.module.ModuleRegistry;
+import info.magnolia.objectfactory.Components;
import java.awt.Point;
import java.util.ArrayList;
@@ -36,13 +34,14 @@
import java.util.Collections;
import java.util.Iterator;
import java.util.List;
-import java.util.Locale;
import java.util.Map;
import javax.jcr.Node;
+import javax.jcr.PathNotFoundException;
import javax.jcr.PropertyType;
import javax.jcr.RepositoryException;
import javax.jcr.Value;
+import javax.jcr.ValueFormatException;
import javax.jcr.query.InvalidQueryException;
import javax.servlet.http.HttpServletRequest;
@@ -95,7 +94,7 @@
*/
public static MediaModule module()
{
- return (MediaModule) ModuleRegistry.Factory.getInstance().getModuleInstance(MediaModule.NAME);
+ return (MediaModule) Components.getComponent(ModuleRegistry.class).getModuleInstance(MediaModule.NAME);
}
/**
@@ -103,7 +102,7 @@
* @param obj content node or node UUID or jcr absolute path in media repository
* @return content node
*/
- public static Content node(Object obj)
+ public static Node node(Object obj)
{
if (obj == null)
{
@@ -114,22 +113,7 @@
if (node != null)
{
- Content currentpage = null;
-
- if (MgnlContext.isWebContext())
- {
- currentpage = MgnlContext.getAggregationState().getMainContent();
- }
-
- if (currentpage == null)
- {
- currentpage = new DefaultContent(node);
- }
-
- Content content = new NodeMapWrapper(
- new I18nContentWrapper(new DefaultContent(node)),
- currentpage.getHandle());
- return content;
+ return Components.getComponent(NodeWrapperFactory.class).wrapNode(node);
}
return null;
@@ -153,7 +137,7 @@
*/
public static String urlParams(Object mediaref, Map<String, String> options)
{
- Content media = node(mediaref);
+ Node media = node(mediaref);
if (media == null)
{
return null;
@@ -174,7 +158,7 @@
public static String thumbnail(Object mediaref)
{
- Content media = node(mediaref);
+ Node media = node(mediaref);
if (media == null)
{
@@ -199,7 +183,7 @@
{
return null;
}
- return NodeDataUtil.getString(node(media), "type");
+ return PropertyUtil.getString(node(media), "type");
}
/**
@@ -210,11 +194,11 @@
public static String[] resolutions(Object mediaref)
{
- Content media = node(mediaref);
+ Node media = node(mediaref);
List<String> res = new ArrayList<String>();
- Content resolutions = getResolutionsNode(media);
+ Node resolutions = getResolutionsNode(media);
Collection<NodeData> nodeDataCollection = resolutions.getNodeDataCollection();
@@ -246,7 +230,7 @@
public static String urlres(Object mediaref, String resolution)
{
- Content media = node(mediaref);
+ Node media = node(mediaref);
if (media == null)
{
@@ -271,7 +255,7 @@
return null;
}
- Content resolutions = getResolutionsNode(media);
+ Node resolutions = getResolutionsNode(media);
try
{
@@ -300,7 +284,7 @@
public static int[] size(Object mediaref, String resolution)
{
- Content media = node(mediaref);
+ Node media = node(mediaref);
if (media != null)
{
@@ -312,7 +296,7 @@
}
else
{
- Content resolutions = getResolutionsNode(media);
+ Node resolutions = getResolutionsNode(media);
if (resolutions != null)
{
try
@@ -360,7 +344,7 @@
public static String preview(Object mediaref)
{
- Content media = node(mediaref);
+ Node media = node(mediaref);
if (media == null)
{
@@ -382,7 +366,7 @@
public static String[] usedInWebPages(Object mediaref)
{
- Content media = node(mediaref);
+ Node media = node(mediaref);
if (media == null)
{
@@ -391,7 +375,7 @@
}
try
{
- List<String> retVal = mcm.getUsedInWebPages(media.getUUID());
+ List<String> retVal = mcm.getUsedInWebPages(media.getIdentifier());
return (CollectionUtils.isNotEmpty(retVal) ? retVal.toArray(new String[retVal.size()]) : EMPTY_STRING_ARRAY);
}
catch (InvalidQueryException e)
@@ -416,11 +400,11 @@
public static Object property(Object mediaref, String property)
{
- Content media = node(mediaref);
+ Node media = node(mediaref);
try
{
- if (media == null || !media.hasNodeData(property))
+ if (media == null || !media.hasProperty(property))
{
return null;
}
@@ -430,8 +414,17 @@
// return null;
}
- return getValueAsObject(media.getNodeData(property).getValue());
+ try
+ {
+ return getValueAsObject(media.getProperty(property).getValue());
+ }
+ catch (RepositoryException e)
+ {
+ log.debug("RepositoryException reading property " + property + " from " + media, e);
+ }
+ return null;
+
}
/**
@@ -501,15 +494,15 @@
* @param media
* @return
*/
- protected static Content getResolutionsNode(final Content media)
+ protected static Node getResolutionsNode(final Node media)
{
- Content resolutions = null;
+ Node resolutions = null;
try
{
- if (media.hasContent("resolutions"))
+ if (media.hasNode("resolutions"))
{
- resolutions = media.getContent("resolutions");
+ resolutions = media.getNode("resolutions");
}
}
catch (RepositoryException e)
Modified: magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/types/MediaTypeHandler.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/types/MediaTypeHandler.java 2013-09-18 21:04:37 UTC (rev 4327)
+++ magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/types/MediaTypeHandler.java 2013-09-19 09:45:42 UTC (rev 4328)
@@ -20,12 +20,12 @@
package net.sourceforge.openutils.mgnlmedia.media.types;
import info.magnolia.cms.beans.runtime.MultipartForm;
-import info.magnolia.cms.core.Content;
import info.magnolia.cms.security.AccessDeniedException;
import java.io.File;
import java.util.Map;
+import javax.jcr.Node;
import javax.jcr.RepositoryException;
import javax.servlet.http.HttpServletRequest;
@@ -58,105 +58,105 @@
* init handler
* @param typeDefinitionNode type definition node
*/
- void init(Content typeDefinitionNode);
+ void init(Node typeDefinitionNode);
/**
* return true if media has no binary-data
* @param media media
* @return true if media has no binary-data
*/
- boolean isExternal(Content media);
+ boolean isExternal(Node media);
/**
* return thumbnail absolute url
* @param media media
* @return url
*/
- String getUrl(Content media);
+ String getUrl(Node media);
/**
* @param media
* @param options
* @return url
*/
- String getUrl(Content media, Map<String, String> options);
+ String getUrl(Node media, Map<String, String> options);
/**
* return thumbnail absolute url
* @param media media
* @return url
*/
- String getThumbnailUrl(Content media);
+ String getThumbnailUrl(Node media);
/**
* return thumbnail absolute url
* @param media media
* @return url
*/
- String getPreviewUrl(Content media);
+ String getPreviewUrl(Node media);
/**
* return filename
* @param media media
* @return filename
*/
- String getFilename(Content media);
+ String getFilename(Node media);
/**
* return filename
* @param media media
* @return filename
*/
- String getExtension(Content media);
+ String getExtension(Node media);
/**
* return filename
* @param media media
* @return filename
*/
- String getFullFilename(Content media);
+ String getFullFilename(Node media);
/**
* return title
* @param media media
* @return title
*/
- String getTitle(Content media);
+ String getTitle(Node media);
/**
* return tags
* @param media media
* @return tags
*/
- String getTags(Content media);
+ String getTags(Node media);
/**
* return description
* @param media media
* @return description
*/
- String getDescription(Content media);
+ String getDescription(Node media);
/**
* return abstract
* @param media media
* @return abstract
*/
- String getAbstract(Content media);
+ String getAbstract(Node media);
/**
* Returns the basic media info (file type, size for images, ...)
* @param media media
* @return a formatted string for media info
*/
- Map<String, String> getMediaInfo(Content media);
+ Map<String, String> getMediaInfo(Node media);
/**
* Called from dialog when saving a media
* @param media media saving
* @return true if continue saving
*/
- boolean onPostSave(Content media);
+ boolean onPostSave(Node media);
/**
* Get the name for a new node
@@ -188,20 +188,20 @@
* @exception RepositoryException repository exception
* @exception AccessDeniedException access denied exception
*/
- boolean onSavingPropertyMedia(Content media, Content parentNode, Content configNode, String name,
+ boolean onSavingPropertyMedia(Node media, Node parentNode, Node configNode, String name,
HttpServletRequest request, MultipartForm form, int type, int valueType, int isRichEditValue, int encoding)
throws RepositoryException, AccessDeniedException;
/**
* save a media file to a newly created media content
- * @param media media content to save to
+ * @param media media Node to save to
* @param f file input stream
* @param cleanFileName file name without extension
* @param extension file extension
* @exception RepositoryException exception working on repository
* @exception AccessDeniedException exception accessing node
*/
- void saveFromZipFile(Content media, File f, String cleanFileName, String extension) throws AccessDeniedException,
+ void saveFromZipFile(Node media, File f, String cleanFileName, String extension) throws AccessDeniedException,
RepositoryException;
/**
Modified: magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/types/impl/AudioTypeHandler.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/types/impl/AudioTypeHandler.java 2013-09-18 21:04:37 UTC (rev 4327)
+++ magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/types/impl/AudioTypeHandler.java 2013-09-19 09:45:42 UTC (rev 4328)
@@ -19,7 +19,7 @@
package net.sourceforge.openutils.mgnlmedia.media.types.impl;
-import info.magnolia.cms.core.Content;
+import javax.jcr.Node;
/**
@@ -33,7 +33,7 @@
/**
* {@inheritDoc}
*/
- public String getThumbnailUrl(Content media)
+ public String getThumbnailUrl(Node media)
{
return "/.resources/media/icons/thumb-audio.png";
}
Modified: 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/BaseTypeHandler.java 2013-09-18 21:04:37 UTC (rev 4327)
+++ magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/types/impl/BaseTypeHandler.java 2013-09-19 09:45:42 UTC (rev 4328)
@@ -22,11 +22,11 @@
import info.magnolia.cms.beans.runtime.Document;
import info.magnolia.cms.beans.runtime.FileProperties;
import info.magnolia.cms.beans.runtime.MultipartForm;
-import info.magnolia.cms.core.Content;
import info.magnolia.cms.core.NodeData;
import info.magnolia.cms.i18n.I18nContentSupportFactory;
import info.magnolia.cms.security.AccessDeniedException;
import info.magnolia.cms.util.NodeDataUtil;
+import info.magnolia.jcr.util.MetaDataUtil;
import info.magnolia.module.admininterface.SaveHandlerImpl;
import java.io.File;
@@ -36,6 +36,7 @@
import java.util.LinkedHashMap;
import java.util.Map;
+import javax.jcr.Node;
import javax.jcr.PropertyType;
import javax.jcr.RepositoryException;
import javax.servlet.http.HttpServletRequest;
@@ -59,7 +60,7 @@
{
/**
- * Nodedata name where original media content is saved
+ * Nodedata name where original media Node is saved
*/
public static final String ORGINAL_NODEDATA_NAME = "original";
@@ -73,7 +74,7 @@
/**
* {@inheritDoc}
*/
- public void init(Content typeDefinitionNode)
+ public void init(Node typeDefinitionNode)
{
type = typeDefinitionNode.getName();
}
@@ -94,7 +95,7 @@
/**
* {@inheritDoc}
*/
- public boolean onSavingPropertyMedia(Content media, Content parentNode, Content configNode, String name,
+ public boolean onSavingPropertyMedia(Node media, Node parentNode, Node configNode, String name,
HttpServletRequest request, MultipartForm form, int type, int valueType, int isRichEditValue, int encoding)
throws RepositoryException, AccessDeniedException
{
@@ -126,7 +127,7 @@
/**
* {@inheritDoc}
*/
- public void saveFromZipFile(Content media, File f, String cleanFileName, String extension)
+ public void saveFromZipFile(Node media, File f, String cleanFileName, String extension)
throws AccessDeniedException, RepositoryException
{
Document doc = new Document(f, type + extension);
@@ -138,7 +139,7 @@
/**
* {@inheritDoc}
*/
- public boolean onPostSave(Content media)
+ public boolean onPostSave(Node media)
{
try
{
@@ -165,7 +166,7 @@
if (MediaEl.module().isSingleinstance())
{
- media.getMetaData().setActivated();
+ MetaDataUtil.getMetaData(media).setActivated();
media.save();
}
}
@@ -182,12 +183,12 @@
* @param media media
* @return default nodedata
*/
- protected NodeData getOriginalFileNodeData(Content media)
+ protected NodeData getOriginalFileNodeData(Node media)
{
return media.getNodeData(ORGINAL_NODEDATA_NAME);
}
- public boolean isExternal(Content media)
+ public boolean isExternal(Node media)
{
try
{
@@ -203,7 +204,7 @@
/**
* {@inheritDoc}
*/
- public String getExtension(Content media)
+ public String getExtension(Node media)
{
return getOriginalFileNodeData(media).getAttribute(FileProperties.PROPERTY_EXTENSION);
}
@@ -211,7 +212,7 @@
/**
* {@inheritDoc}
*/
- public String getFilename(Content media)
+ public String getFilename(Node media)
{
return getOriginalFileNodeData(media).getAttribute(FileProperties.PROPERTY_FILENAME);
}
@@ -219,7 +220,7 @@
/**
* {@inheritDoc}
*/
- public String getFullFilename(Content media)
+ public String getFullFilename(Node media)
{
return getFilename(media)
+ (StringUtils.isNotBlank(getExtension(media)) ? "." + getExtension(media) : StringUtils.EMPTY);
@@ -228,7 +229,7 @@
/**
* {@inheritDoc}
*/
- public String getUrl(Content media, Map<String, String> options)
+ public String getUrl(Node media, Map<String, String> options)
{
String filenameEncoded = getFullFilename(media);
try
@@ -250,7 +251,7 @@
/**
* {@inheritDoc}
*/
- public String getUrl(Content media)
+ public String getUrl(Node media)
{
return getUrl(media, null);
}
@@ -258,7 +259,7 @@
/**
* {@inheritDoc}
*/
- public String getPreviewUrl(Content media)
+ public String getPreviewUrl(Node media)
{
return getUrl(media);
}
@@ -266,7 +267,7 @@
/**
* {@inheritDoc}
*/
- public String getTitle(Content media)
+ public String getTitle(Node media)
{
return I18nContentSupportFactory.getI18nSupport().getNodeData(media, "title").getString();
}
@@ -274,7 +275,7 @@
/**
* {@inheritDoc}
*/
- public String getTags(Content media)
+ public String getTags(Node media)
{
return I18nContentSupportFactory.getI18nSupport().getNodeData(media, "tags").getString();
}
@@ -282,7 +283,7 @@
/**
* {@inheritDoc}
*/
- public String getDescription(Content media)
+ public String getDescription(Node media)
{
return I18nContentSupportFactory.getI18nSupport().getNodeData(media, "description").getString();
}
@@ -290,7 +291,7 @@
/**
* {@inheritDoc}
*/
- public String getAbstract(Content media)
+ public String getAbstract(Node media)
{
return I18nContentSupportFactory.getI18nSupport().getNodeData(media, "abstract").getString();
}
@@ -298,7 +299,7 @@
/**
* {@inheritDoc}
*/
- public Map<String, String> getMediaInfo(Content media)
+ public Map<String, String> getMediaInfo(Node media)
{
Map<String, String> info = new LinkedHashMap<String, String>();
@@ -352,7 +353,7 @@
* @param info map containing metadata keys/values
* @param key nodedata name
*/
- protected void addToInfo(Content media, Map<String, String> info, String key)
+ protected void addToInfo(Node media, Map<String, String> info, String key)
{
NodeData data = media.getNodeData(key);
@@ -384,6 +385,5 @@
{
// Do nothing
}
-
-
+
}
Modified: 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/BaseVideoTypeHandler.java 2013-09-18 21:04:37 UTC (rev 4327)
+++ magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/types/impl/BaseVideoTypeHandler.java 2013-09-19 09:45:42 UTC (rev 4328)
@@ -19,11 +19,12 @@
package net.sourceforge.openutils.mgnlmedia.media.types.impl;
-import info.magnolia.cms.core.Content;
import info.magnolia.cms.util.NodeDataUtil;
import java.util.Map;
+import javax.jcr.Node;
+
import net.sourceforge.openutils.mgnlmedia.media.utils.MediaMetadataFormatUtils;
import net.sourceforge.openutils.mgnlmedia.media.utils.VideoMedataUtils.VideoMetaData;
@@ -42,10 +43,10 @@
*/
private Logger log = LoggerFactory.getLogger(BaseVideoTypeHandler.class);
- protected abstract VideoMetaData parseFLVMetaData(Content media) throws Exception;
+ protected abstract VideoMetaData parseFLVMetaData(Node media) throws Exception;
@Override
- public boolean onPostSave(Content media)
+ public boolean onPostSave(Node media)
{
try
{
@@ -87,7 +88,7 @@
* {@inheritDoc}
*/
@Override
- public Map<String, String> getMediaInfo(Content media)
+ public Map<String, String> getMediaInfo(Node media)
{
Map<String, String> info = super.getMediaInfo(media);
Modified: magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/types/impl/DocumentTypeHandler.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/types/impl/DocumentTypeHandler.java 2013-09-18 21:04:37 UTC (rev 4327)
+++ magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/types/impl/DocumentTypeHandler.java 2013-09-19 09:45:42 UTC (rev 4328)
@@ -21,7 +21,6 @@
import info.magnolia.cms.beans.runtime.Document;
import info.magnolia.cms.beans.runtime.FileProperties;
-import info.magnolia.cms.core.Content;
import info.magnolia.cms.core.NodeData;
import info.magnolia.cms.util.NodeDataUtil;
import info.magnolia.module.admininterface.SaveHandlerImpl;
@@ -34,6 +33,7 @@
import java.util.List;
import javax.imageio.ImageIO;
+import javax.jcr.Node;
import javax.jcr.PropertyType;
import javax.jcr.RepositoryException;
@@ -67,7 +67,7 @@
* {@inheritDoc}
*/
@Override
- public String getUrl(Content media)
+ public String getUrl(Node media)
{
return getUrl(media, Collections.<String, String> emptyMap());
}
@@ -76,7 +76,7 @@
* {@inheritDoc}
*/
@Override
- public boolean onPostSave(Content media)
+ public boolean onPostSave(Node media)
{
NodeData data = getOriginalFileNodeData(media);
@@ -120,7 +120,7 @@
* @param stream inputStream for the original pdf
* @param filename original filename
*/
- protected void createPdfPreview(Content media, InputStream stream, String filename)
+ protected void createPdfPreview(Node media, InputStream stream, String filename)
{
PDDocument document = null;
@@ -193,7 +193,7 @@
* @param file File to be copied
* @param filename filename
*/
- protected void copyPreviewImageToRepository(Content media, File file, String filename)
+ protected void copyPreviewImageToRepository(Node media, File file, String filename)
{
Document doc = new Document(file, "image/png");
Modified: 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/ExternalVideoTypeHandler.java 2013-09-18 21:04:37 UTC (rev 4327)
+++ magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/types/impl/ExternalVideoTypeHandler.java 2013-09-19 09:45:42 UTC (rev 4328)
@@ -21,7 +21,6 @@
import info.magnolia.cms.beans.runtime.Document;
import info.magnolia.cms.beans.runtime.MultipartForm;
-import info.magnolia.cms.core.Content;
import info.magnolia.module.admininterface.SaveHandlerImpl;
import java.io.File;
@@ -38,6 +37,7 @@
import java.util.UUID;
import javax.jcr.AccessDeniedException;
+import javax.jcr.Node;
import javax.jcr.RepositoryException;
import javax.servlet.http.HttpServletRequest;
@@ -94,7 +94,7 @@
* {@inheritDoc}
*/
@Override
- public void init(Content typeDefinitionNode)
+ public void init(Node typeDefinitionNode)
{
super.init(typeDefinitionNode);
}
@@ -131,7 +131,7 @@
* {@inheritDoc}
*/
@Override
- public String getFilename(Content media)
+ public String getFilename(Node media)
{
return getUrl(media);
}
@@ -140,13 +140,13 @@
* {@inheritDoc}
*/
@Override
- public String getExtension(Content media)
+ public String getExtension(Node media)
{
return null;
}
@Override
- public void saveFromZipFile(Content media, File f, String cleanFileName, String extension)
+ public void saveFromZipFile(Node media, File f, String cleanFileName, String extension)
throws AccessDeniedException, RepositoryException
{
@@ -156,7 +156,7 @@
* {@inheritDoc}
*/
@Override
- public String getUrl(Content media, Map<String, String> options)
+ public String getUrl(Node media, Map<String, String> options)
{
String url = media.getNodeData("videoUrl").getString();
@@ -221,7 +221,7 @@
}
@Override
- protected VideoMetaData parseFLVMetaData(Content media) throws Exception
+ protected VideoMetaData parseFLVMetaData(Node media) throws Exception
{
if (!parseremotefiles)
{
@@ -301,7 +301,7 @@
* {@inheritDoc}
*/
@Override
- public String getUrl(Content media)
+ public String getUrl(Node media)
{
return getUrl(media, null);
}
@@ -310,7 +310,7 @@
* {@inheritDoc}
*/
@Override
- public boolean onPostSave(Content media)
+ public boolean onPostSave(Node media)
{
if (parseremotefiles)
@@ -347,7 +347,7 @@
* @param media
* @param previewUrl
*/
- private void copyPreviewImageToRepository(Content media, String previewUrl)
+ private void copyPreviewImageToRepository(Node media, String previewUrl)
{
InputStream is = null;
try
Modified: magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/types/impl/ImageTypeHandler.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/types/impl/ImageTypeHandler.java 2013-09-18 21:04:37 UTC (rev 4327)
+++ magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/types/impl/ImageTypeHandler.java 2013-09-19 09:45:42 UTC (rev 4328)
@@ -20,13 +20,14 @@
package net.sourceforge.openutils.mgnlmedia.media.types.impl;
import info.magnolia.cms.beans.runtime.FileProperties;
-import info.magnolia.cms.core.Content;
import info.magnolia.cms.core.NodeData;
import info.magnolia.cms.util.NodeDataUtil;
import java.awt.image.BufferedImage;
import java.io.InputStream;
+import javax.jcr.Node;
+
import net.sourceforge.openutils.mgnlmedia.media.configuration.MediaConfigurationManager;
import net.sourceforge.openutils.mgnlmedia.media.utils.IcoUtils;
import net.sourceforge.openutils.mgnlmedia.media.utils.ImageUtils;
@@ -54,7 +55,7 @@
/**
* {@inheritDoc}
*/
- public String getThumbnailUrl(Content media)
+ public String getThumbnailUrl(Node media)
{
if (!ImageUtils.checkOrCreateResolution(media, "thumbnail", BaseTypeHandler.ORGINAL_NODEDATA_NAME))
{
@@ -72,7 +73,7 @@
* {@inheritDoc}
*/
@Override
- public String getPreviewUrl(Content media)
+ public String getPreviewUrl(Node media)
{
if (!ImageUtils.checkOrCreateResolution(media, "preview", BaseTypeHandler.ORGINAL_NODEDATA_NAME))
{
@@ -87,7 +88,7 @@
}
@Override
- public boolean onPostSave(Content media)
+ public boolean onPostSave(Node media)
{
InputStream stream = null;
try
Modified: 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/SwfTypeHandler.java 2013-09-18 21:04:37 UTC (rev 4327)
+++ magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/types/impl/SwfTypeHandler.java 2013-09-19 09:45:42 UTC (rev 4328)
@@ -19,12 +19,13 @@
package net.sourceforge.openutils.mgnlmedia.media.types.impl;
-import info.magnolia.cms.core.Content;
import info.magnolia.cms.util.NodeDataUtil;
import java.awt.Dimension;
import java.io.InputStream;
+import javax.jcr.Node;
+
import org.apache.commons.io.IOUtils;
import org.devlib.schmidt.imageinfo.ImageInfo;
import org.freehep.graphicsio.swf.SWFHeader;
@@ -47,7 +48,7 @@
private Logger log = LoggerFactory.getLogger(SwfTypeHandler.class);
@Override
- public boolean onPostSave(Content media)
+ public boolean onPostSave(Node media)
{
InputStream stream = null;
try
Modified: magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/types/impl/VideoTypeHandler.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/types/impl/VideoTypeHandler.java 2013-09-18 21:04:37 UTC (rev 4327)
+++ magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/types/impl/VideoTypeHandler.java 2013-09-19 09:45:42 UTC (rev 4328)
@@ -20,10 +20,11 @@
package net.sourceforge.openutils.mgnlmedia.media.types.impl;
import info.magnolia.cms.beans.runtime.FileProperties;
-import info.magnolia.cms.core.Content;
import java.io.InputStream;
+import javax.jcr.Node;
+
import net.sourceforge.openutils.mgnlmedia.media.utils.VideoMedataUtils;
import net.sourceforge.openutils.mgnlmedia.media.utils.VideoMedataUtils.VideoMetaData;
@@ -48,7 +49,7 @@
protected final String DURATION_ATTRIBUTE = "duration";
@Override
- protected VideoMetaData parseFLVMetaData(Content media) throws Exception
+ protected VideoMetaData parseFLVMetaData(Node media) throws Exception
{
InputStream stream = getOriginalFileNodeData(media).getStream();
try
Modified: magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/playlist/utils/PlaylistIterateUtils.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/playlist/utils/PlaylistIterateUtils.java 2013-09-18 21:04:37 UTC (rev 4327)
+++ magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/playlist/utils/PlaylistIterateUtils.java 2013-09-19 09:45:42 UTC (rev 4328)
@@ -19,7 +19,6 @@
package net.sourceforge.openutils.mgnlmedia.playlist.utils;
-import info.magnolia.cms.core.Content;
import info.magnolia.cms.core.MgnlNodeType;
import info.magnolia.context.MgnlContext;
import info.magnolia.jcr.util.NodeUtil;
@@ -152,7 +151,7 @@
public MediaNodeAndEntryPath apply(Node playlistEntry)
{
String mediaUUID = PropertyUtil.getString(playlistEntry, "media");
- Content mediaNode = MediaEl.node(mediaUUID);
+ Node mediaNode = MediaEl.node(mediaUUID);
if (mediaNode == null)
{
log.warn(
@@ -163,7 +162,7 @@
NodeUtil.getPathIfPossible(playlistNode) });
}
- return new MediaNodeAndEntryPath(mediaNode.getJCRNode(), NodeUtil
+ return new MediaNodeAndEntryPath(mediaNode, NodeUtil
.getPathIfPossible(playlistEntry));
}
});
Modified: magnoliamodules/trunk/openutils-mgnlmedia/src/main/resources/META-INF/media.tld
===================================================================
--- magnoliamodules/trunk/openutils-mgnlmedia/src/main/resources/META-INF/media.tld 2013-09-18 21:04:37 UTC (rev 4327)
+++ magnoliamodules/trunk/openutils-mgnlmedia/src/main/resources/META-INF/media.tld 2013-09-19 09:45:42 UTC (rev 4328)
@@ -70,7 +70,7 @@
<display-name>node</display-name>
<name>node</name>
<function-class>net.sourceforge.openutils.mgnlmedia.media.tags.el.MediaEl</function-class>
- <function-signature>info.magnolia.cms.core.Content node(java.lang.Object)</function-signature>
+ <function-signature>javax.jcr.Node node(java.lang.Object)</function-signature>
<example>
<