[Openutils-svn] SF.net SVN: openutils:[962] trunk/openutils-mgnlstripes

[<mol...@us...>]

Revision: 962
          http://openutils.svn.sourceforge.net/openutils/?rev=962&view=rev
Author:   molaschi
Date:     2009-01-30 15:41:52 +0000 (Fri, 30 Jan 2009)

Log Message:
-----------
port to magnolia 4.0 api

Modified Paths:
--------------
    trunk/openutils-mgnlstripes/pom.xml
    trunk/openutils-mgnlstripes/src/main/java/it/openutils/magnoliastripes/MgnlActionResolver.java
    trunk/openutils-mgnlstripes/src/main/java/it/openutils/magnoliastripes/StripesRenderer.java

Modified: trunk/openutils-mgnlstripes/pom.xml
===================================================================
--- trunk/openutils-mgnlstripes/pom.xml	2009-01-30 15:12:56 UTC (rev 961)
+++ trunk/openutils-mgnlstripes/pom.xml	2009-01-30 15:41:52 UTC (rev 962)
@@ -10,7 +10,7 @@
   <packaging>jar</packaging>
   <artifactId>openutils-mgnlstripes</artifactId>
   <name>openutils-mgnlstripes</name>
-  <version>3.6-SNAPSHOT</version>
+  <version>4.0-SNAPSHOT</version>
   <licenses>
     <license>
       <name>GPLv3</name>
@@ -50,17 +50,17 @@
     <dependency>
       <groupId>info.magnolia</groupId>
       <artifactId>magnolia-core</artifactId>
-      <version>3.6.1</version>
+      <version>4.0-rc1</version>
     </dependency>
     <dependency>
       <groupId>info.magnolia</groupId>
       <artifactId>magnolia-module-admininterface</artifactId>
-      <version>3.6.1</version>
+      <version>4.0-rc1</version>
     </dependency>
     <dependency>
       <groupId>javax.servlet</groupId>
       <artifactId>servlet-api</artifactId>
-      <version>2.4</version>
+      <version>2.5</version>
       <scope>provided</scope>
     </dependency>
     <dependency>

Modified: trunk/openutils-mgnlstripes/src/main/java/it/openutils/magnoliastripes/MgnlActionResolver.java
===================================================================
--- trunk/openutils-mgnlstripes/src/main/java/it/openutils/magnoliastripes/MgnlActionResolver.java	2009-01-30 15:12:56 UTC (rev 961)
+++ trunk/openutils-mgnlstripes/src/main/java/it/openutils/magnoliastripes/MgnlActionResolver.java	2009-01-30 15:41:52 UTC (rev 962)
@@ -17,8 +17,8 @@
  */
 package it.openutils.magnoliastripes;
 
-import info.magnolia.cms.beans.config.Paragraph;
-import info.magnolia.cms.beans.config.ParagraphManager;
+import info.magnolia.module.templating.Paragraph;
+import info.magnolia.module.templating.ParagraphManager;
 
 import java.util.HashSet;
 import java.util.Set;
@@ -32,8 +32,8 @@
 
 
 /**
- * ActionResolver that extends <code>NameBasedActionResolver</code>, registering any found Stripe action as a
- * Magnolia paragraph.
+ * ActionResolver that extends <code>NameBasedActionResolver</code>, registering any found Stripe action as a Magnolia
+ * paragraph.
  * @author fgiust
  * @version $Id: $
  */

Modified: trunk/openutils-mgnlstripes/src/main/java/it/openutils/magnoliastripes/StripesRenderer.java
===================================================================
--- trunk/openutils-mgnlstripes/src/main/java/it/openutils/magnoliastripes/StripesRenderer.java	2009-01-30 15:12:56 UTC (rev 961)
+++ trunk/openutils-mgnlstripes/src/main/java/it/openutils/magnoliastripes/StripesRenderer.java	2009-01-30 15:41:52 UTC (rev 962)
@@ -17,14 +17,15 @@
  */
 package it.openutils.magnoliastripes;
 
-import info.magnolia.cms.beans.config.Paragraph;
-import info.magnolia.cms.beans.config.Template;
-import info.magnolia.cms.beans.runtime.ParagraphRenderer;
-import info.magnolia.cms.beans.runtime.TemplateRenderer;
 import info.magnolia.cms.core.Content;
 import info.magnolia.cms.core.NodeData;
 import info.magnolia.context.MgnlContext;
 import info.magnolia.context.WebContext;
+import info.magnolia.module.templating.Paragraph;
+import info.magnolia.module.templating.ParagraphRenderer;
+import info.magnolia.module.templating.RenderException;
+import info.magnolia.module.templating.Template;
+import info.magnolia.module.templating.TemplateRenderer;
 
 import java.io.IOException;
 import java.io.Writer;
@@ -90,10 +91,23 @@
     public void renderTemplate(Template template, HttpServletRequest request, HttpServletResponse response)
         throws IOException, ServletException
     {
-        final String templatePath = template.getPath();
+        try
+        {
+            renderTemplate(MgnlContext.getAggregationState().getCurrentContent(), template, response.getWriter());
+        }
+        catch (RenderException e)
+        {
+            throw new ServletException(e);
+        }
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public void renderTemplate(Content content, Template template, Writer out) throws RenderException, IOException
+    {
         Map<String, String[]> nodeDataMap = contentToMap(MgnlContext.getAggregationState().getCurrentContent());
-
-        renderCommon(templatePath, nodeDataMap, response.getWriter());
+        renderCommon(template.getTemplatePath(), nodeDataMap, out);
     }
 
     /**


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