openutils-svn

[Openutils-svn] SF.net SVN: openutils:[3799] magnoliamodules/trunk/openutils-mgnlmail/src/ main/java/net/sourceforge/openutils/mgnlmail/EmailFromPage.java

[<die...@us...>]

Revision: 3799
          http://openutils.svn.sourceforge.net/openutils/?rev=3799&view=rev
Author:   diego_schivo
Date:     2012-03-15 10:21:48 +0000 (Thu, 15 Mar 2012)
Log Message:
-----------
openutils-mgnlmail: EmailFromPage

Modified Paths:
--------------
    magnoliamodules/trunk/openutils-mgnlmail/src/main/java/net/sourceforge/openutils/mgnlmail/EmailFromPage.java

Modified: magnoliamodules/trunk/openutils-mgnlmail/src/main/java/net/sourceforge/openutils/mgnlmail/EmailFromPage.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlmail/src/main/java/net/sourceforge/openutils/mgnlmail/EmailFromPage.java	2012-03-15 10:04:44 UTC (rev 3798)
+++ magnoliamodules/trunk/openutils-mgnlmail/src/main/java/net/sourceforge/openutils/mgnlmail/EmailFromPage.java	2012-03-15 10:21:48 UTC (rev 3799)
@@ -20,15 +20,19 @@
 package net.sourceforge.openutils.mgnlmail;
 
 import freemarker.template.Template;
-import info.magnolia.cms.core.Content;
 import info.magnolia.context.MgnlContext;
 import info.magnolia.module.mail.MailTemplate;
 import info.magnolia.module.mail.templates.impl.FreemarkerEmail;
+import info.magnolia.objectfactory.Components;
+import info.magnolia.rendering.engine.AppendableOnlyOutputProvider;
+import info.magnolia.rendering.engine.RenderingEngine;
 
 import java.io.StringWriter;
 import java.io.Writer;
 import java.util.Map;
 
+import javax.jcr.Node;
+
 import org.apache.commons.lang.StringUtils;
 
 
@@ -52,8 +56,8 @@
 
         final String pageUrl = this.getTemplate().getTemplateFile();
 
-        Content mailNode = MgnlContext.getHierarchyManager("email").getContent(pageUrl);
-        MagnoliaTemplatingUtilities.getInstance().renderTemplate(mailNode, writer);
+        Node mailNode = MgnlContext.getJCRSession("email").getNode(pageUrl);
+        Components.getSingleton(RenderingEngine.class).render(mailNode, new AppendableOnlyOutputProvider(writer));
 
         String pageContent = writer.toString();
 

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Openutils-svn] SF.net SVN: openutils:[3801] magnoliamodules/trunk/openutils-mgnlmail/src/ main/java/net/sourceforge/openutils/mgnlmail/EmailFromPage.java

[<die...@us...>]

Revision: 3801
          http://openutils.svn.sourceforge.net/openutils/?rev=3801&view=rev
Author:   diego_schivo
Date:     2012-03-15 10:32:49 +0000 (Thu, 15 Mar 2012)
Log Message:
-----------
EmailFromPage.java: revert

Modified Paths:
--------------
    magnoliamodules/trunk/openutils-mgnlmail/src/main/java/net/sourceforge/openutils/mgnlmail/EmailFromPage.java

Modified: magnoliamodules/trunk/openutils-mgnlmail/src/main/java/net/sourceforge/openutils/mgnlmail/EmailFromPage.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlmail/src/main/java/net/sourceforge/openutils/mgnlmail/EmailFromPage.java	2012-03-15 10:32:22 UTC (rev 3800)
+++ magnoliamodules/trunk/openutils-mgnlmail/src/main/java/net/sourceforge/openutils/mgnlmail/EmailFromPage.java	2012-03-15 10:32:49 UTC (rev 3801)
@@ -20,19 +20,16 @@
 package net.sourceforge.openutils.mgnlmail;
 
 import freemarker.template.Template;
+import info.magnolia.cms.core.Content;
 import info.magnolia.context.MgnlContext;
 import info.magnolia.module.mail.MailTemplate;
 import info.magnolia.module.mail.templates.impl.FreemarkerEmail;
-import info.magnolia.objectfactory.Components;
-import info.magnolia.rendering.engine.AppendableOnlyOutputProvider;
-import info.magnolia.rendering.engine.RenderingEngine;
+import info.magnolia.module.templating.MagnoliaTemplatingUtilities;
 
 import java.io.StringWriter;
 import java.io.Writer;
 import java.util.Map;
 
-import javax.jcr.Node;
-
 import org.apache.commons.lang.StringUtils;
 
 
@@ -56,8 +53,8 @@
 
         final String pageUrl = this.getTemplate().getTemplateFile();
 
-        Node mailNode = MgnlContext.getJCRSession("email").getNode(pageUrl);
-        Components.getSingleton(RenderingEngine.class).render(mailNode, new AppendableOnlyOutputProvider(writer));
+        Content mailNode = MgnlContext.getHierarchyManager("email").getContent(pageUrl);
+        MagnoliaTemplatingUtilities.getInstance().renderTemplate(mailNode, writer);
 
         String pageContent = writer.toString();
 

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.