Menu
▾
▴
[Openutils-svn] SF.net SVN: openutils:[4331] magnoliamodules/trunk/openutils-mgnlmedia/src
|
From: <fg...@us...> - 2013-09-20 12:38:43
|
Revision: 4331
http://openutils.svn.sourceforge.net/openutils/?rev=4331&view=rev
Author: fgiust
Date: 2013-09-20 12:38:39 +0000 (Fri, 20 Sep 2013)
Log Message:
-----------
less Content (and more broken)
Modified Paths:
--------------
magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/dam/SimpleMediaAsset.java
magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/dam/SimpleMediaContentHandler.java
magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/grid/MediaGridColumnType.java
magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/advancedsearch/SearchFilterOptionProvider.java
magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/commands/MediaActivationCommand.java
magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/configuration/MediaConfigurationManager.java
magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/crop/PzcServlet.java
magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/dialog/DialogHiddenParameters.java
magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/dialog/LayerDialogMVC.java
magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/pages/MediaAdvancedSearchPage.java
magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/pages/MediaBean.java
magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/pages/MediaBeanBuilder.java
magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/pages/MediaBrowserPage.java
magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/pages/MediaSearchPage.java
magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/setup/AddExtensionToType.java
magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/setup/ConditionallySubscribeMediaRepositoriesTask.java
magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/setup/MoveHandlerNodedataToNode.java
magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/setup/RemoveExtensionFromType.java
magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/setup/RemoveResolutionsNodeTask.java
magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/setup/RenameThumbToImageTask.java
magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/tree/JcrBrowserWithNodeTypeTreeConfiguration.java
magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/tree/MediaBrowserConfiguration.java
magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/tree/MediaModuleTree.java
magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/types/impl/BaseTypeHandler.java
magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/types/impl/ImageTypeHandler.java
magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/uri/MediaURI2RepositoryMapping.java
magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/utils/ImageUtils.java
magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/utils/MediaLoadUtils.java
magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/playlist/dialog/PlaylistEntryDialogMVC.java
magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/playlist/dialog/SearchBasedPlaylistDialogMVC.java
magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/playlist/pages/DefaultPlaylistTrackExtensionContributor.java
magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/playlist/pages/PlaylistView.java
magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/playlist/tree/PlaylistsTree.java
magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/playlist/tree/PlaylistsTreeMVCHandler.java
magnoliamodules/trunk/openutils-mgnlmedia/src/test/java/net/sourceforge/openutils/mgnlmedia/media/repotests/MediaTests.java
magnoliamodules/trunk/openutils-mgnlmedia/src/test/java/net/sourceforge/openutils/mgnlmedia/media/utils/FileNodeData.java
Modified: magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/dam/SimpleMediaAsset.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/dam/SimpleMediaAsset.java 2013-09-19 14:32:06 UTC (rev 4330)
+++ magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/dam/SimpleMediaAsset.java 2013-09-20 12:38:39 UTC (rev 4331)
@@ -19,6 +19,7 @@
package net.sourceforge.openutils.mgnlmedia.dam;
+
import info.magnolia.cms.core.Content;
import info.magnolia.cms.core.NodeData;
import info.magnolia.module.templatingkit.dam.AssetNotFoundException;
Modified: magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/dam/SimpleMediaContentHandler.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/dam/SimpleMediaContentHandler.java 2013-09-19 14:32:06 UTC (rev 4330)
+++ magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/dam/SimpleMediaContentHandler.java 2013-09-20 12:38:39 UTC (rev 4331)
@@ -19,6 +19,7 @@
package net.sourceforge.openutils.mgnlmedia.dam;
+
import info.magnolia.cms.core.Content;
import info.magnolia.cms.core.HierarchyManager;
import info.magnolia.cms.core.NodeData;
Modified: magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/grid/MediaGridColumnType.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/grid/MediaGridColumnType.java 2013-09-19 14:32:06 UTC (rev 4330)
+++ magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/grid/MediaGridColumnType.java 2013-09-20 12:38:39 UTC (rev 4331)
@@ -19,6 +19,7 @@
package net.sourceforge.openutils.mgnlmedia.grid;
+
import info.magnolia.cms.core.Content;
import info.magnolia.cms.i18n.Messages;
import info.magnolia.cms.security.AccessDeniedException;
Modified: magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/advancedsearch/SearchFilterOptionProvider.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/advancedsearch/SearchFilterOptionProvider.java 2013-09-19 14:32:06 UTC (rev 4330)
+++ magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/advancedsearch/SearchFilterOptionProvider.java 2013-09-20 12:38:39 UTC (rev 4331)
@@ -19,13 +19,14 @@
package net.sourceforge.openutils.mgnlmedia.media.advancedsearch;
-import info.magnolia.cms.core.Content;
+
import info.magnolia.context.MgnlContext;
import java.util.ArrayList;
import java.util.Collection;
import java.util.List;
+import javax.jcr.Node;
import javax.jcr.RepositoryException;
import org.apache.commons.lang.StringUtils;
@@ -112,7 +113,7 @@
{
try
{
- Collection<Content> referenceOptions = MgnlContext
+ Collection<Node> referenceOptions = MgnlContext
.getHierarchyManager("config")
.getContent(reference)
.getChildren();
@@ -126,7 +127,7 @@
addOptions(opt);
}
- for (Content content : referenceOptions)
+ for (Node content : referenceOptions)
{
opt = new Option();
opt.setLabel(content.getNodeData("label").getString());
Modified: magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/commands/MediaActivationCommand.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/commands/MediaActivationCommand.java 2013-09-19 14:32:06 UTC (rev 4330)
+++ magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/commands/MediaActivationCommand.java 2013-09-20 12:38:39 UTC (rev 4331)
@@ -19,6 +19,7 @@
package net.sourceforge.openutils.mgnlmedia.media.commands;
+
import info.magnolia.cms.core.Content;
import info.magnolia.cms.core.ItemType;
import info.magnolia.cms.exchange.ExchangeException;
Modified: magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/configuration/MediaConfigurationManager.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/configuration/MediaConfigurationManager.java 2013-09-19 14:32:06 UTC (rev 4330)
+++ magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/configuration/MediaConfigurationManager.java 2013-09-20 12:38:39 UTC (rev 4331)
@@ -114,9 +114,7 @@
{
Node node = content.getJCRNode();
-
-
-
+
for (Iterator iter = ContentUtil.getAllChildren(node).iterator(); iter.hasNext();)
{
Node typeNode = iter.next();
@@ -147,7 +145,7 @@
}
catch (Throwable e)
{
- log.error("Error getting media type configuration for {}", typeNode.getHandle(), e);
+ log.error("Error getting media type configuration for {}", NodeUtil.getPathIfPossible(typeNode), e);
}
}
}
Modified: magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/crop/PzcServlet.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/crop/PzcServlet.java 2013-09-19 14:32:06 UTC (rev 4330)
+++ magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/crop/PzcServlet.java 2013-09-20 12:38:39 UTC (rev 4331)
@@ -19,7 +19,7 @@
package net.sourceforge.openutils.mgnlmedia.media.crop;
-import info.magnolia.cms.core.Content;
+
import info.magnolia.cms.core.HierarchyManager;
import info.magnolia.cms.core.NodeData;
import info.magnolia.cms.util.NodeDataUtil;
@@ -28,6 +28,7 @@
import java.io.IOException;
+import javax.jcr.Node;
import javax.jcr.RepositoryException;
import javax.servlet.ServletException;
import javax.servlet.http.HttpServlet;
@@ -73,7 +74,7 @@
try
{
- final Content node = hm.getContent(handle);
+ final Node node = hm.getContent(handle);
if ("delete".equals(command))
{
NodeData nd = node.getNodeData(id);
@@ -95,7 +96,7 @@
HierarchyManager hm = MgnlContext.getHierarchyManager(systemRepository);
try
{
- Content systemNode = hm.getContent(node.getHandle());
+ Node systemNode = hm.getContent(node.getHandle());
NodeDataUtil.getOrCreateAndSet(systemNode, id, new StringBuffer()
.append(zoom)
.append("|")
Modified: magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/dialog/DialogHiddenParameters.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/dialog/DialogHiddenParameters.java 2013-09-19 14:32:06 UTC (rev 4330)
+++ magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/dialog/DialogHiddenParameters.java 2013-09-20 12:38:39 UTC (rev 4331)
@@ -19,6 +19,8 @@
package net.sourceforge.openutils.mgnlmedia.media.dialog;
+
+
import info.magnolia.cms.core.Content;
import javax.jcr.RepositoryException;
Modified: magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/dialog/LayerDialogMVC.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/dialog/LayerDialogMVC.java 2013-09-19 14:32:06 UTC (rev 4330)
+++ magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/dialog/LayerDialogMVC.java 2013-09-20 12:38:39 UTC (rev 4331)
@@ -19,6 +19,7 @@
package net.sourceforge.openutils.mgnlmedia.media.dialog;
+
import info.magnolia.cms.core.Content;
import info.magnolia.cms.core.HierarchyManager;
import info.magnolia.cms.core.Path;
Modified: magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/pages/MediaAdvancedSearchPage.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/pages/MediaAdvancedSearchPage.java 2013-09-19 14:32:06 UTC (rev 4330)
+++ magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/pages/MediaAdvancedSearchPage.java 2013-09-20 12:38:39 UTC (rev 4331)
@@ -19,7 +19,7 @@
package net.sourceforge.openutils.mgnlmedia.media.pages;
-import info.magnolia.cms.core.Content;
+
import info.magnolia.context.MgnlContext;
import info.magnolia.freemarker.FreemarkerUtil;
@@ -27,6 +27,7 @@
import java.util.LinkedHashMap;
import java.util.Map;
+import javax.jcr.Node;
import javax.jcr.RepositoryException;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
@@ -214,15 +215,15 @@
return metas;
}
- public Iterator<Content> getMediaContentList()
+ public Iterator<Node> getMediaContentList()
{
- return Iterators.transform(searchResult.getItems(), new Function<AdvancedResultItem, Content>()
+ return Iterators.transform(searchResult.getItems(), new Function<AdvancedResultItem, Node>()
{
/**
* {@inheritDoc}
*/
- public Content apply(AdvancedResultItem from)
+ public Node apply(AdvancedResultItem from)
{
try
{
Modified: magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/pages/MediaBean.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/pages/MediaBean.java 2013-09-19 14:32:06 UTC (rev 4330)
+++ magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/pages/MediaBean.java 2013-09-20 12:38:39 UTC (rev 4331)
@@ -19,14 +19,16 @@
package net.sourceforge.openutils.mgnlmedia.media.pages;
-import info.magnolia.cms.core.Content;
+
import info.magnolia.cms.core.MetaData;
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
+import javax.jcr.Node;
+
/**
* Store media info for rendering in {@link MediaFolderViewPage}
* @author molaschi
@@ -51,7 +53,7 @@
private String dialog;
- private Content content;
+ private Node content;
private MetaData metaData;
@@ -203,7 +205,7 @@
* Returns the content.
* @return the content
*/
- public Content getContent()
+ public Node getContent()
{
return content;
}
@@ -212,7 +214,7 @@
* Sets the content.
* @param content the content to set
*/
- public void setContent(Content content)
+ public void setContent(Node content)
{
this.content = content;
}
Modified: magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/pages/MediaBeanBuilder.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/pages/MediaBeanBuilder.java 2013-09-19 14:32:06 UTC (rev 4330)
+++ magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/pages/MediaBeanBuilder.java 2013-09-20 12:38:39 UTC (rev 4331)
@@ -20,7 +20,6 @@
package net.sourceforge.openutils.mgnlmedia.media.pages;
import info.magnolia.cms.beans.config.URI2RepositoryManager;
-import info.magnolia.cms.core.Content;
import info.magnolia.cms.exchange.ActivationManagerFactory;
import info.magnolia.cms.security.Permission;
import info.magnolia.cms.util.NodeDataUtil;
@@ -29,6 +28,7 @@
import java.util.List;
import java.util.Map;
+import javax.jcr.Node;
import javax.jcr.RepositoryException;
import net.sourceforge.openutils.mgnlmedia.media.configuration.MediaConfigurationManager;
@@ -48,7 +48,7 @@
* @author dschivo
* @version $Id$
*/
-public class MediaBeanBuilder implements Function<Content, MediaBean>
+public class MediaBeanBuilder implements Function<Node, MediaBean>
{
/**
@@ -59,7 +59,7 @@
/**
* {@inheritDoc}
*/
- public MediaBean apply(Content media)
+ public MediaBean apply(Node media)
{
String mediatype = media.getNodeData("type").getString();
Modified: magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/pages/MediaBrowserPage.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/pages/MediaBrowserPage.java 2013-09-19 14:32:06 UTC (rev 4330)
+++ magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/pages/MediaBrowserPage.java 2013-09-20 12:38:39 UTC (rev 4331)
@@ -20,7 +20,6 @@
package net.sourceforge.openutils.mgnlmedia.media.pages;
import info.magnolia.cms.beans.runtime.Document;
-import info.magnolia.cms.core.Content;
import info.magnolia.cms.core.HierarchyManager;
import info.magnolia.cms.i18n.Messages;
import info.magnolia.cms.util.AlertUtil;
@@ -39,6 +38,7 @@
import java.util.List;
import java.util.zip.ZipFile;
+import javax.jcr.Node;
import javax.jcr.RepositoryException;
import javax.servlet.http.Cookie;
import javax.servlet.http.HttpServletRequest;
@@ -116,7 +116,7 @@
HierarchyManager mgr = MgnlContext.getHierarchyManager(MediaModule.REPO);
try
{
- Content media = mgr.getContentByUUID(actMedia);
+ Node media = mgr.getContentByUUID(actMedia);
openPath = media.getParent().getHandle();
actMediaHandle = media.getHandle();
}
@@ -127,13 +127,13 @@
}
if (!StringUtils.isEmpty(playlistHandle))
{
- Content playlistContent = ContentUtil.getContent(PlaylistConstants.REPO, playlistHandle);
+ Node playlistContent = ContentUtil.getContent(PlaylistConstants.REPO, playlistHandle);
try
{
if (playlistContent.hasContent("search"))
{
List<String> params = new ArrayList<String>();
- for (Content content : playlistContent.getContent("search").getChildren())
+ for (Node content : playlistContent.getContent("search").getChildren())
{
String paramName = NodeDataUtil.getString(content, "name");
String paramValue = NodeDataUtil.getString(content, "value");
Modified: magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/pages/MediaSearchPage.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/pages/MediaSearchPage.java 2013-09-19 14:32:06 UTC (rev 4330)
+++ magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/pages/MediaSearchPage.java 2013-09-20 12:38:39 UTC (rev 4331)
@@ -19,7 +19,7 @@
package net.sourceforge.openutils.mgnlmedia.media.pages;
-import info.magnolia.cms.core.Content;
+
import info.magnolia.cms.core.HierarchyManager;
import info.magnolia.context.MgnlContext;
@@ -28,6 +28,7 @@
import java.util.List;
import java.util.Map;
+import javax.jcr.Node;
import javax.jcr.RepositoryException;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
@@ -95,9 +96,9 @@
HierarchyManager mgr = MgnlContext.getHierarchyManager(MediaModule.REPO);
try
{
- Collection<Content> contents = mgr.getRoot().getChildren(MediaConfigurationManager.FOLDER);
+ Collection<Node> contents = mgr.getRoot().getChildren(MediaConfigurationManager.FOLDER);
List<String> tmpPaths = new ArrayList<String>();
- for (Content c : contents)
+ for (Node c : contents)
{
tmpPaths.add(c.getName());
}
Modified: magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/setup/AddExtensionToType.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/setup/AddExtensionToType.java 2013-09-19 14:32:06 UTC (rev 4330)
+++ magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/setup/AddExtensionToType.java 2013-09-20 12:38:39 UTC (rev 4331)
@@ -19,13 +19,14 @@
package net.sourceforge.openutils.mgnlmedia.media.setup;
-import info.magnolia.cms.core.Content;
+
import info.magnolia.cms.core.HierarchyManager;
import info.magnolia.module.InstallContext;
import info.magnolia.module.delta.AbstractRepositoryTask;
import info.magnolia.module.delta.TaskExecutionException;
import info.magnolia.repository.RepositoryConstants;
+import javax.jcr.Node;
import javax.jcr.RepositoryException;
import org.apache.commons.lang.StringUtils;
@@ -71,7 +72,7 @@
try
{
- final Content mediatypenode = hm.getContent(nodePath);
+ final Node mediatypenode = hm.getContent(nodePath);
String extensions = mediatypenode.getNodeData("extensions").getString();
if (!StringUtils.contains(extensions, this.extension))
{
@@ -85,7 +86,7 @@
try
{
- final Content mediatypenode = hm.getContent(control);
+ final Node mediatypenode = hm.getContent(control);
String extensions = mediatypenode.getNodeData("extensions").getString();
if (!StringUtils.contains(extensions, this.extension))
{
Modified: magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/setup/ConditionallySubscribeMediaRepositoriesTask.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/setup/ConditionallySubscribeMediaRepositoriesTask.java 2013-09-19 14:32:06 UTC (rev 4330)
+++ magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/setup/ConditionallySubscribeMediaRepositoriesTask.java 2013-09-20 12:38:39 UTC (rev 4331)
@@ -19,7 +19,7 @@
package net.sourceforge.openutils.mgnlmedia.media.setup;
-import info.magnolia.cms.core.Content;
+
import info.magnolia.cms.core.ItemType;
import info.magnolia.cms.exchange.ActivationManager;
import info.magnolia.cms.exchange.ActivationManagerFactory;
@@ -35,6 +35,7 @@
import java.util.Collection;
import java.util.List;
+import javax.jcr.Node;
import javax.jcr.RepositoryException;
@@ -59,7 +60,7 @@
// check for the sigleinstance flag directly in jcr, the module is not started yet
boolean singleinstance = false;
- Content moduleConfigNode = ContentUtil.getContent(RepositoryConstants.CONFIG, "/modules/media/config");
+ Node moduleConfigNode = ContentUtil.getContent(RepositoryConstants.CONFIG, "/modules/media/config");
if (moduleConfigNode != null)
{
singleinstance = moduleConfigNode.getNodeData("singleinstance").getBoolean();
@@ -95,13 +96,13 @@
{
if (!subscriber.isSubscribed("/", repository))
{
- Content subscriptionsNode = ContentUtil.getContent(RepositoryConstants.CONFIG, sManager.getConfigPath()
+ Node subscriptionsNode = ContentUtil.getContent(RepositoryConstants.CONFIG, sManager.getConfigPath()
+ "/"
+ subscriber.getName()
+ "/subscriptions");
try
{
- Content newSubscription = subscriptionsNode.createContent(repository, ItemType.CONTENTNODE);
+ Node newSubscription = subscriptionsNode.createContent(repository, ItemType.CONTENTNODE);
newSubscription.createNodeData("toURI").setValue("/");
newSubscription.createNodeData("repository").setValue(repository);
newSubscription.createNodeData("fromURI").setValue("/");
Modified: magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/setup/MoveHandlerNodedataToNode.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/setup/MoveHandlerNodedataToNode.java 2013-09-19 14:32:06 UTC (rev 4330)
+++ magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/setup/MoveHandlerNodedataToNode.java 2013-09-20 12:38:39 UTC (rev 4331)
@@ -19,6 +19,7 @@
package net.sourceforge.openutils.mgnlmedia.media.setup;
+
import info.magnolia.cms.core.Content;
import info.magnolia.cms.core.ItemType;
import info.magnolia.cms.core.NodeData;
Modified: magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/setup/RemoveExtensionFromType.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/setup/RemoveExtensionFromType.java 2013-09-19 14:32:06 UTC (rev 4330)
+++ magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/setup/RemoveExtensionFromType.java 2013-09-20 12:38:39 UTC (rev 4331)
@@ -19,6 +19,7 @@
package net.sourceforge.openutils.mgnlmedia.media.setup;
+
import info.magnolia.cms.core.Content;
import info.magnolia.cms.core.HierarchyManager;
import info.magnolia.module.InstallContext;
Modified: magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/setup/RemoveResolutionsNodeTask.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/setup/RemoveResolutionsNodeTask.java 2013-09-19 14:32:06 UTC (rev 4330)
+++ magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/setup/RemoveResolutionsNodeTask.java 2013-09-20 12:38:39 UTC (rev 4331)
@@ -19,6 +19,7 @@
package net.sourceforge.openutils.mgnlmedia.media.setup;
+
import info.magnolia.cms.core.Content;
import info.magnolia.cms.core.HierarchyManager;
import info.magnolia.cms.core.ItemType;
Modified: magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/setup/RenameThumbToImageTask.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/setup/RenameThumbToImageTask.java 2013-09-19 14:32:06 UTC (rev 4330)
+++ magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/setup/RenameThumbToImageTask.java 2013-09-20 12:38:39 UTC (rev 4331)
@@ -20,7 +20,6 @@
package net.sourceforge.openutils.mgnlmedia.media.setup;
import info.magnolia.cms.beans.runtime.FileProperties;
-import info.magnolia.cms.core.Content;
import info.magnolia.cms.core.HierarchyManager;
import info.magnolia.cms.core.NodeData;
import info.magnolia.cms.core.search.Query;
@@ -32,6 +31,7 @@
import java.util.Collection;
+import javax.jcr.Node;
import javax.jcr.PropertyType;
import javax.jcr.RepositoryException;
@@ -66,8 +66,8 @@
{
Query query = mgr.createQuery("//*", Query.XPATH);
QueryResult result = query.execute();
- Collection<Content> medias = result.getContent(MediaConfigurationManager.MEDIA.getSystemName());
- for (Content node : medias)
+ Collection<Node> medias = result.getContent(MediaConfigurationManager.MEDIA.getSystemName());
+ for (Node node : medias)
{
if (node.hasNodeData("thumbnail"))
{
Modified: magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/tree/JcrBrowserWithNodeTypeTreeConfiguration.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/tree/JcrBrowserWithNodeTypeTreeConfiguration.java 2013-09-19 14:32:06 UTC (rev 4330)
+++ magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/tree/JcrBrowserWithNodeTypeTreeConfiguration.java 2013-09-20 12:38:39 UTC (rev 4331)
@@ -19,6 +19,7 @@
package net.sourceforge.openutils.mgnlmedia.media.tree;
+
import info.magnolia.cms.core.Content;
import info.magnolia.cms.core.ItemType;
import info.magnolia.cms.gui.control.Tree;
Modified: magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/tree/MediaBrowserConfiguration.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/tree/MediaBrowserConfiguration.java 2013-09-19 14:32:06 UTC (rev 4330)
+++ magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/tree/MediaBrowserConfiguration.java 2013-09-20 12:38:39 UTC (rev 4331)
@@ -19,6 +19,7 @@
package net.sourceforge.openutils.mgnlmedia.media.tree;
+
import info.magnolia.cms.core.Content;
import info.magnolia.cms.core.ItemType;
import info.magnolia.cms.gui.control.Tree;
Modified: magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/tree/MediaModuleTree.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/tree/MediaModuleTree.java 2013-09-19 14:32:06 UTC (rev 4330)
+++ magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/tree/MediaModuleTree.java 2013-09-20 12:38:39 UTC (rev 4331)
@@ -19,6 +19,7 @@
package net.sourceforge.openutils.mgnlmedia.media.tree;
+
import info.magnolia.cms.core.Content;
import info.magnolia.cms.core.NodeData;
import info.magnolia.cms.gui.control.Hidden;
Modified: magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/types/impl/BaseTypeHandler.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/types/impl/BaseTypeHandler.java 2013-09-19 14:32:06 UTC (rev 4330)
+++ magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/types/impl/BaseTypeHandler.java 2013-09-20 12:38:39 UTC (rev 4331)
@@ -27,6 +27,8 @@
import info.magnolia.cms.security.AccessDeniedException;
import info.magnolia.cms.util.NodeDataUtil;
import info.magnolia.jcr.util.MetaDataUtil;
+import info.magnolia.jcr.util.NodeUtil;
+import info.magnolia.jcr.util.PropertyUtil;
import info.magnolia.module.admininterface.SaveHandlerImpl;
import java.io.File;
@@ -148,15 +150,15 @@
String name = p != -1 ? filename.substring(p + 1) : filename;
// lowercase at saving for case insensitive sorting
name = StringUtils.lowerCase(name);
- if (!StringUtils.equals(name, NodeDataUtil.getString(media, METADATA_NAME)))
+ if (!StringUtils.equals(name, PropertyUtil.getString(media, METADATA_NAME)))
{
NodeDataUtil.getOrCreateAndSet(media, METADATA_NAME, name);
media.save();
}
- if (media.hasContent("resolutions"))
+ if (media.hasNode("resolutions"))
{
- Collection<NodeData> nodedatas = media.getChildByName("resolutions").getNodeDataCollection();
+ Collection<NodeData> nodedatas = media.getNode("resolutions").getNodeDataCollection();
for (NodeData nd : nodedatas)
{
nd.delete();
@@ -241,7 +243,7 @@
// should never happen
}
return MediaConfigurationManager.getInstance().getURIMappingPrefix()
- + media.getHandle()
+ + NodeUtil.getPathIfPossible(media)
+ "/"
+ ORGINAL_NODEDATA_NAME
+ "/"
Modified: magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/types/impl/ImageTypeHandler.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/types/impl/ImageTypeHandler.java 2013-09-19 14:32:06 UTC (rev 4330)
+++ magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/types/impl/ImageTypeHandler.java 2013-09-20 12:38:39 UTC (rev 4331)
@@ -22,6 +22,7 @@
import info.magnolia.cms.beans.runtime.FileProperties;
import info.magnolia.cms.core.NodeData;
import info.magnolia.cms.util.NodeDataUtil;
+import info.magnolia.jcr.util.NodeUtil;
import java.awt.image.BufferedImage;
import java.io.InputStream;
@@ -62,7 +63,7 @@
return StringUtils.EMPTY;
}
return MediaConfigurationManager.getInstance().getURIMappingPrefix()
- + media.getHandle()
+ + NodeUtil.getPathIfPossible(media)
+ "/resolutions/thumbnail/"
+ media.getName()
+ "."
@@ -80,7 +81,7 @@
return StringUtils.EMPTY;
}
return MediaConfigurationManager.getInstance().getURIMappingPrefix()
- + media.getHandle()
+ + NodeUtil.getPathIfPossible(media)
+ "/resolutions/preview/"
+ media.getName()
+ "."
Modified: magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/uri/MediaURI2RepositoryMapping.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/uri/MediaURI2RepositoryMapping.java 2013-09-19 14:32:06 UTC (rev 4330)
+++ magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/uri/MediaURI2RepositoryMapping.java 2013-09-20 12:38:39 UTC (rev 4331)
@@ -20,12 +20,12 @@
package net.sourceforge.openutils.mgnlmedia.media.uri;
import info.magnolia.cms.beans.config.URI2RepositoryMapping;
-import info.magnolia.cms.core.Content;
import info.magnolia.cms.core.NodeData;
import info.magnolia.cms.util.ContentUtil;
import info.magnolia.context.MgnlContext;
import info.magnolia.link.Link;
+import javax.jcr.Node;
import javax.jcr.RepositoryException;
import net.sourceforge.openutils.mgnlmedia.media.lifecycle.MediaModule;
@@ -116,10 +116,10 @@
if (p != -1)
{
String mediaPath = handle.substring(0, p);
- Content mediaNode = ContentUtil.getContent(MediaModule.REPO, mediaPath);
+ Node mediaNode = ContentUtil.getContent(MediaModule.REPO, mediaPath);
if (mediaNode != null)
{
- Content resolutionsNode = ContentUtil.getContent(mediaNode, resolutionsName);
+ Node resolutionsNode = ContentUtil.getContent(mediaNode, resolutionsName);
String ndName = StringUtils.substringBefore(handle.substring(p + search.length()), "/");
if (resolutionsNode != null && !StringUtils.isEmpty(ndName))
{
Modified: magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/utils/ImageUtils.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/utils/ImageUtils.java 2013-09-19 14:32:06 UTC (rev 4330)
+++ magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/utils/ImageUtils.java 2013-09-20 12:38:39 UTC (rev 4331)
@@ -20,7 +20,7 @@
package net.sourceforge.openutils.mgnlmedia.media.utils;
import info.magnolia.cms.beans.runtime.FileProperties;
-import info.magnolia.cms.core.Content;
+
import info.magnolia.cms.core.HierarchyManager;
import info.magnolia.cms.core.NodeData;
import info.magnolia.context.Context;
@@ -497,7 +497,7 @@
* @throws RepositoryException exception in jcr operations
* @throws IOException exception converting image to jpg
*/
- public static NodeData saveResolution(BufferedImage image, Content saveTo, String extension, float quality,
+ public static NodeData saveResolution(BufferedImage image, Node saveTo, String extension, float quality,
boolean forceProgressive) throws RepositoryException, IOException
{
return saveResolution(image, saveTo, null, extension, quality, forceProgressive);
@@ -514,12 +514,12 @@
* @throws RepositoryException exception in jcr operations
* @throws IOException exception converting image to jpg
*/
- public static NodeData saveResolution(final BufferedImage image, final Content saveTo, final String name,
+ public static Node saveResolution(final BufferedImage image, final Node saveTo, final String name,
final String extension, final float quality, final boolean forceProgressive) throws RepositoryException,
IOException
{
- Content resolutions = getResolutionsNode(saveTo);
+ Node resolutions = getResolutionsNode(saveTo);
if (resolutions == null)
{
resolutions = saveTo.createContent("resolutions", MediaConfigurationManager.RESOLUTIONS);
@@ -534,9 +534,9 @@
}
final String resolutionNodeName = getResolutionPath(resolution);
- final Content resolutionsFinal = resolutions;
+ final Node resolutionsFinal = resolutions;
- Node resolutionsJcrNode = resolutions.getJCRNode();
+ Node resolutionsJcrNode = resolutions;
Object ret;
try
@@ -830,7 +830,7 @@
* @param resolutionTarget target resolution
* @return false if resolution doesn't exist and there is a problem in generate it; true otherwise
*/
- public static boolean checkOrCreateResolution(final Content media, final String resolutionTarget)
+ public static boolean checkOrCreateResolution(final Node media, final String resolutionTarget)
{
return checkOrCreateResolution(media, resolutionTarget, BaseTypeHandler.ORGINAL_NODEDATA_NAME);
@@ -843,15 +843,15 @@
* @param nodeDataName nodedata where the image to resize is stored
* @return false if resolution doesn't exist and there is a problem in generate it; true otherwise
*/
- public static boolean checkOrCreateResolution(final Content media, final String resolutionTarget,
+ public static boolean checkOrCreateResolution(final Node media, final String resolutionTarget,
String nodeDataName)
{
return checkOrCreateResolution(media, resolutionTarget, nodeDataName, false);
}
- private static boolean checkResolution(final Content media, final String resolutionTarget, final boolean lazy)
+ private static boolean checkResolution(final Node media, final String resolutionTarget, final boolean lazy)
{
- Content resolutions = getResolutionsNode(media);
+ Node resolutions = getResolutionsNode(media);
String resolution = resolutionTarget;
@@ -886,7 +886,7 @@
return false;
}
- public static boolean checkOrCreateResolution(final Content media, final String resolutionTarget,
+ public static boolean checkOrCreateResolution(final Node media, final String resolutionTarget,
String nodeDataName, final boolean lazy)
{
if (checkResolution(media, resolutionTarget, lazy))
@@ -953,7 +953,7 @@
resolutioNodeName = resolutionTarget;
}
- Content node;
+ Node node;
try
{
node = hm.getContent(media.getHandle());
@@ -1126,15 +1126,15 @@
* @param media
* @return
*/
- protected static Content getResolutionsNode(final Content media)
+ protected static Node getResolutionsNode(final Node media)
{
- Content resolutions = null;
+ Node resolutions = null;
try
{
- if (media.hasContent("resolutions"))
+ if (media.hasNode("resolutions"))
{
- resolutions = media.getContent("resolutions");
+ resolutions = media.getNode("resolutions");
}
}
catch (RepositoryException e)
@@ -1231,11 +1231,11 @@
* @param resolution resolution
* @return file extension for a resolution stored in a media node
*/
- public static String getExtension(Content media, String resolution)
+ public static String getExtension(Node media, String resolution)
{
try
{
- Content resolutions = media.getContent("resolutions");
+ Node resolutions = media.getNode("resolutions");
NodeData res = resolutions.getNodeData(resolution);
return res.getAttribute(FileProperties.PROPERTY_EXTENSION);
}
Modified: magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/utils/MediaLoadUtils.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/utils/MediaLoadUtils.java 2013-09-19 14:32:06 UTC (rev 4330)
+++ magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/utils/MediaLoadUtils.java 2013-09-20 12:38:39 UTC (rev 4331)
@@ -19,7 +19,7 @@
package net.sourceforge.openutils.mgnlmedia.media.utils;
-import info.magnolia.cms.core.Content;
+
import info.magnolia.cms.core.HierarchyManager;
import info.magnolia.cms.core.Path;
import info.magnolia.cms.security.AccessDeniedException;
@@ -33,6 +33,7 @@
import java.io.InputStream;
import java.util.Calendar;
+import javax.jcr.Node;
import javax.jcr.RepositoryException;
import net.sourceforge.openutils.mgnlmedia.media.configuration.MediaConfigurationManager;
@@ -70,7 +71,7 @@
* @throws RepositoryException exception working on media repository
* @throws IOException exception working with file stream
*/
- public static Content loadExternalVideo(String videourl, String parent, String filename, boolean overwrite)
+ public static Node loadExternalVideo(String videourl, String parent, String filename, boolean overwrite)
throws RepositoryException, IOException
{
log.debug("loading external video {}/{} with url {}", new Object[]{parent, filename, videourl });
@@ -79,7 +80,7 @@
String cleanFilename = Path.getValidatedLabel(videourl);
- Content media = createMediaNode(mtc, parent, cleanFilename, overwrite);
+ Node media = createMediaNode(mtc, parent, cleanFilename, overwrite);
media.setNodeData("videoUrl", videourl);
mtc.getHandler().onPostSave(media);
@@ -98,7 +99,7 @@
* @throws RepositoryException exception working on media repository
* @throws IOException exception working with file stream
*/
- public static Content loadEntry(InputStream inputStream, String parent, String filename, boolean overwrite)
+ public static Node loadEntry(InputStream inputStream, String parent, String filename, boolean overwrite)
throws RepositoryException, IOException
{
@@ -110,7 +111,7 @@
if (mtc != null)
{
- Content media = createMediaNode(mtc, parent, cleanFilename, overwrite);
+ Node media = createMediaNode(mtc, parent, cleanFilename, overwrite);
File f = File.createTempFile("entry", "." + extension);
FileOutputStream fTemp = new FileOutputStream(f);
@@ -137,18 +138,18 @@
* @throws RepositoryException
* @throws AccessDeniedException
*/
- private static Content createMediaNode(MediaTypeConfiguration mtc, String parent, String filename, boolean overwrite)
+ private static Node createMediaNode(MediaTypeConfiguration mtc, String parent, String filename, boolean overwrite)
throws RepositoryException, AccessDeniedException
{
HierarchyManager mgr = MgnlContext.getSystemContext().getHierarchyManager(MediaModule.REPO);
- Content parentNode = getOrCreateFullPath(mgr, parent);
+ Node parentNode = getOrCreateFullPath(mgr, parent);
String mediaName = Path.getValidatedLabel(filename);
if (overwrite)
{
- Content existing = parentNode.getChildByName(mediaName);
+ Node existing = parentNode.getChildByName(mediaName);
if (existing != null)
{
existing.delete();
@@ -156,7 +157,7 @@
}
}
- Content media = mgr.createContent(
+ Node media = mgr.createContent(
parent,
Path.getUniqueLabel(parentNode, mediaName),
MediaConfigurationManager.MEDIA.getSystemName());
@@ -184,7 +185,7 @@
* @throws RepositoryException
* @throws AccessDeniedException
*/
- private static void setNodedataOnlyIfNotExisting(Content media, String key, Object value)
+ private static void setNodedataOnlyIfNotExisting(Node media, String key, Object value)
throws RepositoryException, AccessDeniedException
{
if (media.hasNodeData(key))
@@ -201,10 +202,10 @@
* @return content to required path
* @throws RepositoryException exception getting or creating path
*/
- public static Content getOrCreateFullPath(HierarchyManager mgr, String path) throws RepositoryException
+ public static Node getOrCreateFullPath(HierarchyManager mgr, String path) throws RepositoryException
{
String[] contentNodeNames = path.split("/");
- Content currContent = mgr.getRoot();
+ Node currContent = mgr.getRoot();
for (String contentNodeName : contentNodeNames)
{
if (StringUtils.isNotEmpty(contentNodeName))
Modified: magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/playlist/dialog/PlaylistEntryDialogMVC.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/playlist/dialog/PlaylistEntryDialogMVC.java 2013-09-19 14:32:06 UTC (rev 4330)
+++ magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/playlist/dialog/PlaylistEntryDialogMVC.java 2013-09-20 12:38:39 UTC (rev 4331)
@@ -19,6 +19,7 @@
package net.sourceforge.openutils.mgnlmedia.playlist.dialog;
+
import info.magnolia.cms.core.Content;
import info.magnolia.cms.core.HierarchyManager;
import info.magnolia.cms.core.Path;
@@ -28,6 +29,7 @@
import java.io.IOException;
+import javax.jcr.Node;
import javax.jcr.RepositoryException;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
@@ -79,7 +81,7 @@
protected boolean onPreSave(SaveHandler control)
{
HierarchyManager hm = MgnlContext.getHierarchyManager(PlaylistConstants.REPO);
- Content c = null;
+ Node c = null;
try
{
c = hm.getContent(control.getPath());
Modified: magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/playlist/dialog/SearchBasedPlaylistDialogMVC.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/playlist/dialog/SearchBasedPlaylistDialogMVC.java 2013-09-19 14:32:06 UTC (rev 4330)
+++ magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/playlist/dialog/SearchBasedPlaylistDialogMVC.java 2013-09-20 12:38:39 UTC (rev 4331)
@@ -19,6 +19,7 @@
package net.sourceforge.openutils.mgnlmedia.playlist.dialog;
+
import info.magnolia.cms.core.Content;
import info.magnolia.cms.gui.dialog.Dialog;
import info.magnolia.cms.gui.misc.Sources;
Modified: magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/playlist/pages/DefaultPlaylistTrackExtensionContributor.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/playlist/pages/DefaultPlaylistTrackExtensionContributor.java 2013-09-19 14:32:06 UTC (rev 4330)
+++ magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/playlist/pages/DefaultPlaylistTrackExtensionContributor.java 2013-09-20 12:38:39 UTC (rev 4331)
@@ -19,12 +19,14 @@
package net.sourceforge.openutils.mgnlmedia.playlist.pages;
-import info.magnolia.cms.core.Content;
+
import info.magnolia.cms.util.NodeDataUtil;
import java.io.PrintWriter;
+import javax.jcr.Node;
+
/**
* @author dschivo
* @version $Id$
@@ -35,7 +37,7 @@
/**
* {@inheritDoc}
*/
- public void addMediaAttributes(Content media, PrintWriter writer)
+ public void addMediaAttributes(Node media, PrintWriter writer)
{
writer.println("<media:type>" + NodeDataUtil.getString(media, "type") + "</media:type>");
}
Modified: magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/playlist/pages/PlaylistView.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/playlist/pages/PlaylistView.java 2013-09-19 14:32:06 UTC (rev 4330)
+++ magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/playlist/pages/PlaylistView.java 2013-09-20 12:38:39 UTC (rev 4331)
@@ -180,7 +180,7 @@
{
playlist = new PlaylistBean();
- playlist.setUuid(node.getUUID());
+ playlist.setUuid(node.getIdentifier());
playlist.setHandle(NodeUtil.getPathIfPossible(node));
playlist.setTitle(NodeDataUtil.getString(node, "title"));
playlist.setDescription(NodeDataUtil.getString(node, "description"));
@@ -218,7 +218,7 @@
try
{
- playlist.setSearchBased(node.hasContent("search"));
+ playlist.setSearchBased(node.hasNode("search"));
}
catch (RepositoryException e)
{
@@ -247,7 +247,7 @@
{
MetaDataUtil.getMetaData(node).setActivated();
}
- node.save();
+ node.getSession().save();
success = true;
}
catch (RepositoryException e)
@@ -271,7 +271,7 @@
{
MetaDataUtil.getMetaData(node).setActivated();
}
- node.save();
+ node.getSession().save();
success = true;
}
catch (RepositoryException e)
Modified: magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/playlist/tree/PlaylistsTree.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/playlist/tree/PlaylistsTree.java 2013-09-19 14:32:06 UTC (rev 4330)
+++ magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/playlist/tree/PlaylistsTree.java 2013-09-20 12:38:39 UTC (rev 4331)
@@ -19,6 +19,7 @@
package net.sourceforge.openutils.mgnlmedia.playlist.tree;
+
import info.magnolia.cms.core.Content;
import info.magnolia.cms.core.NodeData;
import info.magnolia.cms.gui.control.Tree;
Modified: magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/playlist/tree/PlaylistsTreeMVCHandler.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/playlist/tree/PlaylistsTreeMVCHandler.java 2013-09-19 14:32:06 UTC (rev 4330)
+++ magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/playlist/tree/PlaylistsTreeMVCHandler.java 2013-09-20 12:38:39 UTC (rev 4331)
@@ -19,6 +19,7 @@
package net.sourceforge.openutils.mgnlmedia.playlist.tree;
+
import info.magnolia.cms.core.Content;
import info.magnolia.cms.exchange.ExchangeException;
import info.magnolia.module.admininterface.AdminTreeMVCHandler;
Modified: magnoliamodules/trunk/openutils-mgnlmedia/src/test/java/net/sourceforge/openutils/mgnlmedia/media/repotests/MediaTests.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlmedia/src/test/java/net/sourceforge/openutils/mgnlmedia/media/repotests/MediaTests.java 2013-09-19 14:32:06 UTC (rev 4330)
+++ magnoliamodules/trunk/openutils-mgnlmedia/src/test/java/net/sourceforge/openutils/mgnlmedia/media/repotests/MediaTests.java 2013-09-20 12:38:39 UTC (rev 4331)
@@ -19,7 +19,7 @@
package net.sourceforge.openutils.mgnlmedia.media.repotests;
-import info.magnolia.cms.core.Content;
+
import info.magnolia.cms.core.HierarchyManager;
import info.magnolia.cms.util.ContentUtil;
import info.magnolia.context.MgnlContext;
@@ -28,6 +28,8 @@
import java.io.InputStream;
+import javax.jcr.Node;
+
import net.sourceforge.openutils.mgnlmedia.media.utils.MediaLoadUtils;
import org.apache.commons.io.IOUtils;
@@ -62,7 +64,7 @@
hm.save();
InputStream is = getClass().getResourceAsStream("/images/openmind.ico");
- Content entry = MediaLoadUtils.loadEntry(is, "/test/folder", "openmind.ico", true);
+ Node entry = MediaLoadUtils.loadEntry(is, "/test/folder", "openmind.ico", true);
IOUtils.closeQuietly(is);
Modified: magnoliamodules/trunk/openutils-mgnlmedia/src/test/java/net/sourceforge/openutils/mgnlmedia/media/utils/FileNodeData.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlmedia/src/test/java/net/sourceforge/openutils/mgnlmedia/media/utils/FileNodeData.java 2013-09-19 14:32:06 UTC (rev 4330)
+++ magnoliamodules/trunk/openutils-mgnlmedia/src/test/java/net/sourceforge/openutils/mgnlmedia/media/utils/FileNodeData.java 2013-09-20 12:38:39 UTC (rev 4331)
@@ -19,6 +19,7 @@
package net.sourceforge.openutils.mgnlmedia.media.utils;
+
import info.magnolia.cms.core.Content;
import info.magnolia.cms.core.HierarchyManager;
import info.magnolia.cms.core.NodeData;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
