[Openutils-svn] SF.net SVN: openutils:[1789] trunk/openutils-mgnlmedia/src/main

[<die...@us...>]

Revision: 1789
          http://openutils.svn.sourceforge.net/openutils/?rev=1789&view=rev
Author:   diego_schivo
Date:     2010-02-03 11:05:58 +0000 (Wed, 03 Feb 2010)

Log Message:
-----------
MEDIA-59 add a media-module config parameter for the default player (the one to use when <media>'s "player" attribute is unspecified) 

Modified Paths:
--------------
    trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/lifecycle/MediaModule.java
    trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/tags/el/MediaEl.java
    trunk/openutils-mgnlmedia/src/main/resources/META-INF/media.tld
    trunk/openutils-mgnlmedia/src/main/resources/META-INF/tags/media/media.tag

Modified: trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/lifecycle/MediaModule.java
===================================================================
--- trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/lifecycle/MediaModule.java	2010-02-03 10:33:14 UTC (rev 1788)
+++ trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/lifecycle/MediaModule.java	2010-02-03 11:05:58 UTC (rev 1789)
@@ -44,6 +44,8 @@
 
     private boolean singleinstance;
 
+    private String player = "player.swf";
+
     private static MediaModule instance;
 
     private String version;
@@ -124,6 +126,16 @@
         this.singleinstance = singleinstance;
     }
 
+    public String getPlayer()
+    {
+        return player;
+    }
+
+    public void setPlayer(String player)
+    {
+        this.player = player;
+    }
+
     /**
      * Returns the version.
      * @return the version

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	2010-02-03 10:33:14 UTC (rev 1788)
+++ trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/tags/el/MediaEl.java	2010-02-03 11:05:58 UTC (rev 1789)
@@ -71,6 +71,15 @@
     }
 
     /**
+     * Get the media module instance
+     * @return media module instance
+     */
+    public static MediaModule getModule()
+    {
+        return MediaModule.getInstance();
+    }
+
+    /**
      * Get content node for media
      * @param obj content node or node UUID
      * @return content node

Modified: trunk/openutils-mgnlmedia/src/main/resources/META-INF/media.tld
===================================================================
--- trunk/openutils-mgnlmedia/src/main/resources/META-INF/media.tld	2010-02-03 10:33:14 UTC (rev 1788)
+++ trunk/openutils-mgnlmedia/src/main/resources/META-INF/media.tld	2010-02-03 11:05:58 UTC (rev 1789)
@@ -38,6 +38,18 @@
     </example>
   </tag-file>
   <function>
+    <name>module</name>
+    <description>Get the media module instance.</description>
+    <function-class>net.sourceforge.openutils.mgnlmedia.media.tags.el.MediaEl</function-class>
+    <function-signature>net.sourceforge.openutils.mgnlmedia.media.lifecycle.MediaModule getModule()</function-signature>
+    <display-name>Function module</display-name>
+    <example>
+      <![CDATA[
+      <c:set var="player" value="${media:module().player}" />
+      ]]>
+    </example>
+  </function>
+  <function>
     <name>node</name>
     <description>Load a node from the media repository, given the UUID of the media node.</description>
     <function-class>net.sourceforge.openutils.mgnlmedia.media.tags.el.MediaEl</function-class>

Modified: trunk/openutils-mgnlmedia/src/main/resources/META-INF/tags/media/media.tag
===================================================================
--- trunk/openutils-mgnlmedia/src/main/resources/META-INF/tags/media/media.tag	2010-02-03 10:33:14 UTC (rev 1788)
+++ trunk/openutils-mgnlmedia/src/main/resources/META-INF/tags/media/media.tag	2010-02-03 11:05:58 UTC (rev 1789)
@@ -39,7 +39,7 @@
     <c:set var="emRatio" value="${1.0 }" />
   </c:if>
   <c:if test="${empty player}">
-    <c:set var="player" value="player.swf" />
+    <c:set var="player" value="${media:module().player}" />
   </c:if>
   <c:set value="${media:node(item)}" var="mediaNode" />
   <c:choose>


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.