Menu
▾
▴
[Openutils-svn] SF.net SVN: openutils:[4377] magnoliamodules/trunk
|
From: <fg...@us...> - 2013-10-13 20:39:32
|
Revision: 4377
http://openutils.svn.sourceforge.net/openutils/?rev=4377&view=rev
Author: fgiust
Date: 2013-10-13 20:39:28 +0000 (Sun, 13 Oct 2013)
Log Message:
-----------
migration fixes
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/impl/DocumentTypeHandler.java
magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/types/impl/MediaWithPreviewImageTypeHandler.java
magnoliamodules/trunk/openutils-mgnlmedia/src/main/resources/META-INF/tags/media/media.tag
magnoliamodules/trunk/openutils-mgnlmedia/src/main/resources/META-INF/tags/media/player.tag
magnoliamodules/trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap-samples/media/config.modules.media.templates.pages.sampleSimpleMedia.xml
magnoliamodules/trunk/openutils-mgnlmedia/src/main/resources/mgnl-files/templates/samples-media/paragraph-mediael.jsp
magnoliamodules/trunk/openutils-mgnlutils/src/main/java/it/openutils/mgnlutils/api/NodeUtilsExt.java
Added Paths:
-----------
magnoliamodules/trunk/openutils-mgnlmedia/src/main/resources/samples-media/
magnoliamodules/trunk/openutils-mgnlmedia/src/main/resources/samples-media/template.ftl
Removed Paths:
-------------
magnoliamodules/trunk/openutils-mgnlmedia/src/main/resources/mgnl-files/templates/samples-media/area.jsp
magnoliamodules/trunk/openutils-mgnlmedia/src/main/resources/mgnl-files/templates/samples-media/template.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-10-13 19:12:57 UTC (rev 4376)
+++ magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/tags/el/MediaEl.java 2013-10-13 20:39:28 UTC (rev 4377)
@@ -248,10 +248,29 @@
Integer width = NumberUtils.toInt(PropertyUtil.getString(prop, FileProperties.PROPERTY_WIDTH));
Integer height = NumberUtils.toInt(PropertyUtil.getString(prop, FileProperties.PROPERTY_HEIGHT));
Point size = ImageUtils.parseForSize(resolution);
+
+ boolean isSameSizeAsOriginal = false;
if (width == size.x && height == size.y)
{
- return appendBaseUrl(mcm.getURIMappingPrefix() + prop.getProperty(FileProperties.PATH));
+ isSameSizeAsOriginal = true;
}
+
+ if (!isSameSizeAsOriginal)
+ {
+ char controlchar = StringUtils.lowerCase(resolution).charAt(0);
+ if (controlchar == 'l')
+ {
+ if ((width == size.x && height < size.y) || (width < size.x && height == size.y))
+ {
+ isSameSizeAsOriginal = true;
+ }
+ }
+ }
+
+ if (isSameSizeAsOriginal)
+ {
+ return appendBaseUrl(mcm.getURIMappingPrefix() + NodeUtilsExt.getBinaryPath(prop));
+ }
}
if (!ImageUtils.checkOrCreateResolution(media, resolution, null, module().isLazyResolutionCreation()))
@@ -263,7 +282,7 @@
String resString = "res-" + ImageUtils.getResolutionPath(resolution);
if (resolutions != null && resolutions.hasNode(resString))
{
- String resPath = PropertyUtil.getString(resolutions.getNode(resString), FileProperties.PATH);
+ String resPath = NodeUtilsExt.getBinaryPath(resolutions.getNode(resString));
return appendBaseUrl(mcm.getURIMappingPrefix() + resPath);
@@ -580,10 +599,19 @@
private static String appendBaseUrl(String url)
{
- String baseurl = module().getBaseurl();
- if (baseurl != null && StringUtils.isNotEmpty(url) && !StringUtils.contains(url, "://"))
+
+ if (StringUtils.isNotEmpty(url) && !StringUtils.contains(url, "://"))
{
- return baseurl + url;
+ if (MgnlContext.isWebContext())
+ {
+ url = StringUtils.defaultString(MgnlContext.getWebContext().getContextPath()) + url;
+ }
+
+ String baseurl = module().getBaseurl();
+ if (baseurl != null)
+ {
+ return baseurl + url;
+ }
}
return url;
}
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-10-13 19:12:57 UTC (rev 4376)
+++ magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/types/impl/DocumentTypeHandler.java 2013-10-13 20:39:28 UTC (rev 4377)
@@ -84,46 +84,34 @@
{
Node data = getOriginalFileNodeData(media);
- try
+
+ if (StringUtils.equalsIgnoreCase(PropertyUtil.getString(data, FileProperties.EXTENSION), "pdf"))
{
- if (NodeUtil.isNodeType(data, NodeType.NT_RESOURCE))
+
+ try
{
+ String filename = PropertyUtil.getString(data, FileProperties.PROPERTY_FILENAME) + ".png";
- if (StringUtils.equalsIgnoreCase(PropertyUtil.getString(data, FileProperties.EXTENSION), "pdf"))
+ InputStream stream = data.getProperty(MgnlNodeType.JCR_DATA).getValue().getBinary().getStream();
+ try
{
-
- try
- {
- String filename = PropertyUtil.getString(data, FileProperties.PROPERTY_FILENAME) + ".png";
-
- InputStream stream = getOriginalFileNodeData(data)
- .getProperty(MgnlNodeType.JCR_DATA)
- .getValue()
- .getBinary()
- .getStream();
- try
- {
- createPdfPreview(media, stream, filename);
- }
- finally
- {
- IOUtils.closeQuietly(stream);
- }
- }
- catch (Throwable e)
- {
- log.warn(
- "Unable to generate a preview for {} due to a {}: {}",
- new Object[]{NodeUtil.getPathIfPossible(media), e.getClass().getName(), e.getMessage() });
- }
+ createPdfPreview(media, stream, filename);
}
-
+ finally
+ {
+ IOUtils.closeQuietly(stream);
+ }
}
+ catch (Throwable e)
+ {
+ log.warn("Unable to generate a preview for "
+ + NodeUtil.getPathIfPossible(media)
+ + " due to a "
+ + e.getClass().getName()
+ + ": "
+ + e.getMessage());
+ }
}
- catch (RepositoryException e)
- {
- // do nothing
- }
return super.onPostSave(media);
}
Modified: magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/types/impl/MediaWithPreviewImageTypeHandler.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/types/impl/MediaWithPreviewImageTypeHandler.java 2013-10-13 19:12:57 UTC (rev 4376)
+++ magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/types/impl/MediaWithPreviewImageTypeHandler.java 2013-10-13 20:39:28 UTC (rev 4377)
@@ -84,7 +84,7 @@
{
try
{
- return media.hasProperty(PREVIEW_NODEDATA_NAME);
+ return media.hasNode(PREVIEW_NODEDATA_NAME);
}
catch (RepositoryException e)
{
Modified: magnoliamodules/trunk/openutils-mgnlmedia/src/main/resources/META-INF/tags/media/media.tag
===================================================================
--- magnoliamodules/trunk/openutils-mgnlmedia/src/main/resources/META-INF/tags/media/media.tag 2013-10-13 19:12:57 UTC (rev 4376)
+++ magnoliamodules/trunk/openutils-mgnlmedia/src/main/resources/META-INF/tags/media/media.tag 2013-10-13 20:39:28 UTC (rev 4377)
@@ -118,7 +118,7 @@
<c:if test="${empty alt}">
<c:set var="alt" value="${mediaNode.title}" />
</c:if>
- <![CDATA[<img src="${pageContext.request.contextPath}${url}" alt="${alt}" title="${alt}"]]>
+ <![CDATA[<img src="${url}" alt="${alt}" title="${alt}"]]>
<c:if test="${not empty id}">
<![CDATA[ id="${id}"]]>
</c:if>
@@ -199,11 +199,11 @@
</c:choose>
<c:if test="${!empty preview}">
- <c:set var="preview" value="${pageContext.request.contextPath}${preview}" />
+ <c:set var="preview" value="${preview}" />
</c:if>
<media:swfobject
- player="${pageContext.request.contextPath}${media:url(mediaNode)}"
+ player="${media:url(mediaNode)}"
width="${width gt 0 ? width : ''}"
height="${height gt 0? height : ''}"
image="${preview}"
@@ -219,7 +219,7 @@
<![CDATA[<!-- missing media: ${item} -->]]>
</c:when>
<c:when test="${fn:startsWith(item, '/')}">
- <![CDATA[<img src="${pageContext.request.contextPath}${item}" alt="" width="${width gt 0 ? width : ''}" height="${height gt 0? height : ''}" />]]>
+ <![CDATA[<img src="${item}" alt="" width="${width gt 0 ? width : ''}" height="${height gt 0? height : ''}" />]]>
</c:when>
<c:otherwise>
<![CDATA[<!-- missing media: ${item} -->]]>
Modified: magnoliamodules/trunk/openutils-mgnlmedia/src/main/resources/META-INF/tags/media/player.tag
===================================================================
--- magnoliamodules/trunk/openutils-mgnlmedia/src/main/resources/META-INF/tags/media/player.tag 2013-10-13 19:12:57 UTC (rev 4376)
+++ magnoliamodules/trunk/openutils-mgnlmedia/src/main/resources/META-INF/tags/media/player.tag 2013-10-13 20:39:28 UTC (rev 4377)
@@ -41,7 +41,6 @@
<c:set var="baseUrl" scope="request">
<jsp:text>${pageContext.request.scheme}://${pageContext.request.serverName}</jsp:text>
<c:if test="${(pageContext.request.scheme eq 'http' and pageContext.request.serverPort != 80)}">:${pageContext.request.serverPort}</c:if>
- <jsp:text>${pageContext.request.contextPath}</jsp:text>
</c:set>
<c:if test="${empty width or width eq 0 }">
<c:set var="width" value="${media:width(mediaNode)}" />
@@ -68,10 +67,10 @@
<c:choose>
<c:when test="${previewwidth gt 0 and previewheight gt 0}">
<c:set var="previewres" value="${previewwidth}x${previewheight}" />
- <c:set var="preview" value="${pageContext.request.contextPath}${media:urlres(mediaNode, previewres)}" />
+ <c:set var="preview" value="${media:urlres(mediaNode, previewres)}" />
</c:when>
<c:otherwise>
- <c:set var="preview" value="${pageContext.request.contextPath}${media:thumbnail(mediaNode)}" />
+ <c:set var="preview" value="${media:thumbnail(mediaNode)}" />
</c:otherwise>
</c:choose>
</c:if>
Modified: magnoliamodules/trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap-samples/media/config.modules.media.templates.pages.sampleSimpleMedia.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap-samples/media/config.modules.media.templates.pages.sampleSimpleMedia.xml 2013-10-13 19:12:57 UTC (rev 4376)
+++ magnoliamodules/trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap-samples/media/config.modules.media.templates.pages.sampleSimpleMedia.xml 2013-10-13 20:39:28 UTC (rev 4377)
@@ -13,10 +13,10 @@
<sv:value>admin</sv:value>
</sv:property>
<sv:property sv:name="renderType" sv:type="String">
- <sv:value>jsp</sv:value>
+ <sv:value>freemarker</sv:value>
</sv:property>
<sv:property sv:name="templateScript" sv:type="String">
- <sv:value>/templates/samples-media/template.jsp</sv:value>
+ <sv:value>/samples-media/template.ftl</sv:value>
</sv:property>
<sv:property sv:name="title" sv:type="String">
<sv:value>SimpleMedia sample template</sv:value>
@@ -41,7 +41,7 @@
<sv:value>2008-09-23T16:56:46.344+02:00</sv:value>
</sv:property>
<sv:property sv:name="mgnl:lastmodified" sv:type="Date">
- <sv:value>2012-04-10T10:03:46.018+02:00</sv:value>
+ <sv:value>2013-10-13T21:16:25.602+02:00</sv:value>
</sv:property>
</sv:node>
<sv:node sv:name="areas">
@@ -90,9 +90,6 @@
<sv:property sv:name="jcr:createdBy" sv:type="String">
<sv:value>admin</sv:value>
</sv:property>
- <sv:property sv:name="templateScript" sv:type="String">
- <sv:value>/templates/samples-media/area.jsp</sv:value>
- </sv:property>
<sv:property sv:name="type" sv:type="String">
<sv:value>list</sv:value>
</sv:property>
Deleted: magnoliamodules/trunk/openutils-mgnlmedia/src/main/resources/mgnl-files/templates/samples-media/area.jsp
===================================================================
--- magnoliamodules/trunk/openutils-mgnlmedia/src/main/resources/mgnl-files/templates/samples-media/area.jsp 2013-10-13 19:12:57 UTC (rev 4376)
+++ magnoliamodules/trunk/openutils-mgnlmedia/src/main/resources/mgnl-files/templates/samples-media/area.jsp 2013-10-13 20:39:28 UTC (rev 4377)
@@ -1,9 +0,0 @@
-<jsp:root version="2.0" xmlns:jsp="http://java.sun.com/JSP/Page" xmlns:c="http://java.sun.com/jsp/jstl/core"
- xmlns:fmt="http://java.sun.com/jsp/jstl/fmt" xmlns:fn="http://java.sun.com/jsp/jstl/functions" xmlns:cms="http://magnolia-cms.com/taglib/templating-components/cms"
- xmlns:cmsfn="http://magnolia-cms.com/taglib/templating-components/cmsfn" xmlns:media="http://net.sourceforge.openutils/mgnlMedia"
- xmlns:mu="mgnlutils">
- <jsp:directive.page contentType="text/html; charset=UTF-8" session="false" />
- <c:forEach var="component" items="${components}">
- <cms:component content="${component}" />
- </c:forEach>
-</jsp:root>
\ No newline at end of file
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-10-13 19:12:57 UTC (rev 4376)
+++ magnoliamodules/trunk/openutils-mgnlmedia/src/main/resources/mgnl-files/templates/samples-media/paragraph-mediael.jsp 2013-10-13 20:39:28 UTC (rev 4377)
@@ -2,60 +2,65 @@
xmlns:fmt="http://java.sun.com/jsp/jstl/fmt" xmlns:fn="http://java.sun.com/jsp/jstl/functions" xmlns:cms="http://magnolia-cms.com/taglib/templating-components/cms"
xmlns:cmsfn="http://magnolia-cms.com/taglib/templating-components/cmsfn" xmlns:media="http://net.sourceforge.openutils/mgnlMedia"
xmlns:mu="mgnlutils">
- <jsp:directive.page contentType="text/html; charset=UTF-8"
- session="false" />
- <div class="textImage"><c:set var="mediaNode"
- value="${media:node(content.media)}" />
- <div>
- <h3>Original image</h3>
- <div><pre>media:url(mediaNode)</pre> <img
- src="${pageContext.request.contextPath}${media:url(mediaNode)}" /></div>
+ <jsp:directive.page contentType="text/html; charset=UTF-8" session="false" />
+ <div class="textImage">
+ <c:set var="mediaNode" value="${media:node(content.media)}" />
+ <div>
+ <h3>Original image</h3>
+ <div>
+ <pre>media:url(mediaNode)</pre>
+ <img src="${media:url(mediaNode)}" />
+ </div>
+ </div>
+ <div>
+ <h3>100x100: resize image in order to contain required resolution (100x100) and crop outfitting simmetric bands.
+ Resulting image has the required resolution.
+ </h3>
+ <div>
+ <pre>media:urlres(mediaNode, '100x100')</pre>
+ <img src="${media:urlres(mediaNode, '100x100')}" />
+ </div>
+ </div>
+ <div>
+ <h3>L100x100: resize image in order to fit into required resolution. Resulting image should have one side smaller
+ than required resolution.
+ </h3>
+ <div>
+ <pre>media:urlres(mediaNode, 'l100x100')</pre>
+ <img src="${media:urlres(mediaNode, 'l100x100')}" />
+ </div>
+ </div>
+ <div>
+ <h3>o100x100: resize image in order to fit into required resolution and fills empty bands with background color
+ (default = White). Resulting image has the required resolution.
+ </h3>
+ <div>
+ <pre>media:urlres(mediaNode, 'o100x100')</pre>
+ <img src="${media:urlres(mediaNode, 'o100x100')}" />
+ </div>
+ <div>
+ <p>With background color</p>
+ <pre>media:urlres(mediaNode, 'o100x100;background=FF0000')</pre>
+ <img src="${media:urlres(mediaNode, 'o100x100;background=FF0000')}" />
+ </div>
+ </div>
+ <div>
+ <h3>n100x100: resize image in order to contain the required resolution. Resulting image should have one side
+ bigger than required resolution.
+ </h3>
+ <div>
+ <pre>media:urlres(mediaNode, 'n100x100')</pre>
+ <img src="${media:urlres(mediaNode, 'n100x100')}" />
+ </div>
+ </div>
+ <div>
+ <h3>Passing parameters: resolution string supports optional parameters that may enable post processing.
+ </h3>
+ <div>
+ <p>Adding parameter bw will make the image in grayscale</p>
+ <pre>media:urlres(mediaNode, 'n100x100;bw')</pre>
+ <img src="${media:urlres(mediaNode, 'n100x100;bw')}" />
+ </div>
+ </div>
</div>
- <div>
- <h3>100x100: resize image in order to contain required resolution
- (100x100) and crop outfitting simmetric bands. Resulting image has the
- required resolution.</h3>
- <div><pre>media:urlres(mediaNode, '100x100')</pre> <img
- src="${pageContext.request.contextPath}${media:urlres(mediaNode, '100x100')}" />
- </div>
- </div>
- <div>
- <h3>L100x100: resize image in order to fit into required
- resolution. Resulting image should have one side smaller than required
- resolution.</h3>
- <div><pre>media:urlres(mediaNode, 'l100x100')</pre> <img
- src="${pageContext.request.contextPath}${media:urlres(mediaNode, 'l100x100')}" />
- </div>
- </div>
- <div>
- <h3>o100x100: resize image in order to fit into required
- resolution and fills empty bands with background color (default =
- White). Resulting image has the required resolution.</h3>
- <div><pre>media:urlres(mediaNode, 'o100x100')</pre> <img
- src="${pageContext.request.contextPath}${media:urlres(mediaNode, 'o100x100')}" />
- </div>
- <div>
- <p>With background color</p>
- <pre>media:urlres(mediaNode, 'o100x100;background=FF0000')</pre> <img
- src="${pageContext.request.contextPath}${media:urlres(mediaNode, 'o100x100;background=FF0000')}" />
- </div>
- </div>
- <div>
- <h3>n100x100: resize image in order to contain the required
- resolution. Resulting image should have one side bigger than required
- resolution.</h3>
- <div><pre>media:urlres(mediaNode, 'n100x100')</pre> <img
- src="${pageContext.request.contextPath}${media:urlres(mediaNode, 'n100x100')}" />
- </div>
- </div>
- <div>
- <h3>Passing parameters: resolution string supports optional
- parameters that may enable post processing.</h3>
- <div>
- <p>Adding parameter bw will make the image in grayscale</p>
- <pre>media:urlres(mediaNode, 'n100x100;bw')</pre> <img
- src="${pageContext.request.contextPath}${media:urlres(mediaNode, 'n100x100;bw')}" />
- </div>
- </div>
- </div>
</jsp:root>
\ No newline at end of file
Deleted: magnoliamodules/trunk/openutils-mgnlmedia/src/main/resources/mgnl-files/templates/samples-media/template.jsp
===================================================================
--- magnoliamodules/trunk/openutils-mgnlmedia/src/main/resources/mgnl-files/templates/samples-media/template.jsp 2013-10-13 19:12:57 UTC (rev 4376)
+++ magnoliamodules/trunk/openutils-mgnlmedia/src/main/resources/mgnl-files/templates/samples-media/template.jsp 2013-10-13 20:39:28 UTC (rev 4377)
@@ -1,25 +0,0 @@
-<jsp:root version="2.0" xmlns:jsp="http://java.sun.com/JSP/Page" xmlns:c="http://java.sun.com/jsp/jstl/core"
- xmlns:fmt="http://java.sun.com/jsp/jstl/fmt" xmlns:fn="http://java.sun.com/jsp/jstl/functions" xmlns:cms="http://magnolia-cms.com/taglib/templating-components/cms"
- xmlns:cmsfn="http://magnolia-cms.com/taglib/templating-components/cmsfn" xmlns:media="http://net.sourceforge.openutils/mgnlMedia"
- xmlns:mu="mgnlutils">
- <jsp:directive.page contentType="text/html; charset=UTF-8" session="false" />
- <jsp:text>
- <![CDATA[<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> ]]>
- </jsp:text>
- <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
- <head>
- <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
- <title>${content.title}</title>
- <cms:init />
- <link rel="stylesheet" type="text/css"
- href="${pageContext.request.contextPath}/.resources/media-samples/css/bootstrap.min.css" />
- <link rel="stylesheet" type="text/css" href="${pageContext.request.contextPath}/.resources/contextmenu/css/media-samples.css" />
- </head>
- <body>
- <div class="container">
- <h1>${content.title}</h1>
- <cms:area name="main" />
- </div>
- </body>
- </html>
-</jsp:root>
\ No newline at end of file
Added: magnoliamodules/trunk/openutils-mgnlmedia/src/main/resources/samples-media/template.ftl
===================================================================
--- magnoliamodules/trunk/openutils-mgnlmedia/src/main/resources/samples-media/template.ftl (rev 0)
+++ magnoliamodules/trunk/openutils-mgnlmedia/src/main/resources/samples-media/template.ftl 2013-10-13 20:39:28 UTC (rev 4377)
@@ -0,0 +1,16 @@
+<!DOCTYPE html>
+<html lang="en">
+ <head>
+ <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
+ <title>${content.title}</title>
+ [@cms.init /]
+ <link rel="stylesheet" type="text/css" href="${contextPath}/.resources/media-samples/css/bootstrap.min.css" />
+ <link rel="stylesheet" type="text/css" href="${contextPath}/.resources/contextmenu/css/media-samples.css" />
+ </head>
+ <body>
+ <div class="container">
+ <h1>${content.title}</h1>
+ [@cms.area name="main" /]
+ </div>
+ </body>
+</html>
\ No newline at end of file
Property changes on: magnoliamodules/trunk/openutils-mgnlmedia/src/main/resources/samples-media/template.ftl
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Modified: magnoliamodules/trunk/openutils-mgnlutils/src/main/java/it/openutils/mgnlutils/api/NodeUtilsExt.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlutils/src/main/java/it/openutils/mgnlutils/api/NodeUtilsExt.java 2013-10-13 19:12:57 UTC (rev 4376)
+++ magnoliamodules/trunk/openutils-mgnlutils/src/main/java/it/openutils/mgnlutils/api/NodeUtilsExt.java 2013-10-13 20:39:28 UTC (rev 4377)
@@ -211,4 +211,13 @@
// TODO introduce configured wrapping
return node;
}
+
+ public static String getBinaryPath(Node node)
+ {
+ if (node == null)
+ {
+ return null;
+ }
+ return NodeUtil.getPathIfPossible(node) + "/" + PropertyUtil.getString(node, "fileName");
+ }
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
