Menu
▾
▴
openutils-svn — developer list with svn commits
You can subscribe to this list here.
| 2006 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
(4) |
Nov
(39) |
Dec
(10) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2007 |
Jan
(19) |
Feb
(150) |
Mar
(10) |
Apr
|
May
(8) |
Jun
(11) |
Jul
(27) |
Aug
(52) |
Sep
(35) |
Oct
(30) |
Nov
(18) |
Dec
(4) |
| 2008 |
Jan
(76) |
Feb
(121) |
Mar
(39) |
Apr
(55) |
May
(18) |
Jun
(49) |
Jul
(32) |
Aug
(4) |
Sep
(10) |
Oct
|
Nov
(3) |
Dec
(33) |
| 2009 |
Jan
(19) |
Feb
(87) |
Mar
(69) |
Apr
(38) |
May
(47) |
Jun
(20) |
Jul
(5) |
Aug
(76) |
Sep
(145) |
Oct
(34) |
Nov
(8) |
Dec
(68) |
| 2010 |
Jan
(150) |
Feb
(379) |
Mar
(191) |
Apr
(100) |
May
(525) |
Jun
(269) |
Jul
(127) |
Aug
(190) |
Sep
(190) |
Oct
(29) |
Nov
(147) |
Dec
(83) |
| 2011 |
Jan
(188) |
Feb
(81) |
Mar
(43) |
Apr
(97) |
May
(63) |
Jun
(129) |
Jul
(17) |
Aug
(124) |
Sep
(6) |
Oct
(20) |
Nov
(67) |
Dec
(23) |
| 2012 |
Jan
(6) |
Feb
(14) |
Mar
(181) |
Apr
(64) |
May
(102) |
Jun
(47) |
Jul
(26) |
Aug
(3) |
Sep
(1) |
Oct
(14) |
Nov
(13) |
Dec
(23) |
| 2013 |
Jan
(4) |
Feb
(14) |
Mar
(18) |
Apr
(14) |
May
(27) |
Jun
(27) |
Jul
(5) |
Aug
(2) |
Sep
(74) |
Oct
(79) |
Nov
(21) |
Dec
(97) |
| 2014 |
Jan
(6) |
Feb
(3) |
Mar
(8) |
Apr
|
May
(5) |
Jun
|
Jul
(9) |
Aug
(6) |
Sep
(3) |
Oct
(10) |
Nov
(6) |
Dec
|
| 2015 |
Jan
|
Feb
|
Mar
(1) |
Apr
(25) |
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
| 2016 |
Jan
|
Feb
|
Mar
|
Apr
(5) |
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
|
From: <die...@us...> - 2011-02-08 17:58:22
|
Revision: 3323
http://openutils.svn.sourceforge.net/openutils/?rev=3323&view=rev
Author: diego_schivo
Date: 2011-02-08 17:58:15 +0000 (Tue, 08 Feb 2011)
Log Message:
-----------
MEDIA-214 playlist from search
Modified Paths:
--------------
trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap/media/config.modules.media.dialogs.playlistAsSearch.xml
trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/playlist/pages/PlaylistView.html
Removed Paths:
-------------
trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/save/PlaylistFromSearchSaveHandler.java
Deleted: trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/save/PlaylistFromSearchSaveHandler.java
===================================================================
--- trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/save/PlaylistFromSearchSaveHandler.java 2011-02-08 17:48:33 UTC (rev 3322)
+++ trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/save/PlaylistFromSearchSaveHandler.java 2011-02-08 17:58:15 UTC (rev 3323)
@@ -1,47 +0,0 @@
-/**
- *
- * 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.media.save;
-
-import info.magnolia.cms.core.Content;
-import info.magnolia.cms.security.AccessDeniedException;
-import info.magnolia.module.admininterface.UUIDSaveHandler;
-
-import javax.jcr.PathNotFoundException;
-import javax.jcr.RepositoryException;
-
-
-/**
- * @author ADMIN
- * @version $Id: $
- */
-public class PlaylistFromSearchSaveHandler extends UUIDSaveHandler
-{
-
- /**
- * {@inheritDoc}
- */
- @Override
- protected void processSaveInfo(Content node, String saveInfo) throws PathNotFoundException, RepositoryException,
- AccessDeniedException
- {
- // TODO Auto-generated method stub
- super.processSaveInfo(node, saveInfo);
- }
-}
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:48:33 UTC (rev 3322)
+++ trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap/media/config.modules.media.dialogs.playlistAsSearch.xml 2011-02-08 17:58:15 UTC (rev 3323)
@@ -18,9 +18,6 @@
<sv:property sv:name="label" sv:type="String">
<sv:value>Playlist</sv:value>
</sv:property>
- <sv:property sv:name="saveHandler" sv:type="String">
- <sv:value>net.sourceforge.openutils.mgnlmedia.media.save.PlaylistFromSearchSaveHandler</sv:value>
- </sv:property>
<sv:node sv:name="MetaData">
<sv:property sv:name="jcr:primaryType" sv:type="Name">
<sv:value>mgnl:metaData</sv:value>
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-08 17:48:33 UTC (rev 3322)
+++ trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/playlist/pages/PlaylistView.html 2011-02-08 17:58:15 UTC (rev 3323)
@@ -250,7 +250,7 @@
enableColLock: false,
tbar: tbar,
stripeRows: true,
- plugins: [dd]
+ plugins: !playlist.readOnly ? [dd] : []
}
},{
columnWidth: 0.4,
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <die...@us...> - 2011-02-08 17:48:41
|
Revision: 3322
http://openutils.svn.sourceforge.net/openutils/?rev=3322&view=rev
Author: diego_schivo
Date: 2011-02-08 17:48:33 +0000 (Tue, 08 Feb 2011)
Log Message:
-----------
MEDIA-214 playlist from search
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/media/pages/MediaAdvancedSearchFormPage.html
trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/media/pages/MediaFolderViewPage.html
trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/playlist/pages/PlaylistView.html
Added Paths:
-----------
trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/save/PlaylistFromSearchSaveHandler.java
trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/playlist/dialog/PlaylistFromSearchDialogMVC.java
trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap/media/config.modules.media.dialogs.playlistAsSearch.xml
Removed Paths:
-------------
trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/playlist/dialog/SearchPlaylistDialogMVC.java
trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/playlist/dialog/SearchPlaylistSaveHandler.java
trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap/media/config.modules.media.dialogs.search-playlist.xml
Added: trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/save/PlaylistFromSearchSaveHandler.java
===================================================================
--- trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/save/PlaylistFromSearchSaveHandler.java (rev 0)
+++ trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/save/PlaylistFromSearchSaveHandler.java 2011-02-08 17:48:33 UTC (rev 3322)
@@ -0,0 +1,47 @@
+/**
+ *
+ * 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.media.save;
+
+import info.magnolia.cms.core.Content;
+import info.magnolia.cms.security.AccessDeniedException;
+import info.magnolia.module.admininterface.UUIDSaveHandler;
+
+import javax.jcr.PathNotFoundException;
+import javax.jcr.RepositoryException;
+
+
+/**
+ * @author ADMIN
+ * @version $Id: $
+ */
+public class PlaylistFromSearchSaveHandler extends UUIDSaveHandler
+{
+
+ /**
+ * {@inheritDoc}
+ */
+ @Override
+ protected void processSaveInfo(Content node, String saveInfo) throws PathNotFoundException, RepositoryException,
+ AccessDeniedException
+ {
+ // TODO Auto-generated method stub
+ super.processSaveInfo(node, saveInfo);
+ }
+}
Added: 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 (rev 0)
+++ trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/playlist/dialog/PlaylistFromSearchDialogMVC.java 2011-02-08 17:48:33 UTC (rev 3322)
@@ -0,0 +1,118 @@
+/**
+ *
+ * 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.dialog;
+
+import info.magnolia.cms.core.Content;
+import info.magnolia.cms.gui.misc.Sources;
+import info.magnolia.module.admininterface.SaveHandler;
+import info.magnolia.module.admininterface.dialogs.ConfiguredDialog;
+
+import java.io.IOException;
+import java.io.PrintWriter;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+import net.sourceforge.openutils.mgnlmedia.playlist.PlaylistConstants;
+
+import org.apache.commons.lang.StringUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+
+/**
+ * @author ADMIN
+ * @version $Id: $
+ */
+public class PlaylistFromSearchDialogMVC extends ConfiguredDialog
+{
+
+ /**
+ * Logger.
+ */
+ private Logger log = LoggerFactory.getLogger(PlaylistFromSearchDialogMVC.class);
+
+ /**
+ *
+ */
+ public PlaylistFromSearchDialogMVC(
+ String name,
+ HttpServletRequest request,
+ HttpServletResponse response,
+ Content configNode)
+ {
+ super(name, request, response, configNode);
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ @Override
+ protected void configureSaveHandler(SaveHandler saveHandler)
+ {
+ super.configureSaveHandler(saveHandler);
+ saveHandler.setPath(form.getParameter("parentFolder"));
+ saveHandler.setNodeName(form.getParameter("playlistName"));
+ saveHandler.setRepository(PlaylistConstants.REPO);
+ saveHandler.setCreationItemType(PlaylistConstants.PLAYLIST);
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ @Override
+ protected boolean onPreSave(SaveHandler control)
+ {
+ // TODO Auto-generated method stub
+ return super.onPreSave(control);
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ @Override
+ protected boolean onPostSave(SaveHandler control)
+ {
+ // TODO Auto-generated method stub
+ return super.onPostSave(control);
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ @Override
+ public void renderHtml(String view) throws IOException
+ {
+ if (VIEW_CLOSE_WINDOW.equals(view))
+ {
+ PrintWriter out = this.getResponse().getWriter();
+
+ 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("</script></html>"); //$NON-NLS-1$
+ }
+ else
+ {
+ super.renderHtml(view);
+ }
+ }
+}
Deleted: trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/playlist/dialog/SearchPlaylistDialogMVC.java
===================================================================
--- trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/playlist/dialog/SearchPlaylistDialogMVC.java 2011-02-08 14:38:37 UTC (rev 3321)
+++ trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/playlist/dialog/SearchPlaylistDialogMVC.java 2011-02-08 17:48:33 UTC (rev 3322)
@@ -1,118 +0,0 @@
-/**
- *
- * 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.dialog;
-
-import info.magnolia.cms.core.Content;
-import info.magnolia.cms.gui.misc.Sources;
-import info.magnolia.module.admininterface.SaveHandler;
-import info.magnolia.module.admininterface.dialogs.ConfiguredDialog;
-
-import java.io.IOException;
-import java.io.PrintWriter;
-
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
-import net.sourceforge.openutils.mgnlmedia.playlist.PlaylistConstants;
-
-import org.apache.commons.lang.StringUtils;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-
-/**
- * @author ADMIN
- * @version $Id: $
- */
-public class SearchPlaylistDialogMVC extends ConfiguredDialog
-{
-
- /**
- * Logger.
- */
- private Logger log = LoggerFactory.getLogger(SearchPlaylistDialogMVC.class);
-
- /**
- *
- */
- public SearchPlaylistDialogMVC(
- String name,
- HttpServletRequest request,
- HttpServletResponse response,
- Content configNode)
- {
- super(name, request, response, configNode);
- }
-
- /**
- * {@inheritDoc}
- */
- @Override
- protected void configureSaveHandler(SaveHandler saveHandler)
- {
- super.configureSaveHandler(saveHandler);
- saveHandler.setPath(form.getParameter("parentFolder"));
- saveHandler.setNodeName(form.getParameter("playlistName"));
- saveHandler.setRepository(PlaylistConstants.REPO);
- saveHandler.setCreationItemType(PlaylistConstants.PLAYLIST);
- }
-
- /**
- * {@inheritDoc}
- */
- @Override
- protected boolean onPreSave(SaveHandler control)
- {
- // TODO Auto-generated method stub
- return super.onPreSave(control);
- }
-
- /**
- * {@inheritDoc}
- */
- @Override
- protected boolean onPostSave(SaveHandler control)
- {
- // TODO Auto-generated method stub
- return super.onPostSave(control);
- }
-
- /**
- * {@inheritDoc}
- */
- @Override
- public void renderHtml(String view) throws IOException
- {
- if (VIEW_CLOSE_WINDOW.equals(view))
- {
- PrintWriter out = this.getResponse().getWriter();
-
- 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("</script></html>"); //$NON-NLS-1$
- }
- else
- {
- super.renderHtml(view);
- }
- }
-}
Deleted: trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/playlist/dialog/SearchPlaylistSaveHandler.java
===================================================================
--- trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/playlist/dialog/SearchPlaylistSaveHandler.java 2011-02-08 14:38:37 UTC (rev 3321)
+++ trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/playlist/dialog/SearchPlaylistSaveHandler.java 2011-02-08 17:48:33 UTC (rev 3322)
@@ -1,47 +0,0 @@
-/**
- *
- * 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.dialog;
-
-import info.magnolia.cms.core.Content;
-import info.magnolia.cms.security.AccessDeniedException;
-import info.magnolia.module.admininterface.UUIDSaveHandler;
-
-import javax.jcr.PathNotFoundException;
-import javax.jcr.RepositoryException;
-
-
-/**
- * @author ADMIN
- * @version $Id: $
- */
-public class SearchPlaylistSaveHandler extends UUIDSaveHandler
-{
-
- /**
- * {@inheritDoc}
- */
- @Override
- protected void processSaveInfo(Content node, String saveInfo) throws PathNotFoundException, RepositoryException,
- AccessDeniedException
- {
- // TODO Auto-generated method stub
- super.processSaveInfo(node, saveInfo);
- }
-}
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-08 14:38:37 UTC (rev 3321)
+++ trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/playlist/pages/PlaylistBean.java 2011-02-08 17:48:33 UTC (rev 3322)
@@ -38,6 +38,8 @@
private List<PlaylistEntryBean> entries;
+ private boolean readOnly;
+
/**
* Returns the uuid.
* @return the uuid
@@ -127,4 +129,24 @@
{
this.entries = entries;
}
+
+
+ /**
+ * Returns the readOnly.
+ * @return the readOnly
+ */
+ public boolean isReadOnly()
+ {
+ return readOnly;
+ }
+
+
+ /**
+ * Sets the readOnly.
+ * @param readOnly the readOnly to set
+ */
+ public void setReadOnly(boolean readOnly)
+ {
+ this.readOnly = readOnly;
+ }
}
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-08 14:38:37 UTC (rev 3321)
+++ trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/playlist/pages/PlaylistView.java 2011-02-08 17:48:33 UTC (rev 3322)
@@ -227,12 +227,11 @@
}
}
- String requestNodeName = "search";
try
{
- if (node.hasContent(requestNodeName))
+ if (node.hasContent("search"))
{
- Content requestNode = node.getContent(requestNodeName);
+ 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)
@@ -275,10 +274,18 @@
}
catch (RepositoryException e)
{
- // TODO Auto-generated catch block
- e.printStackTrace();
+ // should never happen
}
playlist.setEntries(entries);
+
+ try
+ {
+ playlist.setReadOnly(node.hasContent("search"));
+ }
+ catch (RepositoryException e)
+ {
+ // should never happen
+ }
}
else
{
Added: 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 (rev 0)
+++ trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap/media/config.modules.media.dialogs.playlistAsSearch.xml 2011-02-08 17:48:33 UTC (rev 3322)
@@ -0,0 +1,253 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<sv:node sv:name="playlistAsSearch" xmlns:sv="http://www.jcp.org/jcr/sv/1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+ <sv:property sv:name="jcr:primaryType" sv:type="Name">
+ <sv:value>mgnl:contentNode</sv:value>
+ </sv:property>
+ <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
+ <sv:value>mix:lockable</sv:value>
+ </sv:property>
+ <sv:property sv:name="jcr:uuid" sv:type="String">
+ <sv:value>aa50c92e-cad0-493b-ab7f-facecac2a284</sv:value>
+ </sv:property>
+ <sv:property sv:name="class" sv:type="String">
+ <sv:value>net.sourceforge.openutils.mgnlmedia.playlist.dialog.PlaylistFromSearchDialogMVC</sv:value>
+ </sv:property>
+ <sv:property sv:name="jcr:createdBy" sv:type="String">
+ <sv:value>admin</sv:value>
+ </sv:property>
+ <sv:property sv:name="label" sv:type="String">
+ <sv:value>Playlist</sv:value>
+ </sv:property>
+ <sv:property sv:name="saveHandler" sv:type="String">
+ <sv:value>net.sourceforge.openutils.mgnlmedia.media.save.PlaylistFromSearchSaveHandler</sv:value>
+ </sv:property>
+ <sv:node sv:name="MetaData">
+ <sv:property sv:name="jcr:primaryType" sv:type="Name">
+ <sv:value>mgnl:metaData</sv:value>
+ </sv:property>
+ <sv:property sv:name="jcr:createdBy" sv:type="String">
+ <sv:value>admin</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:activated" sv:type="Boolean">
+ <sv:value>false</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:authorid" sv:type="String">
+ <sv:value>superuser</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:creationdate" sv:type="Date">
+ <sv:value>2010-02-04T16:31:25.515+01:00</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:lastmodified" sv:type="Date">
+ <sv:value>2011-02-08T18:43:46.422+01:00</sv:value>
+ </sv:property>
+ </sv:node>
+ <sv:node sv:name="tabGeneral">
+ <sv:property sv:name="jcr:primaryType" sv:type="Name">
+ <sv:value>mgnl:contentNode</sv:value>
+ </sv:property>
+ <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
+ <sv:value>mix:lockable</sv:value>
+ </sv:property>
+ <sv:property sv:name="jcr:uuid" sv:type="String">
+ <sv:value>301b55cd-e68f-47f3-85a3-9a1b3507b45f</sv:value>
+ </sv:property>
+ <sv:property sv:name="controlType" sv:type="String">
+ <sv:value>tab</sv:value>
+ </sv:property>
+ <sv:property sv:name="jcr:createdBy" sv:type="String">
+ <sv:value>admin</sv:value>
+ </sv:property>
+ <sv:property sv:name="label" sv:type="String">
+ <sv:value>Playlist</sv:value>
+ </sv:property>
+ <sv:node sv:name="MetaData">
+ <sv:property sv:name="jcr:primaryType" sv:type="Name">
+ <sv:value>mgnl:metaData</sv:value>
+ </sv:property>
+ <sv:property sv:name="jcr:createdBy" sv:type="String">
+ <sv:value>admin</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:activated" sv:type="Boolean">
+ <sv:value>false</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:authorid" sv:type="String">
+ <sv:value>superuser</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:creationdate" sv:type="Date">
+ <sv:value>2010-02-04T16:31:50.312+01:00</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:lastmodified" sv:type="Date">
+ <sv:value>2011-02-07T20:47:33.255+01:00</sv:value>
+ </sv:property>
+ </sv:node>
+ <sv:node sv:name="parentFolder">
+ <sv:property sv:name="jcr:primaryType" sv:type="Name">
+ <sv:value>mgnl:contentNode</sv:value>
+ </sv:property>
+ <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
+ <sv:value>mix:lockable</sv:value>
+ </sv:property>
+ <sv:property sv:name="jcr:uuid" sv:type="String">
+ <sv:value>f4648ddb-b34b-4cf1-a657-a897159a2721</sv:value>
+ </sv:property>
+ <sv:property sv:name="controlType" sv:type="String">
+ <sv:value>link</sv:value>
+ </sv:property>
+ <sv:property sv:name="jcr:createdBy" sv:type="String">
+ <sv:value>admin</sv:value>
+ </sv:property>
+ <sv:property sv:name="label" sv:type="String">
+ <sv:value>Parent folder</sv:value>
+ </sv:property>
+ <sv:property sv:name="saveInfo" sv:type="String">
+ <sv:value>false</sv:value>
+ </sv:property>
+ <sv:property sv:name="tree" sv:type="String">
+ <sv:value>playlist-folders</sv:value>
+ </sv:property>
+ <sv:node sv:name="MetaData">
+ <sv:property sv:name="jcr:primaryType" sv:type="Name">
+ <sv:value>mgnl:metaData</sv:value>
+ </sv:property>
+ <sv:property sv:name="jcr:createdBy" sv:type="String">
+ <sv:value>admin</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:activated" sv:type="Boolean">
+ <sv:value>false</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:authorid" sv:type="String">
+ <sv:value>superuser</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:creationdate" sv:type="Date">
+ <sv:value>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:property>
+ </sv:node>
+ </sv:node>
+ <sv:node sv:name="playlistName">
+ <sv:property sv:name="jcr:primaryType" sv:type="Name">
+ <sv:value>mgnl:contentNode</sv:value>
+ </sv:property>
+ <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
+ <sv:value>mix:lockable</sv:value>
+ </sv:property>
+ <sv:property sv:name="jcr:uuid" sv:type="String">
+ <sv:value>8174d77e-7be3-43a3-bfe9-babbdac23b19</sv:value>
+ </sv:property>
+ <sv:property sv:name="controlType" sv:type="String">
+ <sv:value>edit</sv:value>
+ </sv:property>
+ <sv:property sv:name="jcr:createdBy" sv:type="String">
+ <sv:value>admin</sv:value>
+ </sv:property>
+ <sv:property sv:name="label" sv:type="String">
+ <sv:value>Playlist name</sv:value>
+ </sv:property>
+ <sv:property sv:name="saveInfo" sv:type="String">
+ <sv:value>false</sv:value>
+ </sv:property>
+ <sv:node sv:name="MetaData">
+ <sv:property sv:name="jcr:primaryType" sv:type="Name">
+ <sv:value>mgnl:metaData</sv:value>
+ </sv:property>
+ <sv:property sv:name="jcr:createdBy" sv:type="String">
+ <sv:value>admin</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:activated" sv:type="Boolean">
+ <sv:value>false</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:authorid" sv:type="String">
+ <sv:value>superuser</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:creationdate" sv:type="Date">
+ <sv:value>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:property>
+ </sv:node>
+ </sv:node>
+ <sv:node sv:name="maxResults">
+ <sv:property sv:name="jcr:primaryType" sv:type="Name">
+ <sv:value>mgnl:contentNode</sv:value>
+ </sv:property>
+ <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
+ <sv:value>mix:lockable</sv:value>
+ </sv:property>
+ <sv:property sv:name="jcr:uuid" sv:type="String">
+ <sv:value>1294413b-03fa-43ed-9333-ccbdd8ebd2e1</sv:value>
+ </sv:property>
+ <sv:property sv:name="controlType" sv:type="String">
+ <sv:value>edit</sv:value>
+ </sv:property>
+ <sv:property sv:name="jcr:createdBy" sv:type="String">
+ <sv:value>admin</sv:value>
+ </sv:property>
+ <sv:property sv:name="label" sv:type="String">
+ <sv:value>Max results</sv:value>
+ </sv:property>
+ <sv:property sv:name="type" sv:type="String">
+ <sv:value>Long</sv:value>
+ </sv:property>
+ <sv:node sv:name="MetaData">
+ <sv:property sv:name="jcr:primaryType" sv:type="Name">
+ <sv:value>mgnl:metaData</sv:value>
+ </sv:property>
+ <sv:property sv:name="jcr:createdBy" sv:type="String">
+ <sv:value>admin</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:activated" sv:type="Boolean">
+ <sv:value>false</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:authorid" sv:type="String">
+ <sv:value>superuser</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:creationdate" sv:type="Date">
+ <sv:value>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:48:01.729+01:00</sv:value>
+ </sv:property>
+ </sv:node>
+ </sv:node>
+ <sv:node sv:name="search">
+ <sv:property sv:name="jcr:primaryType" sv:type="Name">
+ <sv:value>mgnl:contentNode</sv:value>
+ </sv:property>
+ <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
+ <sv:value>mix:lockable</sv:value>
+ </sv:property>
+ <sv:property sv:name="jcr:uuid" sv:type="String">
+ <sv:value>805c4546-515e-48d0-a8ae-20fde5108303</sv:value>
+ </sv:property>
+ <sv:property sv:name="controlType" sv:type="String">
+ <sv:value>hiddenParameters</sv:value>
+ </sv:property>
+ <sv:property sv:name="jcr:createdBy" sv:type="String">
+ <sv:value>admin</sv:value>
+ </sv:property>
+ <sv:node sv:name="MetaData">
+ <sv:property sv:name="jcr:primaryType" sv:type="Name">
+ <sv:value>mgnl:metaData</sv:value>
+ </sv:property>
+ <sv:property sv:name="jcr:createdBy" sv:type="String">
+ <sv:value>admin</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:activated" sv:type="Boolean">
+ <sv:value>false</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:authorid" sv:type="String">
+ <sv:value>superuser</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:creationdate" sv:type="Date">
+ <sv:value>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-08T11:55:44.769+01:00</sv:value>
+ </sv:property>
+ </sv:node>
+ </sv:node>
+ </sv:node>
+</sv:node>
Deleted: trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap/media/config.modules.media.dialogs.search-playlist.xml
===================================================================
--- trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap/media/config.modules.media.dialogs.search-playlist.xml 2011-02-08 14:38:37 UTC (rev 3321)
+++ trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap/media/config.modules.media.dialogs.search-playlist.xml 2011-02-08 17:48:33 UTC (rev 3322)
@@ -1,253 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<sv:node sv:name="search-playlist" xmlns:sv="http://www.jcp.org/jcr/sv/1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
- <sv:property sv:name="jcr:primaryType" sv:type="Name">
- <sv:value>mgnl:contentNode</sv:value>
- </sv:property>
- <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
- <sv:value>mix:lockable</sv:value>
- </sv:property>
- <sv:property sv:name="jcr:uuid" sv:type="String">
- <sv:value>aa50c92e-cad0-493b-ab7f-facecac2a284</sv:value>
- </sv:property>
- <sv:property sv:name="class" sv:type="String">
- <sv:value>net.sourceforge.openutils.mgnlmedia.playlist.dialog.SearchPlaylistDialogMVC</sv:value>
- </sv:property>
- <sv:property sv:name="jcr:createdBy" sv:type="String">
- <sv:value>admin</sv:value>
- </sv:property>
- <sv:property sv:name="label" sv:type="String">
- <sv:value>Playlist</sv:value>
- </sv:property>
- <sv:property sv:name="saveHandler" sv:type="String">
- <sv:value>net.sourceforge.openutils.mgnlmedia.playlist.dialog.SearchPlaylistSaveHandler</sv:value>
- </sv:property>
- <sv:node sv:name="MetaData">
- <sv:property sv:name="jcr:primaryType" sv:type="Name">
- <sv:value>mgnl:metaData</sv:value>
- </sv:property>
- <sv:property sv:name="jcr:createdBy" sv:type="String">
- <sv:value>admin</sv:value>
- </sv:property>
- <sv:property sv:name="mgnl:activated" sv:type="Boolean">
- <sv:value>false</sv:value>
- </sv:property>
- <sv:property sv:name="mgnl:authorid" sv:type="String">
- <sv:value>superuser</sv:value>
- </sv:property>
- <sv:property sv:name="mgnl:creationdate" sv:type="Date">
- <sv:value>2010-02-04T16:31:25.515+01:00</sv:value>
- </sv:property>
- <sv:property sv:name="mgnl:lastmodified" sv:type="Date">
- <sv:value>2011-02-08T11:08:14.971+01:00</sv:value>
- </sv:property>
- </sv:node>
- <sv:node sv:name="tabGeneral">
- <sv:property sv:name="jcr:primaryType" sv:type="Name">
- <sv:value>mgnl:contentNode</sv:value>
- </sv:property>
- <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
- <sv:value>mix:lockable</sv:value>
- </sv:property>
- <sv:property sv:name="jcr:uuid" sv:type="String">
- <sv:value>301b55cd-e68f-47f3-85a3-9a1b3507b45f</sv:value>
- </sv:property>
- <sv:property sv:name="controlType" sv:type="String">
- <sv:value>tab</sv:value>
- </sv:property>
- <sv:property sv:name="jcr:createdBy" sv:type="String">
- <sv:value>admin</sv:value>
- </sv:property>
- <sv:property sv:name="label" sv:type="String">
- <sv:value>Playlist</sv:value>
- </sv:property>
- <sv:node sv:name="MetaData">
- <sv:property sv:name="jcr:primaryType" sv:type="Name">
- <sv:value>mgnl:metaData</sv:value>
- </sv:property>
- <sv:property sv:name="jcr:createdBy" sv:type="String">
- <sv:value>admin</sv:value>
- </sv:property>
- <sv:property sv:name="mgnl:activated" sv:type="Boolean">
- <sv:value>false</sv:value>
- </sv:property>
- <sv:property sv:name="mgnl:authorid" sv:type="String">
- <sv:value>superuser</sv:value>
- </sv:property>
- <sv:property sv:name="mgnl:creationdate" sv:type="Date">
- <sv:value>2010-02-04T16:31:50.312+01:00</sv:value>
- </sv:property>
- <sv:property sv:name="mgnl:lastmodified" sv:type="Date">
- <sv:value>2011-02-07T20:47:33.255+01:00</sv:value>
- </sv:property>
- </sv:node>
- <sv:node sv:name="parentFolder">
- <sv:property sv:name="jcr:primaryType" sv:type="Name">
- <sv:value>mgnl:contentNode</sv:value>
- </sv:property>
- <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
- <sv:value>mix:lockable</sv:value>
- </sv:property>
- <sv:property sv:name="jcr:uuid" sv:type="String">
- <sv:value>f4648ddb-b34b-4cf1-a657-a897159a2721</sv:value>
- </sv:property>
- <sv:property sv:name="controlType" sv:type="String">
- <sv:value>link</sv:value>
- </sv:property>
- <sv:property sv:name="jcr:createdBy" sv:type="String">
- <sv:value>admin</sv:value>
- </sv:property>
- <sv:property sv:name="label" sv:type="String">
- <sv:value>Parent folder</sv:value>
- </sv:property>
- <sv:property sv:name="saveInfo" sv:type="String">
- <sv:value>false</sv:value>
- </sv:property>
- <sv:property sv:name="tree" sv:type="String">
- <sv:value>playlist-folders</sv:value>
- </sv:property>
- <sv:node sv:name="MetaData">
- <sv:property sv:name="jcr:primaryType" sv:type="Name">
- <sv:value>mgnl:metaData</sv:value>
- </sv:property>
- <sv:property sv:name="jcr:createdBy" sv:type="String">
- <sv:value>admin</sv:value>
- </sv:property>
- <sv:property sv:name="mgnl:activated" sv:type="Boolean">
- <sv:value>false</sv:value>
- </sv:property>
- <sv:property sv:name="mgnl:authorid" sv:type="String">
- <sv:value>superuser</sv:value>
- </sv:property>
- <sv:property sv:name="mgnl:creationdate" sv:type="Date">
- <sv:value>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:property>
- </sv:node>
- </sv:node>
- <sv:node sv:name="playlistName">
- <sv:property sv:name="jcr:primaryType" sv:type="Name">
- <sv:value>mgnl:contentNode</sv:value>
- </sv:property>
- <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
- <sv:value>mix:lockable</sv:value>
- </sv:property>
- <sv:property sv:name="jcr:uuid" sv:type="String">
- <sv:value>8174d77e-7be3-43a3-bfe9-babbdac23b19</sv:value>
- </sv:property>
- <sv:property sv:name="controlType" sv:type="String">
- <sv:value>edit</sv:value>
- </sv:property>
- <sv:property sv:name="jcr:createdBy" sv:type="String">
- <sv:value>admin</sv:value>
- </sv:property>
- <sv:property sv:name="label" sv:type="String">
- <sv:value>Playlist name</sv:value>
- </sv:property>
- <sv:property sv:name="saveInfo" sv:type="String">
- <sv:value>false</sv:value>
- </sv:property>
- <sv:node sv:name="MetaData">
- <sv:property sv:name="jcr:primaryType" sv:type="Name">
- <sv:value>mgnl:metaData</sv:value>
- </sv:property>
- <sv:property sv:name="jcr:createdBy" sv:type="String">
- <sv:value>admin</sv:value>
- </sv:property>
- <sv:property sv:name="mgnl:activated" sv:type="Boolean">
- <sv:value>false</sv:value>
- </sv:property>
- <sv:property sv:name="mgnl:authorid" sv:type="String">
- <sv:value>superuser</sv:value>
- </sv:property>
- <sv:property sv:name="mgnl:creationdate" sv:type="Date">
- <sv:value>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:property>
- </sv:node>
- </sv:node>
- <sv:node sv:name="maxResults">
- <sv:property sv:name="jcr:primaryType" sv:type="Name">
- <sv:value>mgnl:contentNode</sv:value>
- </sv:property>
- <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
- <sv:value>mix:lockable</sv:value>
- </sv:property>
- <sv:property sv:name="jcr:uuid" sv:type="String">
- <sv:value>1294413b-03fa-43ed-9333-ccbdd8ebd2e1</sv:value>
- </sv:property>
- <sv:property sv:name="controlType" sv:type="String">
- <sv:value>edit</sv:value>
- </sv:property>
- <sv:property sv:name="jcr:createdBy" sv:type="String">
- <sv:value>admin</sv:value>
- </sv:property>
- <sv:property sv:name="label" sv:type="String">
- <sv:value>Max results</sv:value>
- </sv:property>
- <sv:property sv:name="type" sv:type="String">
- <sv:value>Long</sv:value>
- </sv:property>
- <sv:node sv:name="MetaData">
- <sv:property sv:name="jcr:primaryType" sv:type="Name">
- <sv:value>mgnl:metaData</sv:value>
- </sv:property>
- <sv:property sv:name="jcr:createdBy" sv:type="String">
- <sv:value>admin</sv:value>
- </sv:property>
- <sv:property sv:name="mgnl:activated" sv:type="Boolean">
- <sv:value>false</sv:value>
- </sv:property>
- <sv:property sv:name="mgnl:authorid" sv:type="String">
- <sv:value>superuser</sv:value>
- </sv:property>
- <sv:property sv:name="mgnl:creationdate" sv:type="Date">
- <sv:value>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:48:01.729+01:00</sv:value>
- </sv:property>
- </sv:node>
- </sv:node>
- <sv:node sv:name="search">
- <sv:property sv:name="jcr:primaryType" sv:type="Name">
- <sv:value>mgnl:contentNode</sv:value>
- </sv:property>
- <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
- <sv:value>mix:lockable</sv:value>
- </sv:property>
- <sv:property sv:name="jcr:uuid" sv:type="String">
- <sv:value>805c4546-515e-48d0-a8ae-20fde5108303</sv:value>
- </sv:property>
- <sv:property sv:name="controlType" sv:type="String">
- <sv:value>hiddenParameters</sv:value>
- </sv:property>
- <sv:property sv:name="jcr:createdBy" sv:type="String">
- <sv:value>admin</sv:value>
- </sv:property>
- <sv:node sv:name="MetaData">
- <sv:property sv:name="jcr:primaryType" sv:type="Name">
- <sv:value>mgnl:metaData</sv:value>
- </sv:property>
- <sv:property sv:name="jcr:createdBy" sv:type="String">
- <sv:value>admin</sv:value>
- </sv:property>
- <sv:property sv:name="mgnl:activated" sv:type="Boolean">
- <sv:value>false</sv:value>
- </sv:property>
- <sv:property sv:name="mgnl:authorid" sv:type="String">
- <sv:value>superuser</sv:value>
- </sv:property>
- <sv:property sv:name="mgnl:creationdate" sv:type="Date">
- <sv:value>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-08T11:55:44.769+01:00</sv:value>
- </sv:property>
- </sv:node>
- </sv:node>
- </sv:node>
-</sv:node>
Modified: trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/media/pages/MediaAdvancedSearchFormPage.html
===================================================================
--- trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/media/pages/MediaAdvancedSearchFormPage.html 2011-02-08 14:38:37 UTC (rev 3321)
+++ trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/media/pages/MediaAdvancedSearchFormPage.html 2011-02-08 17:48:33 UTC (rev 3322)
@@ -33,9 +33,6 @@
<div class="row">
<input type="submit" name="submit" value="${this.msgs['buttons.search']}" class="button-submit" onclick="this.form.command.value = ''"/>
<input type="submit" name="saveAsPlaylist" value="${this.msgs['buttons.saveAsPlaylist']}" class="button-submit" onclick="this.form.command.value = 'saveAsPlaylist'"/>
- <!--
- <input type="submit" name="saveAsPlaylist" value="${this.msgs['buttons.saveAsPlaylist']}" class="button-submit" onclick="parent.openWindow('.magnolia/dialogs/search-playlist.html?mgnlPath=&mgnlRepository=playlists&mgnlCK=' + (new Date()).getTime()); return false;"/>
- -->
<input type="hidden" name="command" value="" />
</div>
</form>
Modified: trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/media/pages/MediaFolderViewPage.html
===================================================================
--- trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/media/pages/MediaFolderViewPage.html 2011-02-08 14:38:37 UTC (rev 3321)
+++ trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/media/pages/MediaFolderViewPage.html 2011-02-08 17:48:33 UTC (rev 3322)
@@ -39,7 +39,7 @@
new MediaFolderView.EditMenus('li.media .menuitem');
new MediaFolderView.InfoTooltips('li.media .image');
[#if (this.request.getParameter('command')!'') == 'saveAsPlaylist']
- this.openSearchPlaylistDialog();
+ this.openPlaylistFromSearchDialog();
[/#if]
},
@@ -47,8 +47,8 @@
$('scrollablecontent').setStyle('height', window.getSize().y - 58 + 'px');
},
- openSearchPlaylistDialog: function(){
- parent.openWindow('.magnolia/dialogs/search-playlist.html?mgnlCK=' + (new Date()).getTime() + '[#list this.request.parameterNames as name][#list this.request.getParameterValues(name) as value]&search_${name?js_string}=${value?js_string}[/#list][/#list]');
+ openPlaylistFromSearchDialog: function(){
+ parent.openWindow('.magnolia/dialogs/playlistAsSearch.html?mgnlCK=' + (new Date()).getTime() + '[#list this.request.parameterNames as name][#list this.request.getParameterValues(name) as value]&search_${name?js_string}=${value?js_string}[/#list][/#list]');
}
});
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-08 14:38:37 UTC (rev 3321)
+++ trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/playlist/pages/PlaylistView.html 2011-02-08 17:48:33 UTC (rev 3322)
@@ -52,6 +52,7 @@
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){
@@ -76,6 +77,7 @@
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());
@@ -287,7 +289,7 @@
});
});
grid.getSelectionModel().on('selectionchange', function(sm){
- Ext.getCmp('removeEntryBtn').setDisabled(sm.getCount() < 1);
+ Ext.getCmp('removeEntryBtn').setDisabled(playlist.readOnly || sm.getCount() < 1);
Ext.getCmp('editMediaBtn').setDisabled(sm.getCount() < 1);
});
@@ -390,7 +392,8 @@
addManyEntriesProgressStart: '${this.msgs.get('playlist.entries.addMany.msgBox.progressStart')?js_string}',
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}
};
initPlaylistView();
[/#if]
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <die...@us...> - 2011-02-08 14:38:43
|
Revision: 3321
http://openutils.svn.sourceforge.net/openutils/?rev=3321&view=rev
Author: diego_schivo
Date: 2011-02-08 14:38:37 +0000 (Tue, 08 Feb 2011)
Log Message:
-----------
MEDIA-214 playlist save
Modified Paths:
--------------
trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/playlist/pages/PlaylistView.java
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-08 14:28:30 UTC (rev 3320)
+++ trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/playlist/pages/PlaylistView.java 2011-02-08 14:38:37 UTC (rev 3321)
@@ -262,7 +262,7 @@
"/",
true,
SortMode.SCORE,
- 0,
+ (int) NodeDataUtil.getLong(node, "maxResults", 0),
1);
ResultIterator<AdvancedResultItem> items = searchResult.getItems();
while (items.hasNext())
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <die...@us...> - 2011-02-08 14:28:37
|
Revision: 3320
http://openutils.svn.sourceforge.net/openutils/?rev=3320&view=rev
Author: diego_schivo
Date: 2011-02-08 14:28:30 +0000 (Tue, 08 Feb 2011)
Log Message:
-----------
MEDIA-214 playlist save
Modified Paths:
--------------
trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/playlist/dialog/SearchPlaylistDialogMVC.java
trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/playlist/pages/PlaylistsBrowserPage.java
trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/playlist/pages/PlaylistsBrowserPage.html
Modified: trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/playlist/dialog/SearchPlaylistDialogMVC.java
===================================================================
--- trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/playlist/dialog/SearchPlaylistDialogMVC.java 2011-02-08 13:50:06 UTC (rev 3319)
+++ trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/playlist/dialog/SearchPlaylistDialogMVC.java 2011-02-08 14:28:30 UTC (rev 3320)
@@ -20,16 +20,19 @@
package net.sourceforge.openutils.mgnlmedia.playlist.dialog;
import info.magnolia.cms.core.Content;
+import info.magnolia.cms.gui.misc.Sources;
import info.magnolia.module.admininterface.SaveHandler;
import info.magnolia.module.admininterface.dialogs.ConfiguredDialog;
import java.io.IOException;
+import java.io.PrintWriter;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import net.sourceforge.openutils.mgnlmedia.playlist.PlaylistConstants;
+import org.apache.commons.lang.StringUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -97,7 +100,19 @@
@Override
public void renderHtml(String view) throws IOException
{
- // TODO Auto-generated method stub
- super.renderHtml(view);
+ if (VIEW_CLOSE_WINDOW.equals(view))
+ {
+ PrintWriter out = this.getResponse().getWriter();
+
+ 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("</script></html>"); //$NON-NLS-1$
+ }
+ else
+ {
+ super.renderHtml(view);
+ }
}
}
Modified: trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/playlist/pages/PlaylistsBrowserPage.java
===================================================================
--- trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/playlist/pages/PlaylistsBrowserPage.java 2011-02-08 13:50:06 UTC (rev 3319)
+++ trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/playlist/pages/PlaylistsBrowserPage.java 2011-02-08 14:28:30 UTC (rev 3320)
@@ -24,7 +24,10 @@
import net.sourceforge.openutils.mgnlmedia.media.pages.MessagesTemplatedMVCHandler;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
/**
* @author dschivo
*/
@@ -32,10 +35,35 @@
{
/**
+ * Logger.
+ */
+ private Logger log = LoggerFactory.getLogger(PlaylistsBrowserPage.class);
+
+ private String openPath;
+
+ /**
*
*/
public PlaylistsBrowserPage(String name, HttpServletRequest request, HttpServletResponse response)
{
super(name, request, response);
}
+
+ /**
+ * Returns the openPath.
+ * @return the openPath
+ */
+ public String getOpenPath()
+ {
+ return openPath;
+ }
+
+ /**
+ * Sets the openPath.
+ * @param openPath the openPath to set
+ */
+ public void setOpenPath(String openPath)
+ {
+ this.openPath = openPath;
+ }
}
Modified: trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/playlist/pages/PlaylistsBrowserPage.html
===================================================================
--- trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/playlist/pages/PlaylistsBrowserPage.html 2011-02-08 13:50:06 UTC (rev 3319)
+++ trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/playlist/pages/PlaylistsBrowserPage.html 2011-02-08 14:28:30 UTC (rev 3320)
@@ -10,6 +10,7 @@
<script type="text/javascript">
// <![CDATA[
var viewport;
+var openPath = "${this.openPath!''}";
Ext.onReady(function(){
viewport = new Ext.Viewport({
@@ -45,8 +46,8 @@
]
});
setTimeout(function() {
- frames['playlistTreeView'].location.href = '${this.request.contextPath}/.magnolia/trees/playlists.html?mgnlCK=' + (new Date()).getTime();
- frames['playlistView'].location.href = '${this.request.contextPath}/.magnolia/pages/playlistView.html?mgnlCK=' + (new Date()).getTime();
+ frames['playlistTreeView'].location.href = '${this.request.contextPath}/.magnolia/trees/playlists.html?pathOpen=' + openPath + '&pathCurrent=' + openPath + '&pathSelected=' + openPath + '&mgnlCK=' + (new Date()).getTime();
+ frames['playlistView'].location.href = '${this.request.contextPath}/.magnolia/pages/playlistView.html?path=' + openPath + '&mgnlCK=' + (new Date()).getTime();
}, 100);
});
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <die...@us...> - 2011-02-08 13:50:12
|
Revision: 3319
http://openutils.svn.sourceforge.net/openutils/?rev=3319&view=rev
Author: diego_schivo
Date: 2011-02-08 13:50:06 +0000 (Tue, 08 Feb 2011)
Log Message:
-----------
MEDIA-214 playlist save
Modified Paths:
--------------
trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap/media/config.modules.media.dialogs.search-playlist.xml
Modified: trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap/media/config.modules.media.dialogs.search-playlist.xml
===================================================================
--- trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap/media/config.modules.media.dialogs.search-playlist.xml 2011-02-08 13:41:16 UTC (rev 3318)
+++ trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap/media/config.modules.media.dialogs.search-playlist.xml 2011-02-08 13:50:06 UTC (rev 3319)
@@ -99,6 +99,9 @@
<sv:property sv:name="label" sv:type="String">
<sv:value>Parent folder</sv:value>
</sv:property>
+ <sv:property sv:name="saveInfo" sv:type="String">
+ <sv:value>false</sv:value>
+ </sv:property>
<sv:property sv:name="tree" sv:type="String">
<sv:value>playlist-folders</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-08T12:46:20.865+01:00</sv:value>
+ <sv:value>2011-02-08T14:47:19.599+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="saveInfo" sv:type="String">
+ <sv:value>false</sv:value>
+ </sv:property>
<sv:node sv:name="MetaData">
<sv:property sv:name="jcr:primaryType" sv:type="Name">
<sv:value>mgnl:metaData</sv:value>
@@ -159,10 +165,53 @@
<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-07T20:49:08.823+01:00</sv:value>
+ <sv:value>2011-02-08T14:47:30.384+01:00</sv:value>
</sv:property>
</sv:node>
</sv:node>
+ <sv:node sv:name="maxResults">
+ <sv:property sv:name="jcr:primaryType" sv:type="Name">
+ <sv:value>mgnl:contentNode</sv:value>
+ </sv:property>
+ <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
+ <sv:value>mix:lockable</sv:value>
+ </sv:property>
+ <sv:property sv:name="jcr:uuid" sv:type="String">
+ <sv:value>1294413b-03fa-43ed-9333-ccbdd8ebd2e1</sv:value>
+ </sv:property>
+ <sv:property sv:name="controlType" sv:type="String">
+ <sv:value>edit</sv:value>
+ </sv:property>
+ <sv:property sv:name="jcr:createdBy" sv:type="String">
+ <sv:value>admin</sv:value>
+ </sv:property>
+ <sv:property sv:name="label" sv:type="String">
+ <sv:value>Max results</sv:value>
+ </sv:property>
+ <sv:property sv:name="type" sv:type="String">
+ <sv:value>Long</sv:value>
+ </sv:property>
+ <sv:node sv:name="MetaData">
+ <sv:property sv:name="jcr:primaryType" sv:type="Name">
+ <sv:value>mgnl:metaData</sv:value>
+ </sv:property>
+ <sv:property sv:name="jcr:createdBy" sv:type="String">
+ <sv:value>admin</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:activated" sv:type="Boolean">
+ <sv:value>false</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:authorid" sv:type="String">
+ <sv:value>superuser</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:creationdate" sv:type="Date">
+ <sv:value>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:48:01.729+01:00</sv:value>
+ </sv:property>
+ </sv:node>
+ </sv:node>
<sv:node sv:name="search">
<sv:property sv:name="jcr:primaryType" sv:type="Name">
<sv:value>mgnl:contentNode</sv:value>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <die...@us...> - 2011-02-08 13:41:23
|
Revision: 3318
http://openutils.svn.sourceforge.net/openutils/?rev=3318&view=rev
Author: diego_schivo
Date: 2011-02-08 13:41:16 +0000 (Tue, 08 Feb 2011)
Log Message:
-----------
MEDIA-214 playlist save
Modified Paths:
--------------
trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/save/HiddenParametersSaveHandler.java
trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/playlist/pages/PlaylistView.java
trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap/media/config.modules.media.dialogs.search-playlist.xml
trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/media/pages/MediaFolderViewPage.html
Modified: trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/save/HiddenParametersSaveHandler.java
===================================================================
--- trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/save/HiddenParametersSaveHandler.java 2011-02-08 11:48:48 UTC (rev 3317)
+++ trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/save/HiddenParametersSaveHandler.java 2011-02-08 13:41:16 UTC (rev 3318)
@@ -67,7 +67,7 @@
String[] paramValues = form.getParameterValues(paramName);
Content paramNode = node.createContent(Path.getUniqueLabel(node, "0"), ItemType.CONTENTNODE);
- paramNode.setNodeData("name", paramName);
+ paramNode.setNodeData("name", StringUtils.removeStart(paramName, name + "_"));
Value[] jcrValues = new Value[paramValues.length];
for (int i = 0; i < paramValues.length; i++)
{
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-08 11:48:48 UTC (rev 3317)
+++ trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/playlist/pages/PlaylistView.java 2011-02-08 13:41:16 UTC (rev 3318)
@@ -227,7 +227,7 @@
}
}
- String requestNodeName = "request";
+ String requestNodeName = "search";
try
{
if (node.hasContent(requestNodeName))
Modified: trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap/media/config.modules.media.dialogs.search-playlist.xml
===================================================================
--- trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap/media/config.modules.media.dialogs.search-playlist.xml 2011-02-08 11:48:48 UTC (rev 3317)
+++ trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap/media/config.modules.media.dialogs.search-playlist.xml 2011-02-08 13:41:16 UTC (rev 3318)
@@ -163,7 +163,7 @@
</sv:property>
</sv:node>
</sv:node>
- <sv:node sv:name="request">
+ <sv:node sv:name="search">
<sv:property sv:name="jcr:primaryType" sv:type="Name">
<sv:value>mgnl:contentNode</sv:value>
</sv:property>
Modified: trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/media/pages/MediaFolderViewPage.html
===================================================================
--- trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/media/pages/MediaFolderViewPage.html 2011-02-08 11:48:48 UTC (rev 3317)
+++ trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/media/pages/MediaFolderViewPage.html 2011-02-08 13:41:16 UTC (rev 3318)
@@ -48,7 +48,7 @@
},
openSearchPlaylistDialog: function(){
- parent.openWindow('.magnolia/dialogs/search-playlist.html?mgnlCK=' + (new Date()).getTime() + '[#list this.request.parameterNames as name][#list this.request.getParameterValues(name) as value]&request_${name?js_string}=${value?js_string}[/#list][/#list]');
+ parent.openWindow('.magnolia/dialogs/search-playlist.html?mgnlCK=' + (new Date()).getTime() + '[#list this.request.parameterNames as name][#list this.request.getParameterValues(name) as value]&search_${name?js_string}=${value?js_string}[/#list][/#list]');
}
});
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <die...@us...> - 2011-02-08 11:48:54
|
Revision: 3317
http://openutils.svn.sourceforge.net/openutils/?rev=3317&view=rev
Author: diego_schivo
Date: 2011-02-08 11:48:48 +0000 (Tue, 08 Feb 2011)
Log Message:
-----------
MEDIA-214 playlist save
Modified Paths:
--------------
trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/save/HiddenParametersSaveHandler.java
trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap/media/config.modules.media.dialogs.search-playlist.xml
Added Paths:
-----------
trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/playlist/tree/PlaylistFoldersTreeConfiguration.java
trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap/media/config.modules.media.trees.playlist-folders.xml
Modified: trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/save/HiddenParametersSaveHandler.java
===================================================================
--- trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/save/HiddenParametersSaveHandler.java 2011-02-08 11:34:02 UTC (rev 3316)
+++ trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/save/HiddenParametersSaveHandler.java 2011-02-08 11:48:48 UTC (rev 3317)
@@ -25,7 +25,6 @@
import info.magnolia.cms.core.Path;
import info.magnolia.cms.security.AccessDeniedException;
import info.magnolia.cms.util.NodeDataUtil;
-import info.magnolia.context.MgnlContext;
import info.magnolia.module.admininterface.FieldSaveHandler;
import java.util.Enumeration;
@@ -33,7 +32,6 @@
import javax.jcr.PropertyType;
import javax.jcr.RepositoryException;
import javax.jcr.Value;
-import javax.servlet.http.HttpServletRequest;
import org.apache.commons.lang.StringUtils;
import org.slf4j.Logger;
Added: trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/playlist/tree/PlaylistFoldersTreeConfiguration.java
===================================================================
--- trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/playlist/tree/PlaylistFoldersTreeConfiguration.java (rev 0)
+++ trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/playlist/tree/PlaylistFoldersTreeConfiguration.java 2011-02-08 11:48:48 UTC (rev 3317)
@@ -0,0 +1,69 @@
+/**
+ *
+ * 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.tree;
+
+import info.magnolia.cms.gui.control.FunctionBarItem;
+import info.magnolia.cms.gui.control.Tree;
+import info.magnolia.cms.gui.control.TreeColumn;
+import info.magnolia.cms.i18n.Messages;
+import info.magnolia.module.admininterface.AbstractTreeConfiguration;
+
+import javax.servlet.http.HttpServletRequest;
+
+import net.sourceforge.openutils.mgnlmedia.playlist.PlaylistConstants;
+
+
+/**
+ * @author ADMIN
+ * @version $Id: $
+ */
+public class PlaylistFoldersTreeConfiguration extends AbstractTreeConfiguration
+{
+
+ /**
+ * {@inheritDoc}
+ */
+ public void prepareContextMenu(Tree tree, boolean browseMode, HttpServletRequest request)
+ {
+ tree.addSeparator();
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public void prepareFunctionBar(Tree tree, boolean browseMode, HttpServletRequest request)
+ {
+ tree.addFunctionBarItem(FunctionBarItem.getRefreshFunctionBarItem(tree, getMessages(), request));
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public void prepareTree(Tree tree, boolean browseMode, HttpServletRequest request)
+ {
+ final Messages msgs = getMessages();
+
+ tree.addItemType(PlaylistConstants.FOLDER.getSystemName(), "/.resources/media/icons/ico16-folder.png");
+
+ TreeColumn column0 = TreeColumn.createLabelColumn(tree, msgs.get("tree.playlists.column"), true);
+ column0.setWidth(3);
+ tree.addColumn(column0);
+ }
+}
Modified: trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap/media/config.modules.media.dialogs.search-playlist.xml
===================================================================
--- trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap/media/config.modules.media.dialogs.search-playlist.xml 2011-02-08 11:34:02 UTC (rev 3316)
+++ trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap/media/config.modules.media.dialogs.search-playlist.xml 2011-02-08 11:48:48 UTC (rev 3317)
@@ -99,8 +99,8 @@
<sv:property sv:name="label" sv:type="String">
<sv:value>Parent folder</sv:value>
</sv:property>
- <sv:property sv:name="repository" sv:type="String">
- <sv:value>playlists</sv:value>
+ <sv:property sv:name="tree" sv:type="String">
+ <sv:value>playlist-folders</sv:value>
</sv:property>
<sv:node sv:name="MetaData">
<sv:property sv:name="jcr:primaryType" sv:type="Name">
@@ -119,7 +119,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-08T10:56:37.939+01:00</sv:value>
+ <sv:value>2011-02-08T12:46:20.865+01:00</sv:value>
</sv:property>
</sv:node>
</sv:node>
Added: trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap/media/config.modules.media.trees.playlist-folders.xml
===================================================================
--- trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap/media/config.modules.media.trees.playlist-folders.xml (rev 0)
+++ trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap/media/config.modules.media.trees.playlist-folders.xml 2011-02-08 11:48:48 UTC (rev 3317)
@@ -0,0 +1,53 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<sv:node sv:name="playlist-folders" xmlns:sv="http://www.jcp.org/jcr/sv/1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+ <sv:property sv:name="jcr:primaryType" sv:type="Name">
+ <sv:value>mgnl:contentNode</sv:value>
+ </sv:property>
+ <sv:property sv:name="jcr:uuid" sv:type="String">
+ <sv:value>fd9b4693-e7e6-4673-8952-6f4e42f162e6</sv:value>
+ </sv:property>
+ <sv:property sv:name="class" sv:type="String">
+ <sv:value>info.magnolia.module.admininterface.AdminTreeMVCHandler</sv:value>
+ </sv:property>
+ <sv:property sv:name="configurationClass" sv:type="String">
+ <sv:value>net.sourceforge.openutils.mgnlmedia.playlist.tree.PlaylistFoldersTreeConfiguration</sv:value>
+ </sv:property>
+ <sv:property sv:name="i18nBasename" sv:type="String">
+ <sv:value>net.sourceforge.openutils.mgnlmedia.media.lang.messages</sv:value>
+ </sv:property>
+ <sv:property sv:name="jcr:createdBy" sv:type="String">
+ <sv:value>admin</sv:value>
+ </sv:property>
+ <sv:property sv:name="repository" sv:type="String">
+ <sv:value>playlists</sv:value>
+ </sv:property>
+ <sv:node sv:name="MetaData">
+ <sv:property sv:name="jcr:primaryType" sv:type="Name">
+ <sv:value>mgnl:metaData</sv:value>
+ </sv:property>
+ <sv:property sv:name="jcr:createdBy" sv:type="String">
+ <sv:value>admin</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:Data" sv:type="String">
+ <sv:value>MetaData</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:activated" sv:type="Boolean">
+ <sv:value>false</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:activatorid" sv:type="String">
+ <sv:value>superuser</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:authorid" sv:type="String">
+ <sv:value>superuser</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:creationdate" sv:type="Date">
+ <sv:value>2005-05-06T16:18:38.686+02:00</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:lastaction" sv:type="Date">
+ <sv:value>2008-06-18T16:32:32.987Z</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:lastmodified" sv:type="Date">
+ <sv:value>2011-02-08T12:46:27.524+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.
|
|
From: <hu...@op...> - 2011-02-08 11:35:28
|
See <https://hudson.openmindonline.it/job/openutils-mgnlmedia/360/changes> |
|
From: <hu...@op...> - 2011-02-08 11:35:25
|
See <https://hudson.openmindonline.it/job/openutils-mgnlmedia/net.sourceforge.openutils$openutils-mgnlmedia/360/changes> |
|
From: <die...@us...> - 2011-02-08 11:34:09
|
Revision: 3316
http://openutils.svn.sourceforge.net/openutils/?rev=3316&view=rev
Author: diego_schivo
Date: 2011-02-08 11:34:02 +0000 (Tue, 08 Feb 2011)
Log Message:
-----------
MEDIA-214 playlist save
Modified Paths:
--------------
trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/save/HiddenParametersSaveHandler.java
trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/playlist/dialog/SearchPlaylistSaveHandler.java
trunk/openutils-mgnlmedia/src/main/resources/dialog/hiddenParameters.ftl
trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/media/pages/MediaFolderViewPage.html
Modified: trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/save/HiddenParametersSaveHandler.java
===================================================================
--- trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/save/HiddenParametersSaveHandler.java 2011-02-08 11:12:00 UTC (rev 3315)
+++ trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/save/HiddenParametersSaveHandler.java 2011-02-08 11:34:02 UTC (rev 3316)
@@ -35,6 +35,7 @@
import javax.jcr.Value;
import javax.servlet.http.HttpServletRequest;
+import org.apache.commons.lang.StringUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -58,11 +59,14 @@
int isRichEditValue, int encoding) throws RepositoryException, AccessDeniedException
{
Content node = parentNode.createContent(name, ItemType.CONTENTNODE);
- HttpServletRequest request = MgnlContext.getWebContext().getRequest();
- for (Enumeration paramNames = request.getParameterNames(); paramNames.hasMoreElements();)
+ for (Enumeration paramNames = form.getParameterNames(); paramNames.hasMoreElements();)
{
String paramName = (String) paramNames.nextElement();
- String[] paramValues = request.getParameterValues(paramName);
+ if (!StringUtils.startsWith(paramName, name + "_"))
+ {
+ continue;
+ }
+ String[] paramValues = form.getParameterValues(paramName);
Content paramNode = node.createContent(Path.getUniqueLabel(node, "0"), ItemType.CONTENTNODE);
paramNode.setNodeData("name", paramName);
Modified: trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/playlist/dialog/SearchPlaylistSaveHandler.java
===================================================================
--- trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/playlist/dialog/SearchPlaylistSaveHandler.java 2011-02-08 11:12:00 UTC (rev 3315)
+++ trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/playlist/dialog/SearchPlaylistSaveHandler.java 2011-02-08 11:34:02 UTC (rev 3316)
@@ -41,5 +41,7 @@
protected void processSaveInfo(Content node, String saveInfo) throws PathNotFoundException, RepositoryException,
AccessDeniedException
{
+ // TODO Auto-generated method stub
+ super.processSaveInfo(node, saveInfo);
}
}
Modified: trunk/openutils-mgnlmedia/src/main/resources/dialog/hiddenParameters.ftl
===================================================================
--- trunk/openutils-mgnlmedia/src/main/resources/dialog/hiddenParameters.ftl 2011-02-08 11:12:00 UTC (rev 3315)
+++ trunk/openutils-mgnlmedia/src/main/resources/dialog/hiddenParameters.ftl 2011-02-08 11:34:02 UTC (rev 3316)
@@ -1,5 +1,7 @@
[#list request.parameterNames as pName]
+[#if pName?starts_with('${name}_')]
[#list request.getParameterValues(pName) as pValue]
-<input type="hidden" id="${name}_${pName}" name="${name}_${pName}" value="${pValue!''}" />
+<input type="hidden" id="${pName}" name="${pName}" value="${pValue!''}" />
[/#list]
+[/#if]
[/#list]
Modified: trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/media/pages/MediaFolderViewPage.html
===================================================================
--- trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/media/pages/MediaFolderViewPage.html 2011-02-08 11:12:00 UTC (rev 3315)
+++ trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/media/pages/MediaFolderViewPage.html 2011-02-08 11:34:02 UTC (rev 3316)
@@ -48,7 +48,7 @@
},
openSearchPlaylistDialog: function(){
- parent.openWindow('.magnolia/dialogs/search-playlist.html?mgnlCK=' + (new Date()).getTime() + '[#list this.request.parameterNames as name][#list this.request.getParameterValues(name) as value]&${name?js_string}=${value?js_string}[/#list][/#list]');
+ parent.openWindow('.magnolia/dialogs/search-playlist.html?mgnlCK=' + (new Date()).getTime() + '[#list this.request.parameterNames as name][#list this.request.getParameterValues(name) as value]&request_${name?js_string}=${value?js_string}[/#list][/#list]');
}
});
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <die...@us...> - 2011-02-08 11:12:07
|
Revision: 3315
http://openutils.svn.sourceforge.net/openutils/?rev=3315&view=rev
Author: diego_schivo
Date: 2011-02-08 11:12:00 +0000 (Tue, 08 Feb 2011)
Log Message:
-----------
MEDIA-214 playlist save
Modified Paths:
--------------
trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/dialog/DialogHiddenParameters.java
trunk/openutils-mgnlmedia/src/main/resources/dialog/hiddenParameters.ftl
Added Paths:
-----------
trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/save/HiddenParametersSaveHandler.java
Modified: trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/dialog/DialogHiddenParameters.java
===================================================================
--- trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/dialog/DialogHiddenParameters.java 2011-02-08 10:58:39 UTC (rev 3314)
+++ trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/dialog/DialogHiddenParameters.java 2011-02-08 11:12:00 UTC (rev 3315)
@@ -26,7 +26,9 @@
import javax.servlet.http.HttpServletResponse;
import net.sourceforge.openutils.mgnlcontrols.dialog.ConfigurableFreemarkerDialog;
+import net.sourceforge.openutils.mgnlmedia.media.save.HiddenParametersSaveHandler;
+import org.apache.commons.lang.StringUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -52,6 +54,10 @@
throws RepositoryException
{
super.init(request, response, websiteNode, configNode);
+ if (StringUtils.isEmpty(getConfigValue("saveHandler")))
+ {
+ setConfig("saveHandler", HiddenParametersSaveHandler.class.getName());
+ }
}
@Override
Added: trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/save/HiddenParametersSaveHandler.java
===================================================================
--- trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/save/HiddenParametersSaveHandler.java (rev 0)
+++ trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/save/HiddenParametersSaveHandler.java 2011-02-08 11:12:00 UTC (rev 3315)
@@ -0,0 +1,77 @@
+/**
+ *
+ * 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.media.save;
+
+import info.magnolia.cms.beans.runtime.MultipartForm;
+import info.magnolia.cms.core.Content;
+import info.magnolia.cms.core.ItemType;
+import info.magnolia.cms.core.Path;
+import info.magnolia.cms.security.AccessDeniedException;
+import info.magnolia.cms.util.NodeDataUtil;
+import info.magnolia.context.MgnlContext;
+import info.magnolia.module.admininterface.FieldSaveHandler;
+
+import java.util.Enumeration;
+
+import javax.jcr.PropertyType;
+import javax.jcr.RepositoryException;
+import javax.jcr.Value;
+import javax.servlet.http.HttpServletRequest;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+
+/**
+ * @author ADMIN
+ * @version $Id: $
+ */
+public class HiddenParametersSaveHandler implements FieldSaveHandler
+{
+
+ /**
+ * Logger.
+ */
+ private Logger log = LoggerFactory.getLogger(HiddenParametersSaveHandler.class);
+
+ /**
+ * {@inheritDoc}
+ */
+ public void save(Content parentNode, Content configNode, String name, MultipartForm form, int type, int valueType,
+ int isRichEditValue, int encoding) throws RepositoryException, AccessDeniedException
+ {
+ Content node = parentNode.createContent(name, ItemType.CONTENTNODE);
+ HttpServletRequest request = MgnlContext.getWebContext().getRequest();
+ for (Enumeration paramNames = request.getParameterNames(); paramNames.hasMoreElements();)
+ {
+ String paramName = (String) paramNames.nextElement();
+ String[] paramValues = request.getParameterValues(paramName);
+
+ Content paramNode = node.createContent(Path.getUniqueLabel(node, "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);
+ }
+ paramNode.setNodeData("value", jcrValues);
+ }
+ }
+}
Modified: trunk/openutils-mgnlmedia/src/main/resources/dialog/hiddenParameters.ftl
===================================================================
--- trunk/openutils-mgnlmedia/src/main/resources/dialog/hiddenParameters.ftl 2011-02-08 10:58:39 UTC (rev 3314)
+++ trunk/openutils-mgnlmedia/src/main/resources/dialog/hiddenParameters.ftl 2011-02-08 11:12:00 UTC (rev 3315)
@@ -1,5 +1,5 @@
[#list request.parameterNames as pName]
[#list request.getParameterValues(pName) as pValue]
-<input type="hidden" id="${pName}" name="${pName}" value="${pValue!''}" />
+<input type="hidden" id="${name}_${pName}" name="${name}_${pName}" value="${pValue!''}" />
[/#list]
[/#list]
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <die...@us...> - 2011-02-08 10:58:46
|
Revision: 3314
http://openutils.svn.sourceforge.net/openutils/?rev=3314&view=rev
Author: diego_schivo
Date: 2011-02-08 10:58:39 +0000 (Tue, 08 Feb 2011)
Log Message:
-----------
MEDIA-214 playlist save
Modified Paths:
--------------
trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/playlist/dialog/SearchPlaylistDialogMVC.java
trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/playlist/dialog/SearchPlaylistSaveHandler.java
trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap/media/config.modules.media.dialogs.search-playlist.xml
Added Paths:
-----------
trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/dialog/DialogHiddenParameters.java
trunk/openutils-mgnlmedia/src/main/resources/dialog/hiddenParameters.ftl
trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap/media/config.modules.media.controls.hiddenParameters.xml
Added: trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/dialog/DialogHiddenParameters.java
===================================================================
--- trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/dialog/DialogHiddenParameters.java (rev 0)
+++ trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/dialog/DialogHiddenParameters.java 2011-02-08 10:58:39 UTC (rev 3314)
@@ -0,0 +1,62 @@
+/**
+ *
+ * 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.media.dialog;
+
+import info.magnolia.cms.core.Content;
+
+import javax.jcr.RepositoryException;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+import net.sourceforge.openutils.mgnlcontrols.dialog.ConfigurableFreemarkerDialog;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+
+/**
+ * @author ADMIN
+ * @version $Id: $
+ */
+public class DialogHiddenParameters extends ConfigurableFreemarkerDialog
+{
+
+ /**
+ * Logger.
+ */
+ private Logger log = LoggerFactory.getLogger(DialogHiddenParameters.class);
+
+ /**
+ * {@inheritDoc}
+ */
+
+ @Override
+ public void init(HttpServletRequest request, HttpServletResponse response, Content websiteNode, Content configNode)
+ throws RepositoryException
+ {
+ super.init(request, response, websiteNode, configNode);
+ }
+
+ @Override
+ protected String getPath()
+ {
+ return "dialog/hiddenParameters.ftl";
+ }
+}
Modified: trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/playlist/dialog/SearchPlaylistDialogMVC.java
===================================================================
--- trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/playlist/dialog/SearchPlaylistDialogMVC.java 2011-02-08 10:46:39 UTC (rev 3313)
+++ trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/playlist/dialog/SearchPlaylistDialogMVC.java 2011-02-08 10:58:39 UTC (rev 3314)
@@ -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.dialog;
import info.magnolia.cms.core.Content;
Modified: trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/playlist/dialog/SearchPlaylistSaveHandler.java
===================================================================
--- trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/playlist/dialog/SearchPlaylistSaveHandler.java 2011-02-08 10:46:39 UTC (rev 3313)
+++ trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/playlist/dialog/SearchPlaylistSaveHandler.java 2011-02-08 10:58:39 UTC (rev 3314)
@@ -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.dialog;
import info.magnolia.cms.core.Content;
Added: trunk/openutils-mgnlmedia/src/main/resources/dialog/hiddenParameters.ftl
===================================================================
--- trunk/openutils-mgnlmedia/src/main/resources/dialog/hiddenParameters.ftl (rev 0)
+++ trunk/openutils-mgnlmedia/src/main/resources/dialog/hiddenParameters.ftl 2011-02-08 10:58:39 UTC (rev 3314)
@@ -0,0 +1,5 @@
+[#list request.parameterNames as pName]
+[#list request.getParameterValues(pName) as pValue]
+<input type="hidden" id="${pName}" name="${pName}" value="${pValue!''}" />
+[/#list]
+[/#list]
Added: trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap/media/config.modules.media.controls.hiddenParameters.xml
===================================================================
--- trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap/media/config.modules.media.controls.hiddenParameters.xml (rev 0)
+++ trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap/media/config.modules.media.controls.hiddenParameters.xml 2011-02-08 10:58:39 UTC (rev 3314)
@@ -0,0 +1,44 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<sv:node sv:name="hiddenParameters" xmlns:sv="http://www.jcp.org/jcr/sv/1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+ <sv:property sv:name="jcr:primaryType" sv:type="Name">
+ <sv:value>mgnl:contentNode</sv:value>
+ </sv:property>
+ <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
+ <sv:value>mix:lockable</sv:value>
+ </sv:property>
+ <sv:property sv:name="jcr:uuid" sv:type="String">
+ <sv:value>bf533b67-3270-4f41-8c34-ead4b005dc97</sv:value>
+ </sv:property>
+ <sv:property sv:name="class" sv:type="String">
+ <sv:value>net.sourceforge.openutils.mgnlmedia.media.dialog.DialogHiddenParameters</sv:value>
+ </sv:property>
+ <sv:property sv:name="jcr:createdBy" sv:type="String">
+ <sv:value>admin</sv:value>
+ </sv:property>
+ <sv:node sv:name="MetaData">
+ <sv:property sv:name="jcr:primaryType" sv:type="Name">
+ <sv:value>mgnl:metaData</sv:value>
+ </sv:property>
+ <sv:property sv:name="jcr:createdBy" sv:type="String">
+ <sv:value>admin</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:activated" sv:type="Boolean">
+ <sv:value>false</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:activatorid" sv:type="String">
+ <sv:value>superuser</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:authorid" sv:type="String">
+ <sv:value>superuser</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:creationdate" sv:type="Date">
+ <sv:value>2008-06-26T16:13:12.696Z</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:lastaction" sv:type="Date">
+ <sv:value>2008-06-26T16:13:35.061Z</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:lastmodified" sv:type="Date">
+ <sv:value>2011-02-08T11:54:51.262+01:00</sv:value>
+ </sv:property>
+ </sv:node>
+</sv:node>
Modified: trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap/media/config.modules.media.dialogs.search-playlist.xml
===================================================================
--- trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap/media/config.modules.media.dialogs.search-playlist.xml 2011-02-08 10:46:39 UTC (rev 3313)
+++ trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap/media/config.modules.media.dialogs.search-playlist.xml 2011-02-08 10:58:39 UTC (rev 3314)
@@ -163,5 +163,42 @@
</sv:property>
</sv:node>
</sv:node>
+ <sv:node sv:name="request">
+ <sv:property sv:name="jcr:primaryType" sv:type="Name">
+ <sv:value>mgnl:contentNode</sv:value>
+ </sv:property>
+ <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
+ <sv:value>mix:lockable</sv:value>
+ </sv:property>
+ <sv:property sv:name="jcr:uuid" sv:type="String">
+ <sv:value>805c4546-515e-48d0-a8ae-20fde5108303</sv:value>
+ </sv:property>
+ <sv:property sv:name="controlType" sv:type="String">
+ <sv:value>hiddenParameters</sv:value>
+ </sv:property>
+ <sv:property sv:name="jcr:createdBy" sv:type="String">
+ <sv:value>admin</sv:value>
+ </sv:property>
+ <sv:node sv:name="MetaData">
+ <sv:property sv:name="jcr:primaryType" sv:type="Name">
+ <sv:value>mgnl:metaData</sv:value>
+ </sv:property>
+ <sv:property sv:name="jcr:createdBy" sv:type="String">
+ <sv:value>admin</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:activated" sv:type="Boolean">
+ <sv:value>false</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:authorid" sv:type="String">
+ <sv:value>superuser</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:creationdate" sv:type="Date">
+ <sv:value>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-08T11:55:44.769+01:00</sv:value>
+ </sv:property>
+ </sv:node>
+ </sv:node>
</sv:node>
</sv:node>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <die...@us...> - 2011-02-08 10:46:46
|
Revision: 3313
http://openutils.svn.sourceforge.net/openutils/?rev=3313&view=rev
Author: diego_schivo
Date: 2011-02-08 10:46:39 +0000 (Tue, 08 Feb 2011)
Log Message:
-----------
MEDIA-214 playlist save
Modified Paths:
--------------
trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/playlist/dialog/SearchPlaylistDialogMVC.java
trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/media/pages/MediaFolderViewPage.html
Modified: trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/playlist/dialog/SearchPlaylistDialogMVC.java
===================================================================
--- trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/playlist/dialog/SearchPlaylistDialogMVC.java 2011-02-08 10:30:09 UTC (rev 3312)
+++ trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/playlist/dialog/SearchPlaylistDialogMVC.java 2011-02-08 10:46:39 UTC (rev 3313)
@@ -48,6 +48,7 @@
super.configureSaveHandler(saveHandler);
saveHandler.setPath(form.getParameter("parentFolder"));
saveHandler.setNodeName(form.getParameter("playlistName"));
+ saveHandler.setRepository(PlaylistConstants.REPO);
saveHandler.setCreationItemType(PlaylistConstants.PLAYLIST);
}
Modified: trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/media/pages/MediaFolderViewPage.html
===================================================================
--- trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/media/pages/MediaFolderViewPage.html 2011-02-08 10:30:09 UTC (rev 3312)
+++ trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/media/pages/MediaFolderViewPage.html 2011-02-08 10:46:39 UTC (rev 3313)
@@ -48,7 +48,7 @@
},
openSearchPlaylistDialog: function(){
- parent.openWindow('.magnolia/dialogs/search-playlist.html?mgnlPath=&mgnlRepository=playlists&mgnlCK=' + (new Date()).getTime());
+ parent.openWindow('.magnolia/dialogs/search-playlist.html?mgnlCK=' + (new Date()).getTime() + '[#list this.request.parameterNames as name][#list this.request.getParameterValues(name) as value]&${name?js_string}=${value?js_string}[/#list][/#list]');
}
});
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <hu...@op...> - 2011-02-08 10:35:30
|
See <https://hudson.openmindonline.it/job/openutils-mgnlmedia/359/changes> Changes: [diego_schivo] MEDIA-214 playlist save [diego_schivo] MEDIA-214 playlist save ------------------------------------------ Started by an SCM change Updating https://openutils.svn.sourceforge.net/svnroot/openutils/trunk/openutils-mgnlmedia A src/main/java/net/sourceforge/openutils/mgnlmedia/playlist/dialog/SearchPlaylistSaveHandler.java U src/main/java/net/sourceforge/openutils/mgnlmedia/playlist/dialog/SearchPlaylistDialogMVC.java U src/main/resources/net/sourceforge/openutils/mgnlmedia/media/pages/MediaAdvancedSearchFormPage.html U src/main/resources/mgnl-bootstrap/media/config.modules.media.dialogs.search-playlist.xml At revision 3311 WARNING: clock of the subversion server appears to be out of sync. This can result in inconsistent check out behavior. 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 55680 /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 265 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 2 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: 3.444 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/dialog/SearchPlaylistSaveHandler.java> [INFO] Missing header in: <https://hudson.openmindonline.it/job/openutils-mgnlmedia/ws/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/playlist/dialog/SearchPlaylistDialogMVC.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-08_11-21-59/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-08_11-21-59/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-08_11-21-59/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: 35 seconds [INFO] Finished at: Tue Feb 08 11:22:38 CET 2011 [INFO] Final Memory: 51M/316M [INFO] ------------------------------------------------------------------------ Waiting for Hudson to finish collecting data Sending e-mails to: ope...@li... channel stopped |
|
From: <hu...@op...> - 2011-02-08 10:35:26
|
See <https://hudson.openmindonline.it/job/openutils-mgnlmedia/net.sourceforge.openutils$openutils-mgnlmedia/359/changes> Changes: [diego_schivo] MEDIA-214 playlist save [diego_schivo] MEDIA-214 playlist save ------------------------------------------ <===[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 265 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 2 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: 3.444 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/dialog/SearchPlaylistSaveHandler.java> [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/dialog/SearchPlaylistDialogMVC.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-08_11-21-59/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-08_11-21-59/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-08_11-21-59/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: 35 seconds [INFO] Finished at: Tue Feb 08 11:22:38 CET 2011 [INFO] Final Memory: 51M/316M [INFO] ------------------------------------------------------------------------ Waiting for Hudson to finish collecting data |
|
From: <die...@us...> - 2011-02-08 10:30:15
|
Revision: 3312
http://openutils.svn.sourceforge.net/openutils/?rev=3312&view=rev
Author: diego_schivo
Date: 2011-02-08 10:30:09 +0000 (Tue, 08 Feb 2011)
Log Message:
-----------
MEDIA-214 playlist save
Modified Paths:
--------------
trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/pages/MediaAdvancedSearchPage.java
trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/media/pages/MediaAdvancedSearchFormPage.html
trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/media/pages/MediaFolderViewPage.html
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 10:12:42 UTC (rev 3311)
+++ trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/pages/MediaAdvancedSearchPage.java 2011-02-08 10:30:09 UTC (rev 3312)
@@ -249,43 +249,46 @@
public String saveAsPlaylist()
{
- Set<String> excludeParamNames = new HashSet<String>();
- excludeParamNames.add("saveAsPlaylist");
- excludeParamNames.add("command");
- try
+ if (false)
{
- HierarchyManager hm = MgnlContext.getSystemContext().getHierarchyManager(PlaylistConstants.REPO);
- ValueFactory valueFactory = hm.getWorkspace().getSession().getValueFactory();
+ 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))
+ Content playlistNode = hm.createContent("/samples", "hello", PlaylistConstants.PLAYLIST.getSystemName());
+ Content requestNode = playlistNode.createContent("request", ItemType.CONTENTNODE);
+ for (Enumeration paramNames = request.getParameterNames(); paramNames.hasMoreElements();)
{
- continue;
- }
- String[] paramValues = request.getParameterValues(paramName);
+ 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);
+ 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);
}
- paramNode.setNodeData("value", jcrValues);
+ playlistNode.getParent().save();
}
- playlistNode.getParent().save();
+ catch (RepositoryException e)
+ {
+ // TODO Auto-generated catch block
+ e.printStackTrace();
+ }
}
- catch (RepositoryException e)
- {
- // TODO Auto-generated catch block
- e.printStackTrace();
- }
return show();
}
}
Modified: trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/media/pages/MediaAdvancedSearchFormPage.html
===================================================================
--- trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/media/pages/MediaAdvancedSearchFormPage.html 2011-02-08 10:12:42 UTC (rev 3311)
+++ trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/media/pages/MediaAdvancedSearchFormPage.html 2011-02-08 10:30:09 UTC (rev 3312)
@@ -31,11 +31,11 @@
<input type="hidden" name="selectMedia" value="${this.selectMedia?string('true', 'false')}" />
<div class="row">
- <input type="submit" name="submit" value="${this.msgs['buttons.search']}" class="button-submit"/>
+ <input type="submit" name="submit" value="${this.msgs['buttons.search']}" class="button-submit" onclick="this.form.command.value = ''"/>
+ <input type="submit" name="saveAsPlaylist" value="${this.msgs['buttons.saveAsPlaylist']}" class="button-submit" onclick="this.form.command.value = 'saveAsPlaylist'"/>
<!--
- <input type="submit" name="saveAsPlaylist" value="${this.msgs['buttons.saveAsPlaylist']}" class="button-submit" onclick="this.form.command.value = 'saveAsPlaylist'"/>
+ <input type="submit" name="saveAsPlaylist" value="${this.msgs['buttons.saveAsPlaylist']}" class="button-submit" onclick="parent.openWindow('.magnolia/dialogs/search-playlist.html?mgnlPath=&mgnlRepository=playlists&mgnlCK=' + (new Date()).getTime()); return false;"/>
-->
- <input type="submit" name="saveAsPlaylist" value="${this.msgs['buttons.saveAsPlaylist']}" class="button-submit" onclick="parent.openWindow('.magnolia/dialogs/search-playlist.html?mgnlPath=&mgnlRepository=playlists&mgnlCK=' + (new Date()).getTime()); return false;"/>
<input type="hidden" name="command" value="" />
</div>
</form>
Modified: trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/media/pages/MediaFolderViewPage.html
===================================================================
--- trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/media/pages/MediaFolderViewPage.html 2011-02-08 10:12:42 UTC (rev 3311)
+++ trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/media/pages/MediaFolderViewPage.html 2011-02-08 10:30:09 UTC (rev 3312)
@@ -38,10 +38,17 @@
new MediaFolderView.Sorting('sorting', this.options);
new MediaFolderView.EditMenus('li.media .menuitem');
new MediaFolderView.InfoTooltips('li.media .image');
+ [#if (this.request.getParameter('command')!'') == 'saveAsPlaylist']
+ this.openSearchPlaylistDialog();
+ [/#if]
},
layout: function(){
$('scrollablecontent').setStyle('height', window.getSize().y - 58 + 'px');
+ },
+
+ openSearchPlaylistDialog: function(){
+ parent.openWindow('.magnolia/dialogs/search-playlist.html?mgnlPath=&mgnlRepository=playlists&mgnlCK=' + (new Date()).getTime());
}
});
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <die...@us...> - 2011-02-08 10:12:49
|
Revision: 3311
http://openutils.svn.sourceforge.net/openutils/?rev=3311&view=rev
Author: diego_schivo
Date: 2011-02-08 10:12:42 +0000 (Tue, 08 Feb 2011)
Log Message:
-----------
MEDIA-214 playlist save
Modified Paths:
--------------
trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap/media/config.modules.media.dialogs.search-playlist.xml
Added Paths:
-----------
trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/playlist/dialog/SearchPlaylistSaveHandler.java
Added: trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/playlist/dialog/SearchPlaylistSaveHandler.java
===================================================================
--- trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/playlist/dialog/SearchPlaylistSaveHandler.java (rev 0)
+++ trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/playlist/dialog/SearchPlaylistSaveHandler.java 2011-02-08 10:12:42 UTC (rev 3311)
@@ -0,0 +1,26 @@
+package net.sourceforge.openutils.mgnlmedia.playlist.dialog;
+
+import info.magnolia.cms.core.Content;
+import info.magnolia.cms.security.AccessDeniedException;
+import info.magnolia.module.admininterface.UUIDSaveHandler;
+
+import javax.jcr.PathNotFoundException;
+import javax.jcr.RepositoryException;
+
+
+/**
+ * @author ADMIN
+ * @version $Id: $
+ */
+public class SearchPlaylistSaveHandler extends UUIDSaveHandler
+{
+
+ /**
+ * {@inheritDoc}
+ */
+ @Override
+ protected void processSaveInfo(Content node, String saveInfo) throws PathNotFoundException, RepositoryException,
+ AccessDeniedException
+ {
+ }
+}
Modified: trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap/media/config.modules.media.dialogs.search-playlist.xml
===================================================================
--- trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap/media/config.modules.media.dialogs.search-playlist.xml 2011-02-08 09:59:24 UTC (rev 3310)
+++ trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap/media/config.modules.media.dialogs.search-playlist.xml 2011-02-08 10:12:42 UTC (rev 3311)
@@ -18,6 +18,9 @@
<sv:property sv:name="label" sv:type="String">
<sv:value>Playlist</sv:value>
</sv:property>
+ <sv:property sv:name="saveHandler" sv:type="String">
+ <sv:value>net.sourceforge.openutils.mgnlmedia.playlist.dialog.SearchPlaylistSaveHandler</sv:value>
+ </sv:property>
<sv:node sv:name="MetaData">
<sv:property sv:name="jcr:primaryType" sv:type="Name">
<sv:value>mgnl:metaData</sv:value>
@@ -35,7 +38,7 @@
<sv:value>2010-02-04T16:31:25.515+01:00</sv:value>
</sv:property>
<sv:property sv:name="mgnl:lastmodified" sv:type="Date">
- <sv:value>2011-02-07T20:47:25.314+01:00</sv:value>
+ <sv:value>2011-02-08T11:08:14.971+01:00</sv:value>
</sv:property>
</sv:node>
<sv:node sv:name="tabGeneral">
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <die...@us...> - 2011-02-08 09:59:30
|
Revision: 3310
http://openutils.svn.sourceforge.net/openutils/?rev=3310&view=rev
Author: diego_schivo
Date: 2011-02-08 09:59:24 +0000 (Tue, 08 Feb 2011)
Log Message:
-----------
MEDIA-214 playlist save
Modified Paths:
--------------
trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/playlist/dialog/SearchPlaylistDialogMVC.java
trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap/media/config.modules.media.dialogs.search-playlist.xml
trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/media/pages/MediaAdvancedSearchFormPage.html
Modified: trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/playlist/dialog/SearchPlaylistDialogMVC.java
===================================================================
--- trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/playlist/dialog/SearchPlaylistDialogMVC.java 2011-02-08 07:49:44 UTC (rev 3309)
+++ trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/playlist/dialog/SearchPlaylistDialogMVC.java 2011-02-08 09:59:24 UTC (rev 3310)
@@ -46,6 +46,8 @@
protected void configureSaveHandler(SaveHandler saveHandler)
{
super.configureSaveHandler(saveHandler);
+ saveHandler.setPath(form.getParameter("parentFolder"));
+ saveHandler.setNodeName(form.getParameter("playlistName"));
saveHandler.setCreationItemType(PlaylistConstants.PLAYLIST);
}
Modified: trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap/media/config.modules.media.dialogs.search-playlist.xml
===================================================================
--- trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap/media/config.modules.media.dialogs.search-playlist.xml 2011-02-08 07:49:44 UTC (rev 3309)
+++ trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap/media/config.modules.media.dialogs.search-playlist.xml 2011-02-08 09:59:24 UTC (rev 3310)
@@ -97,7 +97,7 @@
<sv:value>Parent folder</sv:value>
</sv:property>
<sv:property sv:name="repository" sv:type="String">
- <sv:value>media</sv:value>
+ <sv:value>playlists</sv:value>
</sv:property>
<sv:node sv:name="MetaData">
<sv:property sv:name="jcr:primaryType" sv:type="Name">
@@ -116,7 +116,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-07T21:10:12.830+01:00</sv:value>
+ <sv:value>2011-02-08T10:56:37.939+01:00</sv:value>
</sv:property>
</sv:node>
</sv:node>
Modified: trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/media/pages/MediaAdvancedSearchFormPage.html
===================================================================
--- trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/media/pages/MediaAdvancedSearchFormPage.html 2011-02-08 07:49:44 UTC (rev 3309)
+++ trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/media/pages/MediaAdvancedSearchFormPage.html 2011-02-08 09:59:24 UTC (rev 3310)
@@ -35,7 +35,7 @@
<!--
<input type="submit" name="saveAsPlaylist" value="${this.msgs['buttons.saveAsPlaylist']}" class="button-submit" onclick="this.form.command.value = 'saveAsPlaylist'"/>
-->
- <input type="submit" name="saveAsPlaylist" value="${this.msgs['buttons.saveAsPlaylist']}" class="button-submit" onclick="parent.openWindow('.magnolia/dialogs/search-playlist.html?mgnlPath=&mgnlRepository=media&mgnlCK=' + (new Date()).getTime()); return false;"/>
+ <input type="submit" name="saveAsPlaylist" value="${this.msgs['buttons.saveAsPlaylist']}" class="button-submit" onclick="parent.openWindow('.magnolia/dialogs/search-playlist.html?mgnlPath=&mgnlRepository=playlists&mgnlCK=' + (new Date()).getTime()); return false;"/>
<input type="hidden" name="command" value="" />
</div>
</form>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <hu...@op...> - 2011-02-08 08:36:03
|
See <https://hudson.openmindonline.it/job/openutils-mgnlmedia/358/changes> Changes: [diego_schivo] MEDIA-214 playlist save [diego_schivo] MEDIA-210 fix path ------------------------------------------ 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/pages/MediaAdvancedSearchPage.java A src/main/java/net/sourceforge/openutils/mgnlmedia/playlist/dialog/SearchPlaylistDialogMVC.java U src/main/java/net/sourceforge/openutils/mgnlmedia/playlist/pages/PlaylistView.java U src/main/resources/net/sourceforge/openutils/mgnlmedia/media/pages/MediaAdvancedSearchFormPage.html U src/main/resources/net/sourceforge/openutils/mgnlmedia/controls/MediaTreeFooter.ftl A src/main/resources/mgnl-bootstrap/media/config.modules.media.dialogs.search-playlist.xml At revision 3309 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 50625 /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 265 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.544 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/dialog/SearchPlaylistDialogMVC.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-08_09-21-54/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-08_09-21-54/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-08_09-21-54/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: 1 minute 1 second [INFO] Finished at: Tue Feb 08 09:23:05 CET 2011 [INFO] Final Memory: 52M/317M [INFO] ------------------------------------------------------------------------ Waiting for Hudson to finish collecting data Sending e-mails to: ope...@li... channel stopped |
|
From: <hu...@op...> - 2011-02-08 08:35:57
|
See <https://hudson.openmindonline.it/job/openutils-mgnlmedia/net.sourceforge.openutils$openutils-mgnlmedia/358/changes> Changes: [diego_schivo] MEDIA-214 playlist save [diego_schivo] MEDIA-210 fix path ------------------------------------------ <===[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 265 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.544 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/dialog/SearchPlaylistDialogMVC.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-08_09-21-54/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-08_09-21-54/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-08_09-21-54/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: 1 minute 1 second [INFO] Finished at: Tue Feb 08 09:23:05 CET 2011 [INFO] Final Memory: 52M/317M [INFO] ------------------------------------------------------------------------ Waiting for Hudson to finish collecting data |
|
From: <die...@us...> - 2011-02-08 07:49:50
|
Revision: 3309
http://openutils.svn.sourceforge.net/openutils/?rev=3309&view=rev
Author: diego_schivo
Date: 2011-02-08 07:49:44 +0000 (Tue, 08 Feb 2011)
Log Message:
-----------
MEDIA-214 playlist save
Modified Paths:
--------------
trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/pages/MediaAdvancedSearchPage.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/media/pages/MediaAdvancedSearchFormPage.html
Added Paths:
-----------
trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/playlist/dialog/SearchPlaylistDialogMVC.java
trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap/media/config.modules.media.dialogs.search-playlist.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 07:47:04 UTC (rev 3308)
+++ trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/pages/MediaAdvancedSearchPage.java 2011-02-08 07:49:44 UTC (rev 3309)
@@ -28,9 +28,11 @@
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;
@@ -247,6 +249,9 @@
public String saveAsPlaylist()
{
+ Set<String> excludeParamNames = new HashSet<String>();
+ excludeParamNames.add("saveAsPlaylist");
+ excludeParamNames.add("command");
try
{
HierarchyManager hm = MgnlContext.getSystemContext().getHierarchyManager(PlaylistConstants.REPO);
@@ -257,6 +262,10 @@
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(
Added: trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/playlist/dialog/SearchPlaylistDialogMVC.java
===================================================================
--- trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/playlist/dialog/SearchPlaylistDialogMVC.java (rev 0)
+++ trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/playlist/dialog/SearchPlaylistDialogMVC.java 2011-02-08 07:49:44 UTC (rev 3309)
@@ -0,0 +1,81 @@
+package net.sourceforge.openutils.mgnlmedia.playlist.dialog;
+
+import info.magnolia.cms.core.Content;
+import info.magnolia.module.admininterface.SaveHandler;
+import info.magnolia.module.admininterface.dialogs.ConfiguredDialog;
+
+import java.io.IOException;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+import net.sourceforge.openutils.mgnlmedia.playlist.PlaylistConstants;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+
+/**
+ * @author ADMIN
+ * @version $Id: $
+ */
+public class SearchPlaylistDialogMVC extends ConfiguredDialog
+{
+
+ /**
+ * Logger.
+ */
+ private Logger log = LoggerFactory.getLogger(SearchPlaylistDialogMVC.class);
+
+ /**
+ *
+ */
+ public SearchPlaylistDialogMVC(
+ String name,
+ HttpServletRequest request,
+ HttpServletResponse response,
+ Content configNode)
+ {
+ super(name, request, response, configNode);
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ @Override
+ protected void configureSaveHandler(SaveHandler saveHandler)
+ {
+ super.configureSaveHandler(saveHandler);
+ saveHandler.setCreationItemType(PlaylistConstants.PLAYLIST);
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ @Override
+ protected boolean onPreSave(SaveHandler control)
+ {
+ // TODO Auto-generated method stub
+ return super.onPreSave(control);
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ @Override
+ protected boolean onPostSave(SaveHandler control)
+ {
+ // TODO Auto-generated method stub
+ return super.onPostSave(control);
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ @Override
+ public void renderHtml(String view) throws IOException
+ {
+ // TODO Auto-generated method stub
+ super.renderHtml(view);
+ }
+}
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-08 07:47:04 UTC (rev 3308)
+++ trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/playlist/pages/PlaylistView.java 2011-02-08 07:49:44 UTC (rev 3309)
@@ -234,7 +234,7 @@
{
Content requestNode = node.getContent(requestNodeName);
Collection<Content> paramNodes = requestNode.getChildren(ItemType.CONTENTNODE);
- final Map<String, String[]> map = new HashMap<String, String[]>();
+ final Map<String, Object> map = new HashMap<String, Object>();
for (Content paramNode : paramNodes)
{
String paramName = NodeDataUtil.getString(paramNode, "name");
@@ -244,7 +244,14 @@
{
paramValues[i] = jcrValues[i].getString();
}
- map.put(paramName, paramValues);
+ if (paramValues.length == 1)
+ {
+ map.put(paramName, paramValues[0]);
+ }
+ else if (paramValues.length > 1)
+ {
+ map.put(paramName, paramValues);
+ }
}
AdvancedResult searchResult = MediaEl
.module()
@@ -252,7 +259,7 @@
.search(
new CustomParamsRequest(request, map, false),
null,
- null,
+ "/",
true,
SortMode.SCORE,
0,
Added: trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap/media/config.modules.media.dialogs.search-playlist.xml
===================================================================
--- trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap/media/config.modules.media.dialogs.search-playlist.xml (rev 0)
+++ trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap/media/config.modules.media.dialogs.search-playlist.xml 2011-02-08 07:49:44 UTC (rev 3309)
@@ -0,0 +1,164 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<sv:node sv:name="search-playlist" xmlns:sv="http://www.jcp.org/jcr/sv/1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+ <sv:property sv:name="jcr:primaryType" sv:type="Name">
+ <sv:value>mgnl:contentNode</sv:value>
+ </sv:property>
+ <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
+ <sv:value>mix:lockable</sv:value>
+ </sv:property>
+ <sv:property sv:name="jcr:uuid" sv:type="String">
+ <sv:value>aa50c92e-cad0-493b-ab7f-facecac2a284</sv:value>
+ </sv:property>
+ <sv:property sv:name="class" sv:type="String">
+ <sv:value>net.sourceforge.openutils.mgnlmedia.playlist.dialog.SearchPlaylistDialogMVC</sv:value>
+ </sv:property>
+ <sv:property sv:name="jcr:createdBy" sv:type="String">
+ <sv:value>admin</sv:value>
+ </sv:property>
+ <sv:property sv:name="label" sv:type="String">
+ <sv:value>Playlist</sv:value>
+ </sv:property>
+ <sv:node sv:name="MetaData">
+ <sv:property sv:name="jcr:primaryType" sv:type="Name">
+ <sv:value>mgnl:metaData</sv:value>
+ </sv:property>
+ <sv:property sv:name="jcr:createdBy" sv:type="String">
+ <sv:value>admin</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:activated" sv:type="Boolean">
+ <sv:value>false</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:authorid" sv:type="String">
+ <sv:value>superuser</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:creationdate" sv:type="Date">
+ <sv:value>2010-02-04T16:31:25.515+01:00</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:lastmodified" sv:type="Date">
+ <sv:value>2011-02-07T20:47:25.314+01:00</sv:value>
+ </sv:property>
+ </sv:node>
+ <sv:node sv:name="tabGeneral">
+ <sv:property sv:name="jcr:primaryType" sv:type="Name">
+ <sv:value>mgnl:contentNode</sv:value>
+ </sv:property>
+ <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
+ <sv:value>mix:lockable</sv:value>
+ </sv:property>
+ <sv:property sv:name="jcr:uuid" sv:type="String">
+ <sv:value>301b55cd-e68f-47f3-85a3-9a1b3507b45f</sv:value>
+ </sv:property>
+ <sv:property sv:name="controlType" sv:type="String">
+ <sv:value>tab</sv:value>
+ </sv:property>
+ <sv:property sv:name="jcr:createdBy" sv:type="String">
+ <sv:value>admin</sv:value>
+ </sv:property>
+ <sv:property sv:name="label" sv:type="String">
+ <sv:value>Playlist</sv:value>
+ </sv:property>
+ <sv:node sv:name="MetaData">
+ <sv:property sv:name="jcr:primaryType" sv:type="Name">
+ <sv:value>mgnl:metaData</sv:value>
+ </sv:property>
+ <sv:property sv:name="jcr:createdBy" sv:type="String">
+ <sv:value>admin</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:activated" sv:type="Boolean">
+ <sv:value>false</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:authorid" sv:type="String">
+ <sv:value>superuser</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:creationdate" sv:type="Date">
+ <sv:value>2010-02-04T16:31:50.312+01:00</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:lastmodified" sv:type="Date">
+ <sv:value>2011-02-07T20:47:33.255+01:00</sv:value>
+ </sv:property>
+ </sv:node>
+ <sv:node sv:name="parentFolder">
+ <sv:property sv:name="jcr:primaryType" sv:type="Name">
+ <sv:value>mgnl:contentNode</sv:value>
+ </sv:property>
+ <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
+ <sv:value>mix:lockable</sv:value>
+ </sv:property>
+ <sv:property sv:name="jcr:uuid" sv:type="String">
+ <sv:value>f4648ddb-b34b-4cf1-a657-a897159a2721</sv:value>
+ </sv:property>
+ <sv:property sv:name="controlType" sv:type="String">
+ <sv:value>link</sv:value>
+ </sv:property>
+ <sv:property sv:name="jcr:createdBy" sv:type="String">
+ <sv:value>admin</sv:value>
+ </sv:property>
+ <sv:property sv:name="label" sv:type="String">
+ <sv:value>Parent folder</sv:value>
+ </sv:property>
+ <sv:property sv:name="repository" sv:type="String">
+ <sv:value>media</sv:value>
+ </sv:property>
+ <sv:node sv:name="MetaData">
+ <sv:property sv:name="jcr:primaryType" sv:type="Name">
+ <sv:value>mgnl:metaData</sv:value>
+ </sv:property>
+ <sv:property sv:name="jcr:createdBy" sv:type="String">
+ <sv:value>admin</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:activated" sv:type="Boolean">
+ <sv:value>false</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:authorid" sv:type="String">
+ <sv:value>superuser</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:creationdate" sv:type="Date">
+ <sv:value>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-07T21:10:12.830+01:00</sv:value>
+ </sv:property>
+ </sv:node>
+ </sv:node>
+ <sv:node sv:name="playlistName">
+ <sv:property sv:name="jcr:primaryType" sv:type="Name">
+ <sv:value>mgnl:contentNode</sv:value>
+ </sv:property>
+ <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
+ <sv:value>mix:lockable</sv:value>
+ </sv:property>
+ <sv:property sv:name="jcr:uuid" sv:type="String">
+ <sv:value>8174d77e-7be3-43a3-bfe9-babbdac23b19</sv:value>
+ </sv:property>
+ <sv:property sv:name="controlType" sv:type="String">
+ <sv:value>edit</sv:value>
+ </sv:property>
+ <sv:property sv:name="jcr:createdBy" sv:type="String">
+ <sv:value>admin</sv:value>
+ </sv:property>
+ <sv:property sv:name="label" sv:type="String">
+ <sv:value>Playlist name</sv:value>
+ </sv:property>
+ <sv:node sv:name="MetaData">
+ <sv:property sv:name="jcr:primaryType" sv:type="Name">
+ <sv:value>mgnl:metaData</sv:value>
+ </sv:property>
+ <sv:property sv:name="jcr:createdBy" sv:type="String">
+ <sv:value>admin</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:activated" sv:type="Boolean">
+ <sv:value>false</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:authorid" sv:type="String">
+ <sv:value>superuser</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:creationdate" sv:type="Date">
+ <sv:value>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-07T20:49:08.823+01:00</sv:value>
+ </sv:property>
+ </sv:node>
+ </sv:node>
+ </sv:node>
+</sv:node>
Modified: trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/media/pages/MediaAdvancedSearchFormPage.html
===================================================================
--- trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/media/pages/MediaAdvancedSearchFormPage.html 2011-02-08 07:47:04 UTC (rev 3308)
+++ trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/media/pages/MediaAdvancedSearchFormPage.html 2011-02-08 07:49:44 UTC (rev 3309)
@@ -32,7 +32,10 @@
<div class="row">
<input type="submit" name="submit" value="${this.msgs['buttons.search']}" class="button-submit"/>
+ <!--
<input type="submit" name="saveAsPlaylist" value="${this.msgs['buttons.saveAsPlaylist']}" class="button-submit" onclick="this.form.command.value = 'saveAsPlaylist'"/>
+ -->
+ <input type="submit" name="saveAsPlaylist" value="${this.msgs['buttons.saveAsPlaylist']}" class="button-submit" onclick="parent.openWindow('.magnolia/dialogs/search-playlist.html?mgnlPath=&mgnlRepository=media&mgnlCK=' + (new Date()).getTime()); return false;"/>
<input type="hidden" name="command" value="" />
</div>
</form>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <die...@us...> - 2011-02-08 07:47:10
|
Revision: 3308
http://openutils.svn.sourceforge.net/openutils/?rev=3308&view=rev
Author: diego_schivo
Date: 2011-02-08 07:47:04 +0000 (Tue, 08 Feb 2011)
Log Message:
-----------
MEDIA-210 fix path
Modified Paths:
--------------
trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/controls/MediaTreeFooter.ftl
Modified: trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/controls/MediaTreeFooter.ftl
===================================================================
--- trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/controls/MediaTreeFooter.ftl 2011-02-07 17:56:54 UTC (rev 3307)
+++ trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/controls/MediaTreeFooter.ftl 2011-02-08 07:47:04 UTC (rev 3308)
@@ -21,7 +21,7 @@
${menu.html}
</#if>
<#if tree.browseMode>
- <#include "TreeAddressBar.ftl"/>
+ <#include "/info/magnolia/cms/gui/control/TreeAddressBar.ftl"/>
<#else>
</#if>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <die...@us...> - 2011-02-07 17:57:01
|
Revision: 3307
http://openutils.svn.sourceforge.net/openutils/?rev=3307&view=rev
Author: diego_schivo
Date: 2011-02-07 17:56:54 +0000 (Mon, 07 Feb 2011)
Log Message:
-----------
MEDIA-214 playlist view
Modified Paths:
--------------
trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/playlist/pages/PlaylistView.java
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-07 15:05:15 UTC (rev 3306)
+++ trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/playlist/pages/PlaylistView.java 2011-02-07 17:56:54 UTC (rev 3307)
@@ -20,15 +20,20 @@
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;
import java.util.List;
import java.util.Locale;
@@ -36,15 +41,21 @@
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;
@@ -204,29 +215,8 @@
Content media = ContentUtil.getContentByUUID(MediaModule.REPO, mediaUUID);
if (media != null)
{
- PlaylistEntryBean entry = new PlaylistEntryBean();
+ PlaylistEntryBean entry = playlistEntryBean(media, propNames);
entry.setHandle(subNode.getHandle());
- 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());
entries.add(entry);
}
else
@@ -236,6 +226,51 @@
new Object[]{mediaUUID, subNode.getName(), playlist.getHandle() });
}
}
+
+ String requestNodeName = "request";
+ try
+ {
+ if (node.hasContent(requestNodeName))
+ {
+ Content requestNode = node.getContent(requestNodeName);
+ Collection<Content> paramNodes = requestNode.getChildren(ItemType.CONTENTNODE);
+ final Map<String, String[]> map = new HashMap<String, String[]>();
+ 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();
+ }
+ map.put(paramName, paramValues);
+ }
+ AdvancedResult searchResult = MediaEl
+ .module()
+ .getSearch()
+ .search(
+ new CustomParamsRequest(request, map, false),
+ null,
+ null,
+ true,
+ SortMode.SCORE,
+ 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)
+ {
+ // TODO Auto-generated catch block
+ e.printStackTrace();
+ }
playlist.setEntries(entries);
}
else
@@ -428,4 +463,139 @@
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);
+ }
+ }
+
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <die...@us...> - 2011-02-07 15:05:21
|
Revision: 3306
http://openutils.svn.sourceforge.net/openutils/?rev=3306&view=rev
Author: diego_schivo
Date: 2011-02-07 15:05:15 +0000 (Mon, 07 Feb 2011)
Log Message:
-----------
MEDIA-214 saveAsPlaylist method
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-07 14:49:29 UTC (rev 3305)
+++ trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/pages/MediaAdvancedSearchPage.java 2011-02-07 15:05:15 UTC (rev 3306)
@@ -20,14 +20,22 @@
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.Iterator;
import java.util.LinkedHashMap;
import java.util.Map;
+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;
@@ -37,6 +45,7 @@
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;
@@ -236,4 +245,38 @@
});
}
+ public String saveAsPlaylist()
+ {
+ 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();
+ 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();
+ }
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <die...@us...> - 2011-02-07 14:49:35
|
Revision: 3305
http://openutils.svn.sourceforge.net/openutils/?rev=3305&view=rev
Author: diego_schivo
Date: 2011-02-07 14:49:29 +0000 (Mon, 07 Feb 2011)
Log Message:
-----------
MEDIA-210 fix path
Modified Paths:
--------------
trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/controls/MediaTreeFooter.ftl
Modified: trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/controls/MediaTreeFooter.ftl
===================================================================
--- trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/controls/MediaTreeFooter.ftl 2011-02-06 21:05:47 UTC (rev 3304)
+++ trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/controls/MediaTreeFooter.ftl 2011-02-07 14:49:29 UTC (rev 3305)
@@ -31,7 +31,7 @@
${functionBarHtml?substring(0, p)} style="height: 59px;"><input id="${tree.javascriptTree}AddressBar" type="text" onkeydown="if (mgnlIsKeyEnter(event)) mgnlTreeControl.expandNode(this.value);" class="mgnlDialogControlEdit" style="width: 100%;" value="" />${functionBarHtml?substring(p + 1)}
</#if>
-<#include "TreeJavascript.ftl"/>
+<#include "/info/magnolia/cms/gui/control/TreeJavascript.ftl"/>
<script type="text/javascript">
// <