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

[<fg...@us...>]

Revision: 2662
          http://openutils.svn.sourceforge.net/openutils/?rev=2662&view=rev
Author:   fgiust
Date:     2010-06-17 19:03:03 +0000 (Thu, 17 Jun 2010)

Log Message:
-----------
MEDIA-142 also support xml extension for xspf

Modified Paths:
--------------
    trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/playlist/pages/PlaylistView.java

Added Paths:
-----------
    trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap/media-nooverwrite/config.modules.media.virtualURIMapping.media-playlist-xspf.xml

Removed Paths:
-------------
    trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap/media/config.modules.media.virtualURIMapping.xspfPlaylists.xml

Modified: trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/playlist/pages/PlaylistView.java
===================================================================
--- trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/playlist/pages/PlaylistView.java	2010-06-17 18:17:29 UTC (rev 2661)
+++ trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/playlist/pages/PlaylistView.java	2010-06-17 19:03:03 UTC (rev 2662)
@@ -1,4 +1,3 @@
-// MEDIA-142 da portare su media
 /**
  *
  * Magnolia SimpleMedia Module (http://www.openmindlab.com/lab/products/media.html)
@@ -40,7 +39,6 @@
 import net.sourceforge.openutils.mgnlmedia.media.configuration.MediaTypeConfiguration;
 import net.sourceforge.openutils.mgnlmedia.media.lifecycle.MediaModule;
 import net.sourceforge.openutils.mgnlmedia.media.pages.MediaBean;
-import net.sourceforge.openutils.mgnlmedia.media.pages.MediaBeanBuilder;
 import net.sourceforge.openutils.mgnlmedia.media.pages.MessagesTemplatedMVCHandler;
 import net.sourceforge.openutils.mgnlmedia.media.tags.el.MediaEl;
 import net.sourceforge.openutils.mgnlmedia.playlist.PlaylistConstants;
@@ -79,6 +77,8 @@
 
     private String locale;
 
+    private boolean xml;
+
     private List<Content> mediaContentList;
 
     private List<MediaBean> mediaBeans;
@@ -301,26 +301,16 @@
                 locale = Locale.getDefault().toString();
             }
 
-            this.response.setContentType("application/xspf+xml");
-        }
-        return VIEW_XSPF;
-    }
-
-    public String mediaFolder()
-    {
-        Content folder = ContentUtil.getContent(MediaModule.REPO, path);
-        if (folder != null)
-        {
-            Collection<Content> nodes = folder.getChildren(MediaConfigurationManager.MEDIA);
-            mediaBeans = new ArrayList<MediaBean>(nodes.size());
-            for (Content node : nodes)
+            if (xml)
             {
-                MediaTypeConfiguration mtc = MediaConfigurationManager.getInstance().getMediaTypeConfigurationFromMedia(node);
-                MediaBean bean = new MediaBeanBuilder(mtc).apply(node);
-                mediaBeans.add(bean);
+                this.response.setContentType("text/xml");
             }
+            else
+            {
+                this.response.setContentType("application/xspf+xml");
+            }
         }
-        return "-mediaFolder";
+        return VIEW_XSPF;
     }
 
     /**
@@ -367,4 +357,14 @@
     {
         return mediaBeans;
     }
+
+    /**
+     * Sets the xml.
+     * @param xml the xml to set
+     */
+    public void setXml(boolean xml)
+    {
+        this.xml = xml;
+    }
+
 }

Deleted: trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap/media/config.modules.media.virtualURIMapping.xspfPlaylists.xml
===================================================================
--- trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap/media/config.modules.media.virtualURIMapping.xspfPlaylists.xml	2010-06-17 18:17:29 UTC (rev 2661)
+++ trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap/media/config.modules.media.virtualURIMapping.xspfPlaylists.xml	2010-06-17 19:03:03 UTC (rev 2662)
@@ -1,44 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<sv:node sv:name="xspfPlaylists" xmlns:sv="http://www.jcp.org/jcr/sv/1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-  <sv:property sv:name="jcr:primaryType" sv:type="Name">
-    <sv:value>mgnl:contentNode</sv:value>
-  </sv:property>
-  <sv:property sv:name="jcr:uuid" sv:type="String">
-    <sv:value>2176aa80-0366-4ef0-be9a-9fa70de3be9c</sv:value>
-  </sv:property>
-  <sv:property sv:name="class" sv:type="String">
-    <sv:value>info.magnolia.cms.beans.config.RegexpVirtualURIMapping</sv:value>
-  </sv:property>
-  <sv:property sv:name="fromURI" sv:type="String">
-    <sv:value>/playlists/(.*)\.xspf</sv:value>
-  </sv:property>
-  <sv:property sv:name="jcr:createdBy" sv:type="String">
-    <sv:value>admin</sv:value>
-  </sv:property>
-  <sv:property sv:name="toURI" sv:type="String">
-    <sv:value>forward:/.magnolia/pages/playlistView.html?command=xspf&amp;path=/$1</sv:value>
-  </sv:property>
-  <sv:node sv:name="MetaData">
-    <sv:property sv:name="jcr:primaryType" sv:type="Name">
-      <sv:value>mgnl:metaData</sv:value>
-    </sv:property>
-    <sv:property sv:name="jcr:createdBy" sv:type="String">
-      <sv:value>admin</sv:value>
-    </sv:property>
-    <sv:property sv:name="mgnl:Data" sv:type="String">
-      <sv:value>MetaData</sv:value>
-    </sv:property>
-    <sv:property sv:name="mgnl:activated" sv:type="Boolean">
-      <sv:value>false</sv:value>
-    </sv:property>
-    <sv:property sv:name="mgnl:authorid" sv:type="String">
-      <sv:value>superuser</sv:value>
-    </sv:property>
-    <sv:property sv:name="mgnl:creationdate" sv:type="String">
-      <sv:value>2004-11-02T15:34:20.479+01:00</sv:value>
-    </sv:property>
-    <sv:property sv:name="mgnl:lastmodified" sv:type="Date">
-      <sv:value>2010-05-25T10:12:35.453+02:00</sv:value>
-    </sv:property>
-  </sv:node>
-</sv:node>

Added: trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap/media-nooverwrite/config.modules.media.virtualURIMapping.media-playlist-xspf.xml
===================================================================
--- trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap/media-nooverwrite/config.modules.media.virtualURIMapping.media-playlist-xspf.xml	                        (rev 0)
+++ trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap/media-nooverwrite/config.modules.media.virtualURIMapping.media-playlist-xspf.xml	2010-06-17 19:03:03 UTC (rev 2662)
@@ -0,0 +1,44 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<sv:node sv:name="media-playlist-xspf" xmlns:sv="http://www.jcp.org/jcr/sv/1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <sv:property sv:name="jcr:primaryType" sv:type="Name">
+    <sv:value>mgnl:contentNode</sv:value>
+  </sv:property>
+  <sv:property sv:name="jcr:uuid" sv:type="String">
+    <sv:value>932b7814-dfef-468c-8473-566f4163f4d5</sv:value>
+  </sv:property>
+  <sv:property sv:name="class" sv:type="String">
+    <sv:value>info.magnolia.cms.beans.config.RegexpVirtualURIMapping</sv:value>
+  </sv:property>
+  <sv:property sv:name="fromURI" sv:type="String">
+    <sv:value>/playlists/(.*)\.(xspf|xml)</sv:value>
+  </sv:property>
+  <sv:property sv:name="jcr:createdBy" sv:type="String">
+    <sv:value>admin</sv:value>
+  </sv:property>
+  <sv:property sv:name="toURI" sv:type="String">
+    <sv:value>forward:/.magnolia/pages/playlistView.html?command=xspf&amp;$2=true&amp;path=/$1</sv:value>
+  </sv:property>
+  <sv:node sv:name="MetaData">
+    <sv:property sv:name="jcr:primaryType" sv:type="Name">
+      <sv:value>mgnl:metaData</sv:value>
+    </sv:property>
+    <sv:property sv:name="jcr:createdBy" sv:type="String">
+      <sv:value>admin</sv:value>
+    </sv:property>
+    <sv:property sv:name="mgnl:Data" sv:type="String">
+      <sv:value>MetaData</sv:value>
+    </sv:property>
+    <sv:property sv:name="mgnl:activated" sv:type="Boolean">
+      <sv:value>false</sv:value>
+    </sv:property>
+    <sv:property sv:name="mgnl:authorid" sv:type="String">
+      <sv:value>superuser</sv:value>
+    </sv:property>
+    <sv:property sv:name="mgnl:creationdate" sv:type="String">
+      <sv:value>2004-11-02T15:34:20.479+01:00</sv:value>
+    </sv:property>
+    <sv:property sv:name="mgnl:lastmodified" sv:type="Date">
+      <sv:value>2010-06-12T20:13:17.989+02:00</sv:value>
+    </sv:property>
+  </sv:node>
+</sv:node>


Property changes on: trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap/media-nooverwrite/config.modules.media.virtualURIMapping.media-playlist-xspf.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.