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

SourceForge Headquarters 225 Broadway Suite 1600 San Diego, CA 92101 +1 (858) 422-6466

Revision: 3545
          http://openutils.svn.sourceforge.net/openutils/?rev=3545&view=rev
Author:   fgiust
Date:     2011-06-20 14:04:24 +0000 (Mon, 20 Jun 2011)

Log Message:
-----------
MEDIA-236 Better freemarker support (also without STK/ETK renderers)

Modified Paths:
--------------
    trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/freemarker/SktSimpleMediaParagraphRenderer.java
    trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/freemarker/SktSimpleMediaTemplateRenderer.java
    trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/setup/MediaModuleVersionHandler.java
    trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/tags/el/MediaEl.java

Added Paths:
-----------
    trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap/media-nooverwrite/config.server.rendering.freemarker.sharedVariables.media.xml

Modified: trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/freemarker/SktSimpleMediaParagraphRenderer.java
===================================================================

--- trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/freemarker/SktSimpleMediaParagraphRenderer.java	2011-06-20 12:22:45 UTC (rev 3544)
+++ trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/freemarker/SktSimpleMediaParagraphRenderer.java	2011-06-20 14:04:24 UTC (rev 3545)
@@ -33,10 +33,11 @@
 
 
 /**
- * Paragraph renderer that wraps support functions
+ * deprecated after http://jira.openmindlab.com/browse/MEDIA-236
  * @author Ernst Bunders
  * @author fgiust
  */
+@Deprecated
 public class SktSimpleMediaParagraphRenderer extends STKParagraphRenderer
 {
 

Modified: trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/freemarker/SktSimpleMediaTemplateRenderer.java
===================================================================
--- trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/freemarker/SktSimpleMediaTemplateRenderer.java	2011-06-20 12:22:45 UTC (rev 3544)
+++ trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/freemarker/SktSimpleMediaTemplateRenderer.java	2011-06-20 14:04:24 UTC (rev 3545)
@@ -33,10 +33,11 @@
 
 
 /**
- * Template renderer that wraps support functions
+ * deprecated after http://jira.openmindlab.com/browse/MEDIA-236
  * @author Ernst Bunders
  * @author fgiust
  */
+@Deprecated
 public class SktSimpleMediaTemplateRenderer extends STKTemplateRenderer
 {
 

Modified: trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/setup/MediaModuleVersionHandler.java
===================================================================
--- trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/setup/MediaModuleVersionHandler.java	2011-06-20 12:22:45 UTC (rev 3544)
+++ trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/setup/MediaModuleVersionHandler.java	2011-06-20 14:04:24 UTC (rev 3545)
@@ -222,7 +222,7 @@
             "flv,swf",
             "flv,swf,mp4,m4v"));
 
-        // install stk support
+        // REVERT old stk support for magnolia < 4.3
         if (isModuleInstalled("standard-templating-kit"))
         {
             tasks.add(new BootstrapMissingNodesTask("media-stk"));
@@ -232,16 +232,16 @@
                 ContentRepository.CONFIG,
                 "/modules/standard-templating-kit/template-renderers/stk",
                 "renderer",
-                "info.magnolia.module.templatingkit.renderers.STKTemplateRenderer",
-                "net.sourceforge.openutils.mgnlmedia.freemarker.SktSimpleMediaTemplateRenderer"));
+                "net.sourceforge.openutils.mgnlmedia.freemarker.SktSimpleMediaTemplateRenderer",
+                "info.magnolia.module.templatingkit.renderers.STKTemplateRenderer"));
 
             // extended paragraph renderer
             tasks.add(new ChangeExistingPropertyTask(
                 ContentRepository.CONFIG,
                 "/modules/standard-templating-kit/paragraph-renderers/stk",
                 "class",
-                "info.magnolia.module.templatingkit.renderers.STKParagraphRenderer",
-                "net.sourceforge.openutils.mgnlmedia.freemarker.SktSimpleMediaParagraphRenderer"));
+                "net.sourceforge.openutils.mgnlmedia.freemarker.SktSimpleMediaParagraphRenderer",
+                "info.magnolia.module.templatingkit.renderers.STKParagraphRenderer"));
         }
 
         // install etk support

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	2011-06-20 12:22:45 UTC (rev 3544)
+++ trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/tags/el/MediaEl.java	2011-06-20 14:04:24 UTC (rev 3545)
@@ -82,7 +82,10 @@
 
     private static final String[] EMPTY_STRING_ARRAY = new String[]{};
 
-    private MediaEl()
+    /**
+     * Public constructor. Needed for freemarker support
+     */
+    public MediaEl()
     {
 
     }

Added: trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap/media-nooverwrite/config.server.rendering.freemarker.sharedVariables.media.xml
===================================================================
--- trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap/media-nooverwrite/config.server.rendering.freemarker.sharedVariables.media.xml	                        (rev 0)
+++ trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap/media-nooverwrite/config.server.rendering.freemarker.sharedVariables.media.xml	2011-06-20 14:04:24 UTC (rev 3545)
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<sv:node sv:name="media" xmlns:sv="http://www.jcp.org/jcr/sv/1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <sv:property sv:name="jcr:primaryType" sv:type="Name">
+    <sv:value>mgnl:contentNode</sv:value>
+  </sv:property>
+  <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
+    <sv:value>mix:lockable</sv:value>
+  </sv:property>
+  <sv:property sv:name="jcr:uuid" sv:type="String">
+    <sv:value>3d601ae5-229d-46ff-8b0f-aafd88af65f3</sv:value>
+  </sv:property>
+  <sv:property sv:name="class" sv:type="String">
+    <sv:value>net.sourceforge.openutils.mgnlmedia.media.tags.el.MediaEl</sv:value>
+  </sv:property>
+  <sv:property sv:name="jcr:createdBy" sv:type="String">
+    <sv:value>admin</sv:value>
+  </sv:property>
+  <sv:node sv:name="MetaData">
+    <sv:property sv:name="jcr:primaryType" sv:type="Name">
+      <sv:value>mgnl:metaData</sv:value>
+    </sv:property>
+    <sv:property sv:name="jcr:createdBy" sv:type="String">
+      <sv:value>admin</sv:value>
+    </sv:property>
+    <sv:property sv:name="mgnl: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>2011-06-19T22:47:12.877+02:00</sv:value>
+    </sv:property>
+    <sv:property sv:name="mgnl:lastmodified" sv:type="Date">
+      <sv:value>2011-06-19T23:18:59.835+02:00</sv:value>
+    </sv:property>
+  </sv:node>
+</sv:node>


Property changes on: trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap/media-nooverwrite/config.server.rendering.freemarker.sharedVariables.media.xml
___________________________________________________________________
Added: svn:mime-type
   + text/xml
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.


