From: <fg...@us...> - 2013-09-12 13:46:41
|
Revision: 4289 http://openutils.svn.sourceforge.net/openutils/?rev=4289&view=rev Author: fgiust Date: 2013-09-12 13:46:38 +0000 (Thu, 12 Sep 2013) Log Message: ----------- deprecations Modified Paths: -------------- magnoliamodules/trunk/openutils-mgnltasks/src/main/java/it/openutils/mgnltasks/BootstrapMissingNodesTask.java Modified: magnoliamodules/trunk/openutils-mgnltasks/src/main/java/it/openutils/mgnltasks/BootstrapMissingNodesTask.java =================================================================== --- magnoliamodules/trunk/openutils-mgnltasks/src/main/java/it/openutils/mgnltasks/BootstrapMissingNodesTask.java 2013-09-12 09:17:50 UTC (rev 4288) +++ magnoliamodules/trunk/openutils-mgnltasks/src/main/java/it/openutils/mgnltasks/BootstrapMissingNodesTask.java 2013-09-12 13:46:38 UTC (rev 4289) @@ -19,7 +19,10 @@ package it.openutils.mgnltasks; -import info.magnolia.cms.core.HierarchyManager; +import javax.jcr.RepositoryException; +import javax.jcr.Session; + +import info.magnolia.jcr.util.NodeUtil; import info.magnolia.module.InstallContext; import info.magnolia.module.delta.BootstrapResourcesTask; @@ -66,16 +69,29 @@ String handle = StringUtils.substringBetween(name, "/mgnl-bootstrap/" + folderName + "/", ".xml"); String workspace = StringUtils.substringBefore(handle, "."); - handle = "/" + StringUtils.replace(StringUtils.substringAfter(handle, "."), ".", "/"); + handle = StringUtils.replace(StringUtils.substringAfter(handle, "."), ".", "/"); - HierarchyManager hm = installContext.getHierarchyManager(workspace); - boolean alreadyExisting = hm.isExist(handle); + try + { + Session session = installContext.getJCRSession(workspace); - if (!alreadyExisting) + // handle is a relative path + boolean alreadyExisting = session.getRootNode().hasNode(handle); + + if (!alreadyExisting) + { + log.info("Loading {} since no content at {}:{} has been found", new Object[]{ + name, + workspace, + "/" + handle }); + } + return !alreadyExisting; + } + catch (RepositoryException e) { - log.info("Loading {} since no content at {}:{} has been found", new Object[]{name, workspace, handle }); + log.debug(e.getMessage(), e); } - return !alreadyExisting; + } return false; } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |