openutils-svn Mailing List for openutils (Page 64)

Brought to you by: fcarone, fgiust, molaschi

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

Flat | Threaded

<< < 1 .. 62 63 64 65 66 .. 227 > >> (Page 64 of 227)

[Openutils-svn] SF.net SVN: openutils:[3340] trunk/openutils-mgnlmedia/src/main/resources/ net/sourceforge/openutils/mgnlmedia/playlist/pages/PlaylistView.html

From: <die...@us...> - 2011-02-16 17:18:48

Revision: 3340
          http://openutils.svn.sourceforge.net/openutils/?rev=3340&view=rev
Author:   diego_schivo
Date:     2011-02-16 17:18:42 +0000 (Wed, 16 Feb 2011)

Log Message:
-----------
MEDIA-218 fix js error

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

Modified: trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/playlist/pages/PlaylistView.html
===================================================================
--- trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/playlist/pages/PlaylistView.html	2011-02-16 17:17:21 UTC (rev 3339)
+++ trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/playlist/pages/PlaylistView.html	2011-02-16 17:18:42 UTC (rev 3340)
@@ -291,7 +291,8 @@
     });
   });
   grid.getSelectionModel().on('selectionchange', function(sm){
-    Ext.getCmp('removeEntryBtn').setDisabled(sm.getCount() < 1);
+    var removeEntryBtn = Ext.getCmp('removeEntryBtn');
+    if (removeEntryBtn) removeEntryBtn.setDisabled(sm.getCount() < 1);
     Ext.getCmp('editMediaBtn').setDisabled(sm.getCount() < 1);
   });
 


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

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

From: <die...@us...> - 2011-02-16 17:17:27

Revision: 3339
          http://openutils.svn.sourceforge.net/openutils/?rev=3339&view=rev
Author:   diego_schivo
Date:     2011-02-16 17:17:21 +0000 (Wed, 16 Feb 2011)

Log Message:
-----------
MEDIA-218 search-based property

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

Modified: trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/playlist/pages/PlaylistBean.java
===================================================================
--- trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/playlist/pages/PlaylistBean.java	2011-02-09 21:10:35 UTC (rev 3338)
+++ trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/playlist/pages/PlaylistBean.java	2011-02-16 17:17:21 UTC (rev 3339)
@@ -38,7 +38,7 @@
 
     private List<PlaylistEntryBean> entries;
 
-    private boolean readOnly;
+    private boolean searchBased;
 
     /**
      * Returns the uuid.
@@ -130,23 +130,22 @@
         this.entries = entries;
     }
 
-    
     /**
-     * Returns the readOnly.
-     * @return the readOnly
+     * Returns the searchBased.
+     * @return the searchBased
      */
-    public boolean isReadOnly()
+    public boolean isSearchBased()
     {
-        return readOnly;
+        return searchBased;
     }
 
-    
     /**
-     * Sets the readOnly.
-     * @param readOnly the readOnly to set
+     * Sets the searchBased.
+     * @param searchBased the searchBased to set
      */
-    public void setReadOnly(boolean readOnly)
+    public void setSearchBased(boolean searchBased)
     {
-        this.readOnly = readOnly;
+        this.searchBased = searchBased;
     }
+
 }

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	2011-02-09 21:10:35 UTC (rev 3338)
+++ trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/playlist/pages/PlaylistView.java	2011-02-16 17:17:21 UTC (rev 3339)
@@ -239,7 +239,7 @@
 
                 try
                 {
-                    playlist.setReadOnly(node.hasContent("search"));
+                    playlist.setSearchBased(node.hasContent("search"));
                 }
                 catch (RepositoryException e)
                 {

Modified: trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/playlist/pages/PlaylistView.html
===================================================================
--- trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/playlist/pages/PlaylistView.html	2011-02-09 21:10:35 UTC (rev 3338)
+++ trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/playlist/pages/PlaylistView.html	2011-02-16 17:17:21 UTC (rev 3339)
@@ -48,11 +48,11 @@
   ]);
 
   var tbar = [
+[#if (!this.playlist.searchBased)]
     {
       text: playlist.msgs.addEntry,
       icon: contextPath + '/.resources/media/icons/ico16-add.png',
       iconCls: 'button-add',
-      disabled: playlist.readOnly,
       handler: function(){
         var mgnlWin = parent.parent;
         mgnlWin.setNewMedia = function(nodeid, uuid, file, thumb){
@@ -77,7 +77,6 @@
       text: playlist.msgs.addEntries,
       icon: contextPath + '/.resources/media/icons/ico16-addmany.png',
       iconCls: 'button-addmany',
-      disabled: playlist.readOnly,
       handler: function(){
         var mgnlWin = parent.parent;
         parent.openWindow(".magnolia/pages/mediaFolderSelection.html?parentFrame=playlistView&action=addEntries&mgnlCK=" + mgnlWin.mgnlGetCacheKiller());
@@ -99,6 +98,7 @@
         });
       }
     },
+[/#if]
     {
       id: 'editMediaBtn',
       text: playlist.msgs.editMedia,
@@ -249,8 +249,10 @@
         autoSizeColumns: true,
         enableColLock: false,
         tbar: tbar,
-        stripeRows: true,
-        plugins: !playlist.readOnly ? [dd] : []
+        stripeRows: true
+[#if (!this.playlist.searchBased)]
+        , plugins: [dd]
+[/#if]
       }
     },{
       columnWidth: 0.4,
@@ -289,7 +291,7 @@
     });
   });
   grid.getSelectionModel().on('selectionchange', function(sm){
-    Ext.getCmp('removeEntryBtn').setDisabled(playlist.readOnly || sm.getCount() < 1);
+    Ext.getCmp('removeEntryBtn').setDisabled(sm.getCount() < 1);
     Ext.getCmp('editMediaBtn').setDisabled(sm.getCount() < 1);
   });
 
@@ -393,7 +395,7 @@
       addManyEntriesProgressEnd: '${this.msgs.get('playlist.entries.addMany.msgBox.progressEnd')?js_string}',
       addManyEntriesProgress: '${this.msgs.get('playlist.entries.addMany.msgBox.progress')?js_string}'
     },
-    readOnly: ${(this.playlist.readOnly)?string}
+    searchBased: ${(this.playlist.searchBased)?string}
   };
   initPlaylistView();
   [/#if]


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

[Openutils-svn] Jenkins build is back to normal : openutils-mgnlmedia #367

From: <hu...@op...> - 2011-02-10 07:35:22

See <https://hudson.openmindonline.it/job/openutils-mgnlmedia/367/changes>

[Openutils-svn] Jenkins build is back to normal : openutils-mgnlmedia » SimpleMedia Module for Magnolia CMS #367

From: <hu...@op...> - 2011-02-10 07:35:16

See <https://hudson.openmindonline.it/job/openutils-mgnlmedia/net.sourceforge.openutils$openutils-mgnlmedia/367/changes>

[Openutils-svn] SF.net SVN: openutils:[3338] trunk/openutils-mgnlmedia/src/main/java/net/ sourceforge/openutils/mgnlmedia/media/advancedsearch/configuration/ SearchMediaQueryConfiguration.java

From: <fg...@us...> - 2011-02-09 21:10:41

Revision: 3338
          http://openutils.svn.sourceforge.net/openutils/?rev=3338&view=rev
Author:   fgiust
Date:     2011-02-09 21:10:35 +0000 (Wed, 09 Feb 2011)

Log Message:
-----------
remove check on the type filter (needs to be applied, a search with type=image shouldn't lead to a result with all the tabs filled)

Modified Paths:
--------------
    trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/advancedsearch/configuration/SearchMediaQueryConfiguration.java

Modified: trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/advancedsearch/configuration/SearchMediaQueryConfiguration.java
===================================================================
--- trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/advancedsearch/configuration/SearchMediaQueryConfiguration.java	2011-02-09 20:55:39 UTC (rev 3337)
+++ trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/advancedsearch/configuration/SearchMediaQueryConfiguration.java	2011-02-09 21:10:35 UTC (rev 3338)
@@ -19,9 +19,7 @@
 
 package net.sourceforge.openutils.mgnlmedia.media.advancedsearch.configuration;
 
-import java.util.ArrayList;
 import java.util.LinkedHashMap;
-import java.util.List;
 import java.util.Map;
 
 import javax.servlet.http.HttpServletRequest;
@@ -121,11 +119,7 @@
         // filters
         for (String key : filters.keySet())
         {
-            if ("type".equals(key) && !StringUtils.isEmpty(mediaType))
-            {
-                // restriction on type already set
-                continue;
-            }
+
             SearchFilter filter = filters.get(key);
             path = StringUtils.defaultIfEmpty(filter.getBasePath(key, request), path);
             for (Criterion criterion : filter.getCriterionList(key, request))


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

[Openutils-svn] SF.net SVN: openutils:[3337] trunk/openutils-mgnlmedia/src/main/java/net/ sourceforge/openutils/mgnlmedia/media/pages/MediaAdvancedSearchPage.java

From: <fg...@us...> - 2011-02-09 20:55:46

Revision: 3337
          http://openutils.svn.sourceforge.net/openutils/?rev=3337&view=rev
Author:   fgiust
Date:     2011-02-09 20:55:39 +0000 (Wed, 09 Feb 2011)

Log Message:
-----------
optimize imports

Modified Paths:
--------------
    trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/pages/MediaAdvancedSearchPage.java

Modified: trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/pages/MediaAdvancedSearchPage.java
===================================================================
--- trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/pages/MediaAdvancedSearchPage.java	2011-02-09 20:39:12 UTC (rev 3336)
+++ trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/pages/MediaAdvancedSearchPage.java	2011-02-09 20:55:39 UTC (rev 3337)
@@ -20,24 +20,14 @@
 package net.sourceforge.openutils.mgnlmedia.media.pages;
 
 import info.magnolia.cms.core.Content;
-import info.magnolia.cms.core.HierarchyManager;
-import info.magnolia.cms.core.ItemType;
-import info.magnolia.cms.core.Path;
-import info.magnolia.cms.util.NodeDataUtil;
 import info.magnolia.context.MgnlContext;
 import info.magnolia.freemarker.FreemarkerUtil;
 
-import java.util.Enumeration;
-import java.util.HashSet;
 import java.util.Iterator;
 import java.util.LinkedHashMap;
 import java.util.Map;
-import java.util.Set;
 
-import javax.jcr.PropertyType;
 import javax.jcr.RepositoryException;
-import javax.jcr.Value;
-import javax.jcr.ValueFactory;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
@@ -47,7 +37,6 @@
 import net.sourceforge.openutils.mgnlmedia.media.configuration.MediaTypeConfiguration;
 import net.sourceforge.openutils.mgnlmedia.media.lifecycle.MediaModule;
 import net.sourceforge.openutils.mgnlmedia.media.tags.el.MediaEl;
-import net.sourceforge.openutils.mgnlmedia.playlist.PlaylistConstants;
 import net.sourceforge.openutils.mgnlmedia.playlist.pages.PlaylistView;
 
 import org.apache.commons.lang.StringUtils;


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

[Openutils-svn] SF.net SVN: openutils:[3336] trunk/openutils-mgnlmedia/src/main/java/net/ sourceforge/openutils/mgnlmedia/playlist/utils/PlaylistIterateUtils.java

From: <fg...@us...> - 2011-02-09 20:39:19

Revision: 3336
          http://openutils.svn.sourceforge.net/openutils/?rev=3336&view=rev
Author:   fgiust
Date:     2011-02-09 20:39:12 +0000 (Wed, 09 Feb 2011)

Log Message:
-----------
null check on iterate()

Modified Paths:
--------------
    trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/playlist/utils/PlaylistIterateUtils.java

Modified: trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/playlist/utils/PlaylistIterateUtils.java
===================================================================
--- trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/playlist/utils/PlaylistIterateUtils.java	2011-02-09 20:15:27 UTC (rev 3335)
+++ trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/playlist/utils/PlaylistIterateUtils.java	2011-02-09 20:39:12 UTC (rev 3336)
@@ -43,6 +43,7 @@
 import net.sourceforge.openutils.mgnlmedia.media.tags.el.MediaEl;
 import net.sourceforge.openutils.mgnlmedia.playlist.PlaylistConstants;
 
+import org.apache.commons.collections.IteratorUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -76,6 +77,11 @@
     @SuppressWarnings("unchecked")
     public static Iterator<MediaNodeAndEntryPath> iterate(final Content playlistNode)
     {
+        if (playlistNode == null)
+        {
+            return IteratorUtils.emptyIterator();
+        }
+
         try
         {
             if (playlistNode.hasContent("search"))
@@ -112,17 +118,19 @@
                         SortMode.SCORE,
                         (int) NodeDataUtil.getLong(playlistNode, "maxResults", 0),
                         1);
-                return Iterators.transform(searchResult.getItems(), new Function<AdvancedResultItem, MediaNodeAndEntryPath>()
-                {
+                return Iterators.transform(
+                    searchResult.getItems(),
+                    new Function<AdvancedResultItem, MediaNodeAndEntryPath>()
+                    {
 
-                    /**
-                     * {@inheritDoc}
-                     */
-                    public MediaNodeAndEntryPath apply(AdvancedResultItem from)
-                    {
-                        return new MediaNodeAndEntryPath(from, null);
-                    }
-                });
+                        /**
+                         * {@inheritDoc}
+                         */
+                        public MediaNodeAndEntryPath apply(AdvancedResultItem from)
+                        {
+                            return new MediaNodeAndEntryPath(from, null);
+                        }
+                    });
             }
             else
             {


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

[Openutils-svn] SF.net SVN: openutils:[3335] trunk/openutils-mgnlmedia/src/main/java/net/ sourceforge/openutils/mgnlmedia/playlist/dialog/PlaylistFromSearchDialogMVC .java

From: <fg...@us...> - 2011-02-09 20:15:34

Revision: 3335
          http://openutils.svn.sourceforge.net/openutils/?rev=3335&view=rev
Author:   fgiust
Date:     2011-02-09 20:15:27 +0000 (Wed, 09 Feb 2011)

Log Message:
-----------
removed hardcoded context path

Modified Paths:
--------------
    trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/playlist/dialog/PlaylistFromSearchDialogMVC.java

Modified: trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/playlist/dialog/PlaylistFromSearchDialogMVC.java
===================================================================
--- trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/playlist/dialog/PlaylistFromSearchDialogMVC.java	2011-02-09 19:52:52 UTC (rev 3334)
+++ trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/playlist/dialog/PlaylistFromSearchDialogMVC.java	2011-02-09 20:15:27 UTC (rev 3335)
@@ -32,7 +32,6 @@
 
 import net.sourceforge.openutils.mgnlmedia.playlist.PlaylistConstants;
 
-import org.apache.commons.lang.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -107,7 +106,8 @@
             out.println("<html>"); //$NON-NLS-1$
             out.println(new Sources(this.getRequest().getContextPath()).getHtmlJs());
             out.println("<script type=\"text/javascript\">"); //$NON-NLS-1$
-            out.println("parent.location.href = '/open/.magnolia/pages/playlistsBrowser.html?openPath=" + form.getParameter("parentFolder") + "/" + form.getParameter("playlistName") + "'"); //$NON-NLS-1$
+            out
+                .println("parent.location.href = '" + getRequest().getContextPath() + "/.magnolia/pages/playlistsBrowser.html?openPath=" + form.getParameter("parentFolder") + "/" + form.getParameter("playlistName") + "'"); //$NON-NLS-1$
             out.println("</script></html>"); //$NON-NLS-1$
         }
         else


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

[Openutils-svn] SF.net SVN: openutils:[3334] trunk/openutils-mgnlmedia/pom.xml

From: <fg...@us...> - 2011-02-09 19:52:58

Revision: 3334
          http://openutils.svn.sourceforge.net/openutils/?rev=3334&view=rev
Author:   fgiust
Date:     2011-02-09 19:52:52 +0000 (Wed, 09 Feb 2011)

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	2011-02-09 19:52:45 UTC (rev 3333)
+++ trunk/openutils-mgnlmedia/pom.xml	2011-02-09 19:52:52 UTC (rev 3334)
@@ -10,7 +10,7 @@
   <artifactId>openutils-mgnlmedia</artifactId>
   <name>SimpleMedia Module for Magnolia CMS</name>
   <description>SimpleMedia Module for Magnolia CMS: a module for Magnolia CMS for easier management of multimedia assets.</description>
-  <version>4.4-b1</version>
+  <version>4.4-b2-SNAPSHOT</version>
   <inceptionYear>2008</inceptionYear>
   <licenses>
     <license>
@@ -24,9 +24,9 @@
     <url>http://jira.openmindlab.com/browse/MEDIA</url>
   </issueManagement>
   <scm>
-    <connection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/tags/openutils-mgnlmedia-4.4-b1</connection>
-    <developerConnection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/tags/openutils-mgnlmedia-4.4-b1</developerConnection>
-    <url>http://openutils.svn.sourceforge.net/viewcvs.cgi/openutils/tags/openutils-mgnlmedia-4.4-b1</url>
+    <connection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/trunk/openutils-mgnlmedia</connection>
+    <developerConnection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/trunk/openutils-mgnlmedia</developerConnection>
+    <url>http://openutils.svn.sourceforge.net/viewcvs.cgi/openutils/trunk/openutils-mgnlmedia</url>
   </scm>
   <build>
     <resources>


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

[Openutils-svn] SF.net SVN: openutils:[3333] tags/openutils-mgnlmedia-4.4-b1/

From: <fg...@us...> - 2011-02-09 19:52:51

Revision: 3333
          http://openutils.svn.sourceforge.net/openutils/?rev=3333&view=rev
Author:   fgiust
Date:     2011-02-09 19:52:45 +0000 (Wed, 09 Feb 2011)

Log Message:
-----------
[maven-release-plugin]  copy for tag openutils-mgnlmedia-4.4-b1

Added Paths:
-----------
    tags/openutils-mgnlmedia-4.4-b1/


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

[Openutils-svn] SF.net SVN: openutils:[3332] trunk/openutils-mgnlmedia/pom.xml

From: <fg...@us...> - 2011-02-09 19:52:31

Revision: 3332
          http://openutils.svn.sourceforge.net/openutils/?rev=3332&view=rev
Author:   fgiust
Date:     2011-02-09 19:52:22 +0000 (Wed, 09 Feb 2011)

Log Message:
-----------
[maven-release-plugin] prepare release openutils-mgnlmedia-4.4-b1

Modified Paths:
--------------
    trunk/openutils-mgnlmedia/pom.xml

Modified: trunk/openutils-mgnlmedia/pom.xml
===================================================================
--- trunk/openutils-mgnlmedia/pom.xml	2011-02-09 19:48:14 UTC (rev 3331)
+++ trunk/openutils-mgnlmedia/pom.xml	2011-02-09 19:52:22 UTC (rev 3332)
@@ -10,7 +10,7 @@
   <artifactId>openutils-mgnlmedia</artifactId>
   <name>SimpleMedia Module for Magnolia CMS</name>
   <description>SimpleMedia Module for Magnolia CMS: a module for Magnolia CMS for easier management of multimedia assets.</description>
-  <version>4.3.2-SNAPSHOT</version>
+  <version>4.4-b1</version>
   <inceptionYear>2008</inceptionYear>
   <licenses>
     <license>
@@ -24,9 +24,9 @@
     <url>http://jira.openmindlab.com/browse/MEDIA</url>
   </issueManagement>
   <scm>
-    <connection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/trunk/openutils-mgnlmedia</connection>
-    <developerConnection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/trunk/openutils-mgnlmedia</developerConnection>
-    <url>http://openutils.svn.sourceforge.net/viewcvs.cgi/openutils/trunk/openutils-mgnlmedia</url>
+    <connection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/tags/openutils-mgnlmedia-4.4-b1</connection>
+    <developerConnection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/tags/openutils-mgnlmedia-4.4-b1</developerConnection>
+    <url>http://openutils.svn.sourceforge.net/viewcvs.cgi/openutils/tags/openutils-mgnlmedia-4.4-b1</url>
   </scm>
   <build>
     <resources>


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

[Openutils-svn] SF.net SVN: openutils:[3331] trunk/openutils-mgnlmedia/pom.xml

From: <fg...@us...> - 2011-02-09 19:48:20

Revision: 3331
          http://openutils.svn.sourceforge.net/openutils/?rev=3331&view=rev
Author:   fgiust
Date:     2011-02-09 19:48:14 +0000 (Wed, 09 Feb 2011)

Log Message:
-----------
criteria 3.2.2

Modified Paths:
--------------
    trunk/openutils-mgnlmedia/pom.xml

Modified: trunk/openutils-mgnlmedia/pom.xml
===================================================================
--- trunk/openutils-mgnlmedia/pom.xml	2011-02-09 19:47:24 UTC (rev 3330)
+++ trunk/openutils-mgnlmedia/pom.xml	2011-02-09 19:48:14 UTC (rev 3331)
@@ -153,7 +153,7 @@
     <dependency>
       <groupId>net.sourceforge.openutils</groupId>
       <artifactId>openutils-mgnlcriteria</artifactId>
-      <version>3.2.1</version>
+      <version>3.2.2</version>
     </dependency>
     <dependency>
       <groupId>javax.servlet</groupId>


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

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

From: <fg...@us...> - 2011-02-09 19:47:29

Revision: 3330
          http://openutils.svn.sourceforge.net/openutils/?rev=3330&view=rev
Author:   fgiust
Date:     2011-02-09 19:47:24 +0000 (Wed, 09 Feb 2011)

Log Message:
-----------
remove empty package

Removed Paths:
-------------
    trunk/openutils-mgnlmedia/src/main/resources/info/


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

[Openutils-svn] SF.net SVN: openutils:[3329] trunk/openutils-mgnlmedia/src/main/java/net/ sourceforge/openutils/mgnlmedia/playlist/utils/PlaylistIterateUtils.java

From: <fg...@us...> - 2011-02-09 19:46:48

Revision: 3329
          http://openutils.svn.sourceforge.net/openutils/?rev=3329&view=rev
Author:   fgiust
Date:     2011-02-09 19:46:41 +0000 (Wed, 09 Feb 2011)

Log Message:
-----------
updated header

Modified Paths:
--------------
    trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/playlist/utils/PlaylistIterateUtils.java

Modified: trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/playlist/utils/PlaylistIterateUtils.java
===================================================================
--- trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/playlist/utils/PlaylistIterateUtils.java	2011-02-09 13:53:17 UTC (rev 3328)
+++ trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/playlist/utils/PlaylistIterateUtils.java	2011-02-09 19:46:41 UTC (rev 3329)
@@ -1,3 +1,22 @@
+/**
+ *
+ * SimpleMedia Module for Magnolia CMS (http://www.openmindlab.com/lab/products/media.html)
+ * Copyright(C) 2008-2011, Openmind S.r.l. http://www.openmindonline.it
+ *
+ *  This program is free software: you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation, either version 3 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
 package net.sourceforge.openutils.mgnlmedia.playlist.utils;
 
 import info.magnolia.cms.core.Content;


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

[Openutils-svn] Build failed in Hudson: openutils-mgnlmedia #366

From: <hu...@op...> - 2011-02-09 14:35:51

See <https://hudson.openmindonline.it/job/openutils-mgnlmedia/366/changes>

Changes:

[diego_schivo] MEDIA-216 exclude null items from iterator

------------------------------------------
Started by an SCM change
Updating https://openutils.svn.sourceforge.net/svnroot/openutils/trunk/openutils-mgnlmedia
U         src/main/java/net/sourceforge/openutils/mgnlmedia/media/tags/el/MediaEl.java
At revision 3328
Parsing POMs
[openutils-mgnlmedia] $ /usr/local/jdk1.6.0_20/bin/java -cp /data/hudson-data/plugins/maven-plugin/WEB-INF/lib/maven-agent-1.386.jar:/usr/local/maven/boot/classworlds-1.1.jar hudson.maven.agent.Main /usr/local/maven /data/webapps/hudson/WEB-INF/lib/remoting-1.386.jar /data/hudson-data/plugins/maven-plugin/WEB-INF/lib/maven-interceptor-1.386.jar 53164 /data/hudson-data/plugins/maven-plugin/WEB-INF/lib/maven2.1-interceptor-1.2.jar
<===[HUDSON REMOTING CAPACITY]===>   channel started
Executing Maven:  -B -f <https://hudson.openmindonline.it/job/openutils-mgnlmedia/ws/openutils-mgnlmedia/pom.xml> install
[INFO] Scanning for projects...
[INFO] ------------------------------------------------------------------------
[INFO] Building SimpleMedia Module for Magnolia CMS
[INFO]    task-segment: [install]
[INFO] ------------------------------------------------------------------------
[INFO] [resources:resources {execution: default-resources}]
[INFO] Using 'UTF-8' encoding to copy filtered resources.
[INFO] Copying 268 resources
[INFO] Copying 1 resource
[WARNING] POM for 'com.drewnoakes:metadata-extractor:pom:2.4.0-beta-1:compile' is invalid.

Its dependencies (if any) will NOT be available to the current build.
[INFO] [compiler:compile {execution: default-compile}]
[INFO] Compiling 1 source file to <https://hudson.openmindonline.it/job/openutils-mgnlmedia/ws/openutils-mgnlmedia/target/classes>
[INFO] [resources:testResources {execution: default-testResources}]
[INFO] Using 'UTF-8' encoding to copy filtered resources.
[INFO] Copying 8 resources
[INFO] [compiler:testCompile {execution: default-testCompile}]
[INFO] Nothing to compile - all classes are up to date
[INFO] [surefire:test {execution: default-test}]
[INFO] Surefire report directory: <https://hudson.openmindonline.it/job/openutils-mgnlmedia/ws/openutils-mgnlmedia/target/surefire-reports>

-------------------------------------------------------
 T E S T S
-------------------------------------------------------
Running TestSuite
Tests run: 8, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 3.45 sec

Results :

Tests run: 8, Failures: 0, Errors: 0, Skipped: 0

[HUDSON] Recording test results
[INFO] [jar:jar {execution: default-jar}]
[INFO] Building jar: <https://hudson.openmindonline.it/job/openutils-mgnlmedia/ws/openutils-mgnlmedia/target/openutils-mgnlmedia-4.3.2-SNAPSHOT.jar>
[INFO] Preparing source:jar
[WARNING] Removing: jar from forked lifecycle, to prevent recursive invocation.
[INFO] No goals needed for project - skipping
[INFO] [source:jar {execution: attach-sources}]
[INFO] Building jar: <https://hudson.openmindonline.it/job/openutils-mgnlmedia/ws/openutils-mgnlmedia/target/openutils-mgnlmedia-4.3.2-SNAPSHOT-sources.jar>
[INFO] [assembly:single {execution: bundle}]
[INFO] Reading assembly descriptor: <https://hudson.openmindonline.it/job/openutils-mgnlmedia/ws/openutils-mgnlmedia/src/main/assembly/assembly-bundle.xml>
[WARNING] POM for 'com.drewnoakes:metadata-extractor:pom:2.4.0-beta-1:compile' is invalid.

Its dependencies (if any) will NOT be available to the current build.
[INFO] Building zip: <https://hudson.openmindonline.it/job/openutils-mgnlmedia/ws/openutils-mgnlmedia/target/openutils-mgnlmedia-4.3.2-SNAPSHOT-bundle.zip>
[INFO] [license:check {execution: default}]
[INFO] Checking licenses...
[INFO] Missing header in: <https://hudson.openmindonline.it/job/openutils-mgnlmedia/ws/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/playlist/utils/PlaylistIterateUtils.java>
[HUDSON] Archiving <https://hudson.openmindonline.it/job/openutils-mgnlmedia/ws/openutils-mgnlmedia/pom.xml> to /data/hudson-data/jobs/openutils-mgnlmedia/modules/net.sourceforge.openutils$openutils-mgnlmedia/builds/2011-02-09_15-22-19/archive/net.sourceforge.openutils/openutils-mgnlmedia/4.3.2-SNAPSHOT/pom.xml
[HUDSON] Archiving <https://hudson.openmindonline.it/job/openutils-mgnlmedia/ws/openutils-mgnlmedia/target/openutils-mgnlmedia-4.3.2-SNAPSHOT.jar> to /data/hudson-data/jobs/openutils-mgnlmedia/modules/net.sourceforge.openutils$openutils-mgnlmedia/builds/2011-02-09_15-22-19/archive/net.sourceforge.openutils/openutils-mgnlmedia/4.3.2-SNAPSHOT/openutils-mgnlmedia-4.3.2-SNAPSHOT.jar
[HUDSON] Archiving <https://hudson.openmindonline.it/job/openutils-mgnlmedia/ws/openutils-mgnlmedia/target/openutils-mgnlmedia-4.3.2-SNAPSHOT-sources.jar> to /data/hudson-data/jobs/openutils-mgnlmedia/modules/net.sourceforge.openutils$openutils-mgnlmedia/builds/2011-02-09_15-22-19/archive/net.sourceforge.openutils/openutils-mgnlmedia/4.3.2-SNAPSHOT/openutils-mgnlmedia-4.3.2-SNAPSHOT-sources.jar
[INFO] ------------------------------------------------------------------------
[ERROR] BUILD ERROR
[INFO] ------------------------------------------------------------------------
[INFO] Some files do not have the expected license header
[INFO] ------------------------------------------------------------------------
[INFO] For more information, run Maven with the -e switch
[INFO] ------------------------------------------------------------------------
[INFO] Total time: 32 seconds
[INFO] Finished at: Wed Feb 09 15:22:54 CET 2011
[INFO] Final Memory: 52M/318M
[INFO] ------------------------------------------------------------------------
Sending e-mails to: ope...@li...
channel stopped

[Openutils-svn] Build failed in Hudson: openutils-mgnlmedia » SimpleMedia Module for Magnolia CMS #366

From: <hu...@op...> - 2011-02-09 14:35:45

See <https://hudson.openmindonline.it/job/openutils-mgnlmedia/net.sourceforge.openutils$openutils-mgnlmedia/366/changes>

Changes:

[diego_schivo] MEDIA-216 exclude null items from iterator

------------------------------------------
<===[HUDSON REMOTING CAPACITY]===>   channel started
Executing Maven:  -B -f <https://hudson.openmindonline.it/job/openutils-mgnlmedia/net.sourceforge.openutils$openutils-mgnlmedia/ws/pom.xml> install
[INFO] Scanning for projects...
[INFO] ------------------------------------------------------------------------
[INFO] Building SimpleMedia Module for Magnolia CMS
[INFO]    task-segment: [install]
[INFO] ------------------------------------------------------------------------
[INFO] [resources:resources {execution: default-resources}]
[INFO] Using 'UTF-8' encoding to copy filtered resources.
[INFO] Copying 268 resources
[INFO] Copying 1 resource
[WARNING] POM for 'com.drewnoakes:metadata-extractor:pom:2.4.0-beta-1:compile' is invalid.

Its dependencies (if any) will NOT be available to the current build.
[INFO] [compiler:compile {execution: default-compile}]
[INFO] Compiling 1 source file to <https://hudson.openmindonline.it/job/openutils-mgnlmedia/net.sourceforge.openutils$openutils-mgnlmedia/ws/target/classes>
[INFO] [resources:testResources {execution: default-testResources}]
[INFO] Using 'UTF-8' encoding to copy filtered resources.
[INFO] Copying 8 resources
[INFO] [compiler:testCompile {execution: default-testCompile}]
[INFO] Nothing to compile - all classes are up to date
[INFO] [surefire:test {execution: default-test}]
[INFO] Surefire report directory: <https://hudson.openmindonline.it/job/openutils-mgnlmedia/net.sourceforge.openutils$openutils-mgnlmedia/ws/target/surefire-reports>

-------------------------------------------------------
 T E S T S
-------------------------------------------------------
Running TestSuite
Tests run: 8, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 3.45 sec

Results :

Tests run: 8, Failures: 0, Errors: 0, Skipped: 0

[HUDSON] Recording test results
[INFO] [jar:jar {execution: default-jar}]
[INFO] Building jar: <https://hudson.openmindonline.it/job/openutils-mgnlmedia/net.sourceforge.openutils$openutils-mgnlmedia/ws/target/openutils-mgnlmedia-4.3.2-SNAPSHOT.jar>
[INFO] Preparing source:jar
[WARNING] Removing: jar from forked lifecycle, to prevent recursive invocation.
[INFO] No goals needed for project - skipping
[INFO] [source:jar {execution: attach-sources}]
[INFO] Building jar: <https://hudson.openmindonline.it/job/openutils-mgnlmedia/net.sourceforge.openutils$openutils-mgnlmedia/ws/target/openutils-mgnlmedia-4.3.2-SNAPSHOT-sources.jar>
[INFO] [assembly:single {execution: bundle}]
[INFO] Reading assembly descriptor: <https://hudson.openmindonline.it/job/openutils-mgnlmedia/net.sourceforge.openutils$openutils-mgnlmedia/ws/src/main/assembly/assembly-bundle.xml>
[WARNING] POM for 'com.drewnoakes:metadata-extractor:pom:2.4.0-beta-1:compile' is invalid.

Its dependencies (if any) will NOT be available to the current build.
[INFO] Building zip: <https://hudson.openmindonline.it/job/openutils-mgnlmedia/net.sourceforge.openutils$openutils-mgnlmedia/ws/target/openutils-mgnlmedia-4.3.2-SNAPSHOT-bundle.zip>
[INFO] [license:check {execution: default}]
[INFO] Checking licenses...
[INFO] Missing header in: <https://hudson.openmindonline.it/job/openutils-mgnlmedia/net.sourceforge.openutils$openutils-mgnlmedia/ws/src/main/java/net/sourceforge/openutils/mgnlmedia/playlist/utils/PlaylistIterateUtils.java>
[HUDSON] Archiving <https://hudson.openmindonline.it/job/openutils-mgnlmedia/net.sourceforge.openutils$openutils-mgnlmedia/ws/pom.xml> to /data/hudson-data/jobs/openutils-mgnlmedia/modules/net.sourceforge.openutils$openutils-mgnlmedia/builds/2011-02-09_15-22-19/archive/net.sourceforge.openutils/openutils-mgnlmedia/4.3.2-SNAPSHOT/pom.xml
[HUDSON] Archiving <https://hudson.openmindonline.it/job/openutils-mgnlmedia/net.sourceforge.openutils$openutils-mgnlmedia/ws/target/openutils-mgnlmedia-4.3.2-SNAPSHOT.jar> to /data/hudson-data/jobs/openutils-mgnlmedia/modules/net.sourceforge.openutils$openutils-mgnlmedia/builds/2011-02-09_15-22-19/archive/net.sourceforge.openutils/openutils-mgnlmedia/4.3.2-SNAPSHOT/openutils-mgnlmedia-4.3.2-SNAPSHOT.jar
[HUDSON] Archiving <https://hudson.openmindonline.it/job/openutils-mgnlmedia/net.sourceforge.openutils$openutils-mgnlmedia/ws/target/openutils-mgnlmedia-4.3.2-SNAPSHOT-sources.jar> to /data/hudson-data/jobs/openutils-mgnlmedia/modules/net.sourceforge.openutils$openutils-mgnlmedia/builds/2011-02-09_15-22-19/archive/net.sourceforge.openutils/openutils-mgnlmedia/4.3.2-SNAPSHOT/openutils-mgnlmedia-4.3.2-SNAPSHOT-sources.jar
[INFO] ------------------------------------------------------------------------
[ERROR] BUILD ERROR
[INFO] ------------------------------------------------------------------------
[INFO] Some files do not have the expected license header
[INFO] ------------------------------------------------------------------------
[INFO] For more information, run Maven with the -e switch
[INFO] ------------------------------------------------------------------------
[INFO] Total time: 32 seconds
[INFO] Finished at: Wed Feb 09 15:22:54 CET 2011
[INFO] Final Memory: 52M/318M
[INFO] ------------------------------------------------------------------------

[Openutils-svn] SF.net SVN: openutils:[3328] trunk/openutils-mgnlmedia/src/main/java/net/ sourceforge/openutils/mgnlmedia/media/tags/el/MediaEl.java

From: <die...@us...> - 2011-02-09 13:53:24

Revision: 3328
          http://openutils.svn.sourceforge.net/openutils/?rev=3328&view=rev
Author:   diego_schivo
Date:     2011-02-09 13:53:17 +0000 (Wed, 09 Feb 2011)

Log Message:
-----------
MEDIA-216 exclude null items from iterator

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	2011-02-09 10:14:51 UTC (rev 3327)
+++ trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/tags/el/MediaEl.java	2011-02-09 13:53:17 UTC (rev 3328)
@@ -63,6 +63,7 @@
 import org.slf4j.LoggerFactory;
 
 import com.google.common.base.Function;
+import com.google.common.base.Predicates;
 import com.google.common.collect.Iterators;
 
 
@@ -856,16 +857,19 @@
             playlistNode = (Content) obj;
         }
 
-        return Iterators.transform(PlaylistIterateUtils.iterate(playlistNode), new Function<MediaNodeAndEntryPath, Content>()
-        {
+        Iterator<Content> iter = Iterators.transform(
+            PlaylistIterateUtils.iterate(playlistNode),
+            new Function<MediaNodeAndEntryPath, Content>()
+            {
 
-            /**
-             * {@inheritDoc}
-             */
-            public Content apply(MediaNodeAndEntryPath from)
-            {
-                return from.getMediaNode();
-            }
-        });
+                /**
+                 * {@inheritDoc}
+                 */
+                public Content apply(MediaNodeAndEntryPath from)
+                {
+                    return from.getMediaNode();
+                }
+            });
+        return Iterators.filter(iter, Predicates.notNull());
     }
 }


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

[Openutils-svn] Build failed in Hudson: openutils-mgnlmedia #365

From: <hu...@op...> - 2011-02-09 10:35:47

See <https://hudson.openmindonline.it/job/openutils-mgnlmedia/365/changes>

Changes:

[diego_schivo] MEDIA-216 EL function mediaNodesInPlaylist

------------------------------------------
Started by an SCM change
Updating https://openutils.svn.sourceforge.net/svnroot/openutils/trunk/openutils-mgnlmedia
U         src/main/java/net/sourceforge/openutils/mgnlmedia/media/tags/el/MediaEl.java
U         src/main/java/net/sourceforge/openutils/mgnlmedia/playlist/pages/PlaylistView.java
A         src/main/java/net/sourceforge/openutils/mgnlmedia/playlist/utils
A         src/main/java/net/sourceforge/openutils/mgnlmedia/playlist/utils/PlaylistIterateUtils.java
U         src/main/resources/META-INF/media.tld
U         src/main/resources/mgnl-files/templates/samples-media/paragraph-playlist.jsp
At revision 3327
Parsing POMs
[openutils-mgnlmedia] $ /usr/local/jdk1.6.0_20/bin/java -cp /data/hudson-data/plugins/maven-plugin/WEB-INF/lib/maven-agent-1.386.jar:/usr/local/maven/boot/classworlds-1.1.jar hudson.maven.agent.Main /usr/local/maven /data/webapps/hudson/WEB-INF/lib/remoting-1.386.jar /data/hudson-data/plugins/maven-plugin/WEB-INF/lib/maven-interceptor-1.386.jar 34169 /data/hudson-data/plugins/maven-plugin/WEB-INF/lib/maven2.1-interceptor-1.2.jar
<===[HUDSON REMOTING CAPACITY]===>   channel started
Executing Maven:  -B -f <https://hudson.openmindonline.it/job/openutils-mgnlmedia/ws/openutils-mgnlmedia/pom.xml> install
[INFO] Scanning for projects...
[INFO] ------------------------------------------------------------------------
[INFO] Building SimpleMedia Module for Magnolia CMS
[INFO]    task-segment: [install]
[INFO] ------------------------------------------------------------------------
[INFO] [resources:resources {execution: default-resources}]
[INFO] Using 'UTF-8' encoding to copy filtered resources.
[INFO] Copying 268 resources
[INFO] Copying 1 resource
[WARNING] POM for 'com.drewnoakes:metadata-extractor:pom:2.4.0-beta-1:compile' is invalid.

Its dependencies (if any) will NOT be available to the current build.
[INFO] [compiler:compile {execution: default-compile}]
[INFO] Compiling 3 source files to <https://hudson.openmindonline.it/job/openutils-mgnlmedia/ws/openutils-mgnlmedia/target/classes>
[INFO] [resources:testResources {execution: default-testResources}]
[INFO] Using 'UTF-8' encoding to copy filtered resources.
[INFO] Copying 8 resources
[INFO] [compiler:testCompile {execution: default-testCompile}]
[INFO] Nothing to compile - all classes are up to date
[INFO] [surefire:test {execution: default-test}]
[INFO] Surefire report directory: <https://hudson.openmindonline.it/job/openutils-mgnlmedia/ws/openutils-mgnlmedia/target/surefire-reports>

-------------------------------------------------------
 T E S T S
-------------------------------------------------------
Running TestSuite
Tests run: 8, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 5.985 sec

Results :

Tests run: 8, Failures: 0, Errors: 0, Skipped: 0

[HUDSON] Recording test results
[INFO] [jar:jar {execution: default-jar}]
[INFO] Building jar: <https://hudson.openmindonline.it/job/openutils-mgnlmedia/ws/openutils-mgnlmedia/target/openutils-mgnlmedia-4.3.2-SNAPSHOT.jar>
[INFO] Preparing source:jar
[WARNING] Removing: jar from forked lifecycle, to prevent recursive invocation.
[INFO] No goals needed for project - skipping
[INFO] [source:jar {execution: attach-sources}]
[INFO] Building jar: <https://hudson.openmindonline.it/job/openutils-mgnlmedia/ws/openutils-mgnlmedia/target/openutils-mgnlmedia-4.3.2-SNAPSHOT-sources.jar>
[INFO] [assembly:single {execution: bundle}]
[INFO] Reading assembly descriptor: <https://hudson.openmindonline.it/job/openutils-mgnlmedia/ws/openutils-mgnlmedia/src/main/assembly/assembly-bundle.xml>
[WARNING] POM for 'com.drewnoakes:metadata-extractor:pom:2.4.0-beta-1:compile' is invalid.

Its dependencies (if any) will NOT be available to the current build.
[INFO] Building zip: <https://hudson.openmindonline.it/job/openutils-mgnlmedia/ws/openutils-mgnlmedia/target/openutils-mgnlmedia-4.3.2-SNAPSHOT-bundle.zip>
[INFO] [license:check {execution: default}]
[INFO] Checking licenses...
[INFO] Missing header in: <https://hudson.openmindonline.it/job/openutils-mgnlmedia/ws/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/playlist/utils/PlaylistIterateUtils.java>
[HUDSON] Archiving <https://hudson.openmindonline.it/job/openutils-mgnlmedia/ws/openutils-mgnlmedia/pom.xml> to /data/hudson-data/jobs/openutils-mgnlmedia/modules/net.sourceforge.openutils$openutils-mgnlmedia/builds/2011-02-09_11-22-02/archive/net.sourceforge.openutils/openutils-mgnlmedia/4.3.2-SNAPSHOT/pom.xml
[HUDSON] Archiving <https://hudson.openmindonline.it/job/openutils-mgnlmedia/ws/openutils-mgnlmedia/target/openutils-mgnlmedia-4.3.2-SNAPSHOT.jar> to /data/hudson-data/jobs/openutils-mgnlmedia/modules/net.sourceforge.openutils$openutils-mgnlmedia/builds/2011-02-09_11-22-02/archive/net.sourceforge.openutils/openutils-mgnlmedia/4.3.2-SNAPSHOT/openutils-mgnlmedia-4.3.2-SNAPSHOT.jar
[HUDSON] Archiving <https://hudson.openmindonline.it/job/openutils-mgnlmedia/ws/openutils-mgnlmedia/target/openutils-mgnlmedia-4.3.2-SNAPSHOT-sources.jar> to /data/hudson-data/jobs/openutils-mgnlmedia/modules/net.sourceforge.openutils$openutils-mgnlmedia/builds/2011-02-09_11-22-02/archive/net.sourceforge.openutils/openutils-mgnlmedia/4.3.2-SNAPSHOT/openutils-mgnlmedia-4.3.2-SNAPSHOT-sources.jar
[INFO] ------------------------------------------------------------------------
[ERROR] BUILD ERROR
[INFO] ------------------------------------------------------------------------
[INFO] Some files do not have the expected license header
[INFO] ------------------------------------------------------------------------
[INFO] For more information, run Maven with the -e switch
[INFO] ------------------------------------------------------------------------
[INFO] Total time: 43 seconds
[INFO] Finished at: Wed Feb 09 11:22:49 CET 2011
[INFO] Final Memory: 52M/319M
[INFO] ------------------------------------------------------------------------
Waiting for Hudson to finish collecting data
Sending e-mails to: ope...@li...
channel stopped

[Openutils-svn] Build failed in Hudson: openutils-mgnlmedia » SimpleMedia Module for Magnolia CMS #365

From: <hu...@op...> - 2011-02-09 10:35:43

See <https://hudson.openmindonline.it/job/openutils-mgnlmedia/net.sourceforge.openutils$openutils-mgnlmedia/365/changes>

Changes:

[diego_schivo] MEDIA-216 EL function mediaNodesInPlaylist

------------------------------------------
<===[HUDSON REMOTING CAPACITY]===>   channel started
Executing Maven:  -B -f <https://hudson.openmindonline.it/job/openutils-mgnlmedia/net.sourceforge.openutils$openutils-mgnlmedia/ws/pom.xml> install
[INFO] Scanning for projects...
[INFO] ------------------------------------------------------------------------
[INFO] Building SimpleMedia Module for Magnolia CMS
[INFO]    task-segment: [install]
[INFO] ------------------------------------------------------------------------
[INFO] [resources:resources {execution: default-resources}]
[INFO] Using 'UTF-8' encoding to copy filtered resources.
[INFO] Copying 268 resources
[INFO] Copying 1 resource
[WARNING] POM for 'com.drewnoakes:metadata-extractor:pom:2.4.0-beta-1:compile' is invalid.

Its dependencies (if any) will NOT be available to the current build.
[INFO] [compiler:compile {execution: default-compile}]
[INFO] Compiling 3 source files to <https://hudson.openmindonline.it/job/openutils-mgnlmedia/net.sourceforge.openutils$openutils-mgnlmedia/ws/target/classes>
[INFO] [resources:testResources {execution: default-testResources}]
[INFO] Using 'UTF-8' encoding to copy filtered resources.
[INFO] Copying 8 resources
[INFO] [compiler:testCompile {execution: default-testCompile}]
[INFO] Nothing to compile - all classes are up to date
[INFO] [surefire:test {execution: default-test}]
[INFO] Surefire report directory: <https://hudson.openmindonline.it/job/openutils-mgnlmedia/net.sourceforge.openutils$openutils-mgnlmedia/ws/target/surefire-reports>

-------------------------------------------------------
 T E S T S
-------------------------------------------------------
Running TestSuite
Tests run: 8, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 5.985 sec

Results :

Tests run: 8, Failures: 0, Errors: 0, Skipped: 0

[HUDSON] Recording test results
[INFO] [jar:jar {execution: default-jar}]
[INFO] Building jar: <https://hudson.openmindonline.it/job/openutils-mgnlmedia/net.sourceforge.openutils$openutils-mgnlmedia/ws/target/openutils-mgnlmedia-4.3.2-SNAPSHOT.jar>
[INFO] Preparing source:jar
[WARNING] Removing: jar from forked lifecycle, to prevent recursive invocation.
[INFO] No goals needed for project - skipping
[INFO] [source:jar {execution: attach-sources}]
[INFO] Building jar: <https://hudson.openmindonline.it/job/openutils-mgnlmedia/net.sourceforge.openutils$openutils-mgnlmedia/ws/target/openutils-mgnlmedia-4.3.2-SNAPSHOT-sources.jar>
[INFO] [assembly:single {execution: bundle}]
[INFO] Reading assembly descriptor: <https://hudson.openmindonline.it/job/openutils-mgnlmedia/net.sourceforge.openutils$openutils-mgnlmedia/ws/src/main/assembly/assembly-bundle.xml>
[WARNING] POM for 'com.drewnoakes:metadata-extractor:pom:2.4.0-beta-1:compile' is invalid.

Its dependencies (if any) will NOT be available to the current build.
[INFO] Building zip: <https://hudson.openmindonline.it/job/openutils-mgnlmedia/net.sourceforge.openutils$openutils-mgnlmedia/ws/target/openutils-mgnlmedia-4.3.2-SNAPSHOT-bundle.zip>
[INFO] [license:check {execution: default}]
[INFO] Checking licenses...
[INFO] Missing header in: <https://hudson.openmindonline.it/job/openutils-mgnlmedia/net.sourceforge.openutils$openutils-mgnlmedia/ws/src/main/java/net/sourceforge/openutils/mgnlmedia/playlist/utils/PlaylistIterateUtils.java>
[HUDSON] Archiving <https://hudson.openmindonline.it/job/openutils-mgnlmedia/net.sourceforge.openutils$openutils-mgnlmedia/ws/pom.xml> to /data/hudson-data/jobs/openutils-mgnlmedia/modules/net.sourceforge.openutils$openutils-mgnlmedia/builds/2011-02-09_11-22-02/archive/net.sourceforge.openutils/openutils-mgnlmedia/4.3.2-SNAPSHOT/pom.xml
[HUDSON] Archiving <https://hudson.openmindonline.it/job/openutils-mgnlmedia/net.sourceforge.openutils$openutils-mgnlmedia/ws/target/openutils-mgnlmedia-4.3.2-SNAPSHOT.jar> to /data/hudson-data/jobs/openutils-mgnlmedia/modules/net.sourceforge.openutils$openutils-mgnlmedia/builds/2011-02-09_11-22-02/archive/net.sourceforge.openutils/openutils-mgnlmedia/4.3.2-SNAPSHOT/openutils-mgnlmedia-4.3.2-SNAPSHOT.jar
[HUDSON] Archiving <https://hudson.openmindonline.it/job/openutils-mgnlmedia/net.sourceforge.openutils$openutils-mgnlmedia/ws/target/openutils-mgnlmedia-4.3.2-SNAPSHOT-sources.jar> to /data/hudson-data/jobs/openutils-mgnlmedia/modules/net.sourceforge.openutils$openutils-mgnlmedia/builds/2011-02-09_11-22-02/archive/net.sourceforge.openutils/openutils-mgnlmedia/4.3.2-SNAPSHOT/openutils-mgnlmedia-4.3.2-SNAPSHOT-sources.jar
[INFO] ------------------------------------------------------------------------
[ERROR] BUILD ERROR
[INFO] ------------------------------------------------------------------------
[INFO] Some files do not have the expected license header
[INFO] ------------------------------------------------------------------------
[INFO] For more information, run Maven with the -e switch
[INFO] ------------------------------------------------------------------------
[INFO] Total time: 43 seconds
[INFO] Finished at: Wed Feb 09 11:22:49 CET 2011
[INFO] Final Memory: 52M/319M
[INFO] ------------------------------------------------------------------------
Waiting for Hudson to finish collecting data

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

From: <die...@us...> - 2011-02-09 10:14:57

Revision: 3327
          http://openutils.svn.sourceforge.net/openutils/?rev=3327&view=rev
Author:   diego_schivo
Date:     2011-02-09 10:14:51 +0000 (Wed, 09 Feb 2011)

Log Message:
-----------
MEDIA-216 EL function mediaNodesInPlaylist

Modified Paths:
--------------
    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/playlist/pages/PlaylistView.java
    trunk/openutils-mgnlmedia/src/main/resources/META-INF/media.tld
    trunk/openutils-mgnlmedia/src/main/resources/mgnl-files/templates/samples-media/paragraph-playlist.jsp

Added Paths:
-----------
    trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/playlist/utils/
    trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/playlist/utils/PlaylistIterateUtils.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	2011-02-09 08:02:05 UTC (rev 3326)
+++ trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/tags/el/MediaEl.java	2011-02-09 10:14:51 UTC (rev 3327)
@@ -34,6 +34,7 @@
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Collections;
+import java.util.Iterator;
 import java.util.List;
 import java.util.Locale;
 import java.util.Map;
@@ -50,7 +51,10 @@
 import net.sourceforge.openutils.mgnlmedia.media.types.MediaTypeHandler;
 import net.sourceforge.openutils.mgnlmedia.media.types.impl.BaseTypeHandler;
 import net.sourceforge.openutils.mgnlmedia.media.utils.ImageUtils;
+import net.sourceforge.openutils.mgnlmedia.playlist.PlaylistConstants;
 import net.sourceforge.openutils.mgnlmedia.playlist.pages.PlaylistTrackExtensionContributor;
+import net.sourceforge.openutils.mgnlmedia.playlist.utils.PlaylistIterateUtils;
+import net.sourceforge.openutils.mgnlmedia.playlist.utils.PlaylistIterateUtils.MediaNodeAndEntryPath;
 
 import org.apache.commons.collections.CollectionUtils;
 import org.apache.commons.lang.StringUtils;
@@ -58,7 +62,10 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import com.google.common.base.Function;
+import com.google.common.collect.Iterators;
 
+
 /**
  * Class that holds media el functions methods
  * @author molaschi
@@ -94,6 +101,9 @@
      */
     public static Content node(Object obj)
     {
+        // TODO use openutils-mgnlutils 1.0.8:
+        // return it.openutils.mgnlutils.el.MgnlUtilsElFunctions.node(obj, MediaModule.REPO);
+
         if (obj == null)
         {
             return null;
@@ -794,4 +804,68 @@
         }
     }
 
+    /**
+     * @param obj
+     * @return
+     */
+    public static Iterator<Content> mediaNodesInPlaylist(Object obj)
+    {
+        // TODO use openutils-mgnlutils 1.0.8:
+        // Content playlistNode = it.openutils.mgnlutils.el.MgnlUtilsElFunctions.node(obj, PlaylistConstants.REPO);
+        Content playlistNode = null;
+        if (obj == null)
+        {
+            return null;
+        }
+
+        if (obj instanceof String)
+        {
+            String identifier = (String) obj;
+
+            if (StringUtils.isBlank(identifier))
+            {
+                return null;
+            }
+
+            HierarchyManager hm = MgnlContext.getHierarchyManager(PlaylistConstants.REPO);
+            try
+            {
+                if (identifier.startsWith("/"))
+                {
+                    if (hm.isExist(identifier))
+                    {
+                        playlistNode = hm.getContent(identifier);
+                    }
+                }
+                else
+                {
+                    playlistNode = hm.getContentByUUID(StringUtils.trim(identifier));
+                }
+            }
+            catch (ItemNotFoundException e)
+            {
+                log.debug("Node \"" + identifier + "\" not found");
+            }
+            catch (RepositoryException e)
+            {
+                log.error(e.getClass().getName() + " getting node \"" + identifier + "\"", e);
+            }
+        }
+        else if (obj instanceof Content)
+        {
+            playlistNode = (Content) obj;
+        }
+
+        return Iterators.transform(PlaylistIterateUtils.iterate(playlistNode), new Function<MediaNodeAndEntryPath, Content>()
+        {
+
+            /**
+             * {@inheritDoc}
+             */
+            public Content apply(MediaNodeAndEntryPath from)
+            {
+                return from.getMediaNode();
+            }
+        });
+    }
 }

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	2011-02-09 08:02:05 UTC (rev 3326)
+++ trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/playlist/pages/PlaylistView.java	2011-02-09 10:14:51 UTC (rev 3327)
@@ -20,18 +20,14 @@
 package net.sourceforge.openutils.mgnlmedia.playlist.pages;
 
 import info.magnolia.cms.core.Content;
-import info.magnolia.cms.core.ItemType;
 import info.magnolia.cms.i18n.I18nContentSupportFactory;
 import info.magnolia.cms.util.ContentUtil;
 import info.magnolia.cms.util.NodeDataUtil;
 import info.magnolia.context.MgnlContext;
 
 import java.io.IOException;
-import java.lang.reflect.Array;
 import java.util.ArrayList;
 import java.util.Collection;
-import java.util.Collections;
-import java.util.Enumeration;
 import java.util.HashMap;
 import java.util.Iterator;
 import java.util.LinkedHashMap;
@@ -41,23 +37,19 @@
 import java.util.Map.Entry;
 
 import javax.jcr.RepositoryException;
-import javax.jcr.Value;
 import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletRequestWrapper;
 import javax.servlet.http.HttpServletResponse;
 
-import net.sourceforge.openutils.mgnlcriteria.jcr.query.AdvancedResult;
-import net.sourceforge.openutils.mgnlcriteria.jcr.query.AdvancedResultItem;
-import net.sourceforge.openutils.mgnlcriteria.jcr.query.ResultIterator;
 import net.sourceforge.openutils.mgnlmedia.media.configuration.MediaConfigurationManager;
 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.pages.SortMode;
 import net.sourceforge.openutils.mgnlmedia.media.tags.el.MediaEl;
 import net.sourceforge.openutils.mgnlmedia.playlist.PlaylistConstants;
+import net.sourceforge.openutils.mgnlmedia.playlist.utils.PlaylistIterateUtils;
+import net.sourceforge.openutils.mgnlmedia.playlist.utils.PlaylistIterateUtils.MediaNodeAndEntryPath;
 
 import org.apache.commons.lang.LocaleUtils;
 import org.apache.commons.lang.StringUtils;
@@ -208,74 +200,41 @@
                 playlist.setDescription(NodeDataUtil.getString(node, propNames.get("description")));
                 List<PlaylistEntryBean> entries = new ArrayList<PlaylistEntryBean>();
 
-                Collection<Content> children = node.getChildren(PlaylistConstants.PLAYLIST_ENTRY);
-                for (Content subNode : children)
+                for (Iterator<MediaNodeAndEntryPath> iterator = PlaylistIterateUtils.iterate(node); iterator.hasNext();)
                 {
-                    String mediaUUID = NodeDataUtil.getString(subNode, "media");
-                    Content media = ContentUtil.getContentByUUID(MediaModule.REPO, mediaUUID);
-                    if (media != null)
+                    MediaNodeAndEntryPath item = iterator.next();
+                    Content media = item.getMediaNode();
+                    if (media == null)
                     {
-                        PlaylistEntryBean entry = playlistEntryBean(media, propNames);
-                        entry.setHandle(subNode.getHandle());
-                        entries.add(entry);
+                        continue;
                     }
-                    else
+                    PlaylistEntryBean entry = new PlaylistEntryBean();
+                    entry.setHandle(item.getPlaylistEntryPath());
+                    entry.setMedia(media.getUUID());
+                    entry.setMediaHandle(media.getHandle());
+                    MediaTypeConfiguration typeConf = MediaConfigurationManager
+                        .getInstance()
+                        .getMediaTypeConfigurationFromMedia(media);
+                    if (typeConf != null)
                     {
-                        log.warn(
-                            "Node {} referenced by entry {} of playlist {} does not exist in media repository",
-                            new Object[]{mediaUUID, subNode.getName(), playlist.getHandle() });
+                        entry.setMediaDialog(typeConf.getDialog());
                     }
+                    entry.setThumbnail(MediaEl.thumbnail(media));
+                    entry.setType(NodeDataUtil.getString(media, "type"));
+                    entry.setTitle(I18nContentSupportFactory
+                        .getI18nSupport()
+                        .getNodeData(media, propNames.get("title"))
+                        .getString());
+                    entry.setDescription(I18nContentSupportFactory
+                        .getI18nSupport()
+                        .getNodeData(media, propNames.get("description"))
+                        .getString());
+                    entry.setTags(I18nContentSupportFactory
+                        .getI18nSupport()
+                        .getNodeData(media, propNames.get("tags"))
+                        .getString());
+                    entries.add(entry);
                 }
-
-                try
-                {
-                    if (node.hasContent("search"))
-                    {
-                        Content requestNode = node.getContent("search");
-                        Collection<Content> paramNodes = requestNode.getChildren(ItemType.CONTENTNODE);
-                        final Map<String, Object> map = new HashMap<String, Object>();
-                        for (Content paramNode : paramNodes)
-                        {
-                            String paramName = NodeDataUtil.getString(paramNode, "name");
-                            Value[] jcrValues = paramNode.getNodeData("value").getValues();
-                            String[] paramValues = new String[jcrValues.length];
-                            for (int i = 0; i < jcrValues.length; i++)
-                            {
-                                paramValues[i] = jcrValues[i].getString();
-                            }
-                            if (paramValues.length == 1)
-                            {
-                                map.put(paramName, paramValues[0]);
-                            }
-                            else if (paramValues.length > 1)
-                            {
-                                map.put(paramName, paramValues);
-                            }
-                        }
-                        AdvancedResult searchResult = MediaEl
-                            .module()
-                            .getSearch()
-                            .search(
-                                new CustomParamsRequest(request, map, false),
-                                null,
-                                "/",
-                                true,
-                                SortMode.SCORE,
-                                (int) NodeDataUtil.getLong(node, "maxResults", 0),
-                                1);
-                        ResultIterator<AdvancedResultItem> items = searchResult.getItems();
-                        while (items.hasNext())
-                        {
-                            AdvancedResultItem item = items.next();
-                            PlaylistEntryBean entry = playlistEntryBean(item, propNames);
-                            entries.add(entry);
-                        }
-                    }
-                }
-                catch (RepositoryException e)
-                {
-                    // should never happen
-                }
                 playlist.setEntries(entries);
 
                 try
@@ -477,139 +436,4 @@
         return metas;
     }
 
-    private PlaylistEntryBean playlistEntryBean(Content media, Map<String, String> propNames)
-    {
-        PlaylistEntryBean entry = new PlaylistEntryBean();
-        entry.setMedia(media.getUUID());
-        entry.setMediaHandle(media.getHandle());
-        MediaTypeConfiguration typeConf = MediaConfigurationManager.getInstance().getMediaTypeConfigurationFromMedia(
-            media);
-        if (typeConf != null)
-        {
-            entry.setMediaDialog(typeConf.getDialog());
-        }
-        entry.setThumbnail(MediaEl.thumbnail(media));
-        entry.setType(NodeDataUtil.getString(media, "type"));
-        entry.setTitle(I18nContentSupportFactory
-            .getI18nSupport()
-            .getNodeData(media, propNames.get("title"))
-            .getString());
-        entry.setDescription(I18nContentSupportFactory
-            .getI18nSupport()
-            .getNodeData(media, propNames.get("description"))
-            .getString());
-        entry.setTags(I18nContentSupportFactory.getI18nSupport().getNodeData(media, propNames.get("tags")).getString());
-        return entry;
-
-    }
-
-    // freemarker.ext.servlet.IncludePage.CustomParamsRequest
-    private static final class CustomParamsRequest extends HttpServletRequestWrapper
-    {
-
-        private final HashMap paramsMap;
-
-        private CustomParamsRequest(HttpServletRequest request, Map paramMap, boolean inheritParams)
-        {
-            super(request);
-            paramsMap = inheritParams ? new HashMap(request.getParameterMap()) : new HashMap();
-            for (Iterator it = paramMap.entrySet().iterator(); it.hasNext();)
-            {
-                Map.Entry entry = (Map.Entry) it.next();
-                String name = String.valueOf(entry.getKey());
-                Object value = entry.getValue();
-                final String[] valueArray;
-                if (value == null)
-                {
-                    // Null values are explicitly added (so, among other
-                    // things, we can hide inherited param values).
-                    valueArray = new String[]{null };
-                }
-                else if (value instanceof String[])
-                {
-                    // String[] arrays are just passed through
-                    valueArray = (String[]) value;
-                }
-                else if (value instanceof Collection)
-                {
-                    // Collections are converted to String[], with
-                    // String.valueOf() used on elements
-                    Collection col = (Collection) value;
-                    valueArray = new String[col.size()];
-                    int i = 0;
-                    for (Iterator it2 = col.iterator(); it2.hasNext();)
-                    {
-                        valueArray[i++] = String.valueOf(it2.next());
-                    }
-                }
-                else if (value.getClass().isArray())
-                {
-                    // Other array types are too converted to String[], with
-                    // String.valueOf() used on elements
-                    int len = Array.getLength(value);
-                    valueArray = new String[len];
-                    for (int i = 0; i < len; ++i)
-                    {
-                        valueArray[i] = String.valueOf(Array.get(value, i));
-                    }
-                }
-                else
-                {
-                    // All other values (including strings) are converted to a
-                    // single-element String[], with String.valueOf applied to
-                    // the value.
-                    valueArray = new String[]{String.valueOf(value) };
-                }
-                String[] existingParams = (String[]) paramsMap.get(name);
-                int el = existingParams == null ? 0 : existingParams.length;
-                if (el == 0)
-                {
-                    // No original params, just put our array
-                    paramsMap.put(name, valueArray);
-                }
-                else
-                {
-                    int vl = valueArray.length;
-                    if (vl > 0)
-                    {
-                        // Both original params and new params, prepend our
-                        // params to original params
-                        String[] newValueArray = new String[el + vl];
-                        System.arraycopy(valueArray, 0, newValueArray, 0, vl);
-                        System.arraycopy(existingParams, 0, newValueArray, vl, el);
-                        paramsMap.put(name, newValueArray);
-                    }
-                }
-            }
-        }
-
-        public String[] getParameterValues(String name)
-        {
-            String[] value = ((String[]) paramsMap.get(name));
-            return value != null ? (String[]) value.clone() : null;
-        }
-
-        public String getParameter(String name)
-        {
-            String[] values = (String[]) paramsMap.get(name);
-            return values != null && values.length > 0 ? values[0] : null;
-        }
-
-        public Enumeration getParameterNames()
-        {
-            return Collections.enumeration(paramsMap.keySet());
-        }
-
-        public Map getParameterMap()
-        {
-            HashMap clone = (HashMap) paramsMap.clone();
-            for (Iterator it = clone.entrySet().iterator(); it.hasNext();)
-            {
-                Map.Entry entry = (Map.Entry) it.next();
-                entry.setValue(((String[]) entry.getValue()).clone());
-            }
-            return Collections.unmodifiableMap(clone);
-        }
-    }
-
 }

Added: trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/playlist/utils/PlaylistIterateUtils.java
===================================================================
--- trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/playlist/utils/PlaylistIterateUtils.java	                        (rev 0)
+++ trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/playlist/utils/PlaylistIterateUtils.java	2011-02-09 10:14:51 UTC (rev 3327)
@@ -0,0 +1,284 @@
+package net.sourceforge.openutils.mgnlmedia.playlist.utils;
+
+import info.magnolia.cms.core.Content;
+import info.magnolia.cms.core.ItemType;
+import info.magnolia.cms.util.NodeDataUtil;
+import info.magnolia.context.MgnlContext;
+
+import java.lang.reflect.Array;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.Enumeration;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.Map;
+
+import javax.jcr.RepositoryException;
+import javax.jcr.Value;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletRequestWrapper;
+
+import net.sourceforge.openutils.mgnlcriteria.jcr.query.AdvancedResult;
+import net.sourceforge.openutils.mgnlcriteria.jcr.query.AdvancedResultItem;
+import net.sourceforge.openutils.mgnlmedia.media.pages.SortMode;
+import net.sourceforge.openutils.mgnlmedia.media.tags.el.MediaEl;
+import net.sourceforge.openutils.mgnlmedia.playlist.PlaylistConstants;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import com.google.common.base.Function;
+import com.google.common.collect.Iterators;
+
+
+/**
+ * @author ADMIN
+ * @version $Id: $
+ */
+public final class PlaylistIterateUtils
+{
+
+    /**
+     * Logger.
+     */
+    private static Logger log = LoggerFactory.getLogger(PlaylistIterateUtils.class);
+
+    /**
+     * 
+     */
+    private PlaylistIterateUtils()
+    {
+    }
+
+    /**
+     * @param obj
+     * @return
+     */
+    @SuppressWarnings("unchecked")
+    public static Iterator<MediaNodeAndEntryPath> iterate(final Content playlistNode)
+    {
+        try
+        {
+            if (playlistNode.hasContent("search"))
+            {
+                Content searchNode = playlistNode.getContent("search");
+                Collection<Content> paramNodes = searchNode.getChildren(ItemType.CONTENTNODE);
+                final Map<String, Object> map = new HashMap<String, Object>();
+                for (Content paramNode : paramNodes)
+                {
+                    String paramName = NodeDataUtil.getString(paramNode, "name");
+                    Value[] jcrValues = paramNode.getNodeData("value").getValues();
+                    String[] paramValues = new String[jcrValues.length];
+                    for (int i = 0; i < jcrValues.length; i++)
+                    {
+                        paramValues[i] = jcrValues[i].getString();
+                    }
+                    if (paramValues.length == 1)
+                    {
+                        map.put(paramName, paramValues[0]);
+                    }
+                    else if (paramValues.length > 1)
+                    {
+                        map.put(paramName, paramValues);
+                    }
+                }
+                AdvancedResult searchResult = MediaEl
+                    .module()
+                    .getSearch()
+                    .search(
+                        new CustomParamsRequest(MgnlContext.getWebContext().getRequest(), map, false),
+                        null,
+                        "/",
+                        true,
+                        SortMode.SCORE,
+                        (int) NodeDataUtil.getLong(playlistNode, "maxResults", 0),
+                        1);
+                return Iterators.transform(searchResult.getItems(), new Function<AdvancedResultItem, MediaNodeAndEntryPath>()
+                {
+
+                    /**
+                     * {@inheritDoc}
+                     */
+                    public MediaNodeAndEntryPath apply(AdvancedResultItem from)
+                    {
+                        return new MediaNodeAndEntryPath(from, null);
+                    }
+                });
+            }
+            else
+            {
+                return Iterators.transform(
+                    playlistNode.getChildren(PlaylistConstants.PLAYLIST_ENTRY).iterator(),
+                    new Function<Content, MediaNodeAndEntryPath>()
+                    {
+
+                        /**
+                         * {@inheritDoc}
+                         */
+                        public MediaNodeAndEntryPath apply(Content playlistEntry)
+                        {
+                            String mediaUUID = NodeDataUtil.getString(playlistEntry, "media");
+                            Content mediaNode = MediaEl.node(mediaUUID);
+                            if (mediaNode == null)
+                            {
+                                log.warn(
+                                    "Node {} referenced by entry {} of playlist {} does not exist in media repository",
+                                    new Object[]{mediaUUID, playlistEntry.getName(), playlistNode.getHandle() });
+                            }
+
+                            return new MediaNodeAndEntryPath(mediaNode, playlistEntry.getHandle());
+                        }
+                    });
+            }
+        }
+        catch (RepositoryException e)
+        {
+            // should never happen
+            return null;
+        }
+    }
+
+    public static class MediaNodeAndEntryPath
+    {
+
+        private final Content mediaNode;
+
+        private final String playlistEntryPath;
+
+        /**
+         * 
+         */
+        public MediaNodeAndEntryPath(Content mediaNode, String playlistEntryPath)
+        {
+            this.mediaNode = mediaNode;
+            this.playlistEntryPath = playlistEntryPath;
+        }
+
+        /**
+         * Returns the mediaNode.
+         * @return the mediaNode
+         */
+        public Content getMediaNode()
+        {
+            return mediaNode;
+        }
+
+        /**
+         * Returns the playlistEntryPath.
+         * @return the playlistEntryPath
+         */
+        public String getPlaylistEntryPath()
+        {
+            return playlistEntryPath;
+        }
+    }
+
+    // freemarker.ext.servlet.IncludePage.CustomParamsRequest
+    private static final class CustomParamsRequest extends HttpServletRequestWrapper
+    {
+
+        private final HashMap paramsMap;
+
+        private CustomParamsRequest(HttpServletRequest request, Map paramMap, boolean inheritParams)
+        {
+            super(request);
+            paramsMap = inheritParams ? new HashMap(request.getParameterMap()) : new HashMap();
+            for (Iterator it = paramMap.entrySet().iterator(); it.hasNext();)
+            {
+                Map.Entry entry = (Map.Entry) it.next();
+                String name = String.valueOf(entry.getKey());
+                Object value = entry.getValue();
+                final String[] valueArray;
+                if (value == null)
+                {
+                    // Null values are explicitly added (so, among other
+                    // things, we can hide inherited param values).
+                    valueArray = new String[]{null };
+                }
+                else if (value instanceof String[])
+                {
+                    // String[] arrays are just passed through
+                    valueArray = (String[]) value;
+                }
+                else if (value instanceof Collection)
+                {
+                    // Collections are converted to String[], with
+                    // String.valueOf() used on elements
+                    Collection col = (Collection) value;
+                    valueArray = new String[col.size()];
+                    int i = 0;
+                    for (Iterator it2 = col.iterator(); it2.hasNext();)
+                    {
+                        valueArray[i++] = String.valueOf(it2.next());
+                    }
+                }
+                else if (value.getClass().isArray())
+                {
+                    // Other array types are too converted to String[], with
+                    // String.valueOf() used on elements
+                    int len = Array.getLength(value);
+                    valueArray = new String[len];
+                    for (int i = 0; i < len; ++i)
+                    {
+                        valueArray[i] = String.valueOf(Array.get(value, i));
+                    }
+                }
+                else
+                {
+                    // All other values (including strings) are converted to a
+                    // single-element String[], with String.valueOf applied to
+                    // the value.
+                    valueArray = new String[]{String.valueOf(value) };
+                }
+                String[] existingParams = (String[]) paramsMap.get(name);
+                int el = existingParams == null ? 0 : existingParams.length;
+                if (el == 0)
+                {
+                    // No original params, just put our array
+                    paramsMap.put(name, valueArray);
+                }
+                else
+                {
+                    int vl = valueArray.length;
+                    if (vl > 0)
+                    {
+                        // Both original params and new params, prepend our
+                        // params to original params
+                        String[] newValueArray = new String[el + vl];
+                        System.arraycopy(valueArray, 0, newValueArray, 0, vl);
+                        System.arraycopy(existingParams, 0, newValueArray, vl, el);
+                        paramsMap.put(name, newValueArray);
+                    }
+                }
+            }
+        }
+
+        public String[] getParameterValues(String name)
+        {
+            String[] value = ((String[]) paramsMap.get(name));
+            return value != null ? (String[]) value.clone() : null;
+        }
+
+        public String getParameter(String name)
+        {
+            String[] values = (String[]) paramsMap.get(name);
+            return values != null && values.length > 0 ? values[0] : null;
+        }
+
+        public Enumeration getParameterNames()
+        {
+            return Collections.enumeration(paramsMap.keySet());
+        }
+
+        public Map getParameterMap()
+        {
+            HashMap clone = (HashMap) paramsMap.clone();
+            for (Iterator it = clone.entrySet().iterator(); it.hasNext();)
+            {
+                Map.Entry entry = (Map.Entry) it.next();
+                entry.setValue(((String[]) entry.getValue()).clone());
+            }
+            return Collections.unmodifiableMap(clone);
+        }
+    }
+}

Modified: trunk/openutils-mgnlmedia/src/main/resources/META-INF/media.tld
===================================================================
--- trunk/openutils-mgnlmedia/src/main/resources/META-INF/media.tld	2011-02-09 08:02:05 UTC (rev 3326)
+++ trunk/openutils-mgnlmedia/src/main/resources/META-INF/media.tld	2011-02-09 10:14:51 UTC (rev 3327)
@@ -320,4 +320,11 @@
     <function-class>net.sourceforge.openutils.mgnlmedia.media.tags.el.MediaEl</function-class>
     <function-signature>java.lang.Object property(info.magnolia.cms.core.Content, java.lang.String)</function-signature>
   </function>
+  <function>
+    <description></description>
+    <display-name>mediaNodesInPlaylist</display-name>
+    <name>mediaNodesInPlaylist</name>
+    <function-class>net.sourceforge.openutils.mgnlmedia.media.tags.el.MediaEl</function-class>
+    <function-signature>java.util.Iterator mediaNodesInPlaylist(java.lang.Object)</function-signature>
+  </function>
 </taglib>
\ No newline at end of file

Modified: trunk/openutils-mgnlmedia/src/main/resources/mgnl-files/templates/samples-media/paragraph-playlist.jsp
===================================================================
--- trunk/openutils-mgnlmedia/src/main/resources/mgnl-files/templates/samples-media/paragraph-playlist.jsp	2011-02-09 08:02:05 UTC (rev 3326)
+++ trunk/openutils-mgnlmedia/src/main/resources/mgnl-files/templates/samples-media/paragraph-playlist.jsp	2011-02-09 10:14:51 UTC (rev 3327)
@@ -8,10 +8,9 @@
     <div>
       <h3>${playlistNode.title}</h3>
       <div>
-        <cms:contentNodeIterator items="${mu:contentChildrenOfType(playlistNode, 'mgnl:playlistentry')}">
-          <cms:setNode var="entryNode" />
-          <media:media node="${entryNode}" property="media" width="320" height="240" />
-        </cms:contentNodeIterator>
+        <c:forEach var="mediaNode" items="${media:mediaNodesInPlaylist(playlistNode)}">
+          <media:media item="${mediaNode}" width="320" height="240" />
+        </c:forEach>
       </div>
     </div>
   </div>


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

[Openutils-svn] Hudson build is back to normal : openutils-mgnlutils #59

From: <hu...@op...> - 2011-02-09 08:51:16

See <https://hudson.openmindonline.it/job/openutils-mgnlutils/59/changes>

[Openutils-svn] Hudson build is back to stable : openutils-mgnlutils » Generic utilities for Magnolia CMS #59

From: <hu...@op...> - 2011-02-09 08:51:16

See <https://hudson.openmindonline.it/job/openutils-mgnlutils/net.sourceforge.openutils$openutils-mgnlutils/59/changes>

[Openutils-svn] SF.net SVN: openutils:[3326] trunk/openutils-mgnlutils/src/main/java/it/ openutils/mgnlutils/el/MgnlUtilsElFunctions.java

From: <die...@us...> - 2011-02-09 08:02:11

Revision: 3326
          http://openutils.svn.sourceforge.net/openutils/?rev=3326&view=rev
Author:   diego_schivo
Date:     2011-02-09 08:02:05 +0000 (Wed, 09 Feb 2011)

Log Message:
-----------
MGNLUTILS-25 EL function returning a content given a UUID/path/content

Modified Paths:
--------------
    trunk/openutils-mgnlutils/src/main/java/it/openutils/mgnlutils/el/MgnlUtilsElFunctions.java

Modified: trunk/openutils-mgnlutils/src/main/java/it/openutils/mgnlutils/el/MgnlUtilsElFunctions.java
===================================================================
--- trunk/openutils-mgnlutils/src/main/java/it/openutils/mgnlutils/el/MgnlUtilsElFunctions.java	2011-02-09 07:55:26 UTC (rev 3325)
+++ trunk/openutils-mgnlutils/src/main/java/it/openutils/mgnlutils/el/MgnlUtilsElFunctions.java	2011-02-09 08:02:05 UTC (rev 3326)
@@ -787,9 +787,9 @@
 
         if (obj instanceof String)
         {
-            String mediaIdentifier = (String) obj;
+            String identifier = (String) obj;
 
-            if (StringUtils.isBlank(mediaIdentifier))
+            if (StringUtils.isBlank(identifier))
             {
                 return null;
             }
@@ -797,25 +797,25 @@
             HierarchyManager hm = MgnlContext.getHierarchyManager(repo);
             try
             {
-                if (mediaIdentifier.startsWith("/"))
+                if (identifier.startsWith("/"))
                 {
-                    if (hm.isExist(mediaIdentifier))
+                    if (hm.isExist(identifier))
                     {
-                        content = hm.getContent(mediaIdentifier);
+                        content = hm.getContent(identifier);
                     }
                 }
                 else
                 {
-                    content = hm.getContentByUUID(StringUtils.trim(mediaIdentifier));
+                    content = hm.getContentByUUID(StringUtils.trim(identifier));
                 }
             }
             catch (ItemNotFoundException e)
             {
-                log.debug("Node \"" + mediaIdentifier + "\" not found");
+                log.debug("Node \"" + identifier + "\" not found");
             }
             catch (RepositoryException e)
             {
-                log.error(e.getClass().getName() + " getting node \"" + mediaIdentifier + "\"", e);
+                log.error(e.getClass().getName() + " getting node \"" + identifier + "\"", e);
             }
         }
         else if (obj instanceof Content)


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

[Openutils-svn] SF.net SVN: openutils:[3325] trunk/openutils-mgnlutils/src/main

From: <die...@us...> - 2011-02-09 07:55:33

Revision: 3325
          http://openutils.svn.sourceforge.net/openutils/?rev=3325&view=rev
Author:   diego_schivo
Date:     2011-02-09 07:55:26 +0000 (Wed, 09 Feb 2011)

Log Message:
-----------
MGNLUTILS-25 EL function returning a content given a UUID/path/content

Modified Paths:
--------------
    trunk/openutils-mgnlutils/src/main/java/it/openutils/mgnlutils/el/MgnlUtilsElFunctions.java
    trunk/openutils-mgnlutils/src/main/resources/META-INF/tld/mgnlutils.tld

Modified: trunk/openutils-mgnlutils/src/main/java/it/openutils/mgnlutils/el/MgnlUtilsElFunctions.java
===================================================================
--- trunk/openutils-mgnlutils/src/main/java/it/openutils/mgnlutils/el/MgnlUtilsElFunctions.java	2011-02-08 18:09:30 UTC (rev 3324)
+++ trunk/openutils-mgnlutils/src/main/java/it/openutils/mgnlutils/el/MgnlUtilsElFunctions.java	2011-02-09 07:55:26 UTC (rev 3325)
@@ -22,10 +22,12 @@
 import info.magnolia.cms.beans.config.ContentRepository;
 import info.magnolia.cms.beans.config.ServerConfiguration;
 import info.magnolia.cms.core.Content;
+import info.magnolia.cms.core.HierarchyManager;
 import info.magnolia.cms.core.ItemType;
 import info.magnolia.cms.core.Path;
 import info.magnolia.cms.core.SystemProperty;
 import info.magnolia.cms.i18n.I18nContentSupportFactory;
+import info.magnolia.cms.i18n.I18nContentWrapper;
 import info.magnolia.cms.util.NodeMapWrapper;
 import info.magnolia.context.MgnlContext;
 import info.magnolia.context.WebContext;
@@ -42,6 +44,7 @@
 import java.util.Map;
 import java.util.Map.Entry;
 
+import javax.jcr.ItemNotFoundException;
 import javax.jcr.RepositoryException;
 import javax.servlet.http.HttpServletRequest;
 
@@ -767,4 +770,86 @@
             return string;
         }
     }
+
+    /**
+     * @param obj
+     * @param repo
+     * @return
+     */
+    public static Content content(Object obj, String repo)
+    {
+        if (obj == null)
+        {
+            return null;
+        }
+
+        Content content = null;
+
+        if (obj instanceof String)
+        {
+            String mediaIdentifier = (String) obj;
+
+            if (StringUtils.isBlank(mediaIdentifier))
+            {
+                return null;
+            }
+
+            HierarchyManager hm = MgnlContext.getHierarchyManager(repo);
+            try
+            {
+                if (mediaIdentifier.startsWith("/"))
+                {
+                    if (hm.isExist(mediaIdentifier))
+                    {
+                        content = hm.getContent(mediaIdentifier);
+                    }
+                }
+                else
+                {
+                    content = hm.getContentByUUID(StringUtils.trim(mediaIdentifier));
+                }
+            }
+            catch (ItemNotFoundException e)
+            {
+                log.debug("Node \"" + mediaIdentifier + "\" not found");
+            }
+            catch (RepositoryException e)
+            {
+                log.error(e.getClass().getName() + " getting node \"" + mediaIdentifier + "\"", e);
+            }
+        }
+        else if (obj instanceof Content)
+        {
+            content = (Content) obj;
+        }
+
+        return content;
+    }
+
+    /**
+     * @param obj
+     * @param repo
+     * @return
+     */
+    public static NodeMapWrapper node(Object obj, String repo)
+    {
+        Content content = content(obj, repo);
+
+        NodeMapWrapper node = null;
+        if (content instanceof NodeMapWrapper)
+        {
+            node = (NodeMapWrapper) content;
+        }
+        else if (content != null)
+        {
+            Content currentpage = MgnlContext.getAggregationState().getMainContent();
+            if (currentpage == null)
+            {
+                currentpage = content;
+            }
+            node = new NodeMapWrapper(new I18nContentWrapper(content), currentpage.getHandle());
+        }
+
+        return node;
+    }
 }

Modified: trunk/openutils-mgnlutils/src/main/resources/META-INF/tld/mgnlutils.tld
===================================================================
--- trunk/openutils-mgnlutils/src/main/resources/META-INF/tld/mgnlutils.tld	2011-02-08 18:09:30 UTC (rev 3324)
+++ trunk/openutils-mgnlutils/src/main/resources/META-INF/tld/mgnlutils.tld	2011-02-09 07:55:26 UTC (rev 3325)
@@ -289,4 +289,16 @@
     <function-class>it.openutils.mgnlutils.el.MgnlUtilsElFunctions</function-class>
     <function-signature>java.util.String buildQuerystringIncluding(java.lang.String)</function-signature>
   </function>
+  <function>
+    <description></description>
+    <name>content</name>
+    <function-class>it.openutils.mgnlutils.el.MgnlUtilsElFunctions</function-class>
+    <function-signature>info.magnolia.cms.core.Content content(java.lang.Object, java.lang.String)</function-signature>
+  </function>
+  <function>
+    <description></description>
+    <name>node</name>
+    <function-class>it.openutils.mgnlutils.el.MgnlUtilsElFunctions</function-class>
+    <function-signature>info.magnolia.cms.util.NodeMapWrapper node(java.lang.Object, java.lang.String)</function-signature>
+  </function>
 </taglib>
\ No newline at end of file


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

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

From: <die...@us...> - 2011-02-08 18:09:37

Revision: 3324
          http://openutils.svn.sourceforge.net/openutils/?rev=3324&view=rev
Author:   diego_schivo
Date:     2011-02-08 18:09:30 +0000 (Tue, 08 Feb 2011)

Log Message:
-----------
MEDIA-214 required fields

Modified Paths:
--------------
    trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/pages/MediaAdvancedSearchPage.java
    trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap/media/config.modules.media.dialogs.playlistAsSearch.xml

Modified: trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/pages/MediaAdvancedSearchPage.java
===================================================================
--- trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/pages/MediaAdvancedSearchPage.java	2011-02-08 17:58:15 UTC (rev 3323)
+++ trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/pages/MediaAdvancedSearchPage.java	2011-02-08 18:09:30 UTC (rev 3324)
@@ -249,46 +249,6 @@
 
     public String saveAsPlaylist()
     {
-        if (false)
-        {
-            Set<String> excludeParamNames = new HashSet<String>();
-            excludeParamNames.add("saveAsPlaylist");
-            excludeParamNames.add("command");
-            try
-            {
-                HierarchyManager hm = MgnlContext.getSystemContext().getHierarchyManager(PlaylistConstants.REPO);
-                ValueFactory valueFactory = hm.getWorkspace().getSession().getValueFactory();
-
-                Content playlistNode = hm.createContent("/samples", "hello", PlaylistConstants.PLAYLIST.getSystemName());
-                Content requestNode = playlistNode.createContent("request", ItemType.CONTENTNODE);
-                for (Enumeration paramNames = request.getParameterNames(); paramNames.hasMoreElements();)
-                {
-                    String paramName = (String) paramNames.nextElement();
-                    if (excludeParamNames.contains(paramName))
-                    {
-                        continue;
-                    }
-                    String[] paramValues = request.getParameterValues(paramName);
-
-                    Content paramNode = requestNode.createContent(
-                        Path.getUniqueLabel(requestNode, "0"),
-                        ItemType.CONTENTNODE);
-                    paramNode.setNodeData("name", paramName);
-                    Value[] jcrValues = new Value[paramValues.length];
-                    for (int i = 0; i < paramValues.length; i++)
-                    {
-                        jcrValues[i] = NodeDataUtil.createValue(paramValues[i], PropertyType.STRING, valueFactory);
-                    }
-                    paramNode.setNodeData("value", jcrValues);
-                }
-                playlistNode.getParent().save();
-            }
-            catch (RepositoryException e)
-            {
-                // TODO Auto-generated catch block
-                e.printStackTrace();
-            }
-        }
         return show();
     }
 }

Modified: trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap/media/config.modules.media.dialogs.playlistAsSearch.xml
===================================================================
--- trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap/media/config.modules.media.dialogs.playlistAsSearch.xml	2011-02-08 17:58:15 UTC (rev 3323)
+++ trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap/media/config.modules.media.dialogs.playlistAsSearch.xml	2011-02-08 18:09:30 UTC (rev 3324)
@@ -96,6 +96,9 @@
       <sv:property sv:name="label" sv:type="String">
         <sv:value>Parent folder</sv:value>
       </sv:property>
+      <sv:property sv:name="required" sv:type="String">
+        <sv:value>true</sv:value>
+      </sv:property>
       <sv:property sv:name="saveInfo" sv:type="String">
         <sv:value>false</sv:value>
       </sv:property>
@@ -119,7 +122,7 @@
           <sv:value>2010-02-04T16:32:31.109+01:00</sv:value>
         </sv:property>
         <sv:property sv:name="mgnl:lastmodified" sv:type="Date">
-          <sv:value>2011-02-08T14:47:19.599+01:00</sv:value>
+          <sv:value>2011-02-08T19:07:23.860+01:00</sv:value>
         </sv:property>
       </sv:node>
     </sv:node>
@@ -142,6 +145,9 @@
       <sv:property sv:name="label" sv:type="String">
         <sv:value>Playlist name</sv:value>
       </sv:property>
+      <sv:property sv:name="required" sv:type="String">
+        <sv:value>true</sv:value>
+      </sv:property>
       <sv:property sv:name="saveInfo" sv:type="String">
         <sv:value>false</sv:value>
       </sv:property>
@@ -162,7 +168,7 @@
           <sv:value>2010-02-04T16:32:31.109+01:00</sv:value>
         </sv:property>
         <sv:property sv:name="mgnl:lastmodified" sv:type="Date">
-          <sv:value>2011-02-08T14:47:30.384+01:00</sv:value>
+          <sv:value>2011-02-08T19:07:33.464+01: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.

Flat | Threaded

<< < 1 .. 62 63 64 65 66 .. 227 > >> (Page 64 of 227)