Menu
▾
▴
[Openutils-svn] SF.net SVN: openutils:[4369] magnoliamodules/trunk
|
From: <fg...@us...> - 2013-10-12 13:54:05
|
Revision: 4369
http://openutils.svn.sourceforge.net/openutils/?rev=4369&view=rev
Author: fgiust
Date: 2013-10-12 13:53:58 +0000 (Sat, 12 Oct 2013)
Log Message:
-----------
deprecations
Modified Paths:
--------------
magnoliamodules/trunk/openutils-mgnlcache/src/main/java/net/sourceforge/openutils/mgnlsimplecache/voters/AllInOneCacheVoter.java
magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/java/net/sourceforge/openutils/mgnlcontextmenu/el/ContextMenuElFunctions.java
magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/java/net/sourceforge/openutils/mgnlcontextmenu/tags/SortListTag.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/advancedsearch/configuration/SearchMediaQueryConfiguration.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/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/DialogFileAudio.java
magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/dialog/DialogFileImage.java
magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/dialog/DialogFileVideo.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/DialogMetadata.java
magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/dialog/DialogSelectMedia.java
magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/dialog/DisplayHandle.java
magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/dialog/DisplayUUID.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/MediaBeanBuilder.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/MediaSearchPage.java
magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/save/HiddenParametersSaveHandler.java
magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/save/MediaCustomSaveHandler.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/RenameThumbToImageTask.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/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/tree/MediaModuleTreeConfiguration.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/BaseVideoTypeHandler.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/ImageTypeHandler.java
magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/types/impl/SwfTypeHandler.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/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/pages/PlaylistView.java
magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/playlist/tree/PlaylistFoldersTreeConfiguration.java
magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/playlist/tree/PlaylistsJcrBrowserTreeConfiguration.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/PlaylistsTreeConfiguration.java
magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/playlist/tree/PlaylistsTreeMVCHandler.java
magnoliamodules/trunk/openutils-mgnltagcloud/pom.xml
magnoliamodules/trunk/openutils-mgnltagcloud/src/main/java/net/sourceforge/openutils/mgnltagcloud/dialog/TagCloudDialog.java
magnoliamodules/trunk/openutils-mgnltagcloud/src/main/java/net/sourceforge/openutils/mgnltagcloud/dialog/TagCloudDialogSafeMultivalueSaveHandler.java
magnoliamodules/trunk/openutils-mgnltagcloud/src/main/java/net/sourceforge/openutils/mgnltagcloud/manager/TagCloudManager.java
magnoliamodules/trunk/openutils-mgnltagcloud/src/main/java/net/sourceforge/openutils/mgnltagcloud/setup/TagCloudModuleVersionHandler.java
magnoliamodules/trunk/openutils-mgnltagcloud/src/main/java/net/sourceforge/openutils/mgnltagcloud/util/JackrabbitUtil.java
magnoliamodules/trunk/openutils-mgnltagcloud/src/test/java/net/sourceforge/openutils/mgnltagcloud/manager/TagCloudManagerTest.java
magnoliamodules/trunk/openutils-mgnlutils/src/main/java/it/openutils/mgnlutils/el/MgnlUtilsElFunctions.java
magnoliamodules/trunk/openutils-mgnlutils/src/main/java/it/openutils/mgnlutils/filters/ClientHeadersFilter.java
magnoliamodules/trunk/openutils-mgnlutils/src/main/java/it/openutils/mgnlutils/jmx/JmxServerContextListener.java
magnoliamodules/trunk/openutils-mgnlutils/src/main/java/it/openutils/mgnlutils/templating/AutoGenerateTemplateModel.java
magnoliamodules/trunk/openutils-mgnlutils/src/main/java/it/openutils/mgnlutils/templating/ExtendedTemplate.java
magnoliamodules/trunk/openutils-mgnlutils/src/test/java/it/openutils/mgnlutils/el/MgnlUtilsElFunctionsTest.java
Added Paths:
-----------
magnoliamodules/trunk/openutils-mgnlutils/src/main/java/it/openutils/mgnlutils/api/ObservedManagerAdapter.java
Removed Paths:
-------------
magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/setup/MoveOriginalNodeTask.java
magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/setup/RemoveResolutionsNodeTask.java
Modified: magnoliamodules/trunk/openutils-mgnlcache/src/main/java/net/sourceforge/openutils/mgnlsimplecache/voters/AllInOneCacheVoter.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlcache/src/main/java/net/sourceforge/openutils/mgnlsimplecache/voters/AllInOneCacheVoter.java 2013-10-10 16:03:33 UTC (rev 4368)
+++ magnoliamodules/trunk/openutils-mgnlcache/src/main/java/net/sourceforge/openutils/mgnlsimplecache/voters/AllInOneCacheVoter.java 2013-10-12 13:53:58 UTC (rev 4369)
@@ -22,6 +22,7 @@
import info.magnolia.cms.beans.config.ServerConfiguration;
import info.magnolia.cms.security.UserManager;
import info.magnolia.context.MgnlContext;
+import info.magnolia.objectfactory.Components;
import info.magnolia.voting.voters.AbstractBoolVoter;
import javax.servlet.http.HttpServletRequest;
@@ -193,7 +194,7 @@
if (!allowAdmin)
{
- if (ServerConfiguration.getInstance().isAdmin())
+ if (Components.getComponent(ServerConfiguration.class).isAdmin())
{
log.debug(logmessage, "on admin server");
return DONTCACHE;
Modified: magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/java/net/sourceforge/openutils/mgnlcontextmenu/el/ContextMenuElFunctions.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/java/net/sourceforge/openutils/mgnlcontextmenu/el/ContextMenuElFunctions.java 2013-10-10 16:03:33 UTC (rev 4368)
+++ magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/java/net/sourceforge/openutils/mgnlcontextmenu/el/ContextMenuElFunctions.java 2013-10-12 13:53:58 UTC (rev 4369)
@@ -20,12 +20,14 @@
package net.sourceforge.openutils.mgnlcontextmenu.el;
import info.magnolia.cms.security.Permission;
+import info.magnolia.cms.util.DeprecationUtil;
import info.magnolia.context.MgnlContext;
import info.magnolia.context.WebContext;
import info.magnolia.jcr.util.NodeUtil;
import info.magnolia.jcr.util.PropertyUtil;
import info.magnolia.jcr.wrapper.HTMLEscapingNodeWrapper;
import info.magnolia.objectfactory.Components;
+import it.openutils.mgnlutils.el.MgnlUtilsDeprecatedAdapters;
import java.util.ArrayList;
import java.util.Collections;
@@ -103,7 +105,7 @@
{
String ctx = MgnlContext.getContextPath();
boolean canEdit = NodeUtil.isGranted(
- MgnlContext.getAggregationState().getMainContent().getJCRNode(),
+ MgnlUtilsDeprecatedAdapters.getMainContent(),
Permission.SET);
StringBuilder out = new StringBuilder();
Modified: magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/java/net/sourceforge/openutils/mgnlcontextmenu/tags/SortListTag.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/java/net/sourceforge/openutils/mgnlcontextmenu/tags/SortListTag.java 2013-10-10 16:03:33 UTC (rev 4368)
+++ magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/java/net/sourceforge/openutils/mgnlcontextmenu/tags/SortListTag.java 2013-10-12 13:53:58 UTC (rev 4369)
@@ -23,6 +23,7 @@
import info.magnolia.cms.util.NodeDataUtil;
import info.magnolia.context.MgnlContext;
import info.magnolia.jcr.util.NodeUtil;
+import it.openutils.mgnlutils.el.MgnlUtilsDeprecatedAdapters;
import java.io.IOException;
import java.util.ArrayList;
@@ -91,7 +92,7 @@
try
{
canEdit = NodeUtil.isGranted(
- MgnlContext.getAggregationState().getMainContent().getJCRNode(),
+ MgnlUtilsDeprecatedAdapters.getMainContent(),
Permission.SET);
}
@@ -104,7 +105,7 @@
Map<String, String> item = new HashMap<String, String>();
item.put("containerId", containerId);
item.put("url", MgnlContext.getContextPath() + "/mgnl-set-property");
- item.put("path", MgnlContext.getAggregationState().getCurrentContent().getHandle());
+ item.put("path", NodeUtil.getPathIfPossible(MgnlUtilsDeprecatedAdapters.getCurrentContent()));
item.put("name", orderProperty);
item.put("order", '[' + order + ']');
List items = (List) pageContext.getRequest().getAttribute(ContextMenuElFunctions.SORT_LIST_KEY);
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-10 16:03:33 UTC (rev 4368)
+++ magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/externalvideo/ExternalVideoUtil.java 2013-10-12 13:53:58 UTC (rev 4369)
@@ -61,7 +61,7 @@
if (media != null)
{
PropertyUtil.setProperty(media, property, value);
- media.save();
+ media.getSession().save();
return true;
}
return false;
@@ -87,7 +87,7 @@
if (media != null && media.hasProperty(property))
{
media.getProperty(property).remove();
- media.save();
+ media.getSession().save();
return true;
}
return false;
@@ -243,7 +243,7 @@
MediaWithPreviewImageTypeHandler.PREVIEW_NODEDATA_NAME,
"preview",
null);
- media.save();
+ media.getSession().save();
return true;
}
catch (RepositoryException e)
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-10 16:03:33 UTC (rev 4368)
+++ magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/externalvideo/FtpAsyncUploadExternalVideoProvider.java 2013-10-12 13:53:58 UTC (rev 4369)
@@ -4,6 +4,8 @@
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;
@@ -29,8 +31,8 @@
@Override
public void uploadVideo(final String mediaUUID) throws IOException, RepositoryException
{
- Content media = MgnlContext
- .getSystemContext()
+ Content media = Components
+ .getComponent(SystemContext.class)
.getHierarchyManager(MediaModule.REPO)
.getContentByUUID(mediaUUID);
NodeData file = media.getNodeData(BaseVideoTypeHandler.ORGINAL_NODEDATA_NAME);
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-10 16:03:33 UTC (rev 4368)
+++ magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/grid/MediaGridColumnType.java 2013-10-12 13:53:58 UTC (rev 4369)
@@ -19,17 +19,18 @@
package net.sourceforge.openutils.mgnlmedia.grid;
-
import info.magnolia.cms.core.Content;
import info.magnolia.cms.i18n.Messages;
import info.magnolia.cms.security.AccessDeniedException;
import info.magnolia.cms.util.ContentUtil;
import info.magnolia.cms.util.NodeDataUtil;
import info.magnolia.context.MgnlContext;
+import info.magnolia.jcr.util.NodeUtil;
import java.io.StringWriter;
import java.util.Map;
+import javax.jcr.Node;
import javax.jcr.RepositoryException;
import net.sourceforge.openutils.mgnlcontrols.configuration.AbstractGridColumnType;
@@ -106,11 +107,17 @@
{
if (StringUtils.startsWith(column[index], "/"))
{
- Content node = ContentUtil.getContentByUUID(MediaModule.REPO, column[index]);
- if (node != null)
+ Node node;
+ try
{
- column[index] = node.getUUID();
+ node = NodeUtil.getNodeByIdentifier(MediaModule.REPO, column[index]);
+
+ column[index] = NodeUtil.getNodeIdentifierIfPossible(node);
}
+ catch (RepositoryException e)
+ {
+ // ignore, can't convert
+ }
}
}
}
@@ -130,11 +137,17 @@
{
if (StringUtils.startsWith(column[index], "/"))
{
- Content node = ContentUtil.getContentByUUID(MediaModule.REPO, column[index]);
- if (node != null)
+ Node node;
+ try
{
- column[index] = node.getUUID();
+ node = NodeUtil.getNodeByIdentifier(MediaModule.REPO, column[index]);
+
+ column[index] = NodeUtil.getNodeIdentifierIfPossible(node);
}
+ catch (RepositoryException e)
+ {
+ // ignore, can't convert
+ }
}
}
}
Modified: magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/advancedsearch/configuration/SearchMediaQueryConfiguration.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/advancedsearch/configuration/SearchMediaQueryConfiguration.java 2013-10-10 16:03:33 UTC (rev 4368)
+++ magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/advancedsearch/configuration/SearchMediaQueryConfiguration.java 2013-10-12 13:53:58 UTC (rev 4369)
@@ -106,7 +106,7 @@
Criteria c = JCRCriteriaFactory
.createCriteria()
.setWorkspace(MediaModule.REPO)
- .add(Restrictions.eq("@jcr:primaryType", MediaConfigurationManager.MEDIA.getSystemName()));
+ .add(Restrictions.eq("@jcr:primaryType", MediaConfigurationManager.NT_MEDIA));
// media type
if (!StringUtils.isEmpty(mediaType))
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-10 16:03:33 UTC (rev 4368)
+++ magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/commands/MediaActivationCommand.java 2013-10-12 13:53:58 UTC (rev 4369)
@@ -22,6 +22,7 @@
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;
@@ -131,8 +132,8 @@
try
{
return !getRule().isAllowed(content.getNodeTypeName())
- && !ItemType.CONTENT.getSystemName().equals(content.getNodeTypeName())
- && !MediaConfigurationManager.RESOLUTIONS.getSystemName().equals(content.getNodeTypeName());
+ && !MgnlNodeType.NT_CONTENT.equals(content.getNodeTypeName())
+ && !MediaConfigurationManager.NT_RESOLUTIONS.equals(content.getNodeTypeName());
}
catch (RepositoryException e)
{
@@ -156,7 +157,7 @@
*/
protected void activateSingleNode(String parentPath, Content node) throws RepositoryException, ExchangeException
{
- if (MediaConfigurationManager.MEDIA.equals(node.getItemType()) && node.getMetaData().getIsActivated())
+ if (MediaConfigurationManager.NT_MEDIA.equals(node.getItemType()) && node.getMetaData().getIsActivated())
{
// already activated media, should deactivate in order to remove stale resolutions
log
@@ -196,7 +197,7 @@
{
log.info("Activating parent folder {}", folder.getHandle());
// folder only, no content
- setRule(new Rule(new String[]{ItemType.NT_METADATA, ItemType.NT_RESOURCE }));
+ setRule(new Rule(new String[]{MgnlNodeType.NT_METADATA, MgnlNodeType.NT_RESOURCE }));
getSyndicator().activate(folder.getParent().getHandle(), folder, getOrderingInfo(folder));
}
@@ -226,7 +227,7 @@
try
{
return !getRule().isAllowed(content.getNodeTypeName())
- && !MediaConfigurationManager.RESOLUTIONS.getSystemName().equals(content.getNodeTypeName());
+ && !MediaConfigurationManager.NT_RESOLUTIONS.equals(content.getNodeTypeName());
}
catch (RepositoryException e)
{
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-10 16:03:33 UTC (rev 4368)
+++ magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/configuration/MediaConfigurationManager.java 2013-10-12 13:53:58 UTC (rev 4369)
@@ -24,6 +24,7 @@
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;
@@ -34,6 +35,7 @@
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 java.util.ArrayList;
@@ -80,17 +82,17 @@
/**
* Folder type
*/
- public static final ItemType FOLDER = ItemType.CONTENT;
+ public static final String NT_FOLDER = MgnlNodeType.NT_CONTENT;
/**
* Media type
*/
- public static final ItemType MEDIA = new ItemType(MGNL_MEDIA_TYPE);
+ public static final String NT_MEDIA = MGNL_MEDIA_TYPE;
/**
* Resolutions node type
*/
- public static final ItemType RESOLUTIONS = new ItemType(MGNL_RESOLUTION_TYPE);
+ public static final String NT_RESOLUTIONS = MGNL_RESOLUTION_TYPE;
private Logger log = LoggerFactory.getLogger(MediaConfigurationManager.class);
@@ -259,7 +261,7 @@
{
sbQuery.append('/');
}
- sbQuery.append("element(*," + MediaConfigurationManager.MEDIA.getSystemName() + ")");
+ sbQuery.append("element(*," + MediaConfigurationManager.NT_MEDIA + ")");
List<String> clauses = new ArrayList<String>();
if (StringUtils.isNotBlank(search))
{
@@ -317,7 +319,7 @@
*/
public String getURIMappingPrefix()
{
- Collection<URI2RepositoryMapping> mappings = URI2RepositoryManager.getInstance().getMappings();
+ Collection<URI2RepositoryMapping> mappings = Components.getComponent(URI2RepositoryManager.class).getMappings();
for (URI2RepositoryMapping mapping : mappings)
{
if (mapping.getRepository().equals(MediaModule.REPO))
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-10 16:03:33 UTC (rev 4368)
+++ magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/configuration/MediaUsedInManager.java 2013-10-12 13:53:58 UTC (rev 4369)
@@ -19,13 +19,14 @@
package net.sourceforge.openutils.mgnlmedia.media.configuration;
-import info.magnolia.cms.beans.config.ObservedManager;
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.objectfactory.Components;
import info.magnolia.repository.RepositoryConstants;
+import it.openutils.mgnlutils.api.ObservedManagerAdapter;
import java.util.ArrayList;
import java.util.Collection;
@@ -57,12 +58,12 @@
* @version $Id$
*/
@Singleton
-public class MediaUsedInManager extends ObservedManager
+public class MediaUsedInManager extends ObservedManagerAdapter
{
public static MediaUsedInManager getInstance()
{
- return Components.getSingleton(MediaUsedInManager.class);
+ return Components.getComponents(MediaUsedInManager.class);
}
private static Logger log = LoggerFactory.getLogger(MediaUsedInManager.class);
@@ -82,9 +83,9 @@
* {@inheritDoc}
*/
@Override
- protected void onRegister(Content node)
+ protected void onRegister(Node node)
{
- Collection<Content> uiwNodes = node.getChildren(ItemType.CONTENTNODE);
+ Collection<Content> uiwNodes = node.getChildren(MgnlNodeType.NT_CONTENTNODE);
for (Content uiwNode : uiwNodes)
{
try
@@ -96,7 +97,7 @@
}
if (StringUtils.isEmpty(uiw.getNodeType()))
{
- uiw.setNodeType(ItemType.CONTENT.getSystemName());
+ uiw.setNodeType(MgnlNodeType.NT_CONTENT);
}
usedInWorkspaceMap.put(uiw.getWorkspaceName(), uiw);
}
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-10 16:03:33 UTC (rev 4368)
+++ magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/configuration/UsedInWorkspace.java 2013-10-12 13:53:58 UTC (rev 4369)
@@ -20,6 +20,7 @@
package net.sourceforge.openutils.mgnlmedia.media.configuration;
import info.magnolia.cms.core.ItemType;
+import info.magnolia.cms.core.MgnlNodeType;
import info.magnolia.repository.RepositoryConstants;
@@ -34,7 +35,7 @@
private String workspaceName;
- private String nodeType = ItemType.CONTENT.getSystemName();
+ private String nodeType = MgnlNodeType.NT_PAGE;
private String basePath = "/";
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-10 16:03:33 UTC (rev 4368)
+++ magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/crop/PzcServlet.java 2013-10-12 13:53:58 UTC (rev 4369)
@@ -102,7 +102,7 @@
.append("|")
.append(y)
.toString());
- systemNode.save();
+ systemNode.getSession().save();
}
catch (RepositoryException ex)
{
Modified: magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/dialog/DialogFileAudio.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/dialog/DialogFileAudio.java 2013-10-10 16:03:33 UTC (rev 4368)
+++ magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/dialog/DialogFileAudio.java 2013-10-12 13:53:58 UTC (rev 4369)
@@ -39,6 +39,7 @@
* @author molaschi
* @version Id:
*/
+@SuppressWarnings("deprecation")
public class DialogFileAudio extends DialogFile
{
Modified: magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/dialog/DialogFileImage.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/dialog/DialogFileImage.java 2013-10-10 16:03:33 UTC (rev 4368)
+++ magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/dialog/DialogFileImage.java 2013-10-12 13:53:58 UTC (rev 4369)
@@ -39,6 +39,7 @@
* @author molaschi
* @version Id:
*/
+@SuppressWarnings("deprecation")
public class DialogFileImage extends DialogFile
{
Modified: magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/dialog/DialogFileVideo.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/dialog/DialogFileVideo.java 2013-10-10 16:03:33 UTC (rev 4368)
+++ magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/dialog/DialogFileVideo.java 2013-10-12 13:53:58 UTC (rev 4369)
@@ -37,6 +37,7 @@
* @author molaschi
* @version Id:
*/
+@SuppressWarnings("deprecation")
public class DialogFileVideo extends DialogFile
{
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-10-10 16:03:33 UTC (rev 4368)
+++ magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/dialog/DialogHiddenParameters.java 2013-10-12 13:53:58 UTC (rev 4369)
@@ -39,6 +39,7 @@
* @author ADMIN
* @version $Id: $
*/
+@SuppressWarnings("deprecation")
public class DialogHiddenParameters extends ConfigurableFreemarkerDialog
{
Modified: magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/dialog/DialogMetadata.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/dialog/DialogMetadata.java 2013-10-10 16:03:33 UTC (rev 4368)
+++ magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/dialog/DialogMetadata.java 2013-10-12 13:53:58 UTC (rev 4369)
@@ -32,6 +32,7 @@
* @author fgiust
* @version $Id$
*/
+@SuppressWarnings("deprecation")
public class DialogMetadata extends DialogStatic
{
Modified: magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/dialog/DialogSelectMedia.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/dialog/DialogSelectMedia.java 2013-10-10 16:03:33 UTC (rev 4368)
+++ magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/dialog/DialogSelectMedia.java 2013-10-12 13:53:58 UTC (rev 4369)
@@ -56,6 +56,7 @@
* @author molaschi
* @version $Id$
*/
+@SuppressWarnings("deprecation")
public class DialogSelectMedia extends ConfigurableFreemarkerDialog
{
Modified: magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/dialog/DisplayHandle.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/dialog/DisplayHandle.java 2013-10-10 16:03:33 UTC (rev 4368)
+++ magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/dialog/DisplayHandle.java 2013-10-12 13:53:58 UTC (rev 4369)
@@ -26,6 +26,7 @@
* @author fgiust
* @version $Id$
*/
+@SuppressWarnings("deprecation")
public class DisplayHandle extends DialogStatic
{
Modified: magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/dialog/DisplayUUID.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/dialog/DisplayUUID.java 2013-10-10 16:03:33 UTC (rev 4368)
+++ magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/dialog/DisplayUUID.java 2013-10-12 13:53:58 UTC (rev 4369)
@@ -26,6 +26,7 @@
* @author cstrappazzon
* @version $Id$
*/
+@SuppressWarnings("deprecation")
public class DisplayUUID extends DialogStatic
{
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-10 16:03:33 UTC (rev 4368)
+++ magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/dialog/LayerDialogMVC.java 2013-10-12 13:53:58 UTC (rev 4369)
@@ -50,6 +50,7 @@
* @author molaschi
* @version $Id$
*/
+@SuppressWarnings("deprecation")
public class LayerDialogMVC extends ConfiguredDialog
{
@@ -134,7 +135,7 @@
{
super.configureSaveHandler(saveHandler);
- saveHandler.setCreationItemType(MediaConfigurationManager.MEDIA);
+ saveHandler.setCreationItemType(MediaConfigurationManager.NT_MEDIA);
}
/**
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-10-10 16:03:33 UTC (rev 4368)
+++ magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/pages/MediaBeanBuilder.java 2013-10-12 13:53:58 UTC (rev 4369)
@@ -25,6 +25,7 @@
import info.magnolia.jcr.util.MetaDataUtil;
import info.magnolia.jcr.util.NodeUtil;
import info.magnolia.jcr.util.PropertyUtil;
+import info.magnolia.objectfactory.Components;
import info.magnolia.repository.RepositoryConstants;
import java.util.List;
@@ -108,7 +109,7 @@
String repository = entry.getKey();
for (String handle : entry.getValue())
{
- String uri = URI2RepositoryManager.getInstance().getURI(repository, handle);
+ String uri = Components.getComponent(URI2RepositoryManager.class).getURI(repository, handle);
mb.getUsedInUris().add(uri);
}
}
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-10 16:03:33 UTC (rev 4368)
+++ magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/pages/MediaFolderViewPage.java 2013-10-12 13:53:58 UTC (rev 4369)
@@ -22,6 +22,7 @@
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;
import info.magnolia.cms.exchange.ExchangeException;
@@ -441,14 +442,14 @@
@SuppressWarnings("unchecked")
public String activate()
{
- Command cmd = CommandsManager.getInstance().getCommand("media", "activate");
+ Command cmd = Components.getComponent(CommandsManager.class).getCommand("media", "activate");
ActivationCommand actCmd = (ActivationCommand) cmd;
StringBuffer sb = new StringBuffer();
- sb.append(MediaConfigurationManager.MEDIA.getSystemName());
+ sb.append(MediaConfigurationManager.NT_MEDIA);
sb.append(",");
- sb.append(ItemType.CONTENTNODE.getSystemName());
+ sb.append(MgnlNodeType.NT_CONTENTNODE);
actCmd.setItemTypes(sb.toString());
Context context = MgnlContext.getInstance();
@@ -477,7 +478,7 @@
@SuppressWarnings("unchecked")
public String deactivate()
{
- Command cmd = CommandsManager.getInstance().getCommand("media", "deactivate");
+ Command cmd = Components.getComponent(CommandsManager.class).getCommand("media", "deactivate");
Context context = MgnlContext.getInstance();
context.put(Context.ATTRIBUTE_REPOSITORY, MediaModule.REPO);
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-10-10 16:03:33 UTC (rev 4368)
+++ magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/pages/MediaSearchPage.java 2013-10-12 13:53:58 UTC (rev 4369)
@@ -97,7 +97,7 @@
Session session = MgnlContext.getJCRSession(MediaModule.REPO);
Iterable<Node> nodes = NodeUtil.getNodes(
session.getRootNode(),
- MediaConfigurationManager.FOLDER.getSystemName());
+ MediaConfigurationManager.NT_FOLDER);
List<String> tmpPaths = new ArrayList<String>();
for (Node c : nodes)
{
Modified: magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/save/HiddenParametersSaveHandler.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/save/HiddenParametersSaveHandler.java 2013-10-10 16:03:33 UTC (rev 4368)
+++ magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/save/HiddenParametersSaveHandler.java 2013-10-12 13:53:58 UTC (rev 4369)
@@ -42,6 +42,7 @@
* @author ADMIN
* @version $Id: $
*/
+@SuppressWarnings("deprecation")
public class HiddenParametersSaveHandler implements FieldSaveHandler
{
Modified: magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/save/MediaCustomSaveHandler.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/save/MediaCustomSaveHandler.java 2013-10-10 16:03:33 UTC (rev 4368)
+++ magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/save/MediaCustomSaveHandler.java 2013-10-12 13:53:58 UTC (rev 4369)
@@ -49,6 +49,7 @@
* @author molaschi
* @version $Id$
*/
+@SuppressWarnings("deprecation")
public class MediaCustomSaveHandler implements FieldSaveHandler
{
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-10-10 16:03:33 UTC (rev 4368)
+++ magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/setup/MoveHandlerNodedataToNode.java 2013-10-12 13:53:58 UTC (rev 4369)
@@ -19,16 +19,14 @@
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;
+import info.magnolia.cms.core.MgnlNodeType;
+import info.magnolia.jcr.util.NodeUtil;
import info.magnolia.module.InstallContext;
import info.magnolia.module.delta.AbstractRepositoryTask;
import info.magnolia.module.delta.TaskExecutionException;
-import java.util.Collection;
-
+import javax.jcr.Node;
+import javax.jcr.Property;
import javax.jcr.RepositoryException;
import org.slf4j.Logger;
@@ -62,22 +60,25 @@
@Override
protected void doExecute(InstallContext installContext) throws RepositoryException, TaskExecutionException
{
- Content types = installContext.getConfigHierarchyManager().getContent("/modules/media/mediatypes");
- Collection<Content> mediatypes = types.getChildren(ItemType.CONTENTNODE);
+ Node types = installContext.getConfigJCRSession().getNode("/modules/media/mediatypes");
+
+ Iterable<Node> mediatypes = NodeUtil.getNodes(types, MgnlNodeType.NT_CONTENTNODE);
String handlerPropertyName = "handler";
- for (Content mediatype : mediatypes)
+ for (Node mediatype : mediatypes)
{
- if (mediatype.hasNodeData(handlerPropertyName))
+ if (mediatype.hasProperty(handlerPropertyName))
{
log.info("Legacy configuration found for mediatype {}", mediatype.getName()
+ ", updating configuration");
- NodeData handlerNd = mediatype.getNodeData(handlerPropertyName);
+
+ Property handlerNd = mediatype.getProperty(handlerPropertyName);
String previousHandler = handlerNd.getString();
- handlerNd.delete();
- if (!mediatype.hasContent(handlerPropertyName))
+ handlerNd.remove();
+
+ if (!mediatype.hasNode(handlerPropertyName))
{
- mediatype.createContent(handlerPropertyName, ItemType.CONTENTNODE).createNodeData(
+ mediatype.addNode(handlerPropertyName, MgnlNodeType.NT_CONTENTNODE).setProperty(
"class",
previousHandler);
}
Deleted: magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/setup/MoveOriginalNodeTask.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/setup/MoveOriginalNodeTask.java 2013-10-10 16:03:33 UTC (rev 4368)
+++ magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/setup/MoveOriginalNodeTask.java 2013-10-12 13:53:58 UTC (rev 4369)
@@ -1,128 +0,0 @@
-/**
- *
- * SimpleMedia Module for Magnolia CMS (http://www.openmindlab.com/lab/products/media.html)
- * Copyright(C) 2008-2013, Openmind S.r.l. http://www.openmindonline.it
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-
-package net.sourceforge.openutils.mgnlmedia.media.setup;
-
-import info.magnolia.cms.core.search.Query;
-import info.magnolia.context.MgnlContext;
-import info.magnolia.module.InstallContext;
-import info.magnolia.module.delta.Task;
-import info.magnolia.module.delta.TaskExecutionException;
-
-import javax.jcr.RepositoryException;
-import javax.jcr.Session;
-
-import net.sourceforge.openutils.mgnlcriteria.jcr.query.AdvancedResult;
-import net.sourceforge.openutils.mgnlcriteria.jcr.query.AdvancedResultItem;
-import net.sourceforge.openutils.mgnlcriteria.jcr.query.DirectJcrQuery;
-import net.sourceforge.openutils.mgnlcriteria.jcr.query.JCRCriteriaFactory;
-import net.sourceforge.openutils.mgnlcriteria.jcr.query.ResultIterator;
-import net.sourceforge.openutils.mgnlmedia.media.configuration.MediaConfigurationManager;
-import net.sourceforge.openutils.mgnlmedia.media.lifecycle.MediaModule;
-import net.sourceforge.openutils.mgnlmedia.media.types.impl.BaseTypeHandler;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-
-/**
- * @author fgiust
- * @version $Id$
- */
-public class MoveOriginalNodeTask implements Task
-{
-
- /**
- * Logger.
- */
- private static Logger log = LoggerFactory.getLogger(MoveOriginalNodeTask.class);
-
- public String getName()
- {
- return "file store nodedata name updater";
- }
-
- public String getDescription()
- {
- return "update custom nodedata names (where original files are stored) to \"original\"";
- }
-
- public void execute(InstallContext installContext) throws TaskExecutionException
- {
- try
- {
- Session session = installContext.getJCRSession(MediaModule.REPO);
- reset(session, "image", "image");
- reset(session, "video", "video");
- reset(session, "audio", "audio");
- }
- catch (RepositoryException ex)
- {
- log.error(ex.getMessage(), ex);
- }
- }
-
- public static void execute() throws RepositoryException
- {
- Session session = MgnlContext.getJCRSession(MediaModule.REPO);
-
- reset(session, "image", "image");
- reset(session, "video", "video");
- reset(session, "audio", "audio");
- }
-
- public static void reset(Session session, String type, String nodedataOldName) throws RepositoryException
- {
-
- DirectJcrQuery query = JCRCriteriaFactory.createDirectJcrQuery(session, "//*[@jcr:primaryType = '"
- + MediaConfigurationManager.MEDIA.getSystemName()
- + "' and "
- + nodedataOldName
- + " and @type='"
- + type
- + "']", Query.XPATH);
-
- AdvancedResult result = query.execute();
-
- ResultIterator<AdvancedResultItem> items = result.getItems();
-
- while (items.hasNext())
- {
- AdvancedResultItem media = items.next();
-
- if (media.hasProperty(nodedataOldName))
- {
- try
- {
- // it's a binary nodedata -> node
- session.getWorkspace().move(
- media.getPath() + "/" + nodedataOldName,
- media.getPath() + "/" + BaseTypeHandler.ORGINAL_NODEDATA_NAME);
- }
- catch (RepositoryException e)
- {
- log.warn(
- "Unable to move node from {} to {}",
- media.getPath() + "/" + nodedataOldName,
- media.getPath() + "/" + BaseTypeHandler.ORGINAL_NODEDATA_NAME);
- }
- }
- }
- }
-}
\ No newline at end of file
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-10 16:03:33 UTC (rev 4368)
+++ magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/setup/RemoveExtensionFromType.java 2013-10-12 13:53:58 UTC (rev 4369)
@@ -20,8 +20,6 @@
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;
@@ -31,7 +29,9 @@
import java.util.Arrays;
import java.util.List;
+import javax.jcr.Node;
import javax.jcr.RepositoryException;
+import javax.jcr.Session;
import org.apache.commons.lang.StringUtils;
@@ -71,12 +71,12 @@
protected void doExecute(InstallContext ctx) throws RepositoryException, TaskExecutionException
{
- final HierarchyManager hm = ctx.getHierarchyManager(RepositoryConstants.CONFIG);
+ Session session = ctx.getJCRSession(RepositoryConstants.CONFIG);
String nodePath = "/modules/media/mediatypes/" + this.mediatype;
try
{
- final Content mediatypenode = hm.getContent(nodePath);
+ Node mediatypenode = session.getNode(nodePath);
String extensions = mediatypenode.getNodeData("extensions").getString();
if (StringUtils.contains(extensions, this.extension))
{
@@ -92,7 +92,7 @@
try
{
- final Content mediatypenode = hm.getContent(control);
+ Node mediatypenode = session.getNode(control);
String extensions = mediatypenode.getNodeData("extensions").getString();
if (StringUtils.contains(extensions, this.extension))
{
Deleted: 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-10-10 16:03:33 UTC (rev 4368)
+++ magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/setup/RemoveResolutionsNodeTask.java 2013-10-12 13:53:58 UTC (rev 4369)
@@ -1,84 +0,0 @@
-/**
- *
- * SimpleMedia Module for Magnolia CMS (http://www.openmindlab.com/lab/products/media.html)
- * Copyright(C) 2008-2013, Openmind S.r.l. http://www.openmindonline.it
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-
-package net.sourceforge.openutils.mgnlmedia.media.setup;
-
-
-import info.magnolia.cms.core.Content;
-import info.magnolia.cms.core.HierarchyManager;
-import info.magnolia.cms.core.ItemType;
-import info.magnolia.cms.core.search.Query;
-import info.magnolia.cms.core.search.QueryManager;
-import info.magnolia.cms.core.search.QueryResult;
-import info.magnolia.module.InstallContext;
-import info.magnolia.module.delta.AbstractTask;
-import info.magnolia.module.delta.TaskExecutionException;
-
-import java.util.Collection;
-
-import javax.jcr.RepositoryException;
-
-import net.sourceforge.openutils.mgnlmedia.media.configuration.MediaConfigurationManager;
-import net.sourceforge.openutils.mgnlmedia.media.lifecycle.MediaModule;
-
-
-/**
- * @author molaschi
- * @version $Id$
- */
-public class RemoveResolutionsNodeTask extends AbstractTask
-{
-
- /**
- * Constructor
- */
- public RemoveResolutionsNodeTask()
- {
- super("Remove resolutions nodes", "Remove resolutions nodes which type is not mgnl:resolutions");
- }
-
- /**
- * {@inheritDoc}
- */
- @SuppressWarnings("unchecked")
- public void execute(InstallContext installContext) throws TaskExecutionException
- {
- HierarchyManager hm = installContext.getHierarchyManager(MediaModule.REPO);
- QueryManager mgr = hm.getQueryManager();
- try
- {
- Query query = mgr.createQuery("//resolutions", Query.XPATH);
- QueryResult result = query.execute();
- Collection<Content> resolutions = result.getContent(ItemType.CONTENTNODE.getSystemName());
- for (Content node : resolutions)
- {
- if (!node.isNodeType(MediaConfigurationManager.RESOLUTIONS.getSystemName()))
- {
- hm.delete(node.getHandle());
- }
- }
- hm.save();
- }
- catch (RepositoryException ex)
- {
- throw new TaskExecutionException(ex.getMessage(), ex);
- }
- }
-
-}
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-10-10 16:03:33 UTC (rev 4368)
+++ magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/setup/RenameThumbToImageTask.java 2013-10-12 13:53:58 UTC (rev 4369)
@@ -19,8 +19,6 @@
package net.sourceforge.openutils.mgnlmedia.media.setup;
-import java.io.InputStream;
-
import info.magnolia.cms.beans.runtime.FileProperties;
import info.magnolia.cms.core.MgnlNodeType;
import info.magnolia.jcr.util.NodeUtil;
@@ -28,15 +26,14 @@
import info.magnolia.module.InstallContext;
import info.magnolia.module.delta.AbstractTask;
import info.magnolia.module.delta.TaskExecutionException;
-import it.openutils.mgnlutils.api.NodeUtilsExt;
+import java.io.InputStream;
+
import javax.jcr.Node;
import javax.jcr.RepositoryException;
import javax.jcr.Session;
import javax.jcr.nodetype.NodeType;
-import org.apache.jackrabbit.value.BinaryValue;
-
import net.sourceforge.openutils.mgnlcriteria.jcr.query.AdvancedResult;
import net.sourceforge.openutils.mgnlcriteria.jcr.query.AdvancedResultItem;
import net.sourceforge.openutils.mgnlcriteria.jcr.query.Criteria;
@@ -45,7 +42,11 @@
import net.sourceforge.openutils.mgnlmedia.media.configuration.MediaConfigurationManager;
import net.sourceforge.openutils.mgnlmedia.media.lifecycle.MediaModule;
+import org.apache.jackrabbit.value.BinaryValue;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
/**
* @author molaschi
* @version $Id$
@@ -54,6 +55,11 @@
{
/**
+ * Logger.
+ */
+ private Logger log = LoggerFactory.getLogger(RenameThumbToImageTask.class);
+
+ /**
* Constructor
*/
public RenameThumbToImageTask()
@@ -73,7 +79,7 @@
Session hm = installContext.getJCRSession(MediaModule.REPO);
Criteria criteria = JCRCriteriaFactory
.createCriteria()
- .setWorkspace(MediaConfigurationManager.MEDIA.getSystemName())
+ .setWorkspace(MediaConfigurationManager.NT_MEDIA)
.setBasePath("//*")
// .add(Restrictions.eq("jcr:primaryType", "mgnl:contentNode"))
.addOrder(Order.desc("@jcr:score"));
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-10 16:03:33 UTC (rev 4368)
+++ 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)
@@ -130,11 +130,11 @@
if (currentpage == null)
{
- currentpage = new DefaultContent(node);
+ currentpage = ContentUtil.asContent(node);
}
Content content = new NodeMapWrapper(
- new I18nContentWrapper(new DefaultContent(node)),
+ new I18nContentWrapper(ContentUtil.asContent(node)),
currentpage.getHandle());
return content.getJCRNode();
}
@@ -566,7 +566,7 @@
*/
public Node apply(MediaNodeAndEntryPath from)
{
- return (Node) from.getMediaNode();
+ return from.getMediaNode();
}
});
return Iterators.filter(iter, Predicates.notNull());
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-10-10 16:03:33 UTC (rev 4368)
+++ magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/tree/JcrBrowserWithNodeTypeTreeConfiguration.java 2013-10-12 13:53:58 UTC (rev 4369)
@@ -39,6 +39,7 @@
* @author molaschi
* @version $Id$
*/
+@SuppressWarnings("deprecation")
public class JcrBrowserWithNodeTypeTreeConfiguration extends JcrBrowserTreeConfiguration
{
@@ -54,8 +55,8 @@
tree.getItemTypes().clear();
tree.addItemType(ItemType.CONTENT);
- tree.addItemType(MediaConfigurationMan...
[truncated message content] |
