Menu
▾
▴
openutils-svn — developer list with svn commits
You can subscribe to this list here.
| 2006 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
(4) |
Nov
(39) |
Dec
(10) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2007 |
Jan
(19) |
Feb
(150) |
Mar
(10) |
Apr
|
May
(8) |
Jun
(11) |
Jul
(27) |
Aug
(52) |
Sep
(35) |
Oct
(30) |
Nov
(18) |
Dec
(4) |
| 2008 |
Jan
(76) |
Feb
(121) |
Mar
(39) |
Apr
(55) |
May
(18) |
Jun
(49) |
Jul
(32) |
Aug
(4) |
Sep
(10) |
Oct
|
Nov
(3) |
Dec
(33) |
| 2009 |
Jan
(19) |
Feb
(87) |
Mar
(69) |
Apr
(38) |
May
(47) |
Jun
(20) |
Jul
(5) |
Aug
(76) |
Sep
(145) |
Oct
(34) |
Nov
(8) |
Dec
(68) |
| 2010 |
Jan
(150) |
Feb
(379) |
Mar
(191) |
Apr
(100) |
May
(525) |
Jun
(269) |
Jul
(127) |
Aug
(190) |
Sep
(190) |
Oct
(29) |
Nov
(147) |
Dec
(83) |
| 2011 |
Jan
(188) |
Feb
(81) |
Mar
(43) |
Apr
(97) |
May
(63) |
Jun
(129) |
Jul
(17) |
Aug
(124) |
Sep
(6) |
Oct
(20) |
Nov
(67) |
Dec
(23) |
| 2012 |
Jan
(6) |
Feb
(14) |
Mar
(181) |
Apr
(64) |
May
(102) |
Jun
(47) |
Jul
(26) |
Aug
(3) |
Sep
(1) |
Oct
(14) |
Nov
(13) |
Dec
(23) |
| 2013 |
Jan
(4) |
Feb
(14) |
Mar
(18) |
Apr
(14) |
May
(27) |
Jun
(27) |
Jul
(5) |
Aug
(2) |
Sep
(74) |
Oct
(79) |
Nov
(21) |
Dec
(97) |
| 2014 |
Jan
(6) |
Feb
(3) |
Mar
(8) |
Apr
|
May
(5) |
Jun
|
Jul
(9) |
Aug
(6) |
Sep
(3) |
Oct
(10) |
Nov
(6) |
Dec
|
| 2015 |
Jan
|
Feb
|
Mar
(1) |
Apr
(25) |
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
| 2016 |
Jan
|
Feb
|
Mar
|
Apr
(5) |
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
|
From: <mol...@us...> - 2009-10-08 15:39:25
|
Revision: 1477
http://openutils.svn.sourceforge.net/openutils/?rev=1477&view=rev
Author: molaschi
Date: 2009-10-08 15:39:13 +0000 (Thu, 08 Oct 2009)
Log Message:
-----------
MEDIA-26 rounded corners image processor
Modified Paths:
--------------
trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/utils/ImageUtils.java
Added Paths:
-----------
trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/processors/RoundedCornersProcessor.java
trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap/media/config.modules.media.processors.image-post.rc.xml
Added: trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/processors/RoundedCornersProcessor.java
===================================================================
--- trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/processors/RoundedCornersProcessor.java (rev 0)
+++ trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/processors/RoundedCornersProcessor.java 2009-10-08 15:39:13 UTC (rev 1477)
@@ -0,0 +1,60 @@
+package net.sourceforge.openutils.mgnlmedia.media.processors;
+
+import java.awt.Color;
+import java.awt.image.BufferedImage;
+import java.util.Map;
+
+import net.sourceforge.openutils.mgnlmedia.media.utils.ImageUtils;
+
+import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang.math.NumberUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+
+/**
+ * @author molaschi
+ * @version $Id: $
+ */
+public class RoundedCornersProcessor implements ImagePostProcessor
+{
+
+ /**
+ * Logger.
+ */
+ private Logger log = LoggerFactory.getLogger(RoundedCornersProcessor.class);
+
+ /**
+ * {@inheritDoc}
+ */
+ public BufferedImage processImage(BufferedImage image, int x, int y, Map<String, String> parameters)
+ {
+ String roundCorners = parameters.get("roundcorners");
+ if (StringUtils.isNotBlank(roundCorners))
+ {
+ int radius = 5;
+ if (!"true".equals(roundCorners))
+ {
+ radius = NumberUtils.toInt(roundCorners);
+ }
+
+ Color backgroundColor = null;
+ String hexColor = parameters.get("background");
+ if (StringUtils.isNotBlank(hexColor))
+ {
+ try
+ {
+ hexColor = "0x" + (hexColor.startsWith("#") ? hexColor.substring(1) : hexColor);
+ backgroundColor = Color.decode(hexColor);
+ }
+ catch (NumberFormatException e)
+ {
+ log.error("Invalid color code: " + hexColor, e);
+ }
+ }
+ return ImageUtils.addRoundedCorners(image, backgroundColor, radius);
+ }
+ return image;
+ }
+
+}
Modified: trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/utils/ImageUtils.java
===================================================================
--- trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/utils/ImageUtils.java 2009-10-08 15:19:54 UTC (rev 1476)
+++ trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/utils/ImageUtils.java 2009-10-08 15:39:13 UTC (rev 1477)
@@ -290,7 +290,7 @@
return rgb;
}
- public static BufferedImage addRoundedCorners(BufferedImage original, String backgroundColor, int radius)
+ public static BufferedImage addRoundedCorners(BufferedImage original, Color backgroundColor, int radius)
{
BufferedImage resizedImage;
try
@@ -307,10 +307,15 @@
graphics2D.setRenderingHint(RenderingHints.KEY_ANTIALIASING, RenderingHints.VALUE_ANTIALIAS_ON);
graphics2D.setRenderingHint(RenderingHints.KEY_RENDERING, RenderingHints.VALUE_RENDER_QUALITY);
- int[] colorAr = convertHexToRGB(backgroundColor);
- Color color = new Color(colorAr[0], colorAr[1], colorAr[2], colorAr[3]);
+ if (original.getColorModel().getTransparency() == Transparency.OPAQUE && backgroundColor == null)
+ {
+ backgroundColor = Color.WHITE;
+ }
+ if (backgroundColor != null)
+ {
+ graphics2D.setBackground(backgroundColor);
+ }
- graphics2D.setBackground(color);
graphics2D.clearRect(0, 0, original.getWidth(), original.getHeight());
graphics2D
.setClip(new RoundRectangle2D.Double(0, 0, original.getWidth(), original.getHeight(), radius, radius));
Added: trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap/media/config.modules.media.processors.image-post.rc.xml
===================================================================
--- trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap/media/config.modules.media.processors.image-post.rc.xml (rev 0)
+++ trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap/media/config.modules.media.processors.image-post.rc.xml 2009-10-08 15:39:13 UTC (rev 1477)
@@ -0,0 +1,45 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<sv:node sv:name="bw" xmlns:x2="http://schemas.microsoft.com/office/excel/2003/xml"
+ xmlns:fn_old="http://www.w3.org/2004/10/xpath-functions"
+ xmlns:w="http://schemas.microsoft.com/office/word/2003/wordml" xmlns:w10="urn:schemas-microsoft-com:office:word"
+ xmlns:fn="http://www.w3.org/2005/xpath-functions" xmlns:html="http://www.w3.org/TR/REC-html40"
+ xmlns:jcr="http://www.jcp.org/jcr/1.0" xmlns:v="urn:schemas-microsoft-com:vml"
+ xmlns:mgnl="http://www.magnolia.info/jcr/mgnl" xmlns:jcrfn="http://www.jcp.org/jcr/xpath-functions/1.0"
+ xmlns:x="urn:schemas-microsoft-com:office:excel" xmlns:rep="internal" xmlns:xs="http://www.w3.org/2001/XMLSchema"
+ xmlns:aml="http://schemas.microsoft.com/aml/2001/core" xmlns:stringutils="xalan://org.apache.commons.lang.StringUtils"
+ xmlns:_pre="urn:schemas-microsoft-com:office:spreadsheet"
+ xmlns:jcrutils="xalan://it.openmindonline.urmetdomus.assembler.utils.Path"
+ xmlns:dt="uuid:C2F41010-65B3-11d1-A29F-00AA00C14882" xmlns:sv="http://www.jcp.org/jcr/sv/1.0"
+ xmlns:mix="http://www.jcp.org/jcr/mix/1.0" xmlns:nt="http://www.jcp.org/jcr/nt/1.0"
+ xmlns:o="urn:schemas-microsoft-com:office:office" xmlns:wx="http://schemas.microsoft.com/office/word/2003/auxHint"
+ xmlns:sl="http://schemas.microsoft.com/schemaLibrary/2003/core" 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:mixinTypes" sv:type="Name">
+ <sv:value>mix:lockable</sv:value>
+ </sv:property>
+ <sv:property sv:name="jcr:uuid" sv:type="String">
+ <sv:value>fc6d140b-2133-4abc-b30b-5d4a76e9424b</sv:value>
+ </sv:property>
+ <sv:property sv:name="class" sv:type="String">
+ <sv:value>net.sourceforge.openutils.mgnlmedia.media.processors.RoundedCornersProcessor</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="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="Date">
+ <sv:value>2009-09-03T18:28:30.446+02:00</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:lastmodified" sv:type="Date">
+ <sv:value>2009-09-09T10:15:47.224+02:00</sv:value>
+ </sv:property>
+ </sv:node>
+</sv:node>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <mol...@us...> - 2009-10-08 15:20:06
|
Revision: 1476
http://openutils.svn.sourceforge.net/openutils/?rev=1476&view=rev
Author: molaschi
Date: 2009-10-08 15:19:54 +0000 (Thu, 08 Oct 2009)
Log Message:
-----------
MEDIA-23 the image tag has to use use real image dimensions for width and height
Modified Paths:
--------------
trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/tags/el/MediaEl.java
trunk/openutils-mgnlmedia/src/main/resources/META-INF/tags/media.tag
Modified: trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/tags/el/MediaEl.java
===================================================================
--- trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/tags/el/MediaEl.java 2009-10-08 15:12:45 UTC (rev 1475)
+++ trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/tags/el/MediaEl.java 2009-10-08 15:19:54 UTC (rev 1476)
@@ -363,9 +363,9 @@
Content resolutions = media.getChildByName("resolutions");
try
{
- if (resolutions.hasNodeData("res-" + resolution))
+ if (resolutions.hasNodeData(ImageUtils.getResolutionPath("res-" + resolution)))
{
- res = resolutions.getNodeData("res-" + resolution);
+ res = resolutions.getNodeData(ImageUtils.getResolutionPath("res-" + resolution));
}
else
{
Modified: trunk/openutils-mgnlmedia/src/main/resources/META-INF/tags/media.tag
===================================================================
--- trunk/openutils-mgnlmedia/src/main/resources/META-INF/tags/media.tag 2009-10-08 15:12:45 UTC (rev 1475)
+++ trunk/openutils-mgnlmedia/src/main/resources/META-INF/tags/media.tag 2009-10-08 15:19:54 UTC (rev 1476)
@@ -31,6 +31,7 @@
<c:choose>
<c:when test="${width eq 0 and height eq 0}">
<c:set var="url" value="${media:url(mediaNode)}" />
+ <c:set var="size" value="${media:size(mediaNode, 'original')}" />
</c:when>
<c:otherwise>
<c:set var="controlChar" value="" />
@@ -55,7 +56,7 @@
</c:if>
<c:set var="resolution">${controlChar}${width}x${height}${empty parameters ? '': ';' + parameters}</c:set>
<c:set var="url" value="${media:urlres(mediaNode, resolution)}" />
-
+ <c:set var="size" value="${media:size(mediaNode, resolution)}" />
</c:otherwise>
</c:choose>
<c:if test="${!empty(url)}">
@@ -67,11 +68,11 @@
<![CDATA[ id="${id}"]]>
</c:if>
<c:if test="${not ignoreDim}">
- <c:if test="${ width gt 0}">
- <![CDATA[ width="${width}"]]>
+ <c:if test="${ size[0] gt 0}">
+ <![CDATA[ width="${size[0]}"]]>
</c:if>
- <c:if test="${ height gt 0}">
- <![CDATA[ height="${height}"]]>
+ <c:if test="${ size[1] gt 0}">
+ <![CDATA[ height="${size[1]}"]]>
</c:if>
</c:if>
<c:if test="${not empty cssClass}">
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <mol...@us...> - 2009-10-08 15:12:56
|
Revision: 1475
http://openutils.svn.sourceforge.net/openutils/?rev=1475&view=rev
Author: molaschi
Date: 2009-10-08 15:12:45 +0000 (Thu, 08 Oct 2009)
Log Message:
-----------
MEDIA-21 when an image is to be rendered and either width or height are not specified resize modality will be forced on "fit" and the non-specified size will be 10000
Modified Paths:
--------------
trunk/openutils-mgnlmedia/src/main/resources/META-INF/tags/media.tag
Modified: trunk/openutils-mgnlmedia/src/main/resources/META-INF/tags/media.tag
===================================================================
--- trunk/openutils-mgnlmedia/src/main/resources/META-INF/tags/media.tag 2009-10-08 15:07:53 UTC (rev 1474)
+++ trunk/openutils-mgnlmedia/src/main/resources/META-INF/tags/media.tag 2009-10-08 15:12:45 UTC (rev 1475)
@@ -16,7 +16,7 @@
<jsp:directive.attribute name="noPlayIcon" required="false" rtexprvalue="true" type="java.lang.Boolean" />
<jsp:directive.attribute name="skin" required="false" rtexprvalue="true" />
<c:set value="${media:node(item)}" var="mediaNode" />
- <c:set value="${10000000}" var="bigValue" />
+ <c:set value="${10000}" var="bigValue" />
<c:if test="${empty width }">
<c:set var="width" value="${0 }" />
</c:if>
@@ -33,12 +33,6 @@
<c:set var="url" value="${media:url(mediaNode)}" />
</c:when>
<c:otherwise>
- <c:if test="${width eq 0}">
- <c:set var="width" value="${bigValue}" />
- </c:if>
- <c:if test="${height eq 0}">
- <c:set var="height" value="${bigValue}" />
- </c:if>
<c:set var="controlChar" value="" />
<c:choose>
<c:when test="${resize eq 'nocrop'}">
@@ -51,8 +45,17 @@
<c:set var="controlChar" value="l" />
</c:when>
</c:choose>
+ <c:if test="${width eq 0}">
+ <c:set var="controlChar" value="l" />
+ <c:set var="width" value="${bigValue}" />
+ </c:if>
+ <c:if test="${height eq 0}">
+ <c:set var="controlChar" value="l" />
+ <c:set var="height" value="${bigValue}" />
+ </c:if>
<c:set var="resolution">${controlChar}${width}x${height}${empty parameters ? '': ';' + parameters}</c:set>
<c:set var="url" value="${media:urlres(mediaNode, resolution)}" />
+
</c:otherwise>
</c:choose>
<c:if test="${!empty(url)}">
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <mol...@us...> - 2009-10-08 15:08:01
|
Revision: 1474
http://openutils.svn.sourceforge.net/openutils/?rev=1474&view=rev
Author: molaschi
Date: 2009-10-08 15:07:53 +0000 (Thu, 08 Oct 2009)
Log Message:
-----------
fix doc for missing parameter on "size(...)" documentation
Modified Paths:
--------------
trunk/openutils-mgnlmedia/src/main/resources/META-INF/media.tld
Modified: trunk/openutils-mgnlmedia/src/main/resources/META-INF/media.tld
===================================================================
--- trunk/openutils-mgnlmedia/src/main/resources/META-INF/media.tld 2009-10-08 14:52:13 UTC (rev 1473)
+++ trunk/openutils-mgnlmedia/src/main/resources/META-INF/media.tld 2009-10-08 15:07:53 UTC (rev 1474)
@@ -406,7 +406,7 @@
<example>
<![CDATA[
<c:set var="mediaNode" value="${media:node(content.image)}" />
- <c:set var="size" value="${media:size(content.image)}" />
+ <c:set var="size" value="${media:size(content.image, 'original')}" />
<img src="${pageContext.request.contextPath}${media:url(mediaNode)}" style="width:${size[0]};height:${size[1]}" />
]]>
</example>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <mol...@us...> - 2009-10-08 14:52:22
|
Revision: 1473
http://openutils.svn.sourceforge.net/openutils/?rev=1473&view=rev
Author: molaschi
Date: 2009-10-08 14:52:13 +0000 (Thu, 08 Oct 2009)
Log Message:
-----------
MEDIA-22 fix control chars in media.tag
Modified Paths:
--------------
trunk/openutils-mgnlmedia/src/main/resources/META-INF/tags/media.tag
Modified: trunk/openutils-mgnlmedia/src/main/resources/META-INF/tags/media.tag
===================================================================
--- trunk/openutils-mgnlmedia/src/main/resources/META-INF/tags/media.tag 2009-10-08 14:48:30 UTC (rev 1472)
+++ trunk/openutils-mgnlmedia/src/main/resources/META-INF/tags/media.tag 2009-10-08 14:52:13 UTC (rev 1473)
@@ -42,10 +42,10 @@
<c:set var="controlChar" value="" />
<c:choose>
<c:when test="${resize eq 'nocrop'}">
- <c:set var="controlChar" value="x" />
+ <c:set var="controlChar" value="n" />
</c:when>
<c:when test="${resize eq 'fitbands'}">
- <c:set var="controlChar" value="b" />
+ <c:set var="controlChar" value="o" />
</c:when>
<c:when test="${resize eq 'fit'}">
<c:set var="controlChar" value="l" />
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <mol...@us...> - 2009-10-08 14:48:39
|
Revision: 1472
http://openutils.svn.sourceforge.net/openutils/?rev=1472&view=rev
Author: molaschi
Date: 2009-10-08 14:48:30 +0000 (Thu, 08 Oct 2009)
Log Message:
-----------
MEDIA-24 fix repositoryexception propagation
Modified Paths:
--------------
trunk/openutils-mgnlmedia/pom.xml
Modified: trunk/openutils-mgnlmedia/pom.xml
===================================================================
--- trunk/openutils-mgnlmedia/pom.xml 2009-10-08 14:48:05 UTC (rev 1471)
+++ trunk/openutils-mgnlmedia/pom.xml 2009-10-08 14:48:30 UTC (rev 1472)
@@ -138,6 +138,12 @@
<version>2.4.0-beta-1</version>
</dependency>
<dependency>
+ <groupId>javax.servlet</groupId>
+ <artifactId>jsp-api</artifactId>
+ <version>2.0</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
<groupId>org.testng</groupId>
<artifactId>testng</artifactId>
<classifier>jdk15</classifier>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <mol...@us...> - 2009-10-08 14:48:20
|
Revision: 1471
http://openutils.svn.sourceforge.net/openutils/?rev=1471&view=rev
Author: molaschi
Date: 2009-10-08 14:48:05 +0000 (Thu, 08 Oct 2009)
Log Message:
-----------
MEDIA-24 fix repositoryexception propagation
Modified Paths:
--------------
trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/tags/el/MediaEl.java
Modified: trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/tags/el/MediaEl.java
===================================================================
--- trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/tags/el/MediaEl.java 2009-10-08 14:30:56 UTC (rev 1470)
+++ trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/tags/el/MediaEl.java 2009-10-08 14:48:05 UTC (rev 1471)
@@ -42,6 +42,7 @@
import javax.jcr.RepositoryException;
import javax.jcr.query.InvalidQueryException;
+import javax.servlet.jsp.JspTagException;
import net.sourceforge.openutils.mgnlmedia.media.configuration.MediaConfigurationManager;
import net.sourceforge.openutils.mgnlmedia.media.configuration.MediaTypeConfiguration;
@@ -79,7 +80,7 @@
* @param uuid media uuid
* @return content node
*/
- public static Content getNode(Object obj) throws RepositoryException
+ public static Content getNode(Object obj) throws JspTagException
{
if (obj == null)
{
@@ -96,7 +97,7 @@
catch (RepositoryException e)
{
log.error("Exception getting node {}", uuid, e);
- throw e;
+ throw new JspTagException(e);
}
}
else if (obj instanceof Content)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <mol...@us...> - 2009-10-08 14:31:07
|
Revision: 1470
http://openutils.svn.sourceforge.net/openutils/?rev=1470&view=rev
Author: molaschi
Date: 2009-10-08 14:30:56 +0000 (Thu, 08 Oct 2009)
Log Message:
-----------
MEDIA-24 fix repositoryexception propagation
Modified Paths:
--------------
trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/tags/el/MediaEl.java
Modified: trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/tags/el/MediaEl.java
===================================================================
--- trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/tags/el/MediaEl.java 2009-10-08 14:24:52 UTC (rev 1469)
+++ trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/tags/el/MediaEl.java 2009-10-08 14:30:56 UTC (rev 1470)
@@ -79,7 +79,7 @@
* @param uuid media uuid
* @return content node
*/
- public static Content getNode(Object obj)
+ public static Content getNode(Object obj) throws RepositoryException
{
if (obj == null)
{
@@ -95,7 +95,8 @@
}
catch (RepositoryException e)
{
- return null;
+ log.error("Exception getting node {}", uuid, e);
+ throw e;
}
}
else if (obj instanceof Content)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <mol...@us...> - 2009-10-08 14:25:07
|
Revision: 1469
http://openutils.svn.sourceforge.net/openutils/?rev=1469&view=rev
Author: molaschi
Date: 2009-10-08 14:24:52 +0000 (Thu, 08 Oct 2009)
Log Message:
-----------
MEDIA-25
Modified Paths:
--------------
trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/utils/ImageUtils.java
Modified: trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/utils/ImageUtils.java
===================================================================
--- trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/utils/ImageUtils.java 2009-10-08 14:21:20 UTC (rev 1468)
+++ trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/utils/ImageUtils.java 2009-10-08 14:24:52 UTC (rev 1469)
@@ -37,6 +37,7 @@
import java.awt.Image;
import java.awt.Point;
import java.awt.RenderingHints;
+import java.awt.Transparency;
import java.awt.geom.RoundRectangle2D;
import java.awt.image.BufferedImage;
import java.awt.image.ColorModel;
@@ -181,6 +182,10 @@
{
graphics2D.clearRect(0, 0, canvasX, canvasY);
+ if (background == null && original.getColorModel().getTransparency() == Transparency.OPAQUE)
+ {
+ background = Color.WHITE;
+ }
// fill bands
if (background != null)
{
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <mol...@us...> - 2009-10-08 14:21:34
|
Revision: 1468
http://openutils.svn.sourceforge.net/openutils/?rev=1468&view=rev
Author: molaschi
Date: 2009-10-08 14:21:20 +0000 (Thu, 08 Oct 2009)
Log Message:
-----------
MEDIA-25
Modified Paths:
--------------
trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/processors/FitInAndFillWithBandsImageResolutionProcessor.java
trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/utils/ImageUtils.java
Modified: trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/processors/FitInAndFillWithBandsImageResolutionProcessor.java
===================================================================
--- trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/processors/FitInAndFillWithBandsImageResolutionProcessor.java 2009-10-02 14:57:50 UTC (rev 1467)
+++ trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/processors/FitInAndFillWithBandsImageResolutionProcessor.java 2009-10-08 14:21:20 UTC (rev 1468)
@@ -53,7 +53,7 @@
*/
public BufferedImage getImageForResolution(BufferedImage original, int x, int y, Map<String, String> parameters)
{
- Color color = Color.WHITE;
+ Color color = null;
String hexColor = parameters.get("background");
if (StringUtils.isNotBlank(hexColor))
Modified: trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/utils/ImageUtils.java
===================================================================
--- trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/utils/ImageUtils.java 2009-10-02 14:57:50 UTC (rev 1467)
+++ trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/utils/ImageUtils.java 2009-10-08 14:21:20 UTC (rev 1468)
@@ -175,16 +175,28 @@
}
Graphics2D graphics2D = resizedImage.createGraphics();
- // background color
- if (background != null)
- {
- graphics2D.setBackground(background);
- }
graphics2D.setRenderingHint(RenderingHints.KEY_ANTIALIASING, RenderingHints.VALUE_ANTIALIAS_ON);
graphics2D.setRenderingHint(RenderingHints.KEY_RENDERING, RenderingHints.VALUE_RENDER_QUALITY);
if (canvasX > x || canvasY > y)
{
graphics2D.clearRect(0, 0, canvasX, canvasY);
+
+ // fill bands
+ if (background != null)
+ {
+ graphics2D.setColor(background);
+
+ if (canvasX > x)
+ {
+ graphics2D.fillRect(0, 0, (canvasX - x) / 2, canvasY);
+ graphics2D.fillRect(canvasX - (canvasX - x) / 2, 0, canvasX, canvasY);
+ }
+ if (canvasY > y)
+ {
+ graphics2D.fillRect(0, 0, canvasX, (canvasY - y) / 2);
+ graphics2D.fillRect(0, canvasY - (canvasY - y) / 2, canvasX, canvasY);
+ }
+ }
}
if (x > original.getWidth())
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <df...@us...> - 2009-10-02 14:58:01
|
Revision: 1467
http://openutils.svn.sourceforge.net/openutils/?rev=1467&view=rev
Author: dfghi
Date: 2009-10-02 14:57:50 +0000 (Fri, 02 Oct 2009)
Log Message:
-----------
DBMIGRATION-2 Added the possibility to execute a task list only for specific database vendors.
Added Paths:
-----------
trunk/openutils-dbmigration/src/main/java/it/openutils/migration/task/setup/DatabaseConditionalTaskList.java
Added: trunk/openutils-dbmigration/src/main/java/it/openutils/migration/task/setup/DatabaseConditionalTaskList.java
===================================================================
--- trunk/openutils-dbmigration/src/main/java/it/openutils/migration/task/setup/DatabaseConditionalTaskList.java (rev 0)
+++ trunk/openutils-dbmigration/src/main/java/it/openutils/migration/task/setup/DatabaseConditionalTaskList.java 2009-10-02 14:57:50 UTC (rev 1467)
@@ -0,0 +1,111 @@
+package it.openutils.migration.task.setup;
+
+import java.sql.Connection;
+import java.sql.SQLException;
+import java.util.List;
+
+import javax.sql.DataSource;
+
+import org.apache.commons.lang.StringUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.dao.DataAccessException;
+import org.springframework.jdbc.core.ConnectionCallback;
+import org.springframework.jdbc.core.JdbcTemplate;
+
+/**
+ * Executes the specified task list only if database vendor info matches both product name and version stated, otherwise
+ * ignores the tasks. Name and version string comparison is case insensitive. If databaseProductName or version are not
+ * specified in configuration (empty or null), those are treated as matching values. If both are missing, the task list
+ * is executed always.
+ * Example, to execute a specific task only on MySQL: <code>
+ <bean class="it.openutils.migration.task.setup.DatabaseConditionalTaskList">
+ <property name="databaseProductName" value="MySQL" />
+ <property name="description" value="Mysql db creation" />
+ <property name="tasks">
+ <list>
+ <bean class="MyTask">...
+ </bean>
+ </list>
+ </property>
+ </bean><code>
+
+ *
+ * @author dfghi
+ */
+public class DatabaseConditionalTaskList extends BaseDbTask {
+
+ protected Logger log = LoggerFactory.getLogger(getClass());
+
+ /**
+ * Database vendor name. Usual names are "Apache Derby", "PostgreSQL", "MySQL"...
+ */
+ private String databaseProductName;
+
+ /**
+ * Database version. This is not the current dbMigration version, but the db product version: for Derby should be
+ * something like "10.x.x"
+ */
+ private String databaseProductVersion;
+
+ /**
+ * Task to execute if product and version matches.
+ */
+ private List<DbTask> tasks;
+
+ /**
+ * @param databaseProductName
+ * the databaseProductName to set
+ */
+ public void setDatabaseProductName(String databaseProductName) {
+ this.databaseProductName = databaseProductName;
+ }
+
+ /**
+ * @param databaseProductVersion
+ * the databaseProductVersion to set
+ */
+ public void setDatabaseProductVersion(String databaseProductVersion) {
+ this.databaseProductVersion = databaseProductVersion;
+ }
+
+ /**
+ * @param tasks
+ * the tasks to set
+ */
+ public void setTasks(List<DbTask> tasks) {
+ this.tasks = tasks;
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ @Override
+ public void execute(DataSource dataSource) {
+ JdbcTemplate jdbcTemplate = new JdbcTemplate(dataSource);
+ String databaseRealProductName = (String) jdbcTemplate.execute(new ConnectionCallback() {
+
+ public Object doInConnection(Connection con) throws SQLException, DataAccessException {
+ return con.getMetaData().getDatabaseProductName();
+ }
+ });
+ String databaseRealProductVersion = (String) jdbcTemplate.execute(new ConnectionCallback() {
+
+ public Object doInConnection(Connection con) throws SQLException, DataAccessException {
+ return con.getMetaData().getDatabaseProductVersion();
+ }
+ });
+ if (StringUtils.isNotEmpty(this.databaseProductName) && (!StringUtils.equalsIgnoreCase(databaseRealProductName, this.databaseProductName))) {
+ log.info("Skipping tasks for specific database: " + this.databaseProductName + " Database found: " + databaseRealProductName);
+ return;
+ }
+ if (StringUtils.isNotEmpty(this.databaseProductVersion) && (!StringUtils.equalsIgnoreCase(databaseRealProductVersion, this.databaseProductVersion))) {
+ log.info("Skipping tasks for specific database version: " + this.databaseProductVersion + " Database version found: " + databaseRealProductVersion);
+ return;
+ }
+ for (DbTask task : tasks) {
+ log.debug(task.getDescription());
+ task.execute(dataSource);
+ }
+ }
+}
Property changes on: trunk/openutils-dbmigration/src/main/java/it/openutils/migration/task/setup/DatabaseConditionalTaskList.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: svn:keywords
+ Author Date Id Revision
Added: svn:eol-style
+ native
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <df...@us...> - 2009-09-25 09:27:46
|
Revision: 1466
http://openutils.svn.sourceforge.net/openutils/?rev=1466&view=rev
Author: dfghi
Date: 2009-09-25 09:27:38 +0000 (Fri, 25 Sep 2009)
Log Message:
-----------
Corrected pom dependency to the mgnltasks project.
Modified Paths:
--------------
trunk/openutils-mgnlcontrols/pom.xml
trunk/openutils-mgnlcontrols/src/site/changes/changes.xml
Modified: trunk/openutils-mgnlcontrols/pom.xml
===================================================================
--- trunk/openutils-mgnlcontrols/pom.xml 2009-09-18 08:28:04 UTC (rev 1465)
+++ trunk/openutils-mgnlcontrols/pom.xml 2009-09-25 09:27:38 UTC (rev 1466)
@@ -84,7 +84,7 @@
<dependency>
<groupId>net.sourceforge.openutils</groupId>
<artifactId>openutils-mgnltasks</artifactId>
- <version>3.5.3</version>
+ <version>4.0.2</version>
</dependency>
<dependency>
<groupId>net.sourceforge.openutils</groupId>
Modified: trunk/openutils-mgnlcontrols/src/site/changes/changes.xml
===================================================================
--- trunk/openutils-mgnlcontrols/src/site/changes/changes.xml 2009-09-18 08:28:04 UTC (rev 1465)
+++ trunk/openutils-mgnlcontrols/src/site/changes/changes.xml 2009-09-25 09:27:38 UTC (rev 1466)
@@ -8,6 +8,9 @@
<author email="fgiust(at)users.sourceforge.net">Fabrizio Giustina</author>
</properties>
<body>
+ <release version="4.0.3" date="2009-09-25" description="">
+ <action type="fix" dev="dfghi">Corrected pom dependency to mgnltasks</action>
+ </release>
<release version="4.0.1" date="2009-06-04" description="">
<action type="add" dev="fgiust">Added a new mehod addToParameters in ConfigurableFreemarkerDialog that can be
overridden to supply custom values to the freemarker template</action>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <mol...@us...> - 2009-09-18 08:28:13
|
Revision: 1465
http://openutils.svn.sourceforge.net/openutils/?rev=1465&view=rev
Author: molaschi
Date: 2009-09-18 08:28:04 +0000 (Fri, 18 Sep 2009)
Log Message:
-----------
MEDIA-19 fix media.tld issues
Modified Paths:
--------------
trunk/openutils-mgnlmedia/src/main/resources/META-INF/media.tld
Modified: trunk/openutils-mgnlmedia/src/main/resources/META-INF/media.tld
===================================================================
--- trunk/openutils-mgnlmedia/src/main/resources/META-INF/media.tld 2009-09-16 15:42:10 UTC (rev 1464)
+++ trunk/openutils-mgnlmedia/src/main/resources/META-INF/media.tld 2009-09-18 08:28:04 UTC (rev 1465)
@@ -259,7 +259,7 @@
<name>tags</name>
<description>Get the tags from a media, given the media node itself.</description>
<function-class>net.sourceforge.openutils.mgnlmedia.media.tags.el.MediaEl</function-class>
- <function-signature>java.lang.String getTags(info.magnolia.cms.core.Content)</function-signature>
+ <function-signature>java.lang.String[] getTags(info.magnolia.cms.core.Content)</function-signature>
<example>
<![CDATA[
<c:set var="mediaNode" value="${media:node(content.image)}" />
@@ -273,7 +273,7 @@
<name>tagsLoc</name>
<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>
<function-class>net.sourceforge.openutils.mgnlmedia.media.tags.el.MediaEl</function-class>
- <function-signature>java.lang.String getTags(info.magnolia.cms.core.Content, java.util.Locale)</function-signature>
+ <function-signature>java.lang.String[] getTags(info.magnolia.cms.core.Content, java.util.Locale)</function-signature>
<example>
<![CDATA[
<c:set var="mediaNode" value="${media:node(content.image)}" />
@@ -287,7 +287,7 @@
<name>url</name>
<description>Get the url to the media, given the media node itself</description>
<function-class>net.sourceforge.openutils.mgnlmedia.media.tags.el.MediaEl</function-class>
- <function-signature>String getUrl(info.magnolia.cms.core.Content)</function-signature>
+ <function-signature>java.lang.String getUrl(info.magnolia.cms.core.Content)</function-signature>
<example>
<![CDATA[
<c:set var="mediaNode" value="${media:node(content.image)}" />
@@ -299,7 +299,7 @@
<name>url2</name>
<description>Get the url to the media, given the media node itself and an options map</description>
<function-class>net.sourceforge.openutils.mgnlmedia.media.tags.el.MediaEl</function-class>
- <function-signature>String getUrl2(info.magnolia.cms.core.Content, java.util.Map)</function-signature>
+ <function-signature>java.lang.String getUrl2(info.magnolia.cms.core.Content, java.util.Map)</function-signature>
<example>
<![CDATA[
<c:set var="mediaNode" value="${media:node(content.image)}" />
@@ -309,7 +309,9 @@
</function>
<function>
<name>urlres</name>
- <description>Get the url to the resolution for a given media node (image or flv/youtube preview)<br />
+ <description>
+ <![CDATA[
+ Get the url to the resolution for a given media node (image or flv/youtube preview)<br />
The resolution string has the following pattern [controlChar][width]x[height][;param_key1=param_value1,param_key2=param_value2,...]<br />
The controlChar identifies which resize method will be used:
<ul>
@@ -332,6 +334,7 @@
: makes the new image to contain the required res and the crop the simmetric bands that outfit res
</li>
</ul>
+ ]]>
</description>
<function-class>net.sourceforge.openutils.mgnlmedia.media.tags.el.MediaEl</function-class>
<function-signature>java.lang.String getResolutionUrl(info.magnolia.cms.core.Content, java.lang.String)</function-signature>
@@ -346,7 +349,7 @@
<name>resolutions</name>
<description>Get all the resolutions for a given media node.</description>
<function-class>net.sourceforge.openutils.mgnlmedia.media.tags.el.MediaEl</function-class>
- <function-signature>java.lang.String[] listResolution(info.magnolia.cms.core.Content)</function-signature>
+ <function-signature>java.lang.String[] listResolutions(info.magnolia.cms.core.Content)</function-signature>
<example>
<![CDATA[
<c:set var="mediaNode" value="${media:node(content.image)}" />
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <mol...@us...> - 2009-09-16 15:42:23
|
Revision: 1464
http://openutils.svn.sourceforge.net/openutils/?rev=1464&view=rev
Author: molaschi
Date: 2009-09-16 15:42:10 +0000 (Wed, 16 Sep 2009)
Log Message:
-----------
MEDIA-17 removed "modifica" and "pubblica" from folder view
Modified Paths:
--------------
trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/media/pages/MediaFolderViewPage.html
Modified: trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/media/pages/MediaFolderViewPage.html
===================================================================
--- trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/media/pages/MediaFolderViewPage.html 2009-09-09 16:34:40 UTC (rev 1463)
+++ trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/media/pages/MediaFolderViewPage.html 2009-09-16 15:42:10 UTC (rev 1464)
@@ -246,17 +246,11 @@
<#if this.selectMedia>
<div class="selectMediaLine">
<#if media.metaData.activationStatus = 2 || this.develop >
- <a href="javascript:$empty()" onclick="selectMedia('${media.uuid}', '${this.request.contextPath}${media.thumbnailUrl}', '${media.filename}')" title="modifica">
+ <a href="javascript:$empty()" onclick="selectMedia('${media.uuid}', '${this.request.contextPath}${media.thumbnailUrl}', '${media.filename}')">
${this.msgs.get('media.select')}
</a>
<#else>
- <#if media.canPublish && media.metaData.activationStatus < 2>
- <a href="javascript:$empty()" onclick="performAction('activate', '${media.handle}','')" title="pubblica">
- <img src="${this.request.contextPath}/.resources/icons/16/arrow_right_green.gif" border="0" align="middle" />
- </a>
- <#else>
${this.msgs.get('media.notpublished')}
- </#if>
</#if>
</div>
</#if>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <mol...@us...> - 2009-09-09 16:34:48
|
Revision: 1463
http://openutils.svn.sourceforge.net/openutils/?rev=1463&view=rev
Author: molaschi
Date: 2009-09-09 16:34:40 +0000 (Wed, 09 Sep 2009)
Log Message:
-----------
update changes.xml
Modified Paths:
--------------
trunk/openutils-mgnlmedia/src/site/changes/changes.xml
Modified: trunk/openutils-mgnlmedia/src/site/changes/changes.xml
===================================================================
--- trunk/openutils-mgnlmedia/src/site/changes/changes.xml 2009-09-09 15:45:43 UTC (rev 1462)
+++ trunk/openutils-mgnlmedia/src/site/changes/changes.xml 2009-09-09 16:34:40 UTC (rev 1463)
@@ -8,9 +8,29 @@
<author email="fgiust(at)users.sourceforge.net">Fabrizio Giustina</author>
</properties>
<body>
+ <release version="4.0-b9" date="in svn" description="">
+ <action type="fix" dev="molaschi">fix some media.tag issues
+ </action>
+ <action type="update" dev="molaschi">insert some defaults for video and audio player dimensions on media.tag
+ </action>
+ </release>
+ <release version="4.0-b8" date="in svn" description="">
+ <action type="fix" dev="molaschi">fix i18n in selectMedia control
+ </action>
+ </release>
+ <release version="4.0-b7" date="in svn" description="">
+ <action type="fix" dev="molaschi">fix error in freemarker comment syntax selectMedia.ftl
+ </action>
+ <action type="add" dev="molaschi">add grayscale image post processor
+ </action>
+ </release>
<release version="4.0-b6" date="in svn" description="">
<action type="fix" dev="fgiust">Avoid image processing when the requested size is identical to the original image
</action>
+ <action type="add" dev="molaschi">Add configurable image post processors
+ </action>
+ <action type="update" dev="molaschi">Make image resolution processors configurable under modules/media/processors
+ </action>
</release>
<release version="4.0-b5" date="2009-06-04" description="">
<action type="fix" dev="fgiust">MediaCustomSaveHandler now only warns about missing referenced media without
@@ -46,4 +66,4 @@
<action type="add" dev="fgiust">first alpha release</action>
</release>
</body>
-</document>
\ No newline at end of file
+</document>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <mol...@us...> - 2009-09-09 15:45:51
|
Revision: 1462
http://openutils.svn.sourceforge.net/openutils/?rev=1462&view=rev
Author: molaschi
Date: 2009-09-09 15:45:43 +0000 (Wed, 09 Sep 2009)
Log Message:
-----------
[maven-release-plugin] prepare for next development iteration
Modified Paths:
--------------
trunk/openutils-mgnlmedia/pom.xml
Modified: trunk/openutils-mgnlmedia/pom.xml
===================================================================
--- trunk/openutils-mgnlmedia/pom.xml 2009-09-09 15:45:30 UTC (rev 1461)
+++ trunk/openutils-mgnlmedia/pom.xml 2009-09-09 15:45:43 UTC (rev 1462)
@@ -10,7 +10,7 @@
<name>Magnolia SimpleMedia Module</name>
<description>Magnolia SimpleMedia Module: a module for Magnolia CMS for easier management of images and videos with
several features.</description>
- <version>4.0-b9</version>
+ <version>4.0-b10-SNAPSHOT</version>
<inceptionYear>2008</inceptionYear>
<licenses>
<license>
@@ -151,10 +151,4 @@
</exclusions>
</dependency>
</dependencies>
-
- <scm>
- <connection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/tags/openutils-mgnlmedia-4.0-b9</connection>
- <developerConnection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/tags/openutils-mgnlmedia-4.0-b9</developerConnection>
- <url>http://openutils.svn.sourceforge.net/viewcvs.cgi/openutils/tags/openutils-mgnlmedia-4.0-b9</url>
- </scm>
</project>
\ 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: <mol...@us...> - 2009-09-09 15:45:37
|
Revision: 1461
http://openutils.svn.sourceforge.net/openutils/?rev=1461&view=rev
Author: molaschi
Date: 2009-09-09 15:45:30 +0000 (Wed, 09 Sep 2009)
Log Message:
-----------
[maven-release-plugin] copy for tag openutils-mgnlmedia-4.0-b9
Added Paths:
-----------
tags/openutils-mgnlmedia-4.0-b9/
tags/openutils-mgnlmedia-4.0-b9/pom.xml
Removed Paths:
-------------
tags/openutils-mgnlmedia-4.0-b9/pom.xml
Property changes on: tags/openutils-mgnlmedia-4.0-b9
___________________________________________________________________
Added: svn:ignore
+ .settings
.checkstyle
.classpath
.project
target
test-output
temp-testng-customsuite.xml
Added: svnmerge-integrated
+ /branches/openutils-mgnlmedia-3.6.x:1-982,1004
Added: svn:mergeinfo
+ /branches/openutils-mgnlmedia-3.6.x:1004
Deleted: tags/openutils-mgnlmedia-4.0-b9/pom.xml
===================================================================
--- trunk/openutils-mgnlmedia/pom.xml 2009-09-09 10:43:21 UTC (rev 1459)
+++ tags/openutils-mgnlmedia-4.0-b9/pom.xml 2009-09-09 15:45:30 UTC (rev 1461)
@@ -1,154 +0,0 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
- <parent>
- <groupId>net.sourceforge.openutils</groupId>
- <artifactId>openutils-parent</artifactId>
- <version>1.1</version>
- </parent>
- <modelVersion>4.0.0</modelVersion>
- <packaging>jar</packaging>
- <artifactId>openutils-mgnlmedia</artifactId>
- <name>Magnolia SimpleMedia Module</name>
- <description>Magnolia SimpleMedia Module: a module for Magnolia CMS for easier management of images and videos with
- several features.</description>
- <version>4.0-b9-SNAPSHOT</version>
- <inceptionYear>2008</inceptionYear>
- <licenses>
- <license>
- <name>GPLv3</name>
- <url>http://www.gnu.org/licenses/gpl-3.0.txt</url>
- </license>
- </licenses>
- <url>http://lab.openmindonline.it/lab/products/media.html</url>
- <issueManagement>
- <system>jira</system>
- <url>http://lab.openmindonline.it/jira/browse/MEDIA</url>
- </issueManagement>
- <build>
- <resources>
- <resource>
- <filtering>false</filtering>
- <directory>src/main/resources</directory>
- <includes>
- <include>**/*</include>
- </includes>
- </resource>
- <resource>
- <filtering>true</filtering>
- <directory>src/main/resources</directory>
- <includes>
- <include>META-INF/magnolia/*</include>
- </includes>
- </resource>
- </resources>
- <plugins>
- <plugin>
- <artifactId>maven-assembly-plugin</artifactId>
- <executions>
- <execution>
- <id>bundle</id>
- <phase>package</phase>
- <goals>
- <goal>single</goal>
- </goals>
- </execution>
- </executions>
- <configuration>
- <descriptors>
- <descriptor>${basedir}/src/main/assembly/assembly-bundle.xml</descriptor>
- </descriptors>
- </configuration>
- </plugin>
- <plugin>
- <groupId>com.google.code.maven-license-plugin</groupId>
- <artifactId>maven-license-plugin</artifactId>
- <version>1.4.0</version>
- <configuration>
- <header>src/main/etc/header.txt</header>
- <includes>
- <include>src/**</include>
- </includes>
- <excludes>
- <exclude>target/**</exclude>
- <exclude>src/site/**</exclude>
- <exclude>src/main/bundle/**</exclude>
- <exclude>src/main/resources/**/*.ftl</exclude>
- <exclude>src/main/assembly/**</exclude>
- <exclude>src/main/resources/mgnl-bootstrap/**</exclude>
- <exclude>src/main/resources/mgnl-nodetypes/**</exclude>
- <exclude>src/main/resources/mgnl-resources/media/css/multibox.css</exclude>
- <exclude>src/main/resources/mgnl-resources/media/js/multibox/**</exclude>
- <exclude>src/main/resources/mgnl-resources/media/js/miframe.js</exclude>
- <exclude>src/main/resources/mgnl-resources/media/js/moo*.*</exclude>
- <exclude>src/main/resources/mgnl-resources/media/js/swfobject.js</exclude>
- </excludes>
- <properties>
- <year>${project.inceptionYear} - 2009</year>
- <name>${project.name}</name>
- <description>${project.description}</description>
- <url>${project.url}</url>
- </properties>
- </configuration>
- <executions>
- <execution>
- <goals>
- <goal>check</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
- <reporting>
- <plugins>
- <plugin>
- <groupId>net.sourceforge.maven-taglib</groupId>
- <artifactId>maven-taglib-plugin</artifactId>
- </plugin>
- </plugins>
- </reporting>
- <dependencies>
- <dependency>
- <groupId>info.magnolia</groupId>
- <artifactId>magnolia-core</artifactId>
- <version>4.0.1</version>
- </dependency>
- <dependency>
- <groupId>info.magnolia</groupId>
- <artifactId>magnolia-module-admininterface</artifactId>
- <version>4.0.1</version>
- </dependency>
- <dependency>
- <groupId>net.sourceforge.openutils</groupId>
- <artifactId>openutils-mgnltasks</artifactId>
- <version>4.0</version>
- </dependency>
- <dependency>
- <groupId>net.sourceforge.openutils</groupId>
- <artifactId>openutils-mgnlext</artifactId>
- <version>2.1</version>
- </dependency>
- <dependency>
- <groupId>net.sourceforge.openutils</groupId>
- <artifactId>openutils-elfunctions</artifactId>
- <version>1.0</version>
- </dependency>
- <dependency>
- <groupId>com.drewnoakes</groupId>
- <artifactId>metadata-extractor</artifactId>
- <version>2.4.0-beta-1</version>
- </dependency>
- <dependency>
- <groupId>org.testng</groupId>
- <artifactId>testng</artifactId>
- <classifier>jdk15</classifier>
- <version>5.1</version>
- <scope>test</scope>
- <exclusions>
- <exclusion>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- </dependencies>
-</project>
\ No newline at end of file
Copied: tags/openutils-mgnlmedia-4.0-b9/pom.xml (from rev 1460, trunk/openutils-mgnlmedia/pom.xml)
===================================================================
--- tags/openutils-mgnlmedia-4.0-b9/pom.xml (rev 0)
+++ tags/openutils-mgnlmedia-4.0-b9/pom.xml 2009-09-09 15:45:30 UTC (rev 1461)
@@ -0,0 +1,160 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ <parent>
+ <groupId>net.sourceforge.openutils</groupId>
+ <artifactId>openutils-parent</artifactId>
+ <version>1.1</version>
+ </parent>
+ <modelVersion>4.0.0</modelVersion>
+ <packaging>jar</packaging>
+ <artifactId>openutils-mgnlmedia</artifactId>
+ <name>Magnolia SimpleMedia Module</name>
+ <description>Magnolia SimpleMedia Module: a module for Magnolia CMS for easier management of images and videos with
+ several features.</description>
+ <version>4.0-b9</version>
+ <inceptionYear>2008</inceptionYear>
+ <licenses>
+ <license>
+ <name>GPLv3</name>
+ <url>http://www.gnu.org/licenses/gpl-3.0.txt</url>
+ </license>
+ </licenses>
+ <url>http://lab.openmindonline.it/lab/products/media.html</url>
+ <issueManagement>
+ <system>jira</system>
+ <url>http://lab.openmindonline.it/jira/browse/MEDIA</url>
+ </issueManagement>
+ <build>
+ <resources>
+ <resource>
+ <filtering>false</filtering>
+ <directory>src/main/resources</directory>
+ <includes>
+ <include>**/*</include>
+ </includes>
+ </resource>
+ <resource>
+ <filtering>true</filtering>
+ <directory>src/main/resources</directory>
+ <includes>
+ <include>META-INF/magnolia/*</include>
+ </includes>
+ </resource>
+ </resources>
+ <plugins>
+ <plugin>
+ <artifactId>maven-assembly-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>bundle</id>
+ <phase>package</phase>
+ <goals>
+ <goal>single</goal>
+ </goals>
+ </execution>
+ </executions>
+ <configuration>
+ <descriptors>
+ <descriptor>${basedir}/src/main/assembly/assembly-bundle.xml</descriptor>
+ </descriptors>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>com.google.code.maven-license-plugin</groupId>
+ <artifactId>maven-license-plugin</artifactId>
+ <version>1.4.0</version>
+ <configuration>
+ <header>src/main/etc/header.txt</header>
+ <includes>
+ <include>src/**</include>
+ </includes>
+ <excludes>
+ <exclude>target/**</exclude>
+ <exclude>src/site/**</exclude>
+ <exclude>src/main/bundle/**</exclude>
+ <exclude>src/main/resources/**/*.ftl</exclude>
+ <exclude>src/main/assembly/**</exclude>
+ <exclude>src/main/resources/mgnl-bootstrap/**</exclude>
+ <exclude>src/main/resources/mgnl-nodetypes/**</exclude>
+ <exclude>src/main/resources/mgnl-resources/media/css/multibox.css</exclude>
+ <exclude>src/main/resources/mgnl-resources/media/js/multibox/**</exclude>
+ <exclude>src/main/resources/mgnl-resources/media/js/miframe.js</exclude>
+ <exclude>src/main/resources/mgnl-resources/media/js/moo*.*</exclude>
+ <exclude>src/main/resources/mgnl-resources/media/js/swfobject.js</exclude>
+ </excludes>
+ <properties>
+ <year>${project.inceptionYear} - 2009</year>
+ <name>${project.name}</name>
+ <description>${project.description}</description>
+ <url>${project.url}</url>
+ </properties>
+ </configuration>
+ <executions>
+ <execution>
+ <goals>
+ <goal>check</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+ <reporting>
+ <plugins>
+ <plugin>
+ <groupId>net.sourceforge.maven-taglib</groupId>
+ <artifactId>maven-taglib-plugin</artifactId>
+ </plugin>
+ </plugins>
+ </reporting>
+ <dependencies>
+ <dependency>
+ <groupId>info.magnolia</groupId>
+ <artifactId>magnolia-core</artifactId>
+ <version>4.0.1</version>
+ </dependency>
+ <dependency>
+ <groupId>info.magnolia</groupId>
+ <artifactId>magnolia-module-admininterface</artifactId>
+ <version>4.0.1</version>
+ </dependency>
+ <dependency>
+ <groupId>net.sourceforge.openutils</groupId>
+ <artifactId>openutils-mgnltasks</artifactId>
+ <version>4.0</version>
+ </dependency>
+ <dependency>
+ <groupId>net.sourceforge.openutils</groupId>
+ <artifactId>openutils-mgnlext</artifactId>
+ <version>2.1</version>
+ </dependency>
+ <dependency>
+ <groupId>net.sourceforge.openutils</groupId>
+ <artifactId>openutils-elfunctions</artifactId>
+ <version>1.0</version>
+ </dependency>
+ <dependency>
+ <groupId>com.drewnoakes</groupId>
+ <artifactId>metadata-extractor</artifactId>
+ <version>2.4.0-beta-1</version>
+ </dependency>
+ <dependency>
+ <groupId>org.testng</groupId>
+ <artifactId>testng</artifactId>
+ <classifier>jdk15</classifier>
+ <version>5.1</version>
+ <scope>test</scope>
+ <exclusions>
+ <exclusion>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ </dependencies>
+
+ <scm>
+ <connection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/tags/openutils-mgnlmedia-4.0-b9</connection>
+ <developerConnection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/tags/openutils-mgnlmedia-4.0-b9</developerConnection>
+ <url>http://openutils.svn.sourceforge.net/viewcvs.cgi/openutils/tags/openutils-mgnlmedia-4.0-b9</url>
+ </scm>
+</project>
\ 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: <mol...@us...> - 2009-09-09 15:45:18
|
Revision: 1460
http://openutils.svn.sourceforge.net/openutils/?rev=1460&view=rev
Author: molaschi
Date: 2009-09-09 15:45:11 +0000 (Wed, 09 Sep 2009)
Log Message:
-----------
[maven-release-plugin] prepare release openutils-mgnlmedia-4.0-b9
Modified Paths:
--------------
trunk/openutils-mgnlmedia/pom.xml
Modified: trunk/openutils-mgnlmedia/pom.xml
===================================================================
--- trunk/openutils-mgnlmedia/pom.xml 2009-09-09 10:43:21 UTC (rev 1459)
+++ trunk/openutils-mgnlmedia/pom.xml 2009-09-09 15:45:11 UTC (rev 1460)
@@ -10,7 +10,7 @@
<name>Magnolia SimpleMedia Module</name>
<description>Magnolia SimpleMedia Module: a module for Magnolia CMS for easier management of images and videos with
several features.</description>
- <version>4.0-b9-SNAPSHOT</version>
+ <version>4.0-b9</version>
<inceptionYear>2008</inceptionYear>
<licenses>
<license>
@@ -151,4 +151,10 @@
</exclusions>
</dependency>
</dependencies>
+
+ <scm>
+ <connection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/tags/openutils-mgnlmedia-4.0-b9</connection>
+ <developerConnection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/tags/openutils-mgnlmedia-4.0-b9</developerConnection>
+ <url>http://openutils.svn.sourceforge.net/viewcvs.cgi/openutils/tags/openutils-mgnlmedia-4.0-b9</url>
+ </scm>
</project>
\ 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: <mol...@us...> - 2009-09-09 10:43:34
|
Revision: 1459
http://openutils.svn.sourceforge.net/openutils/?rev=1459&view=rev
Author: molaschi
Date: 2009-09-09 10:43:21 +0000 (Wed, 09 Sep 2009)
Log Message:
-----------
formatting
Modified Paths:
--------------
trunk/openutils-mgnlmedia/src/main/resources/META-INF/tags/media.tag
Modified: trunk/openutils-mgnlmedia/src/main/resources/META-INF/tags/media.tag
===================================================================
--- trunk/openutils-mgnlmedia/src/main/resources/META-INF/tags/media.tag 2009-09-09 10:39:12 UTC (rev 1458)
+++ trunk/openutils-mgnlmedia/src/main/resources/META-INF/tags/media.tag 2009-09-09 10:43:21 UTC (rev 1459)
@@ -1,36 +1,20 @@
-<jsp:root version="2.0" xmlns:jsp="http://java.sun.com/JSP/Page"
- xmlns:c="http://java.sun.com/jsp/jstl/core" xmlns:cms="cms-taglib"
- xmlns:cmsu="cms-util-taglib"
- xmlns:fmt="http://java.sun.com/jsp/jstl/fmt"
- xmlns:fn="http://java.sun.com/jsp/jstl/functions"
- xmlns:media="http://net.sourceforge.openutils/mgnlMedia"
- xmlns:su="http://openutils.sf.net/openutils-stringutils">
+<jsp:root version="2.0" xmlns:jsp="http://java.sun.com/JSP/Page" xmlns:c="http://java.sun.com/jsp/jstl/core"
+ xmlns:cms="cms-taglib" xmlns:cmsu="cms-util-taglib" xmlns:fmt="http://java.sun.com/jsp/jstl/fmt" xmlns:fn="http://java.sun.com/jsp/jstl/functions"
+ xmlns:media="http://net.sourceforge.openutils/mgnlMedia" xmlns:su="http://openutils.sf.net/openutils-stringutils">
<jsp:directive.attribute name="id" required="false" rtexprvalue="true" />
- <jsp:directive.attribute name="item" required="true" rtexprvalue="true"
- type="java.lang.Object" />
- <jsp:directive.attribute name="width" required="false"
- rtexprvalue="true" type="java.lang.Integer" />
- <jsp:directive.attribute name="height" required="false"
- rtexprvalue="true" type="java.lang.Integer" />
+ <jsp:directive.attribute name="item" required="true" rtexprvalue="true" type="java.lang.Object" />
+ <jsp:directive.attribute name="width" required="false" rtexprvalue="true" type="java.lang.Integer" />
+ <jsp:directive.attribute name="height" required="false" rtexprvalue="true" type="java.lang.Integer" />
<jsp:directive.attribute name="alt" required="false" rtexprvalue="true" />
- <jsp:directive.attribute name="cssClass" required="false"
- rtexprvalue="true" />
- <jsp:directive.attribute name="style" required="false"
- rtexprvalue="true" />
- <jsp:directive.attribute name="resize" required="false"
- rtexprvalue="true" />
- <jsp:directive.attribute name="parameters" required="false"
- rtexprvalue="true" />
- <jsp:directive.attribute name="ignoreDim" required="false"
- rtexprvalue="true" type="java.lang.Boolean" />
- <jsp:directive.attribute name="autoPlay" required="false"
- rtexprvalue="true" type="java.lang.Boolean" />
- <jsp:directive.attribute name="loop" required="false"
- rtexprvalue="true" type="java.lang.Boolean" />
- <jsp:directive.attribute name="noPlayIcon" required="false"
- rtexprvalue="true" type="java.lang.Boolean" />
- <jsp:directive.attribute name="skin" required="false"
- rtexprvalue="true" />
+ <jsp:directive.attribute name="cssClass" required="false" rtexprvalue="true" />
+ <jsp:directive.attribute name="style" required="false" rtexprvalue="true" />
+ <jsp:directive.attribute name="resize" required="false" rtexprvalue="true" />
+ <jsp:directive.attribute name="parameters" required="false" rtexprvalue="true" />
+ <jsp:directive.attribute name="ignoreDim" required="false" rtexprvalue="true" type="java.lang.Boolean" />
+ <jsp:directive.attribute name="autoPlay" required="false" rtexprvalue="true" type="java.lang.Boolean" />
+ <jsp:directive.attribute name="loop" required="false" rtexprvalue="true" type="java.lang.Boolean" />
+ <jsp:directive.attribute name="noPlayIcon" required="false" rtexprvalue="true" type="java.lang.Boolean" />
+ <jsp:directive.attribute name="skin" required="false" rtexprvalue="true" />
<c:set value="${media:node(item)}" var="mediaNode" />
<c:set value="${10000000}" var="bigValue" />
<c:if test="${empty width }">
@@ -113,9 +97,9 @@
<c:if test="${!empty(url)}">
<c:set var="previewId" value="preview-${su:randomAlphanumeric(6)}" />
<div id="${previewId}" class="preview">
- <div id="no-player">
+ <div id="no-player">
+ </div>
</div>
- </div>
<c:if
test="${fn:endsWith(fn:toLowerCase(media:url(mediaNode)), 'flv') or fn:endsWith(fn:toLowerCase(media:url(mediaNode)), 'mp3')}">
<c:set var="flashvars">
@@ -151,8 +135,7 @@
});]]>
</script>
</c:if>
- <c:if
- test="${fn:endsWith(fn:toLowerCase(media:url(mediaNode)), 'swf')}">
+ <c:if test="${fn:endsWith(fn:toLowerCase(media:url(mediaNode)), 'swf')}">
<script type='text/javascript'>
<![CDATA[
window.addEvent('domready', function(){
@@ -179,21 +162,19 @@
<c:set var="flashvars">
<![CDATA[file=${media:url(mediaNode)}&controlbar=over]]>
<c:if test="${fn:indexOf(url, 'youtube') ge 0}">
- <c:set var="previewImage"
- value="${su:substringAfterLast(url, 'v=')}" />
+ <c:set var="previewImage" value="${su:substringAfterLast(url, 'v=')}" />
<![CDATA[&type=youtube&image=http://img.youtube.com/vi/${previewImage}/0.jpg]]>
</c:if>
</c:set>
- <c:set var="previewImage"
- value="${su:substringAfterLast(url, 'v=')}" />
+ <c:set var="previewImage" value="${su:substringAfterLast(url, 'v=')}" />
<c:if test="${!empty(url)}">
<c:set var="previewId" value="preview-${su:randomAlphanumeric(6)}" />
<div id="${previewId}" class="preview">
- <div id="no-player">
- <!--
+ <div id="no-player">
+ <!--
<ma:message key="media.noFlashPlayerDetected" /> -->
+ </div>
</div>
- </div>
<script type='text/javascript'>
<![CDATA[
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <luc...@us...> - 2009-09-09 10:39:24
|
Revision: 1458
http://openutils.svn.sourceforge.net/openutils/?rev=1458&view=rev
Author: lucaboati
Date: 2009-09-09 10:39:12 +0000 (Wed, 09 Sep 2009)
Log Message:
-----------
fix video/audio support with default values for w and h
Modified Paths:
--------------
trunk/openutils-mgnlmedia/src/main/resources/META-INF/tags/media.tag
Modified: trunk/openutils-mgnlmedia/src/main/resources/META-INF/tags/media.tag
===================================================================
--- trunk/openutils-mgnlmedia/src/main/resources/META-INF/tags/media.tag 2009-09-09 10:38:45 UTC (rev 1457)
+++ trunk/openutils-mgnlmedia/src/main/resources/META-INF/tags/media.tag 2009-09-09 10:39:12 UTC (rev 1458)
@@ -1,36 +1,58 @@
-<jsp:root version="2.0" xmlns:jsp="http://java.sun.com/JSP/Page" xmlns:c="http://java.sun.com/jsp/jstl/core"
- xmlns:cms="cms-taglib" xmlns:cmsu="cms-util-taglib" xmlns:fmt="http://java.sun.com/jsp/jstl/fmt" xmlns:fn="http://java.sun.com/jsp/jstl/functions"
- xmlns:media="http://net.sourceforge.openutils/mgnlMedia" xmlns:su="http://openutils.sf.net/openutils-stringutils">
+<jsp:root version="2.0" xmlns:jsp="http://java.sun.com/JSP/Page"
+ xmlns:c="http://java.sun.com/jsp/jstl/core" xmlns:cms="cms-taglib"
+ xmlns:cmsu="cms-util-taglib"
+ xmlns:fmt="http://java.sun.com/jsp/jstl/fmt"
+ xmlns:fn="http://java.sun.com/jsp/jstl/functions"
+ xmlns:media="http://net.sourceforge.openutils/mgnlMedia"
+ xmlns:su="http://openutils.sf.net/openutils-stringutils">
<jsp:directive.attribute name="id" required="false" rtexprvalue="true" />
- <jsp:directive.attribute name="item" required="true" rtexprvalue="true" type="java.lang.Object" />
- <jsp:directive.attribute name="width" required="false" rtexprvalue="true" type="java.lang.Integer" />
- <jsp:directive.attribute name="height" required="false" rtexprvalue="true" type="java.lang.Integer" />
+ <jsp:directive.attribute name="item" required="true" rtexprvalue="true"
+ type="java.lang.Object" />
+ <jsp:directive.attribute name="width" required="false"
+ rtexprvalue="true" type="java.lang.Integer" />
+ <jsp:directive.attribute name="height" required="false"
+ rtexprvalue="true" type="java.lang.Integer" />
<jsp:directive.attribute name="alt" required="false" rtexprvalue="true" />
- <jsp:directive.attribute name="cssClass" required="false" rtexprvalue="true" />
- <jsp:directive.attribute name="style" required="false" rtexprvalue="true" />
- <jsp:directive.attribute name="resize" required="false" rtexprvalue="true" />
- <jsp:directive.attribute name="parameters" required="false" rtexprvalue="true" />
- <jsp:directive.attribute name="ignoreDim" required="false" rtexprvalue="true" type="java.lang.Boolean" />
- <jsp:directive.attribute name="autoPlay" required="false" rtexprvalue="true" type="java.lang.Boolean" />
- <jsp:directive.attribute name="loop" required="false" rtexprvalue="true" type="java.lang.Boolean" />
- <jsp:directive.attribute name="noPlayIcon" required="false" rtexprvalue="true" type="java.lang.Boolean" />
- <jsp:directive.attribute name="skin" required="false" rtexprvalue="true" />
+ <jsp:directive.attribute name="cssClass" required="false"
+ rtexprvalue="true" />
+ <jsp:directive.attribute name="style" required="false"
+ rtexprvalue="true" />
+ <jsp:directive.attribute name="resize" required="false"
+ rtexprvalue="true" />
+ <jsp:directive.attribute name="parameters" required="false"
+ rtexprvalue="true" />
+ <jsp:directive.attribute name="ignoreDim" required="false"
+ rtexprvalue="true" type="java.lang.Boolean" />
+ <jsp:directive.attribute name="autoPlay" required="false"
+ rtexprvalue="true" type="java.lang.Boolean" />
+ <jsp:directive.attribute name="loop" required="false"
+ rtexprvalue="true" type="java.lang.Boolean" />
+ <jsp:directive.attribute name="noPlayIcon" required="false"
+ rtexprvalue="true" type="java.lang.Boolean" />
+ <jsp:directive.attribute name="skin" required="false"
+ rtexprvalue="true" />
<c:set value="${media:node(item)}" var="mediaNode" />
<c:set value="${10000000}" var="bigValue" />
+ <c:if test="${empty width }">
+ <c:set var="width" value="${0 }" />
+ </c:if>
+ <c:if test="${empty height }">
+ <c:set var="height" value="${0 }" />
+ </c:if>
<c:choose>
<c:when test="${!empty mediaNode}">
<cms:setNode var="media" content="${mediaNode}" />
<c:choose>
<c:when test="${media.type eq 'image' or media.type eq 'wallpaper'}">
<c:choose>
- <c:when test="${empty width and empty height}">
+ <c:when test="${width eq 0 and height eq 0}">
<c:set var="url" value="${media:url(mediaNode)}" />
</c:when>
<c:otherwise>
- <c:if test="${empty width}">
+ <c:if test="${width eq 0}">
<c:set var="width" value="${bigValue}" />
</c:if>
- <c:if test="${empty height}">
+ <c:if test="${height eq 0}">
<c:set var="height" value="${bigValue}" />
</c:if>
<c:set var="controlChar" value="" />
@@ -58,11 +80,11 @@
<![CDATA[ id="${id}"]]>
</c:if>
<c:if test="${not ignoreDim}">
- <c:if test="${not empty width">
- <![CDATA[ width="${width}"]]>
+ <c:if test="${ width gt 0}">
+ <![CDATA[ width="${width}"]]>
</c:if>
- <c:if test="${not empty height">
- <![CDATA[ height="${height}"]]>
+ <c:if test="${ height gt 0}">
+ <![CDATA[ height="${height}"]]>
</c:if>
</c:if>
<c:if test="${not empty cssClass}">
@@ -74,17 +96,30 @@
<![CDATA[ />]]>
</c:if>
</c:when>
- <c:when test="${media.type eq 'video'}">
+ <c:when test="${media.type eq 'video' or media.type eq 'audio' }">
<c:set var="url" value="${media:url(mediaNode)}" />
+ <c:if test="${width eq 0 }">
+ <c:set var="width" value="320" />
+ </c:if>
+ <c:if test="${height eq 0}">
+ <c:set var="height" value="${media.type eq 'video' ? 240 : 20}" />
+ </c:if>
+ <c:set var="controlBar" value="" />
+ <c:if test="${media.type eq 'video' }">
+ <c:set var="controlBar">
+ <![CDATA[&controlbar=over"]]>
+ </c:set>
+ </c:if>
<c:if test="${!empty(url)}">
<c:set var="previewId" value="preview-${su:randomAlphanumeric(6)}" />
<div id="${previewId}" class="preview">
- <div id="no-player">
- </div>
+ <div id="no-player">
</div>
- <c:if test="${fn:endsWith(fn:toLowerCase(media:url(mediaNode)), 'flv')}">
+ </div>
+ <c:if
+ test="${fn:endsWith(fn:toLowerCase(media:url(mediaNode)), 'flv') or fn:endsWith(fn:toLowerCase(media:url(mediaNode)), 'mp3')}">
<c:set var="flashvars">
- <![CDATA[file=${pageContext.request.contextPath}${media:url(mediaNode)}&controlbar=over]]>
+ <![CDATA[file=${pageContext.request.contextPath}${media:url(mediaNode)}${controlBar}]]>
<c:if test="${autoPlay}">
<![CDATA[&autostart=true]]>
</c:if>
@@ -116,7 +151,8 @@
});]]>
</script>
</c:if>
- <c:if test="${fn:endsWith(fn:toLowerCase(media:url(mediaNode)), 'swf')}">
+ <c:if
+ test="${fn:endsWith(fn:toLowerCase(media:url(mediaNode)), 'swf')}">
<script type='text/javascript'>
<![CDATA[
window.addEvent('domready', function(){
@@ -134,22 +170,30 @@
</c:when>
<c:when test="${media.type eq 'youtube'}">
<c:set var="url" value="${media:url(mediaNode)}" />
+ <c:if test="${width eq 0 }">
+ <c:set var="width" value="320" />
+ </c:if>
+ <c:if test="${height eq 0}">
+ <c:set var="height" value="240" />
+ </c:if>
<c:set var="flashvars">
<![CDATA[file=${media:url(mediaNode)}&controlbar=over]]>
<c:if test="${fn:indexOf(url, 'youtube') ge 0}">
- <c:set var="previewImage" value="${su:substringAfterLast(url, 'v=')}" />
- <![CDATA[&type=youtube&image=http://img.youtube.com/vi/${previewImage}/0.jpg]]>
+ <c:set var="previewImage"
+ value="${su:substringAfterLast(url, 'v=')}" />
+ <![CDATA[&type=youtube&image=http://img.youtube.com/vi/${previewImage}/0.jpg]]>
</c:if>
</c:set>
- <c:set var="previewImage" value="${su:substringAfterLast(url, 'v=')}" />
+ <c:set var="previewImage"
+ value="${su:substringAfterLast(url, 'v=')}" />
<c:if test="${!empty(url)}">
<c:set var="previewId" value="preview-${su:randomAlphanumeric(6)}" />
<div id="${previewId}" class="preview">
- <div id="no-player">
- <!--
+ <div id="no-player">
+ <!--
<ma:message key="media.noFlashPlayerDetected" /> -->
- </div>
</div>
+ </div>
<script type='text/javascript'>
<![CDATA[
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <luc...@us...> - 2009-09-09 10:39:01
|
Revision: 1457
http://openutils.svn.sourceforge.net/openutils/?rev=1457&view=rev
Author: lucaboati
Date: 2009-09-09 10:38:45 +0000 (Wed, 09 Sep 2009)
Log Message:
-----------
fix nullpointer when editing and not modify files
Modified Paths:
--------------
trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/dialog/DialogFileNoPreview.java
Modified: trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/dialog/DialogFileNoPreview.java
===================================================================
--- trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/dialog/DialogFileNoPreview.java 2009-09-09 09:33:48 UTC (rev 1456)
+++ trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/dialog/DialogFileNoPreview.java 2009-09-09 10:38:45 UTC (rev 1457)
@@ -40,9 +40,8 @@
/**
- * Overrides DialogFile and force no preview but the download link.<br/>
- * Renders the list of valid file extensions (specified by "extensions" property) and validates uploaded file against
- * it.
+ * Overrides DialogFile and force no preview but the download link.<br/> Renders the list of valid file extensions
+ * (specified by "extensions" property) and validates uploaded file against it.
* @author molaschi
* @version $Id: $
*/
@@ -99,21 +98,24 @@
if (form != null)
{
Document doc = form.getDocument(getName());
- String extensions = this.getConfigValue("extensions");
- if (StringUtils.isNotBlank(extensions))
+ if (doc != null)
{
- String[] allowedExtensions = StringUtils.split(extensions, ',');
- for (String allowedExtension : allowedExtensions)
+ String extensions = this.getConfigValue("extensions");
+ if (StringUtils.isNotBlank(extensions))
{
- if (StringUtils.trimToEmpty(allowedExtension).equals(doc.getExtension()))
+ String[] allowedExtensions = StringUtils.split(extensions, ',');
+ for (String allowedExtension : allowedExtensions)
{
- return true;
+ if (StringUtils.trimToEmpty(allowedExtension).equals(doc.getExtension()))
+ {
+ return true;
+ }
+
}
+ setValidationMessage(getMessage("dialog.filenopreview.error.extension"));
+ return false;
}
-
- setValidationMessage(getMessage("dialog.filenopreview.error.extension"));
- return false;
}
// String extensions = doc.getExtension();
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <mol...@us...> - 2009-09-09 09:33:57
|
Revision: 1456
http://openutils.svn.sourceforge.net/openutils/?rev=1456&view=rev
Author: molaschi
Date: 2009-09-09 09:33:48 +0000 (Wed, 09 Sep 2009)
Log Message:
-----------
add support for remote flvs
Modified Paths:
--------------
trunk/openutils-mgnlmedia/src/main/resources/META-INF/tags/media.tag
Modified: trunk/openutils-mgnlmedia/src/main/resources/META-INF/tags/media.tag
===================================================================
--- trunk/openutils-mgnlmedia/src/main/resources/META-INF/tags/media.tag 2009-09-09 09:32:19 UTC (rev 1455)
+++ trunk/openutils-mgnlmedia/src/main/resources/META-INF/tags/media.tag 2009-09-09 09:33:48 UTC (rev 1456)
@@ -134,6 +134,13 @@
</c:when>
<c:when test="${media.type eq 'youtube'}">
<c:set var="url" value="${media:url(mediaNode)}" />
+ <c:set var="flashvars">
+ <![CDATA[file=${media:url(mediaNode)}&controlbar=over]]>
+ <c:if test="${fn:indexOf(url, 'youtube') ge 0}">
+ <c:set var="previewImage" value="${su:substringAfterLast(url, 'v=')}" />
+ <![CDATA[&type=youtube&image=http://img.youtube.com/vi/${previewImage}/0.jpg]]>
+ </c:if>
+ </c:set>
<c:set var="previewImage" value="${su:substringAfterLast(url, 'v=')}" />
<c:if test="${!empty(url)}">
<c:set var="previewId" value="preview-${su:randomAlphanumeric(6)}" />
@@ -151,7 +158,7 @@
swfobject.addParam('allowfullscreen','true');
swfobject.addParam('allowscriptaccess','always');
swfobject.addParam('wmode','opaque');
- swfobject.addParam('flashvars','file=${media:url(mediaNode)}&controlbar=over&type=youtube&image=http://img.youtube.com/vi/${previewImage}/0.jpg');
+ swfobject.addParam('flashvars','${flashvars}');
var version = deconcept.SWFObjectUtil.getPlayerVersion();
if (version["major"] == 0 || version["major"] < 9) {
$('no-player').setStyle('display','block');
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <mol...@us...> - 2009-09-09 09:32:26
|
Revision: 1455
http://openutils.svn.sourceforge.net/openutils/?rev=1455&view=rev
Author: molaschi
Date: 2009-09-09 09:32:19 +0000 (Wed, 09 Sep 2009)
Log Message:
-----------
fix i18n
Modified Paths:
--------------
trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/dialog/DialogSelectMedia.java
Modified: trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/dialog/DialogSelectMedia.java
===================================================================
--- trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/dialog/DialogSelectMedia.java 2009-09-09 09:18:39 UTC (rev 1454)
+++ trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/dialog/DialogSelectMedia.java 2009-09-09 09:32:19 UTC (rev 1455)
@@ -219,7 +219,7 @@
@Override
protected Messages getMessages()
{
- return MessagesUtil.chain("net.sourceforge.openutils.mgnlmedia.media.lang", super.getMessages());
+ return MessagesUtil.chain("net.sourceforge.openutils.mgnlmedia.media.lang.messages", super.getMessages());
}
/**
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <mol...@us...> - 2009-09-09 09:18:49
|
Revision: 1454
http://openutils.svn.sourceforge.net/openutils/?rev=1454&view=rev
Author: molaschi
Date: 2009-09-09 09:18:39 +0000 (Wed, 09 Sep 2009)
Log Message:
-----------
[maven-release-plugin] prepare for next development iteration
Modified Paths:
--------------
trunk/openutils-mgnlmedia/pom.xml
Modified: trunk/openutils-mgnlmedia/pom.xml
===================================================================
--- trunk/openutils-mgnlmedia/pom.xml 2009-09-09 09:18:30 UTC (rev 1453)
+++ trunk/openutils-mgnlmedia/pom.xml 2009-09-09 09:18:39 UTC (rev 1454)
@@ -10,7 +10,7 @@
<name>Magnolia SimpleMedia Module</name>
<description>Magnolia SimpleMedia Module: a module for Magnolia CMS for easier management of images and videos with
several features.</description>
- <version>4.0-b8</version>
+ <version>4.0-b9-SNAPSHOT</version>
<inceptionYear>2008</inceptionYear>
<licenses>
<license>
@@ -151,10 +151,4 @@
</exclusions>
</dependency>
</dependencies>
-
- <scm>
- <connection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/tags/openutils-mgnlmedia-4.0-b8</connection>
- <developerConnection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/tags/openutils-mgnlmedia-4.0-b8</developerConnection>
- <url>http://openutils.svn.sourceforge.net/viewcvs.cgi/openutils/tags/openutils-mgnlmedia-4.0-b8</url>
- </scm>
</project>
\ 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: <mol...@us...> - 2009-09-09 09:18:38
|
Revision: 1453
http://openutils.svn.sourceforge.net/openutils/?rev=1453&view=rev
Author: molaschi
Date: 2009-09-09 09:18:30 +0000 (Wed, 09 Sep 2009)
Log Message:
-----------
[maven-release-plugin] copy for tag openutils-mgnlmedia-4.0-b8
Added Paths:
-----------
tags/openutils-mgnlmedia-4.0-b8/
Property changes on: tags/openutils-mgnlmedia-4.0-b8
___________________________________________________________________
Added: svn:ignore
+ .settings
.checkstyle
.classpath
.project
target
test-output
temp-testng-customsuite.xml
Added: svnmerge-integrated
+ /branches/openutils-mgnlmedia-3.6.x:1-982,1004
Added: svn:mergeinfo
+ /branches/openutils-mgnlmedia-3.6.x:1004
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
