Menu
▾
▴
openutils-svn
|
From: <fg...@us...> - 2013-09-12 09:11:26
|
Revision: 4287
http://openutils.svn.sourceforge.net/openutils/?rev=4287&view=rev
Author: fgiust
Date: 2013-09-12 09:11:22 +0000 (Thu, 12 Sep 2013)
Log Message:
-----------
deprecations
Modified Paths:
--------------
magnoliamodules/trunk/openutils-mgnltasks/src/main/java/it/openutils/mgnltasks/AnonymousUserSetupTask.java
magnoliamodules/trunk/openutils-mgnltasks/src/main/java/it/openutils/mgnltasks/BaseCheckMissingTask.java
magnoliamodules/trunk/openutils-mgnltasks/src/main/java/it/openutils/mgnltasks/BootstrapMissingNodesTask.java
magnoliamodules/trunk/openutils-mgnltasks/src/main/java/it/openutils/mgnltasks/ExistenceConditionalBootstrapTask.java
magnoliamodules/trunk/openutils-mgnltasks/src/main/java/it/openutils/mgnltasks/ReplaceParagraphTask.java
magnoliamodules/trunk/openutils-mgnltasks/src/main/java/it/openutils/mgnltasks/ReplaceTemplateTask.java
magnoliamodules/trunk/openutils-mgnltasks/src/main/java/it/openutils/mgnltasks/dev/ModuleDevelopmentUtilsPage.java
Modified: magnoliamodules/trunk/openutils-mgnltasks/src/main/java/it/openutils/mgnltasks/AnonymousUserSetupTask.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnltasks/src/main/java/it/openutils/mgnltasks/AnonymousUserSetupTask.java 2013-09-12 09:09:44 UTC (rev 4286)
+++ magnoliamodules/trunk/openutils-mgnltasks/src/main/java/it/openutils/mgnltasks/AnonymousUserSetupTask.java 2013-09-12 09:11:22 UTC (rev 4287)
@@ -35,7 +35,10 @@
import javax.jcr.RepositoryException;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
/**
* A task that can be used to add or remove read only access to the anonymous user (for an easy admin/public switch).
* @author fgiust
@@ -46,6 +49,8 @@
private boolean allowAccess;
+ private Logger log = LoggerFactory.getLogger(AnonymousUserSetupTask.class);
+
/**
* @param allowAccess true to add access to anonymous users, false to remove it
*/
Modified: magnoliamodules/trunk/openutils-mgnltasks/src/main/java/it/openutils/mgnltasks/BaseCheckMissingTask.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnltasks/src/main/java/it/openutils/mgnltasks/BaseCheckMissingTask.java 2013-09-12 09:09:44 UTC (rev 4286)
+++ magnoliamodules/trunk/openutils-mgnltasks/src/main/java/it/openutils/mgnltasks/BaseCheckMissingTask.java 2013-09-12 09:11:22 UTC (rev 4287)
@@ -37,6 +37,8 @@
import javax.jcr.query.InvalidQueryException;
import org.apache.commons.lang.StringUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
@@ -52,6 +54,8 @@
private final String nodetype;
+ private Logger log = LoggerFactory.getLogger(AnonymousUserSetupTask.class);
+
/**
* @param templateOrParagraph "template" or "paragraph"
* @param nodetype node type foc checked nodes
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:09:44 UTC (rev 4286)
+++ magnoliamodules/trunk/openutils-mgnltasks/src/main/java/it/openutils/mgnltasks/BootstrapMissingNodesTask.java 2013-09-12 09:11:22 UTC (rev 4287)
@@ -24,6 +24,8 @@
import info.magnolia.module.delta.BootstrapResourcesTask;
import org.apache.commons.lang.StringUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
@@ -37,6 +39,8 @@
private String folderName;
+ private Logger log = LoggerFactory.getLogger(AnonymousUserSetupTask.class);
+
/**
* Bootstrap all the files included in the /mgnl-bootstrap/(folder) directory, only if the nodes are not already
* existing.
Modified: magnoliamodules/trunk/openutils-mgnltasks/src/main/java/it/openutils/mgnltasks/ExistenceConditionalBootstrapTask.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnltasks/src/main/java/it/openutils/mgnltasks/ExistenceConditionalBootstrapTask.java 2013-09-12 09:09:44 UTC (rev 4286)
+++ magnoliamodules/trunk/openutils-mgnltasks/src/main/java/it/openutils/mgnltasks/ExistenceConditionalBootstrapTask.java 2013-09-12 09:11:22 UTC (rev 4287)
@@ -24,6 +24,8 @@
import info.magnolia.module.delta.BootstrapResourcesTask;
import org.apache.commons.lang.StringUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
@@ -38,6 +40,8 @@
private String folderName;
+ private Logger log = LoggerFactory.getLogger(AnonymousUserSetupTask.class);
+
/**
* @param name
* @param description
Modified: magnoliamodules/trunk/openutils-mgnltasks/src/main/java/it/openutils/mgnltasks/ReplaceParagraphTask.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnltasks/src/main/java/it/openutils/mgnltasks/ReplaceParagraphTask.java 2013-09-12 09:09:44 UTC (rev 4286)
+++ magnoliamodules/trunk/openutils-mgnltasks/src/main/java/it/openutils/mgnltasks/ReplaceParagraphTask.java 2013-09-12 09:11:22 UTC (rev 4287)
@@ -33,7 +33,10 @@
import javax.jcr.RepositoryException;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
/**
* A task that replace any occurrence of a given paragraph with another at startup (handy for renamed paragraphs).
* @author fgiust
@@ -46,6 +49,8 @@
private final String newTemplate;
+ private Logger log = LoggerFactory.getLogger(AnonymousUserSetupTask.class);
+
/**
* @param actualTemplate template to be replaced
* @param newTemplate new template
@@ -81,13 +86,17 @@
log.debug("Running query: {}", queryAAsString);
- Collection<Content> nodes = qm.createQuery(queryAAsString, Query.XPATH).execute().getContent(
- ItemType.CONTENTNODE.getSystemName());
+ Collection<Content> nodes = qm
+ .createQuery(queryAAsString, Query.XPATH)
+ .execute()
+ .getContent(ItemType.CONTENTNODE.getSystemName());
for (Content page : nodes)
{
- log.warn("Replacing template " + page.getMetaData().getTemplate() + " with {} in {}", newTemplate, page
- .getHandle());
+ log.warn(
+ "Replacing template " + page.getMetaData().getTemplate() + " with {} in {}",
+ newTemplate,
+ page.getHandle());
page.getMetaData().setTemplate(newTemplate);
}
}
Modified: magnoliamodules/trunk/openutils-mgnltasks/src/main/java/it/openutils/mgnltasks/ReplaceTemplateTask.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnltasks/src/main/java/it/openutils/mgnltasks/ReplaceTemplateTask.java 2013-09-12 09:09:44 UTC (rev 4286)
+++ magnoliamodules/trunk/openutils-mgnltasks/src/main/java/it/openutils/mgnltasks/ReplaceTemplateTask.java 2013-09-12 09:11:22 UTC (rev 4287)
@@ -32,7 +32,10 @@
import javax.jcr.RepositoryException;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
/**
* A task that replace any occurrence of a given template with another at startup (handy for renamed templates).
* @author fgiust
@@ -45,6 +48,8 @@
private final String newTemplate;
+ private Logger log = LoggerFactory.getLogger(AnonymousUserSetupTask.class);
+
/**
* @param actualTemplate template to be replaced
* @param newTemplate new template
@@ -84,8 +89,10 @@
for (Content page : nodes)
{
- log.warn("Replacing template " + page.getMetaData().getTemplate() + " with {} in {}", newTemplate, page
- .getHandle());
+ log.warn(
+ "Replacing template " + page.getMetaData().getTemplate() + " with {} in {}",
+ newTemplate,
+ page.getHandle());
page.getMetaData().setTemplate(newTemplate);
}
}
Modified: magnoliamodules/trunk/openutils-mgnltasks/src/main/java/it/openutils/mgnltasks/dev/ModuleDevelopmentUtilsPage.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnltasks/src/main/java/it/openutils/mgnltasks/dev/ModuleDevelopmentUtilsPage.java 2013-09-12 09:09:44 UTC (rev 4286)
+++ magnoliamodules/trunk/openutils-mgnltasks/src/main/java/it/openutils/mgnltasks/dev/ModuleDevelopmentUtilsPage.java 2013-09-12 09:11:22 UTC (rev 4287)
@@ -23,12 +23,14 @@
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.security.AccessDeniedException;
import info.magnolia.cms.util.AlertUtil;
import info.magnolia.cms.util.ContentUtil;
import info.magnolia.context.MgnlContext;
import info.magnolia.importexport.DataTransporter;
+import info.magnolia.jcr.util.NodeUtil;
import info.magnolia.module.InstallContext;
import info.magnolia.module.ModuleRegistry;
import info.magnolia.module.admininterface.TemplatedMVCHandler;
@@ -44,6 +46,7 @@
import java.util.Iterator;
import java.util.Set;
+import javax.jcr.Node;
import javax.jcr.PathNotFoundException;
import javax.jcr.RepositoryException;
import javax.jcr.Session;
@@ -505,24 +508,30 @@
@Override
protected void doExecute(InstallContext installContext) throws RepositoryException, TaskExecutionException
{
- HierarchyManager hm = installContext.getHierarchyManager(RepositoryConstants.CONFIG);
+ Session session = installContext.getJCRSession(RepositoryConstants.CONFIG);
+
String pagename = "development-" + module2;
- Content pages = hm.getContent("/modules/" + module2 + "/pages", true, ItemType.CONTENT);
- if (!pages.hasContent(pagename))
+
+ Node pages = NodeUtil.createPath(
+ session.getRootNode(),
+ "modules/" + module2 + "/pages",
+ MgnlNodeType.NT_CONTENT);
+
+ if (!pages.hasNode(pagename))
{
- Content page = pages.createContent(pagename, ItemType.CONTENTNODE);
- page.setNodeData("class", ModuleDevelopmentUtilsPage.class.getName());
+ Node page = pages.addNode(pagename, MgnlNodeType.NT_CONTENTNODE);
+ page.setProperty("class", ModuleDevelopmentUtilsPage.class.getName());
}
- Content menu = hm.getContent("/modules/adminInterface/config/menu/tools", true, ItemType.CONTENT);
+ Node menu = session.getNode("/modules/adminInterface/config/menu/tools");
- if (!menu.hasChildren(pagename))
+ if (!menu.hasNode(pagename))
{
- Content page = menu.createContent(pagename, ItemType.CONTENTNODE);
- page.setNodeData("icon", "/.resources/tasks/ico16-save.png");
- page.setNodeData("label", "Tools * " + module2);
- page.setNodeData("onclick", "MgnlAdminCentral.showContent('/.magnolia/pages/"
+ Node page = menu.addNode(pagename, MgnlNodeType.NT_CONTENTNODE);
+ page.setProperty("icon", "/.resources/tasks/ico16-save.png");
+ page.setProperty("label", "Tools * " + module2);
+ page.setProperty("onclick", "MgnlAdminCentral.showContent('/.magnolia/pages/"
+ pagename
+ ".html?module="
+ module2
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fg...@us...> - 2013-09-12 16:00:47
|
Revision: 4293
http://openutils.svn.sourceforge.net/openutils/?rev=4293&view=rev
Author: fgiust
Date: 2013-09-12 16:00:44 +0000 (Thu, 12 Sep 2013)
Log Message:
-----------
deprecations
Modified Paths:
--------------
magnoliamodules/trunk/openutils-mgnltasks/src/main/java/it/openutils/mgnltasks/ChangeDefaultPasswordTask.java
magnoliamodules/trunk/openutils-mgnltasks/src/main/java/it/openutils/mgnltasks/ConditionalTask.java
magnoliamodules/trunk/openutils-mgnltasks/src/main/java/it/openutils/mgnltasks/CreateMissingPropertyTask.java
Modified: magnoliamodules/trunk/openutils-mgnltasks/src/main/java/it/openutils/mgnltasks/ChangeDefaultPasswordTask.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnltasks/src/main/java/it/openutils/mgnltasks/ChangeDefaultPasswordTask.java 2013-09-12 15:54:10 UTC (rev 4292)
+++ magnoliamodules/trunk/openutils-mgnltasks/src/main/java/it/openutils/mgnltasks/ChangeDefaultPasswordTask.java 2013-09-12 16:00:44 UTC (rev 4293)
@@ -19,7 +19,7 @@
package it.openutils.mgnltasks;
-import info.magnolia.cms.core.NodeData;
+import info.magnolia.jcr.util.PropertyUtil;
import info.magnolia.module.InstallContext;
import info.magnolia.module.delta.AbstractRepositoryTask;
import info.magnolia.module.delta.Task;
@@ -79,12 +79,11 @@
Node role = hm.getNode(user);
- NodeData pwdNodeData = role.getNodeData("pswd");
- String actualPassword = pwdNodeData.getString();
+ String actualPassword = PropertyUtil.getString(role, "pswd");
if (StringUtils.equals(defaultPassword, StringUtils.trim(actualPassword)))
{
log.info("Found default password for {}, setting new password", user);
- pwdNodeData.setValue(newpassword);
+ role.setProperty("pswd", newpassword);
}
}
}
Modified: magnoliamodules/trunk/openutils-mgnltasks/src/main/java/it/openutils/mgnltasks/ConditionalTask.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnltasks/src/main/java/it/openutils/mgnltasks/ConditionalTask.java 2013-09-12 15:54:10 UTC (rev 4292)
+++ magnoliamodules/trunk/openutils-mgnltasks/src/main/java/it/openutils/mgnltasks/ConditionalTask.java 2013-09-12 16:00:44 UTC (rev 4293)
@@ -19,7 +19,6 @@
package it.openutils.mgnltasks;
-import info.magnolia.cms.util.NodeDataUtil;
import info.magnolia.module.InstallContext;
import info.magnolia.module.delta.AbstractTask;
import info.magnolia.module.delta.Task;
@@ -90,23 +89,8 @@
}
/**
- * Check if a nodedata exists with a specific value.
* @param session JCR session
* @param handle node handle
- * @param nodedata nodedata name
- * @param value expected value for nodeData
- * @return <code>true</code> if nodedata has the same value
- * @throws RepositoryException exceptions while checking content
- */
- public boolean nodeDataEquals(Session session, String handle, String nodedata, Object value)
- throws RepositoryException
- {
- return value.equals(NodeDataUtil.getValueObject(session.getNode(handle).getNodeData(nodedata)));
- }
-
- /**
- * @param session JCR session
- * @param handle node handle
* @return <code>true</code> if the task must be executed
* @throws RepositoryException exceptions while checking content
*/
Modified: magnoliamodules/trunk/openutils-mgnltasks/src/main/java/it/openutils/mgnltasks/CreateMissingPropertyTask.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnltasks/src/main/java/it/openutils/mgnltasks/CreateMissingPropertyTask.java 2013-09-12 15:54:10 UTC (rev 4292)
+++ magnoliamodules/trunk/openutils-mgnltasks/src/main/java/it/openutils/mgnltasks/CreateMissingPropertyTask.java 2013-09-12 16:00:44 UTC (rev 4293)
@@ -19,13 +19,13 @@
package it.openutils.mgnltasks;
-import info.magnolia.cms.core.Content;
-import info.magnolia.cms.util.ContentUtil;
-import info.magnolia.cms.util.NodeDataUtil;
+import info.magnolia.jcr.util.PropertyUtil;
import info.magnolia.module.InstallContext;
import info.magnolia.module.delta.AbstractRepositoryTask;
import info.magnolia.module.delta.TaskExecutionException;
+import it.openutils.mgnlutils.api.NodeUtilsExt;
+import javax.jcr.Node;
import javax.jcr.RepositoryException;
import javax.jcr.Session;
@@ -82,12 +82,13 @@
@Override
protected void doExecute(InstallContext ctx) throws RepositoryException, TaskExecutionException
{
- Session hm = ctx.getJCRSession(workspaceName);
+ Session session = ctx.getJCRSession(workspaceName);
- final Content node = ContentUtil.createPath(hm, nodePath, false);
- if (!node.hasNodeData(propertyName))
+ Node node = NodeUtilsExt.getNodeIfExists(session, nodePath);
+
+ if (!node.hasProperty(propertyName))
{
- NodeDataUtil.getOrCreateAndSet(node, propertyName, propertyValue);
+ PropertyUtil.setProperty(node, propertyName, propertyValue);
}
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <luc...@us...> - 2013-09-13 09:26:52
|
Revision: 4296
http://openutils.svn.sourceforge.net/openutils/?rev=4296&view=rev
Author: lucaboati
Date: 2013-09-13 09:26:48 +0000 (Fri, 13 Sep 2013)
Log Message:
-----------
fix logger class
Modified Paths:
--------------
magnoliamodules/trunk/openutils-mgnltasks/src/main/java/it/openutils/mgnltasks/BaseCheckMissingTask.java
magnoliamodules/trunk/openutils-mgnltasks/src/main/java/it/openutils/mgnltasks/BootstrapMissingNodesTask.java
Modified: magnoliamodules/trunk/openutils-mgnltasks/src/main/java/it/openutils/mgnltasks/BaseCheckMissingTask.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnltasks/src/main/java/it/openutils/mgnltasks/BaseCheckMissingTask.java 2013-09-12 20:50:49 UTC (rev 4295)
+++ magnoliamodules/trunk/openutils-mgnltasks/src/main/java/it/openutils/mgnltasks/BaseCheckMissingTask.java 2013-09-13 09:26:48 UTC (rev 4296)
@@ -58,7 +58,7 @@
private final String nodetype;
- private Logger log = LoggerFactory.getLogger(AnonymousUserSetupTask.class);
+ private Logger log = LoggerFactory.getLogger(BaseCheckMissingTask.class);
/**
* @param templateOrParagraph "template" or "paragraph"
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 20:50:49 UTC (rev 4295)
+++ magnoliamodules/trunk/openutils-mgnltasks/src/main/java/it/openutils/mgnltasks/BootstrapMissingNodesTask.java 2013-09-13 09:26:48 UTC (rev 4296)
@@ -41,7 +41,7 @@
private String folderName;
- private Logger log = LoggerFactory.getLogger(AnonymousUserSetupTask.class);
+ private Logger log = LoggerFactory.getLogger(BootstrapMissingNodesTask.class);
/**
* Bootstrap all the files included in the /mgnl-bootstrap/(folder) directory, only if the nodes are not already
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
×
Want the latest updates on software, tech news, and AI?
Get latest updates about software, tech news, and AI from SourceForge directly in your inbox once a month.
Thanks for helping keep SourceForge clean.
X