Menu
▾
▴
[Openutils-svn] SF.net SVN: openutils:[4370] magnoliamodules/trunk
|
From: <fg...@us...> - 2013-10-13 13:43:46
|
Revision: 4370
http://openutils.svn.sourceforge.net/openutils/?rev=4370&view=rev
Author: fgiust
Date: 2013-10-13 13:43:41 +0000 (Sun, 13 Oct 2013)
Log Message:
-----------
update APIs
Modified Paths:
--------------
magnoliamodules/trunk/magnolia-test-webapp/pom.xml
magnoliamodules/trunk/openutils-mgnlmedia/pom.xml
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/externalvideo/ExternalVideoTypeHandler.java
magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/externalvideo/ExternalVideoUtil.java
magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/externalvideo/FtpAsyncUploadExternalVideoProvider.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/commands/MediaActivationCommand.java
magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/commands/MediaDeactivationCommand.java
magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/configuration/ImageProcessorsManager.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/configuration/MediaUsedInManager.java
magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/configuration/UsedInWorkspace.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/DialogFileNoPreview.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/MediaFolderViewPage.java
magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/pages/MessagesTemplatedMVCHandler.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/RemoveExtensionFromType.java
magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/tags/el/MediaEl.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/types/impl/BaseTypeHandler.java
magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/types/impl/DocumentTypeHandler.java
magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/types/impl/ExternalVideoTypeHandler.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/JpegUtils.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/PlaylistConstants.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/tree/PlaylistsJcrBrowserTreeConfiguration.java
magnoliamodules/trunk/openutils-mgnlmedia/src/main/resources/META-INF/magnolia/media.xml
magnoliamodules/trunk/openutils-mgnlutils/src/main/java/it/openutils/mgnlutils/api/NodeUtilsExt.java
Property Changed:
----------------
magnoliamodules/trunk/openutils-mgnlcontextmenu/
Modified: magnoliamodules/trunk/magnolia-test-webapp/pom.xml
===================================================================
--- magnoliamodules/trunk/magnolia-test-webapp/pom.xml 2013-10-12 13:53:58 UTC (rev 4369)
+++ magnoliamodules/trunk/magnolia-test-webapp/pom.xml 2013-10-13 13:43:41 UTC (rev 4370)
@@ -206,7 +206,7 @@
<dependency>
<groupId>net.sourceforge.openutils</groupId>
<artifactId>openutils-mgnlcontextmenu</artifactId>
- <version>4.5.3-SNAPSHOT</version>
+ <version>4.5.5-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>net.sourceforge.openutils</groupId>
@@ -276,7 +276,7 @@
</dependencyManagement>
<properties>
<magnolia.version>4.5.11</magnolia.version>
- <stk.version>2.0</stk.version>
+ <stk.version>2.0.10</stk.version>
<jackrabbit.version>2.4.1</jackrabbit.version>
</properties>
<build>
Index: magnoliamodules/trunk/openutils-mgnlcontextmenu
===================================================================
--- magnoliamodules/trunk/openutils-mgnlcontextmenu 2013-10-12 13:53:58 UTC (rev 4369)
+++ magnoliamodules/trunk/openutils-mgnlcontextmenu 2013-10-13 13:43:41 UTC (rev 4370)
Property changes on: magnoliamodules/trunk/openutils-mgnlcontextmenu
___________________________________________________________________
Modified: svn:ignore
## -3,3 +3,4 ##
.project
.settings
target
+release.properties
Modified: magnoliamodules/trunk/openutils-mgnlmedia/pom.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnlmedia/pom.xml 2013-10-12 13:53:58 UTC (rev 4369)
+++ magnoliamodules/trunk/openutils-mgnlmedia/pom.xml 2013-10-13 13:43:41 UTC (rev 4370)
@@ -147,7 +147,7 @@
<dependency>
<groupId>info.magnolia</groupId>
<artifactId>magnolia-module-standard-templating-kit</artifactId>
- <version>2.0</version>
+ <version>2.0.10</version>
<optional>true</optional>
<exclusions>
<exclusion>
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-10-12 13:53:58 UTC (rev 4369)
+++ magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/dam/SimpleMediaAsset.java 2013-10-13 13:43:41 UTC (rev 4370)
@@ -19,7 +19,6 @@
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;
@@ -33,12 +32,15 @@
* Dam-support for the SimpleMedia module.
* @author Ernst Bunders
*/
+@SuppressWarnings("deprecation")
public class SimpleMediaAsset extends InternalAsset
{
- public SimpleMediaAsset(SimpleMediaContentHandler handler, Content metaDataNode, NodeData binaryNodeData, TemplatingFunctions templatingFunctions)
- throws AssetNotFoundException,
- RepositoryException
+ public SimpleMediaAsset(
+ SimpleMediaContentHandler handler,
+ Content metaDataNode,
+ NodeData binaryNodeData,
+ TemplatingFunctions templatingFunctions) throws AssetNotFoundException, RepositoryException
{
super(handler, metaDataNode, "", binaryNodeData, templatingFunctions);
}
@@ -52,7 +54,7 @@
@Override
public String getCaption()
{
- return getMetaDataValue("title", super.getTitle());
+ return getMetaDataValue("title", super.getTitle(), true);
}
}
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-10-12 13:53:58 UTC (rev 4369)
+++ magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/dam/SimpleMediaContentHandler.java 2013-10-13 13:43:41 UTC (rev 4370)
@@ -19,7 +19,6 @@
package net.sourceforge.openutils.mgnlmedia.dam;
-
import info.magnolia.cms.core.Content;
import info.magnolia.cms.core.HierarchyManager;
import info.magnolia.cms.core.NodeData;
@@ -42,6 +41,7 @@
* Dam-support for the SimpleMedia module.
* @author Ernst Bunders
*/
+@SuppressWarnings("deprecation")
public class SimpleMediaContentHandler extends DMSDAMHandler
{
Modified: magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/externalvideo/ExternalVideoTypeHandler.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/externalvideo/ExternalVideoTypeHandler.java 2013-10-12 13:53:58 UTC (rev 4369)
+++ magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/externalvideo/ExternalVideoTypeHandler.java 2013-10-13 13:43:41 UTC (rev 4370)
@@ -107,7 +107,7 @@
throws AccessDeniedException, RepositoryException
{
media.setProperty("provider", "weebo");
- ExternalVideoUtil.setStatus(media.getUUID(), AsyncUploadExternalVideoProvider.STATUS_TO_UPLOAD);
+ ExternalVideoUtil.setStatus(media.getIdentifier(), AsyncUploadExternalVideoProvider.STATUS_TO_UPLOAD);
super.saveFromZipFile(media, f, cleanFileName, extension);
}
@@ -166,6 +166,7 @@
/**
* {@inheritDoc}
*/
+ @Override
public String getFilename(Node media)
{
ExternalVideoProvider provider = getVideoProvider(media);
Modified: magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/externalvideo/ExternalVideoUtil.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/externalvideo/ExternalVideoUtil.java 2013-10-12 13:53:58 UTC (rev 4369)
+++ magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/externalvideo/ExternalVideoUtil.java 2013-10-13 13:43:41 UTC (rev 4370)
@@ -1,9 +1,6 @@
package net.sourceforge.openutils.mgnlmedia.externalvideo;
import info.magnolia.cms.beans.runtime.Document;
-import info.magnolia.cms.core.Content;
-import info.magnolia.cms.util.ContentUtil;
-import info.magnolia.cms.util.NodeDataUtil;
import info.magnolia.context.MgnlContext;
import info.magnolia.jcr.util.NodeUtil;
import info.magnolia.jcr.util.PropertyUtil;
@@ -110,9 +107,9 @@
return StringUtils.join(new String[]{ND_ERROR, suffix != null ? "-" : null, suffix });
}
- public static String getStatus(final Content mediaNode, String statusSuffix)
+ public static String getStatus(final Node mediaNode, String statusSuffix)
{
- return NodeDataUtil.getString(mediaNode, getStatusProperty(statusSuffix));
+ return PropertyUtil.getString(mediaNode, getStatusProperty(statusSuffix));
}
public static boolean setStatus(final String mediaUUID, final String statusSuffix, final String status)
@@ -124,19 +121,16 @@
public Boolean exec() throws RepositoryException
{
- Content media = ContentUtil.getContentByUUID(MediaModule.REPO, mediaUUID);
+ Node media = NodeUtil.getNodeByIdentifier(MediaModule.REPO, mediaUUID);
if (media != null)
{
String statusProperty = getStatusProperty(statusSuffix);
- if (!media.hasNodeData(statusProperty)
- || !StringUtils.equals(NodeDataUtil.getString(media, statusProperty), status))
+ if (!media.hasProperty(statusProperty)
+ || !StringUtils.equals(PropertyUtil.getString(media, statusProperty), status))
{
- NodeDataUtil.getOrCreateAndSet(media, statusProperty, status);
- NodeDataUtil.getOrCreateAndSet(
- media,
- statusProperty + "LastModified",
- Calendar.getInstance());
- media.save();
+ media.setProperty(statusProperty, status);
+ media.setProperty(statusProperty + "LastModified", Calendar.getInstance());
+ media.getSession().save();
}
return true;
}
@@ -150,10 +144,10 @@
}
}
- public static boolean hasStatus(final Content mediaNode, final String statusSuffix, final String status)
+ public static boolean hasStatus(final Node mediaNode, final String statusSuffix, final String status)
{
String statusProperty = getStatusProperty(statusSuffix);
- return StringUtils.equals(NodeDataUtil.getString(mediaNode, statusProperty), status);
+ return StringUtils.equals(PropertyUtil.getString(mediaNode, statusProperty), status);
}
public static boolean hasStatus(final String mediaUUID, final String statusSuffix, final String status)
@@ -165,7 +159,7 @@
public Boolean exec() throws RepositoryException
{
- Content media = ContentUtil.getContentByUUID(MediaModule.REPO, mediaUUID);
+ Node media = NodeUtil.getNodeByIdentifier(MediaModule.REPO, mediaUUID);
return media != null && hasStatus(media, statusSuffix, status);
}
});
@@ -190,15 +184,12 @@
public Boolean exec() throws RepositoryException
{
- Content media = ContentUtil.getContentByUUID(MediaModule.REPO, mediaUUID);
+ Node media = NodeUtil.getNodeByIdentifier(MediaModule.REPO, mediaUUID);
if (media != null)
{
- NodeDataUtil.getOrCreateAndSet(media, getErrorProperty(suffix), true);
- NodeDataUtil.getOrCreateAndSet(
- media,
- getErrorProperty(suffix) + "-" + ND_ERROR_MESSAGE,
- message);
- media.save();
+ media.setProperty(getErrorProperty(suffix), true);
+ media.setProperty(getErrorProperty(suffix) + "-" + ND_ERROR_MESSAGE, message);
+ media.getSession().save();
return true;
}
return false;
@@ -211,6 +202,7 @@
}
}
+ @SuppressWarnings("deprecation")
public static boolean copyPreviewImageToRepository(Node media, final String previewUrl) throws IOException
{
if (StringUtils.isNotBlank(previewUrl))
@@ -238,7 +230,7 @@
try
{
SaveHandlerImpl.saveDocument(
- ContentUtil.asContent(media),
+ info.magnolia.cms.util.ContentUtil.asContent(media),
doc,
MediaWithPreviewImageTypeHandler.PREVIEW_NODEDATA_NAME,
"preview",
Modified: magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/externalvideo/FtpAsyncUploadExternalVideoProvider.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/externalvideo/FtpAsyncUploadExternalVideoProvider.java 2013-10-12 13:53:58 UTC (rev 4369)
+++ magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/externalvideo/FtpAsyncUploadExternalVideoProvider.java 2013-10-13 13:43:41 UTC (rev 4370)
@@ -1,21 +1,17 @@
package net.sourceforge.openutils.mgnlmedia.externalvideo;
import info.magnolia.cms.beans.runtime.FileProperties;
-import info.magnolia.cms.core.Content;
-import info.magnolia.cms.core.NodeData;
-import info.magnolia.context.MgnlContext;
import info.magnolia.context.SystemContext;
import info.magnolia.objectfactory.Components;
import java.io.IOException;
+import javax.jcr.Node;
import javax.jcr.RepositoryException;
import net.sourceforge.openutils.mgnlmedia.media.lifecycle.MediaModule;
-import org.apache.commons.lang.math.NumberUtils;
-
/**
* @author molaschi
* @version $Id: $
@@ -31,17 +27,24 @@
@Override
public void uploadVideo(final String mediaUUID) throws IOException, RepositoryException
{
- Content media = Components
+ Node media = Components
.getComponent(SystemContext.class)
- .getHierarchyManager(MediaModule.REPO)
- .getContentByUUID(mediaUUID);
- NodeData file = media.getNodeData(BaseVideoTypeHandler.ORGINAL_NODEDATA_NAME);
- long size = NumberUtils.toLong(file.getAttribute(FileProperties.PROPERTY_SIZE), -1);
+ .getJCRSession(MediaModule.REPO)
+ .getNodeByIdentifier(mediaUUID);
+ Node file = media.getNode(BaseVideoTypeHandler.ORGINAL_NODEDATA_NAME);
+
+ long size = -1;
+ if (file.hasProperty(FileProperties.PROPERTY_SIZE))
+ {
+ size = file.getProperty(FileProperties.PROPERTY_SIZE).getLong();
+ }
+
+ // TODO check binary nodedata handling
FtpUtil.upload(
account,
- media.getNodeData(BaseVideoTypeHandler.ORGINAL_NODEDATA_NAME).getStream(),
+ file.getProperty("jcr:data").getValue().getBinary().getStream(),
size,
- this.getUploadFileName(media.getJCRNode()),
+ this.getUploadFileName(media),
new FtpUtil.UploadProgress()
{
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-10-12 13:53:58 UTC (rev 4369)
+++ magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/grid/MediaGridColumnType.java 2013-10-13 13:43:41 UTC (rev 4370)
@@ -43,6 +43,8 @@
* @author dschivo
* @version $Id$
*/
+@SuppressWarnings("deprecation")
+// not to be upgraded, to be rewritten for m5
public class MediaGridColumnType extends AbstractGridColumnType
{
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-10-12 13:53:58 UTC (rev 4369)
+++ magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/commands/MediaActivationCommand.java 2013-10-13 13:43:41 UTC (rev 4370)
@@ -19,15 +19,16 @@
package net.sourceforge.openutils.mgnlmedia.media.commands;
-
import info.magnolia.cms.core.Content;
-import info.magnolia.cms.core.ItemType;
import info.magnolia.cms.core.MgnlNodeType;
import info.magnolia.cms.exchange.ExchangeException;
import info.magnolia.cms.i18n.MessagesManager;
import info.magnolia.cms.util.AlertUtil;
+import info.magnolia.cms.util.ContentUtil;
import info.magnolia.cms.util.Rule;
import info.magnolia.context.Context;
+import info.magnolia.jcr.util.MetaDataUtil;
+import info.magnolia.jcr.util.NodeUtil;
import info.magnolia.module.admininterface.commands.ActivationCommand;
import java.util.ArrayList;
@@ -35,6 +36,7 @@
import java.util.Iterator;
import java.util.List;
+import javax.jcr.Node;
import javax.jcr.RepositoryException;
import net.sourceforge.openutils.mgnlmedia.media.configuration.MediaConfigurationManager;
@@ -49,6 +51,8 @@
* @author molaschi
* @version $Id$
*/
+@SuppressWarnings("deprecation")
+// activation APIs need a cleanup in Magnolia, everrything is still based on Content
public class MediaActivationCommand extends ActivationCommand
{
@@ -122,7 +126,7 @@
ExchangeException
{
- activateSingleNode(parentPath, node);
+ activateSingleNode(parentPath, node.getJCRNode());
Iterator<Content> children = node.getChildren(new Content.ContentFilter()
{
@@ -155,36 +159,40 @@
* @throws RepositoryException
* @throws ExchangeException
*/
- protected void activateSingleNode(String parentPath, Content node) throws RepositoryException, ExchangeException
+ protected void activateSingleNode(String parentPath, Node node) throws RepositoryException, ExchangeException
{
- if (MediaConfigurationManager.NT_MEDIA.equals(node.getItemType()) && node.getMetaData().getIsActivated())
+ if (MediaConfigurationManager.NT_MEDIA.equals(node.getPrimaryNodeType().getName())
+ && MetaDataUtil.getMetaData(node).getIsActivated())
{
// already activated media, should deactivate in order to remove stale resolutions
log
.warn(
"Activating already active media {}, will deactivate existing node in order to remove stale resolutions",
- node.getHandle());
+ NodeUtil.getPathIfPossible(node));
- getSyndicator().deactivate(node);
+ getSyndicator().deactivate(info.magnolia.cms.util.ContentUtil.asContent(node));
}
checkFolderActivation(node);
- getSyndicator().activate(parentPath, node, getOrderingInfo(node));
+ getSyndicator().activate(
+ parentPath,
+ info.magnolia.cms.util.ContentUtil.asContent(node),
+ getOrderingInfo(info.magnolia.cms.util.ContentUtil.asContent(node)));
}
/**
* @param node
* @throws ExchangeException
*/
- private void checkFolderActivation(Content node) throws ExchangeException
+ private void checkFolderActivation(Node node) throws ExchangeException
{
try
{
- List<Content> foldersInPath = new ArrayList<Content>(3);
+ List<Node> foldersInPath = new ArrayList<Node>();
- Content parent = node.getParent();
- while (parent.getLevel() != 0 && !parent.getMetaData().getIsActivated())
+ Node parent = node.getParent();
+ while (parent.getDepth() != 0 && !MetaDataUtil.getMetaData(parent).getIsActivated())
{
foldersInPath.add(parent);
parent = parent.getParent();
@@ -193,12 +201,15 @@
if (!foldersInPath.isEmpty())
{
Collections.reverse(foldersInPath);
- for (Content folder : foldersInPath)
+ for (Node folder : foldersInPath)
{
- log.info("Activating parent folder {}", folder.getHandle());
+ log.info("Activating parent folder {}", NodeUtil.getPathIfPossible(folder));
// folder only, no content
setRule(new Rule(new String[]{MgnlNodeType.NT_METADATA, MgnlNodeType.NT_RESOURCE }));
- getSyndicator().activate(folder.getParent().getHandle(), folder, getOrderingInfo(folder));
+ getSyndicator().activate(
+ NodeUtil.getPathIfPossible(folder.getParent()),
+ ContentUtil.asContent(folder),
+ getOrderingInfo(ContentUtil.asContent(folder)));
}
}
Modified: magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/commands/MediaDeactivationCommand.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/commands/MediaDeactivationCommand.java 2013-10-12 13:53:58 UTC (rev 4369)
+++ magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/commands/MediaDeactivationCommand.java 2013-10-13 13:43:41 UTC (rev 4370)
@@ -43,7 +43,7 @@
{
if (!MediaEl.module().isSingleinstance())
{
- Command cmd = Components.getSingleton(CommandsManager.class).getCommand(
+ Command cmd = Components.getComponent(CommandsManager.class).getCommand(
CommandsManager.DEFAULT_CATALOG,
"deactivate");
return cmd.execute(context);
Modified: magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/configuration/ImageProcessorsManager.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/configuration/ImageProcessorsManager.java 2013-10-12 13:53:58 UTC (rev 4369)
+++ magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/configuration/ImageProcessorsManager.java 2013-10-13 13:43:41 UTC (rev 4370)
@@ -19,18 +19,17 @@
package net.sourceforge.openutils.mgnlmedia.media.configuration;
-import info.magnolia.cms.beans.config.ObservedManager;
-import info.magnolia.cms.core.Content;
-import info.magnolia.cms.util.ContentUtil;
-import info.magnolia.cms.util.NodeDataUtil;
+import info.magnolia.jcr.util.NodeUtil;
+import info.magnolia.jcr.util.PropertyUtil;
import info.magnolia.objectfactory.Components;
+import it.openutils.mgnlutils.api.ObservedManagerAdapter;
import java.util.Collection;
import java.util.HashMap;
-import java.util.Iterator;
import java.util.Map;
import javax.inject.Singleton;
+import javax.jcr.Node;
import javax.jcr.RepositoryException;
import net.sourceforge.openutils.mgnlmedia.media.processors.FitInAndFillWithBandsImageResolutionProcessor;
@@ -80,7 +79,7 @@
* @version $Id: $
*/
@Singleton
-public class ImageProcessorsManager extends ObservedManager
+public class ImageProcessorsManager extends ObservedManagerAdapter
{
private static final String IMAGE_RESOLUTION_PROCESSORS_NAME = "image-resolution";
@@ -97,7 +96,7 @@
*/
public static ImageProcessorsManager getInstance()
{
- return Components.getSingleton(ImageProcessorsManager.class);
+ return Components.getComponent(ImageProcessorsManager.class);
}
/**
@@ -115,49 +114,71 @@
*/
@SuppressWarnings("unchecked")
@Override
- protected void onRegister(Content parentNode)
+ protected void onRegister(Node parentNode)
{
- for (Iterator iter = ContentUtil.getAllChildren(parentNode).iterator(); iter.hasNext();)
+
+ Iterable<Node> nodes;
+ try
{
- Content processorsNode = (Content) iter.next();
+ nodes = NodeUtil.getNodes(parentNode, NodeUtil.EXCLUDE_META_DATA_FILTER);
+ }
+ catch (RepositoryException e)
+ {
+ log.error("Error initializing image processor configuration", e);
+ return;
+ }
- for (Iterator iterProcessor = ContentUtil.getAllChildren(processorsNode).iterator(); iterProcessor
- .hasNext();)
+ for (Node processorsNode : nodes)
+ {
+
+ Iterable<Node> processors;
+ try
{
- Content node = (Content) iterProcessor.next();
+ processors = NodeUtil.getNodes(processorsNode, NodeUtil.EXCLUDE_META_DATA_FILTER);
+ }
+ catch (RepositoryException e)
+ {
+ log
+ .error(
+ "Error initializing image processor configuration for " + NodeUtil.getName(processorsNode),
+ e);
+ continue;
+ }
+ for (Node node : processors)
+ {
try
{
- if (IMAGE_POST_PROCESSORS_NAME.equals(processorsNode.getName()))
+ if (IMAGE_POST_PROCESSORS_NAME.equals(NodeUtil.getName(processorsNode)))
{
- String classNameHandler = NodeDataUtil.getString(node, "class");
+ String classNameHandler = PropertyUtil.getString(node, "class");
Class classHandler = Class.forName(classNameHandler);
if (!ImagePostProcessor.class.isAssignableFrom(classHandler))
{
log.error(
"Error getting post processor for {}: class {} not implements ImagePostProcessor",
- node.getHandle(),
+ NodeUtil.getPathIfPossible(node),
classHandler);
continue;
}
ImagePostProcessor imagePostProcessor = (ImagePostProcessor) classHandler.newInstance();
- imagePostProcs.put(node.getName(), imagePostProcessor);
+ imagePostProcs.put(NodeUtil.getName(node), imagePostProcessor);
}
- if (IMAGE_RESOLUTION_PROCESSORS_NAME.equals(processorsNode.getName()))
+ if (IMAGE_RESOLUTION_PROCESSORS_NAME.equals(NodeUtil.getName(processorsNode)))
{
- String controlChar = node.getName();
+ String controlChar = NodeUtil.getName(node);
- String classNameHandler = NodeDataUtil.getString(node, "class");
+ String classNameHandler = PropertyUtil.getString(node, "class");
Class classHandler = Class.forName(classNameHandler);
if (!ImageResolutionProcessor.class.isAssignableFrom(classHandler))
{
log
.error(
"Error getting resolution processor for {}: class {} not implements ImageResolutionProcessor",
- node.getHandle(),
+ NodeUtil.getPathIfPossible(node),
classHandler);
continue;
}
@@ -171,9 +192,9 @@
imageResProcs.put(controlChar, imageResolutionProcessor);
try
{
- if (node.hasNodeData("aliases"))
+ if (node.hasProperty("aliases"))
{
- String[] aliases = StringUtils.split(NodeDataUtil.getString(node, "aliases"), ",");
+ String[] aliases = StringUtils.split(PropertyUtil.getString(node, "aliases"), ",");
for (String alias : aliases)
{
imageResProcs.put(alias, imageResolutionProcessor);
@@ -188,19 +209,19 @@
}
catch (InstantiationException ex)
{
- log.error("Error getting media type configuration for {}", node.getHandle(), ex);
+ log.error("Error getting media type configuration for {}", NodeUtil.getPathIfPossible(node), ex);
}
catch (IllegalAccessException ex)
{
- log.error("Error getting media type configuration for {}", node.getHandle(), ex);
+ log.error("Error getting media type configuration for {}", NodeUtil.getPathIfPossible(node), ex);
}
catch (ClassNotFoundException ex)
{
- log.error("Error getting media type configuration for {}", node.getHandle(), ex);
+ log.error("Error getting media type configuration for {}", NodeUtil.getPathIfPossible(node), ex);
}
catch (RuntimeException ex)
{
- log.error("Error getting media type configuration for {}", node.getHandle(), ex);
+ log.error("Error getting media type configuration for {}", NodeUtil.getPathIfPossible(node), ex);
}
}
}
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-10-12 13:53:58 UTC (rev 4369)
+++ magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/configuration/MediaConfigurationManager.java 2013-10-13 13:43:41 UTC (rev 4370)
@@ -19,26 +19,16 @@
package net.sourceforge.openutils.mgnlmedia.media.configuration;
-import info.magnolia.cms.beans.config.ObservedManager;
import info.magnolia.cms.beans.config.URI2RepositoryManager;
import info.magnolia.cms.beans.config.URI2RepositoryMapping;
-import info.magnolia.cms.core.Content;
-import info.magnolia.cms.core.ItemType;
import info.magnolia.cms.core.MgnlNodeType;
-import info.magnolia.cms.core.search.Query;
-import info.magnolia.cms.core.search.QueryManager;
-import info.magnolia.cms.core.search.QueryResult;
-import info.magnolia.cms.util.ContentUtil;
-import info.magnolia.cms.util.FactoryUtil;
-import info.magnolia.cms.util.NodeDataUtil;
-import info.magnolia.content2bean.Content2BeanUtil;
-import info.magnolia.context.MgnlContext;
import info.magnolia.jcr.util.NodeUtil;
import info.magnolia.jcr.util.PropertyUtil;
import info.magnolia.objectfactory.Components;
import info.magnolia.repository.RepositoryConstants;
+import it.openutils.mgnlutils.api.NodeUtilsExt;
+import it.openutils.mgnlutils.api.ObservedManagerAdapter;
-import java.util.ArrayList;
import java.util.Collection;
import java.util.Iterator;
import java.util.LinkedHashMap;
@@ -53,7 +43,6 @@
import net.sourceforge.openutils.mgnlmedia.media.lifecycle.MediaModule;
import org.apache.commons.lang.StringUtils;
-import org.apache.jackrabbit.util.ISO9075;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -72,7 +61,7 @@
* @author molaschi
*/
@Singleton
-public class MediaConfigurationManager extends ObservedManager
+public class MediaConfigurationManager extends ObservedManagerAdapter
{
private static final String MGNL_MEDIA_TYPE = "mgnl:media";
@@ -112,11 +101,9 @@
*/
@Override
@SuppressWarnings("unchecked")
- protected void onRegister(Content content)
+ protected void onRegister(Node node)
{
- Node node = content.getJCRNode();
-
try
{
for (Iterator<Node> iter = NodeUtil.getNodes(node, NodeUtil.EXCLUDE_META_DATA_FILTER).iterator(); iter
@@ -131,9 +118,8 @@
try
{
- Content typeContent = ContentUtil.asContent(typeNode);
- MediaTypeConfiguration conf = (MediaTypeConfiguration) Content2BeanUtil.toBean(
- typeContent,
+ MediaTypeConfiguration conf = (MediaTypeConfiguration) NodeUtilsExt.toBean(
+ typeNode,
true,
MediaTypeConfiguration.class);
@@ -167,7 +153,7 @@
*/
public static MediaConfigurationManager getInstance()
{
- return (MediaConfigurationManager) FactoryUtil.getSingleton(MediaConfigurationManager.class);
+ return Components.getComponent(MediaConfigurationManager.class);
}
/**
@@ -223,74 +209,54 @@
return MediaUsedInManager.getInstance().getUsedInWorkspacePaths(uuid, RepositoryConstants.WEBSITE);
}
- /**
- * Search media
- * @param text text to search
- * @param type if specified restricts the search to the type
- * @return found medias
- * @throws RepositoryException exception working on repository
- * @deprecated use SearchMediaQueryConfiguration.search(...)
- */
- @Deprecated
- public Collection<Content> search(String text, final String type) throws RepositoryException
- {
- return find(null, type, text, true);
- }
+ // /**
+ // * @param path
+ // * @param type
+ // * @param search
+ // * @param recursive
+ // * @return
+ // * @throws RepositoryException
+ // * @deprecated use the find method overload based on Magnolia Criteria API
+ // */
+ // @Deprecated
+ // public Collection<Content> find(String path, String type, String search, boolean recursive)
+ // throws RepositoryException
+ // {
+ // QueryManager qm = MgnlContext.getQueryManager(MediaModule.REPO);
+ // StringBuffer sbQuery = new StringBuffer("/jcr:root/");
+ // path = StringUtils.removeEnd(StringUtils.removeStart(StringUtils.trimToEmpty(path), "/"), "/");
+ // if (StringUtils.isNotEmpty(path))
+ // {
+ // sbQuery.append(ISO9075.encodePath(path)).append('/');
+ // }
+ // if (recursive)
+ // {
+ // sbQuery.append('/');
+ // }
+ // sbQuery.append("element(*," + MediaConfigurationManager.NT_MEDIA + ")");
+ // List<String> clauses = new ArrayList<String>();
+ // if (StringUtils.isNotBlank(search))
+ // {
+ // clauses.add("jcr:contains(.,'" + StringUtils.replace(search, "'", "''") + "')");
+ // }
+ // if (StringUtils.isNotBlank(type))
+ // {
+ // clauses.add("@type='" + type + "'");
+ // }
+ // if (!clauses.isEmpty())
+ // {
+ // sbQuery.append('[').append(StringUtils.join(clauses, " and ")).append(']');
+ // }
+ // if (StringUtils.isNotBlank(search))
+ // {
+ // sbQuery.append(" order by @jcr:score descending");
+ // }
+ // Query q = qm.createQuery(new String(sbQuery), Query.XPATH);
+ // QueryResult qr = q.execute();
+ // return qr.getContent(MediaConfigurationManager.MGNL_MEDIA_TYPE);
+ // }
/**
- * @param path
- * @param type
- * @param search
- * @param recursive
- * @return
- * @throws RepositoryException
- * @deprecated use the find method overload based on Magnolia Criteria API
- */
- @Deprecated
- public Collection<Content> find(String path, String type, String search, boolean recursive)
- throws RepositoryException
- {
- QueryManager qm = MgnlContext.getQueryManager(MediaModule.REPO);
- StringBuffer sbQuery = new StringBuffer("/jcr:root/");
- path = StringUtils.removeEnd(StringUtils.removeStart(StringUtils.trimToEmpty(path), "/"), "/");
- if (StringUtils.isNotEmpty(path))
- {
- sbQuery.append(ISO9075.encodePath(path)).append('/');
- }
- if (recursive)
- {
- sbQuery.append('/');
- }
- sbQuery.append("element(*," + MediaConfigurationManager.NT_MEDIA + ")");
- List<String> clauses = new ArrayList<String>();
- if (StringUtils.isNotBlank(search))
- {
- clauses.add("jcr:contains(.,'" + StringUtils.replace(search, "'", "''") + "')");
- }
- if (StringUtils.isNotBlank(type))
- {
- clauses.add("@type='" + type + "'");
- }
- if (!clauses.isEmpty())
- {
- sbQuery.append('[').append(StringUtils.join(clauses, " and ")).append(']');
- }
- if (StringUtils.isNotBlank(search))
- {
- sbQuery.append(" order by @jcr:score descending");
- }
- Query q = qm.createQuery(new String(sbQuery), Query.XPATH);
- QueryResult qr = q.execute();
- return qr.getContent(MediaConfigurationManager.MGNL_MEDIA_TYPE);
- }
-
- @Deprecated
- public MediaTypeConfiguration getMediaTypeConfigurationFromMedia(Content media)
- {
- return getMediaTypeConfigurationFromMedia(media.getJCRNode());
- }
-
- /**
* Get the type configuration for a media
* @param media media
* @return type configuration
Modified: magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/configuration/MediaUsedInManager.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/configuration/MediaUsedInManager.java 2013-10-12 13:53:58 UTC (rev 4369)
+++ magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/configuration/MediaUsedInManager.java 2013-10-13 13:43:41 UTC (rev 4370)
@@ -19,17 +19,16 @@
package net.sourceforge.openutils.mgnlmedia.media.configuration;
-import info.magnolia.cms.core.Content;
-import info.magnolia.cms.core.ItemType;
import info.magnolia.cms.core.MgnlNodeType;
import info.magnolia.content2bean.Content2BeanException;
-import info.magnolia.content2bean.Content2BeanUtil;
+import info.magnolia.jcr.RuntimeRepositoryException;
+import info.magnolia.jcr.util.NodeUtil;
import info.magnolia.objectfactory.Components;
import info.magnolia.repository.RepositoryConstants;
+import it.openutils.mgnlutils.api.NodeUtilsExt;
import it.openutils.mgnlutils.api.ObservedManagerAdapter;
import java.util.ArrayList;
-import java.util.Collection;
import java.util.Collections;
import java.util.HashMap;
import java.util.HashSet;
@@ -63,7 +62,7 @@
public static MediaUsedInManager getInstance()
{
- return Components.getComponents(MediaUsedInManager.class);
+ return Components.getComponent(MediaUsedInManager.class);
}
private static Logger log = LoggerFactory.getLogger(MediaUsedInManager.class);
@@ -85,15 +84,25 @@
@Override
protected void onRegister(Node node)
{
- Collection<Content> uiwNodes = node.getChildren(MgnlNodeType.NT_CONTENTNODE);
- for (Content uiwNode : uiwNodes)
+
+ Iterable<Node> uiwNodes;
+ try
{
+ uiwNodes = NodeUtil.getNodes(node, MgnlNodeType.NT_CONTENTNODE);
+ }
+ catch (RepositoryException e)
+ {
+ throw new RuntimeRepositoryException(e);
+ }
+
+ for (Node uiwNode : uiwNodes)
+ {
try
{
- UsedInWorkspace uiw = (UsedInWorkspace) Content2BeanUtil.toBean(uiwNode, UsedInWorkspace.class);
+ UsedInWorkspace uiw = (UsedInWorkspace) NodeUtilsExt.toBean(uiwNode, UsedInWorkspace.class);
if (StringUtils.isEmpty(uiw.getWorkspaceName()))
{
- uiw.setWorkspaceName(uiwNode.getName());
+ uiw.setWorkspaceName(NodeUtil.getName(uiwNode));
}
if (StringUtils.isEmpty(uiw.getNodeType()))
{
@@ -103,7 +112,7 @@
}
catch (Content2BeanException e)
{
- log.error("Error getting media used-in for {}", uiwNode.getHandle(), e);
+ log.error("Error getting media used-in for {}", NodeUtil.getPathIfPossible(uiwNode), e);
}
}
}
Modified: magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/configuration/UsedInWorkspace.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/configuration/UsedInWorkspace.java 2013-10-12 13:53:58 UTC (rev 4369)
+++ magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/configuration/UsedInWorkspace.java 2013-10-13 13:43:41 UTC (rev 4370)
@@ -19,7 +19,6 @@
package net.sourceforge.openutils.mgnlmedia.media.configuration;
-import info.magnolia.cms.core.ItemType;
import info.magnolia.cms.core.MgnlNodeType;
import info.magnolia.repository.RepositoryConstants;
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-10-12 13:53:58 UTC (rev 4369)
+++ magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/crop/PzcServlet.java 2013-10-13 13:43:41 UTC (rev 4370)
@@ -18,10 +18,7 @@
*/
package net.sourceforge.openutils.mgnlmedia.media.crop;
-
-import info.magnolia.cms.core.HierarchyManager;
-import info.magnolia.cms.core.NodeData;
-import info.magnolia.cms.util.NodeDataUtil;
+
import info.magnolia.context.MgnlContext;
import info.magnolia.repository.RepositoryConstants;
Modified: magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/dialog/DialogFileNoPreview.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/dialog/DialogFileNoPreview.java 2013-10-12 13:53:58 UTC (rev 4369)
+++ magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/dialog/DialogFileNoPreview.java 2013-10-13 13:43:41 UTC (rev 4370)
@@ -50,6 +50,7 @@
private Messages messages;
+ @Override
public void initImageExtensions()
{
// no images, so no preview will be generated
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-10-12 13:53:58 UTC (rev 4369)
+++ magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/dialog/LayerDialogMVC.java 2013-10-13 13:43:41 UTC (rev 4370)
@@ -19,9 +19,9 @@
package net.sourceforge.openutils.mgnlmedia.media.dialog;
-
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.gui.dialog.Dialog;
import info.magnolia.cms.gui.misc.Sources;
@@ -135,7 +135,7 @@
{
super.configureSaveHandler(saveHandler);
- saveHandler.setCreationItemType(MediaConfigurationManager.NT_MEDIA);
+ saveHandler.setCreationItemType(new ItemType(MediaConfigurationManager.NT_MEDIA));
}
/**
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-10-12 13:53:58 UTC (rev 4369)
+++ magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/pages/MediaAdvancedSearchPage.java 2013-10-13 13:43:41 UTC (rev 4370)
@@ -226,7 +226,7 @@
{
try
{
- return MgnlContext.getJCRSession(MediaModule.REPO).getNodeByIdentifier(from.getUUID());
+ return MgnlContext.getJCRSession(MediaModule.REPO).getNodeByIdentifier(from.getIdentifier());
}
catch (RepositoryException e)
{
Modified: magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/pages/MediaFolderViewPage.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/pages/MediaFolderViewPage.java 2013-10-12 13:53:58 UTC (rev 4369)
+++ magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/pages/MediaFolderViewPage.java 2013-10-13 13:43:41 UTC (rev 4370)
@@ -19,9 +19,6 @@
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.MgnlNodeType;
import info.magnolia.cms.core.Path;
import info.magnolia.cms.exchange.ActivationManagerFactory;
@@ -51,6 +48,7 @@
import javax.jcr.Node;
import javax.jcr.RepositoryException;
+import javax.jcr.Session;
import javax.servlet.ServletException;
import javax.servlet.http.Cookie;
import javax.servlet.http.HttpServletRequest;
@@ -306,12 +304,14 @@
*/
public String delete()
{
- HierarchyManager hm = MgnlContext.getInstance().getHierarchyManager(MediaModule.REPO);
-
try
{
- hm.delete(this.node);
- hm.save();
+ Session session = MgnlContext.getInstance().getJCRSession(MediaModule.REPO);
+ if (session.itemExists(this.node))
+ {
+ session.removeItem(this.node);
+ session.save();
+ }
}
catch (RepositoryException ex)
{
@@ -383,15 +383,15 @@
public Node copyMoveNode(String source, String destination, boolean move) throws ExchangeException,
RepositoryException
{
- HierarchyManager hm = MgnlContext.getHierarchyManager(MediaModule.REPO);
+ Session session = MgnlContext.getJCRSession(MediaModule.REPO);
String goTo = destination;
- if (hm.isExist(destination))
+ if (session.itemExists(destination))
{
String parentPath = StringUtils.substringBeforeLast(destination, "/"); //$NON-NLS-1$
String label = StringUtils.substringAfterLast(destination, "/"); //$NON-NLS-1$
- label = Path.getUniqueLabel(hm, parentPath, label);
+ label = Path.getUniqueLabel(session, parentPath, label);
goTo = parentPath + "/" + label; //$NON-NLS-1$
}
if (move)
@@ -405,7 +405,7 @@
// this.deactivateNode(source);
try
{
- hm.moveTo(source, goTo);
+ session.move(source, goTo);
}
catch (Exception e)
{
@@ -416,13 +416,13 @@
else
{
// copy
- hm.copyTo(source, goTo);
+ session.getWorkspace().copy(source, goTo);
}
- Content newContent = hm.getContent(destination);
+ Node newContent = session.getNode(destination);
try
{
- MetaDataUtil.updateMetaData(newContent.getJCRNode());
- MetaDataUtil.getMetaData(newContent.getJCRNode()).setUnActivated();
+ MetaDataUtil.updateMetaData(newContent);
+ MetaDataUtil.getMetaData(newContent).setUnActivated();
}
catch (Exception e)
{
@@ -431,8 +431,8 @@
log.debug("Exception caught: " + e.getMessage(), e); //$NON-NLS-1$
}
}
- newContent.save();
- return newContent.getJCRNode();
+ session.save();
+ return newContent;
}
/**
Modified: magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/pages/MessagesTemplatedMVCHandler.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/pages/MessagesTemplatedMVCHandler.java 2013-10-12 13:53:58 UTC (rev 4369)
+++ magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/pages/MessagesTemplatedMVCHandler.java 2013-10-13 13:43:41 UTC (rev 4370)
@@ -25,7 +25,6 @@
import freemarker.template.TemplateModelException;
import info.magnolia.cms.i18n.Messages;
import info.magnolia.cms.i18n.MessagesUtil;
-import info.magnolia.cms.util.RequestFormUtil;
import info.magnolia.module.admininterface.TemplatedMVCHandler;
import java.util.ArrayList;
@@ -102,16 +101,16 @@
* Override the standard method in order to use request.getParameterMap instead of
* requestFormUtils.getParamenterMap() since the latter doesn't work with virtual URI
*/
- @SuppressWarnings("unchecked")
+ @SuppressWarnings({"unchecked", "deprecation" })
@Override
protected void populateFromRequest(Object bean)
{
- RequestFormUtil requestFormUtil = new RequestFormUtil(this.getRequest());
Map<String, Object> parameters = new HashMap<String, Object>();
// FIX: use request.getParameterMap instead of requestFormUtils.getParamenterMap()
parameters.putAll(request.getParameterMap());
- parameters.putAll(requestFormUtil.getDocuments()); // handle uploaded files too
+ // handle uploaded files too
+ parameters.putAll(new info.magnolia.cms.util.RequestFormUtil(this.getRequest()).getDocuments());
try
{
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-10-12 13:53:58 UTC (rev 4369)
+++ magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/setup/ConditionallySubscribeMediaRepositoriesTask.java 2013-10-13 13:43:41 UTC (rev 4370)
@@ -19,12 +19,10 @@
package net.sourceforge.openutils.mgnlmedia.media.setup;
-import info.magnolia.cms.core.ItemType;
import info.magnolia.cms.core.MgnlNodeType;
import info.magnolia.cms.exchange.ActivationManager;
import info.magnolia.cms.exchange.ActivationManagerFactory;
import info.magnolia.cms.exchange.Subscriber;
-import info.magnolia.cms.util.ContentUtil;
import info.magnolia.context.MgnlContext;
import info.magnolia.jcr.util.PropertyUtil;
import info.magnolia.module.InstallContext;
@@ -94,8 +92,7 @@
}
/**
- * Register the repository to get used for activation TODO - use an API for this? But same remark as above, the
- * component might not be ready yet.
+ * Register the repository to get used for activation.
*/
private void subscribeRepository(String repository) throws TaskExecutionException
{
@@ -108,13 +105,12 @@
try
{
Node subscriptionsNode = MgnlContext.getJCRSession(RepositoryConstants.CONFIG).getNode(
- sManager.getConfigPath() + "/" + subscriber.getName() + "/subscriptions");
+ "/server/activation/subscribers/" + subscriber.getName() + "/subscriptions");
Node newSubscription = subscriptionsNode.addNode(repository, MgnlNodeType.NT_CONTENTNODE);
newSubscription.setProperty("toURI", "/");
newSubscription.setProperty("repository", repository);
newSubscription.setProperty("fromURI", "/");
- // subscriptionsNode.save();
}
catch (RepositoryException re)
{
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-10-12 13:53:58 UTC (rev 4369)
+++ magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/setup/RemoveExtensionFromType.java 2013-10-13 13:43:41 UTC (rev 4370)
@@ -19,7 +19,7 @@
package net.sourceforge.openutils.mgnlmedia.media.setup;
-
+import info.magnolia.jcr.util.PropertyUtil;
import info.magnolia.module.InstallContext;
import info.magnolia.module.delta.AbstractRepositoryTask;
import info.magnolia.module.delta.TaskExecutionException;
@@ -77,12 +77,12 @@
try
{
Node mediatypenode = session.getNode(nodePath);
- String extensions = mediatypenode.getNodeData("extensions").getString();
+ String extensions = PropertyUtil.getString(mediatypenode, "extensions");
if (StringUtils.contains(extensions, this.extension))
{
List<String> exts = new ArrayList<String>(Arrays.asList(StringUtils.split(extensions, ",")));
exts.remove(this.extension);
- mediatypenode.setNodeData("extensions", StringUtils.join(exts, ","));
+ mediatypenode.setProperty("extensions", StringUtils.join(exts, ","));
}
}
catch (RepositoryException e)
@@ -93,12 +93,12 @@
try
{
Node mediatypenode = session.getNode(control);
- String extensions = mediatypenode.getNodeData("extensions").getString();
+ String extensions = PropertyUtil.getString(mediatypenode, "extensions");
if (StringUtils.contains(extensions, this.extension))
{
List<String> exts = new ArrayList<String>(Arrays.asList(StringUtils.split(extensions, ",")));
exts.remove(this.extension);
- mediatypenode.setNodeData("extensions", StringUtils.join(exts, ","));
+ mediatypenode.setProperty("extensions", StringUtils.join(exts, ","));
}
}
catch (RepositoryException e)
Modified: magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/tags/el/MediaEl.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/tags/el/MediaEl.java 2013-10-12 13:53:58 UTC (rev 4369)
+++ magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/tags/el/MediaEl.java 2013-10-13 13:43:41 UTC (rev 4370)
@@ -20,31 +20,25 @@
package net.sourceforge.openutils.mgnlmedia.media.tags.el;
import info.magnolia.cms.beans.runtime.FileProperties;
-import info.magnolia.cms.core.Content;
-import info.magnolia.cms.core.DefaultContent;
-import info.magnolia.cms.core.NodeData;
-import info.magnolia.cms.i18n.I18nContentWrapper;
-import info.magnolia.cms.util.ContentUtil;
-import info.magnolia.cms.util.NodeMapWrapper;
import info.magnolia.context.MgnlContext;
-import info.magnolia.jcr.util.NodeUtil;
+import info.magnolia.jcr.RuntimeRepositoryException;
import info.magnolia.jcr.util.PropertyUtil;
import info.magnolia.module.ModuleRegistry;
import info.magnolia.objectfactory.Components;
+import it.openutils.mgnlutils.api.NodeU...
[truncated message content] |
