Menu
▾
▴
openutils-svn
|
From: <die...@us...> - 2012-03-20 18:08:46
|
Revision: 3859
http://openutils.svn.sourceforge.net/openutils/?rev=3859&view=rev
Author: diego_schivo
Date: 2012-03-20 18:08:40 +0000 (Tue, 20 Mar 2012)
Log Message:
-----------
openutils-mgnlmedia components
Modified Paths:
--------------
magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/configuration/MediaConfigurationManager.java
magnoliamodules/trunk/openutils-mgnlmedia/src/main/resources/META-INF/magnolia/media.xml
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 2012-03-20 18:08:25 UTC (rev 3858)
+++ magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/configuration/MediaConfigurationManager.java 2012-03-20 18:08:40 UTC (rev 3859)
@@ -41,6 +41,7 @@
import java.util.List;
import java.util.Map;
+import javax.inject.Singleton;
import javax.jcr.RepositoryException;
import javax.jcr.query.InvalidQueryException;
@@ -65,6 +66,7 @@
* </ul>
* @author molaschi
*/
+@Singleton
public class MediaConfigurationManager extends ObservedManager
{
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 2012-03-20 18:08:25 UTC (rev 3858)
+++ magnoliamodules/trunk/openutils-mgnlmedia/src/main/resources/META-INF/magnolia/media.xml 2012-03-20 18:08:40 UTC (rev 3859)
@@ -7,6 +7,13 @@
<class>net.sourceforge.openutils.mgnlmedia.media.lifecycle.MediaModule</class>
<versionHandler>net.sourceforge.openutils.mgnlmedia.media.setup.MediaModuleVersionHandler</versionHandler>
<version>${project.version}</version>
+ <components>
+ <id>main</id>
+ <component>
+ <type>net.sourceforge.openutils.mgnlmedia.media.configuration.MediaConfigurationManager</type>
+ <implementation>net.sourceforge.openutils.mgnlmedia.media.configuration.MediaConfigurationManager</implementation>
+ </component>
+ </components>
<dependencies>
<dependency>
<name>adminInterface</name>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <die...@us...> - 2012-03-20 18:49:23
|
Revision: 3869
http://openutils.svn.sourceforge.net/openutils/?rev=3869&view=rev
Author: diego_schivo
Date: 2012-03-20 18:49:17 +0000 (Tue, 20 Mar 2012)
Log Message:
-----------
MediaUsedInManager
Modified Paths:
--------------
magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/configuration/MediaUsedInManager.java
magnoliamodules/trunk/openutils-mgnlmedia/src/main/resources/META-INF/magnolia/media.xml
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 2012-03-20 18:49:02 UTC (rev 3868)
+++ magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/configuration/MediaUsedInManager.java 2012-03-20 18:49:17 UTC (rev 3869)
@@ -36,6 +36,7 @@
import java.util.Map;
import java.util.Set;
+import javax.inject.Singleton;
import javax.jcr.RepositoryException;
import javax.jcr.query.InvalidQueryException;
@@ -54,6 +55,7 @@
* @author dschivo
* @version $Id$
*/
+@Singleton
public class MediaUsedInManager extends ObservedManager
{
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 2012-03-20 18:49:02 UTC (rev 3868)
+++ magnoliamodules/trunk/openutils-mgnlmedia/src/main/resources/META-INF/magnolia/media.xml 2012-03-20 18:49:17 UTC (rev 3869)
@@ -17,6 +17,10 @@
<type>net.sourceforge.openutils.mgnlmedia.media.configuration.ImageProcessorsManager</type>
<implementation>net.sourceforge.openutils.mgnlmedia.media.configuration.ImageProcessorsManager</implementation>
</component>
+ <component>
+ <type>net.sourceforge.openutils.mgnlmedia.media.configuration.MediaUsedInManager</type>
+ <implementation>net.sourceforge.openutils.mgnlmedia.media.configuration.MediaUsedInManager</implementation>
+ </component>
</components>
<dependencies>
<dependency>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fg...@us...> - 2012-12-06 13:55:42
|
Revision: 4142
http://openutils.svn.sourceforge.net/openutils/?rev=4142&view=rev
Author: fgiust
Date: 2012-12-06 13:55:35 +0000 (Thu, 06 Dec 2012)
Log Message:
-----------
MEDIA-292 update mediausedin configuration with new magnolia 4.5 nodetypes
Modified Paths:
--------------
magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/setup/MediaModuleVersionHandler.java
magnoliamodules/trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap/media-nooverwrite/config.modules.media.mediausedin.website.xml
Modified: 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/setup/MediaModuleVersionHandler.java 2012-11-29 22:18:43 UTC (rev 4141)
+++ magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/setup/MediaModuleVersionHandler.java 2012-12-06 13:55:35 UTC (rev 4142)
@@ -236,6 +236,13 @@
"/modules/media/config/search/filters/query",
"wildcards",
Boolean.TRUE));
+
+ tasks.add(new ChangeExistingPropertyTask(
+ ContentRepository.CONFIG,
+ "/modules/media/mediausedin/website",
+ "nodeType",
+ "mgnl:content",
+ "mgnl:page"));
return tasks;
}
Modified: magnoliamodules/trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap/media-nooverwrite/config.modules.media.mediausedin.website.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap/media-nooverwrite/config.modules.media.mediausedin.website.xml 2012-11-29 22:18:43 UTC (rev 4141)
+++ magnoliamodules/trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap/media-nooverwrite/config.modules.media.mediausedin.website.xml 2012-12-06 13:55:35 UTC (rev 4142)
@@ -13,7 +13,7 @@
<sv:value>/</sv:value>
</sv:property>
<sv:property sv:name="nodeType" sv:type="String">
- <sv:value>mgnl:content</sv:value>
+ <sv:value>mgnl:page</sv:value>
</sv:property>
<sv:property sv:name="propertyName" sv:type="String">
<sv:value>.</sv:value>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fg...@us...> - 2013-09-15 20:34:57
|
Revision: 4314
http://openutils.svn.sourceforge.net/openutils/?rev=4314&view=rev
Author: fgiust
Date: 2013-09-15 20:34:53 +0000 (Sun, 15 Sep 2013)
Log Message:
-----------
rimosse funzioni deprecate
Modified Paths:
--------------
magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/tags/el/MediaEl.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-15 19:39:07 UTC (rev 4313)
+++ magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/tags/el/MediaEl.java 2013-09-15 20:34:53 UTC (rev 4314)
@@ -579,272 +579,6 @@
return url;
}
- //
- //
- // DEPRECATED FUNCTION
- //
- //
-
- /**
- * @deprecated, use node(Object)
- */
- @Deprecated
- public static Content getNode(Object obj)
- {
- log.warn("\"getNode()\" has been deprecated, please use \"node()\"");
- return node(obj);
- }
-
- /**
- * @deprecated, use descLoc(Content, Locale)
- */
- @Deprecated
- public static String getDescription(Content media, Locale locale)
- {
- log.warn("\"getDescription()\" has been deprecated, please use \"descLoc()\"");
- return descLoc(media, locale);
- }
-
- /**
- * @deprecated, use desc(Content)
- */
- @Deprecated
- public static String getDescription(Content media)
- {
- log.warn("\"getDescription()\" has been deprecated, please use \"desc()\"");
- return desc(media);
- }
-
- /**
- * @deprecated, use titleLoc(Content, Locale)
- */
- @Deprecated
- public static String getTitle(Content media, Locale locale)
- {
- log.warn("\"getTitle()\" has been deprecated, please use \"titleLoc()\"");
- return titleLoc(media, locale);
- }
-
- /**
- * @deprecated, use title(Content)
- */
- @Deprecated
- public static String getTitle(Content media)
- {
- log.warn("\"getTitle()\" has been deprecated, please use \"title()\"");
- return title(media);
- }
-
- /**
- * @deprecated, use url(Content)
- */
- @Deprecated
- public static String getUrl(Content media)
- {
- log.warn("\"getUrl()\" has been deprecated, please use \"url()\"");
- return url(media);
- }
-
- /**
- * @deprecated, use urlParams(Content, Map)
- */
- @Deprecated
- public static String getUrl2(Content media, Map<String, String> options)
- {
- log.warn("\"url2()\" has been deprecated, please use \"urlParams()\"");
- return urlParams(media, options);
- }
-
- /**
- * @deprecated, use urlres(Content, String)
- */
- @Deprecated
- public static String getResolutionUrl(Content media, String resolution)
- {
- log.warn("\"getResolutionUrl()\" has been deprecated, please use \"urlres()\"");
- return urlres(media, resolution);
- }
-
- /**
- * @deprecated, use resolutions(Content)
- */
- @Deprecated
- public static String[] listResolutions(Content media)
- {
- log.warn("\"listResolutions()\" has been deprecated, please use \"resolutions()\"");
- return resolutions(media);
- }
-
- /**
- * @deprecated, use thumbnail(Content)
- */
- @Deprecated
- public static String getThumbnail(Content media)
- {
- log.warn("\"getThumbnail()\" has been deprecated, please use \"thumbnail()\"");
- return thumbnail(media);
- }
-
- /**
- * @deprecated, use preview(Content)
- */
- @Deprecated
- public static String getPreview(Content media)
- {
- log.warn("\"getPreview()\" has been deprecated, please use \"preview()\"");
- return preview(media);
- }
-
- /**
- * @deprecated, use type(Content)
- */
- @Deprecated
- public static String getType(Content media)
- {
- log.warn("\"getType()\" has been deprecated, please use \"type()\"");
- return type(media);
- }
-
- /**
- * @deprecated, use size(Content, String)
- */
- @Deprecated
- public static int[] getSize(Content media, String resolution)
- {
- log.warn("\"getSize()\" has been deprecated, please use \"size()\"");
- return size(media, resolution);
- }
-
- /**
- * @deprecated, use usedInWebPages(Content)
- */
- @Deprecated
- public static String[] findMediaUsedInWebPages(Content media)
- {
- log.warn("\"findMediaUsedInWebPages()\" has been deprecated, please use \"usedInWebPages()\"");
- return usedInWebPages(media);
- }
-
- /**
- * @deprecated, use ${media.description} in templates
- */
- @Deprecated
- public static String descLoc(Content media, Locale locale)
- {
- log.warn("\"descLoc()\" has been deprecated, please check javadocs");
-
- if (media == null)
- {
- return null;
- }
- if (locale != null)
- {
- MgnlContext.setLocale(locale);
- }
- MediaTypeConfiguration mtc = mcm.getMediaTypeConfigurationFromMedia(media);
- if (mtc == null || mtc.getHandler() == null)
- {
- return null;
- }
- return mtc.getHandler().getDescription(media);
- }
-
- /**
- * @deprecated, use ${media.title} in templates
- */
- @Deprecated
- public static String titleLoc(Content media, Locale locale)
- {
- log.warn("\"titleLoc()\" has been deprecated, please check javadocs");
-
- if (media == null)
- {
- return null;
- }
- if (locale != null)
- {
- MgnlContext.setLocale(locale);
- }
- MediaTypeConfiguration mtc = mcm.getMediaTypeConfigurationFromMedia(media);
- if (mtc == null || mtc.getHandler() == null)
- {
- return null;
- }
- return mtc.getHandler().getTitle(media);
- }
-
- /**
- * @deprecated, use ${media.tags} in templates
- */
- @Deprecated
- public static String[] tagsLoc(Content media, Locale locale)
- {
- log.warn("\"tagsLoc()\" has been deprecated, please check javadocs");
-
- if (media == null)
- {
- return null;
- }
- if (locale != null)
- {
- MgnlContext.setLocale(locale);
- }
- MediaTypeConfiguration mtc = mcm.getMediaTypeConfigurationFromMedia(media);
- if (mtc == null || mtc.getHandler() == null)
- {
- return null;
- }
- String tags = mtc.getHandler().getTags(media);
- if (tags == null)
- {
- return null;
-
- }
- return StringUtils.split(tags, ",");
- }
-
- /**
- * Get description for a media for the current locale.
- * @param media media
- * @return description
- * @deprecated use media.getNodeData("description") or ${media.description}
- */
- @Deprecated
- public static String desc(Content media)
- {
- log.warn("\"desc()\" has been deprecated, please check javadocs");
-
- return descLoc(media, null);
- }
-
- /**
- * Get title for a media for the current locale.
- * @param media media
- * @return title
- * @deprecated use media.getNodeData("title") or ${media.title}
- */
- @Deprecated
- public static String title(Content media)
- {
- log.warn("\"title()\" has been deprecated, please check javadocs");
-
- return titleLoc(media, null);
- }
-
- /**
- * Get tags for a media
- * @param media media
- * @return tags
- * @deprecated use media.getNodeData("tags") or ${media.tags}
- */
- @Deprecated
- public static String[] tags(Content media)
- {
- log.warn("\"tags()\" has been deprecated, please check javadocs");
-
- return tagsLoc(media, null);
- }
-
private static String appendBaseUrl(String url)
{
String baseurl = module().getBaseurl();
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-15 19:39:07 UTC (rev 4313)
+++ magnoliamodules/trunk/openutils-mgnlmedia/src/main/resources/META-INF/media.tld 2013-09-15 20:34:53 UTC (rev 4314)
@@ -78,88 +78,6 @@
</example>
</function>
<function>
- <description>Get the description from a media, given the media node itself.</description>
- <display-name>desc</display-name>
- <name>desc</name>
- <function-class>net.sourceforge.openutils.mgnlmedia.media.tags.el.MediaEl</function-class>
- <function-signature>java.lang.String desc(info.magnolia.cms.core.Content)</function-signature>
- <example>
- <![CDATA[
- <c:set var="mediaNode" value="${media:node(content.image)}" />
- <c:out value="${media:desc(mediaNode)}" />
- ]]>
- </example>
- </function>
- <function>
- <description>Get the description from a media, given the media node itself and a locale. Try to get the value from nodedata "description-{locale}"; if not found get the value from "description-en"; if not found again, get the value from "description".</description>
- <display-name>descLoc</display-name>
- <name>descLoc</name>
- <function-class>net.sourceforge.openutils.mgnlmedia.media.tags.el.MediaEl</function-class>
- <function-signature>java.lang.String descLoc(info.magnolia.cms.core.Content, java.util.Locale)</function-signature>
- <example>
- <![CDATA[
- <c:set var="mediaNode" value="${media:node(content.image)}" />
- <c:out value="${media:descLoc(mediaNode, pageContext.request.locale)}" />
- ]]>
- </example>
- </function>
- <function>
- <description>Get the title from a media, given the media node itself.</description>
- <display-name>title</display-name>
- <name>title</name>
- <function-class>net.sourceforge.openutils.mgnlmedia.media.tags.el.MediaEl</function-class>
- <function-signature>java.lang.String title(info.magnolia.cms.core.Content)</function-signature>
- <example>
- <![CDATA[
- <c:set var="mediaNode" value="${media:node(content.image)}" />
- <c:out value="${media:title(mediaNode)}" />
- ]]>
- </example>
- </function>
- <function>
- <description>Get the title from a media, given the media node itself and a locale. Try to get the value from nodedata "title-{locale}"; if not found get the value from "title-en"; if not found again, get the value from "title".</description>
- <display-name>titleLoc</display-name>
- <name>titleLoc</name>
- <function-class>net.sourceforge.openutils.mgnlmedia.media.tags.el.MediaEl</function-class>
- <function-signature>java.lang.String titleLoc(info.magnolia.cms.core.Content, java.util.Locale)</function-signature>
- <example>
- <![CDATA[
- <c:set var="mediaNode" value="${media:node(content.image)}" />
- <c:out value="${media:titleLoc(mediaNode, pageContext.request.locale)}" />
- ]]>
- </example>
- </function>
- <function>
- <description>Get the tags from a media, given the media node itself.</description>
- <display-name>tags</display-name>
- <name>tags</name>
- <function-class>net.sourceforge.openutils.mgnlmedia.media.tags.el.MediaEl</function-class>
- <function-signature>java.lang.String[] tags(info.magnolia.cms.core.Content)</function-signature>
- <example>
- <![CDATA[
- <c:set var="mediaNode" value="${media:node(content.image)}" />
- <c:forEach var="tag" items="${media:tags(mediaNode)}">
- <c:out value="${tag}" />
- </c:forEach>
- ]]>
- </example>
- </function>
- <function>
- <description>Get the tags from a media, given the media node itself and a locale. Try to get the value from nodedata "tags-{locale}"; if not found get the value from "tags-en"; if not found again, get the value from "tags".</description>
- <display-name>tagsLoc</display-name>
- <name>tagsLoc</name>
- <function-class>net.sourceforge.openutils.mgnlmedia.media.tags.el.MediaEl</function-class>
- <function-signature>java.lang.String[] tagsLoc(info.magnolia.cms.core.Content, java.util.Locale)</function-signature>
- <example>
- <![CDATA[
- <c:set var="mediaNode" value="${media:node(content.image)}" />
- <c:forEach var="tag" items="${media:tagsLoc(mediaNode, pageContext.request.locale)}">
- <c:out value="${tag}" />
- </c:forEach>
- ]]>
- </example>
- </function>
- <function>
<description>Get the url to the media, given the media node itself or its UUID</description>
<display-name>url</display-name>
<name>url</name>
@@ -173,15 +91,8 @@
</example>
</function>
<function>
- <description>@deprecated use urlParams()</description>
- <display-name>url2</display-name>
- <name>url2</name>
- <function-class>net.sourceforge.openutils.mgnlmedia.media.tags.el.MediaEl</function-class>
- <function-signature>java.lang.String getUrl2(info.magnolia.cms.core.Content, java.util.Map)</function-signature>
- </function>
- <function>
<description>Get the url to the media, given the media node itself or its UUID and a Map of options</description>
- <display-name>url2</display-name>
+ <display-name>urlParams</display-name>
<name>urlParams</name>
<function-class>net.sourceforge.openutils.mgnlmedia.media.tags.el.MediaEl</function-class>
<function-signature>java.lang.String urlParams(java.lang.Object, java.util.Map)</function-signature>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
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)
{
...
[truncated message content] |
|
From: <luc...@us...> - 2013-09-26 14:42:36
|
Revision: 4346
http://openutils.svn.sourceforge.net/openutils/?rev=4346&view=rev
Author: lucaboati
Date: 2013-09-26 14:42:24 +0000 (Thu, 26 Sep 2013)
Log Message:
-----------
remove deprecations, content to node, fix playlist example
Modified Paths:
--------------
magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/tags/el/MediaEl.java
magnoliamodules/trunk/openutils-mgnlmedia/src/main/resources/mgnl-files/templates/samples-media/paragraph-grid.jsp
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-26 14:20:46 UTC (rev 4345)
+++ magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/tags/el/MediaEl.java 2013-09-26 14:42:24 UTC (rev 4346)
@@ -27,11 +27,10 @@
import info.magnolia.cms.util.ContentUtil;
import info.magnolia.cms.util.NodeMapWrapper;
import info.magnolia.context.MgnlContext;
-import info.magnolia.jcr.util.ContentMap;
+import info.magnolia.jcr.util.NodeUtil;
import info.magnolia.jcr.util.PropertyUtil;
import info.magnolia.module.ModuleRegistry;
import info.magnolia.objectfactory.Components;
-import it.openutils.mgnlutils.api.NodeUtilsExt;
import java.awt.Point;
import java.util.ArrayList;
@@ -42,10 +41,10 @@
import java.util.Map;
import javax.jcr.Node;
-import javax.jcr.Property;
import javax.jcr.PropertyType;
import javax.jcr.RepositoryException;
import javax.jcr.Value;
+import javax.jcr.nodetype.NodeType;
import javax.jcr.query.InvalidQueryException;
import javax.servlet.http.HttpServletRequest;
@@ -263,8 +262,8 @@
try
{
- // MEDIA-90 may be simply a url
- if (media.getProperty(BaseTypeHandler.ORGINAL_NODEDATA_NAME).getType() == PropertyType.BINARY)
+ // MEDIA-90 may be simply a url [LB] TEST ME AGAIN
+ if (NodeUtil.isNodeType(media.getNode(BaseTypeHandler.ORGINAL_NODEDATA_NAME), NodeType.NT_RESOURCE))
{
FileProperties prop = new FileProperties(
ContentUtil.asContent(media),
@@ -548,7 +547,7 @@
* @param obj playlist node or UUID
* @return Iterator of media nodes
*/
- public static Iterator<ContentMap> mediaNodesInPlaylist(Object obj)
+ public static Iterator<Node> mediaNodesInPlaylist(Object obj)
{
if (obj == null)
{
@@ -557,17 +556,17 @@
Node playlistNode = it.openutils.mgnlutils.el.MgnlUtilsElFunctions.node(obj, PlaylistConstants.REPO);
- Iterator<ContentMap> iter = Iterators.transform(
+ Iterator<Node> iter = Iterators.transform(
PlaylistIterateUtils.iterate(playlistNode),
- new Function<MediaNodeAndEntryPath, ContentMap>()
+ new Function<MediaNodeAndEntryPath, Node>()
{
/**
* {@inheritDoc}
*/
- public ContentMap apply(MediaNodeAndEntryPath from)
+ public Node apply(MediaNodeAndEntryPath from)
{
- return (ContentMap) from.getMediaNode();
+ return (Node) from.getMediaNode();
}
});
return Iterators.filter(iter, Predicates.notNull());
Modified: magnoliamodules/trunk/openutils-mgnlmedia/src/main/resources/mgnl-files/templates/samples-media/paragraph-grid.jsp
===================================================================
--- magnoliamodules/trunk/openutils-mgnlmedia/src/main/resources/mgnl-files/templates/samples-media/paragraph-grid.jsp 2013-09-26 14:20:46 UTC (rev 4345)
+++ magnoliamodules/trunk/openutils-mgnlmedia/src/main/resources/mgnl-files/templates/samples-media/paragraph-grid.jsp 2013-09-26 14:42:24 UTC (rev 4346)
@@ -11,7 +11,7 @@
</tr>
</thead>
<tbody>
- <c:forEach var="row" items="${mu:splitAndTokenize(node.grid)}">
+ <c:forEach var="row" items="${mu:splitAndTokenize(cmsfn:decode(content).grid)}">
<tr>
<td>
<media:media item="${row[0]}" />
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <die...@us...> - 2013-11-14 10:33:15
|
Revision: 4451
http://openutils.svn.sourceforge.net/openutils/?rev=4451&view=rev
Author: diego_schivo
Date: 2013-11-14 10:33:12 +0000 (Thu, 14 Nov 2013)
Log Message:
-----------
MEDIA-307 FitInAndFillWithBandsImageResolutionProcessor: same height, different width
Modified Paths:
--------------
magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/utils/ImageUtils.java
magnoliamodules/trunk/openutils-mgnlmedia/src/main/resources/mgnl-files/templates/samples-media/paragraph-mediael.jsp
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-11-14 09:43:21 UTC (rev 4450)
+++ magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/utils/ImageUtils.java 2013-11-14 10:33:12 UTC (rev 4451)
@@ -274,7 +274,9 @@
AffineTransform at = new AffineTransform();
double delta = ((double) x) / original.getWidth();
- if (x > original.getWidth())
+ // MEDIA-307
+ // if (x > original.getWidth())
+ if (x >= original.getWidth())
{
at.scale(delta, delta);
at.translate((canvasX - x) / (2 * delta), (canvasY - y) / (2 * delta));
Modified: magnoliamodules/trunk/openutils-mgnlmedia/src/main/resources/mgnl-files/templates/samples-media/paragraph-mediael.jsp
===================================================================
--- magnoliamodules/trunk/openutils-mgnlmedia/src/main/resources/mgnl-files/templates/samples-media/paragraph-mediael.jsp 2013-11-14 09:43:21 UTC (rev 4450)
+++ magnoliamodules/trunk/openutils-mgnlmedia/src/main/resources/mgnl-files/templates/samples-media/paragraph-mediael.jsp 2013-11-14 10:33:12 UTC (rev 4451)
@@ -62,5 +62,14 @@
<img src="${media:urlres(mediaNode, 'n100x100;bw')}" />
</div>
</div>
+ <!--
+ <div>
+ <h3>MEDIA-307</h3>
+ <div>
+ <pre>media:urlres(mediaNode, 'o1000x600;background=FFFFFF')</pre> <img
+ src="${pageContext.request.contextPath}${media:urlres(mediaNode, 'o1000x600;background=FFFFFF')}" />
</div>
+ </div>
+ -->
+ </div>
</jsp:root>
\ No newline at end of file
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fg...@us...> - 2013-12-08 08:27:46
|
Revision: 4459
http://openutils.svn.sourceforge.net/openutils/?rev=4459&view=rev
Author: fgiust
Date: 2013-12-08 08:27:42 +0000 (Sun, 08 Dec 2013)
Log Message:
-----------
MEDIA-309 Download-link is not rendered
Modified Paths:
--------------
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/types/impl/BaseTypeHandler.java
magnoliamodules/trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/media/pages/MediaFolderViewPage.html
Added Paths:
-----------
magnoliamodules/trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap/media-nooverwrite/config.modules.media.virtualURIMapping.media-download.xml
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-12-07 21:11:44 UTC (rev 4458)
+++ magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/pages/MediaFolderViewPage.java 2013-12-08 08:27:42 UTC (rev 4459)
@@ -19,6 +19,7 @@
package net.sourceforge.openutils.mgnlmedia.media.pages;
+import info.magnolia.cms.beans.runtime.FileProperties;
import info.magnolia.cms.core.MgnlNodeType;
import info.magnolia.cms.core.Path;
import info.magnolia.cms.exchange.ActivationManagerFactory;
@@ -31,6 +32,7 @@
import info.magnolia.init.MagnoliaConfigurationProperties;
import info.magnolia.jcr.util.MetaDataUtil;
import info.magnolia.jcr.util.NodeUtil;
+import info.magnolia.jcr.util.PropertyUtil;
import info.magnolia.module.admininterface.commands.ActivationCommand;
import info.magnolia.objectfactory.Components;
import info.magnolia.templating.functions.TemplatingFunctions;
@@ -48,6 +50,7 @@
import java.util.Map;
import javax.jcr.Node;
+import javax.jcr.PathNotFoundException;
import javax.jcr.RepositoryException;
import javax.jcr.Session;
import javax.servlet.ServletException;
@@ -60,6 +63,7 @@
import net.sourceforge.openutils.mgnlmedia.media.configuration.MediaTypeConfiguration;
import net.sourceforge.openutils.mgnlmedia.media.lifecycle.MediaModule;
import net.sourceforge.openutils.mgnlmedia.media.tags.el.MediaEl;
+import net.sourceforge.openutils.mgnlmedia.media.types.impl.BaseTypeHandler;
import org.apache.commons.chain.Command;
import org.apache.commons.lang.StringUtils;
@@ -510,15 +514,58 @@
if (media == null)
{
+ try
+ {
+ response.sendError(404);
+ }
+ catch (IOException e)
+ {
+ // ignore
+ }
return null;
}
+
MediaTypeConfiguration mtc = Components
.getComponent(MediaConfigurationManager.class)
.getMediaTypeConfigurationFromMedia(media);
+
+ if (mtc == null)
+ {
+
+ // path points to a node but not a media
+ try
+ {
+ response.sendError(404);
+ }
+ catch (IOException e)
+ {
+ // ignore
+ }
+ return null;
+ }
String url = mtc.getHandler().getUrl(media);
String filename = mtc.getHandler().getFullFilename(media);
+ try
+ {
+ if (media.hasNode(BaseTypeHandler.ORGINAL_NODEDATA_NAME))
+ {
+ Node original = media.getNode(BaseTypeHandler.ORGINAL_NODEDATA_NAME);
+ String mime = PropertyUtil.getString(original, FileProperties.PROPERTY_CONTENTTYPE);
+
+ if (StringUtils.isNotEmpty(mime))
+ {
+ this.response.setContentType(mime);
+ }
+ }
+ }
+ catch (RepositoryException e)
+ {
+ // should not happen
+ log.debug(e.getMessage(), e);
+ }
+
this.response.addHeader("Content-Disposition", "attachment; filename=" + filename);
try
{
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-12-07 21:11:44 UTC (rev 4458)
+++ magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/types/impl/BaseTypeHandler.java 2013-12-08 08:27:42 UTC (rev 4459)
@@ -223,7 +223,7 @@
{
try
{
- return !media.hasProperty(ORGINAL_NODEDATA_NAME);
+ return !media.hasNode(ORGINAL_NODEDATA_NAME);
}
catch (RepositoryException e)
{
Added: magnoliamodules/trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap/media-nooverwrite/config.modules.media.virtualURIMapping.media-download.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap/media-nooverwrite/config.modules.media.virtualURIMapping.media-download.xml (rev 0)
+++ magnoliamodules/trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap/media-nooverwrite/config.modules.media.virtualURIMapping.media-download.xml 2013-12-08 08:27:42 UTC (rev 4459)
@@ -0,0 +1,44 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<sv:node sv:name="media-download" 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:uuid" sv:type="String">
+ <sv:value>ae0cc614-772b-4aba-8eab-4857dec74e50</sv:value>
+ </sv:property>
+ <sv:property sv:name="class" sv:type="String">
+ <sv:value>info.magnolia.cms.beans.config.RegexpVirtualURIMapping</sv:value>
+ </sv:property>
+ <sv:property sv:name="fromURI" sv:type="String">
+ <sv:value>/media/download/(.*)</sv:value>
+ </sv:property>
+ <sv:property sv:name="jcr:createdBy" sv:type="String">
+ <sv:value>admin</sv:value>
+ </sv:property>
+ <sv:property sv:name="toURI" sv:type="String">
+ <sv:value>forward:/.magnolia/pages/mediaFolderView.html?command=download&path=/$1</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="jcr:createdBy" sv:type="String">
+ <sv:value>admin</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:Data" sv:type="String">
+ <sv:value>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="String">
+ <sv:value>2004-11-02T15:34:20.479+01:00</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:lastmodified" sv:type="Date">
+ <sv:value>2013-12-07T23:13:04.690+01:00</sv:value>
+ </sv:property>
+ </sv:node>
+</sv:node>
Property changes on: magnoliamodules/trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap/media-nooverwrite/config.modules.media.virtualURIMapping.media-download.xml
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+text/xml
\ No newline at end of property
Added: svn:keywords
## -0,0 +1 ##
+Author Date Id Revision
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Modified: magnoliamodules/trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/media/pages/MediaFolderViewPage.html
===================================================================
--- magnoliamodules/trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/media/pages/MediaFolderViewPage.html 2013-12-07 21:11:44 UTC (rev 4458)
+++ magnoliamodules/trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/media/pages/MediaFolderViewPage.html 2013-12-08 08:27:42 UTC (rev 4459)
@@ -502,7 +502,7 @@
[/#if]
[#if !media.external]
<li>
- <a href="?command=download&path=${media.handle}" style="background-image: url('${this.request.contextPath}/.resources/media/icons/ico16-download.png');">
+ <a href="${this.request.contextPath}/media/download${media.handle}" style="background-image: url('${this.request.contextPath}/.resources/media/icons/ico16-download.png');">
<span>${this.msgs.get('media.download')}</span>
</a>
</li>
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