[Openutils-svn] SF.net SVN: openutils:[1036] trunk/openutils-mgnlstruts11

[<fg...@us...>]

Revision: 1036
          http://openutils.svn.sourceforge.net/openutils/?rev=1036&view=rev
Author:   fgiust
Date:     2009-02-19 12:22:53 +0000 (Thu, 19 Feb 2009)

Log Message:
-----------
updated to magnolia 4.0-rc3

Modified Paths:
--------------
    trunk/openutils-mgnlstruts11/pom.xml
    trunk/openutils-mgnlstruts11/src/main/java/it/openutils/mgnlstruts11/pages/StrutsConfigurationPage.java
    trunk/openutils-mgnlstruts11/src/main/java/it/openutils/mgnlstruts11/render/StrutsParagraph.java
    trunk/openutils-mgnlstruts11/src/main/java/it/openutils/mgnlstruts11/render/StrutsParagraphRegister.java
    trunk/openutils-mgnlstruts11/src/main/java/it/openutils/mgnlstruts11/render/StrutsRenderer.java
    trunk/openutils-mgnlstruts11/src/main/resources/META-INF/magnolia/struts11.xml

Modified: trunk/openutils-mgnlstruts11/pom.xml
===================================================================
--- trunk/openutils-mgnlstruts11/pom.xml	2009-02-19 12:10:36 UTC (rev 1035)
+++ trunk/openutils-mgnlstruts11/pom.xml	2009-02-19 12:22:53 UTC (rev 1036)
@@ -10,7 +10,7 @@
   <artifactId>openutils-mgnlstruts11</artifactId>
   <packaging>jar</packaging>
   <name>openutils-mgnlstruts11</name>
-  <version>1.0-SNAPSHOT</version>
+  <version>4.0-SNAPSHOT</version>
   <licenses>
     <license>
       <name>GPLv3</name>
@@ -39,12 +39,12 @@
     <dependency>
       <groupId>info.magnolia</groupId>
       <artifactId>magnolia-core</artifactId>
-      <version>3.6.3</version>
+      <version>4.0-rc3</version>
     </dependency>
     <dependency>
       <groupId>info.magnolia</groupId>
       <artifactId>magnolia-module-admininterface</artifactId>
-      <version>3.6.3</version>
+      <version>4.0-rc3</version>
     </dependency>
     <dependency>
       <groupId>javax.servlet</groupId>

Modified: trunk/openutils-mgnlstruts11/src/main/java/it/openutils/mgnlstruts11/pages/StrutsConfigurationPage.java
===================================================================
--- trunk/openutils-mgnlstruts11/src/main/java/it/openutils/mgnlstruts11/pages/StrutsConfigurationPage.java	2009-02-19 12:10:36 UTC (rev 1035)
+++ trunk/openutils-mgnlstruts11/src/main/java/it/openutils/mgnlstruts11/pages/StrutsConfigurationPage.java	2009-02-19 12:22:53 UTC (rev 1036)
@@ -17,13 +17,13 @@
  */
 package it.openutils.mgnlstruts11.pages;
 
-import info.magnolia.cms.beans.config.ParagraphManager;
 import info.magnolia.cms.i18n.Messages;
-import info.magnolia.cms.i18n.TemplateMessagesUtil;
+import info.magnolia.cms.i18n.MessagesUtil;
 import info.magnolia.module.admininterface.DialogHandlerManager;
 import info.magnolia.module.admininterface.DialogMVCHandler;
 import info.magnolia.module.admininterface.InvalidDialogHandlerException;
 import info.magnolia.module.admininterface.TemplatedMVCHandler;
+import info.magnolia.module.templating.ParagraphManager;
 import it.openutils.mgnlstruts11.render.StrutsParagraph;
 import it.openutils.mgnlstruts11.render.StrutsParagraphRegister;
 
@@ -61,7 +61,10 @@
 
     public Messages getMessages()
     {
-        return TemplateMessagesUtil.getMessages();
+        // @todo review
+        return MessagesUtil.chain(new String[]{
+            "info.magnolia.module.admininterface.messages_templating_custom",
+            "info.magnolia.module.admininterface.messages_templating" });
     }
 
     public ParagraphManager getParagraphManager()

Modified: trunk/openutils-mgnlstruts11/src/main/java/it/openutils/mgnlstruts11/render/StrutsParagraph.java
===================================================================
--- trunk/openutils-mgnlstruts11/src/main/java/it/openutils/mgnlstruts11/render/StrutsParagraph.java	2009-02-19 12:10:36 UTC (rev 1035)
+++ trunk/openutils-mgnlstruts11/src/main/java/it/openutils/mgnlstruts11/render/StrutsParagraph.java	2009-02-19 12:22:53 UTC (rev 1036)
@@ -17,7 +17,7 @@
  */
 package it.openutils.mgnlstruts11.render;
 
-import info.magnolia.cms.beans.config.Paragraph;
+import info.magnolia.module.templating.Paragraph;
 
 
 /**

Modified: trunk/openutils-mgnlstruts11/src/main/java/it/openutils/mgnlstruts11/render/StrutsParagraphRegister.java
===================================================================
--- trunk/openutils-mgnlstruts11/src/main/java/it/openutils/mgnlstruts11/render/StrutsParagraphRegister.java	2009-02-19 12:10:36 UTC (rev 1035)
+++ trunk/openutils-mgnlstruts11/src/main/java/it/openutils/mgnlstruts11/render/StrutsParagraphRegister.java	2009-02-19 12:22:53 UTC (rev 1036)
@@ -17,8 +17,8 @@
  */
 package it.openutils.mgnlstruts11.render;
 
-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.LinkedHashSet;
 import java.util.Set;

Modified: trunk/openutils-mgnlstruts11/src/main/java/it/openutils/mgnlstruts11/render/StrutsRenderer.java
===================================================================
--- trunk/openutils-mgnlstruts11/src/main/java/it/openutils/mgnlstruts11/render/StrutsRenderer.java	2009-02-19 12:10:36 UTC (rev 1035)
+++ trunk/openutils-mgnlstruts11/src/main/java/it/openutils/mgnlstruts11/render/StrutsRenderer.java	2009-02-19 12:22:53 UTC (rev 1036)
@@ -17,12 +17,11 @@
  */
 package it.openutils.mgnlstruts11.render;
 
-import info.magnolia.cms.beans.config.Paragraph;
-import info.magnolia.cms.beans.runtime.ParagraphRenderer;
 import info.magnolia.cms.core.Content;
-import info.magnolia.cms.util.RequestFormUtil;
 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.voting.voters.DontDispatchOnForwardAttributeVoter;
 import it.openutils.mgnlstruts11.process.MgnlMultipartRequestHandler;
 import it.openutils.mgnlstruts11.process.MgnlRequestProcessor;
@@ -76,7 +75,7 @@
         request.setAttribute(MgnlStrutsUtils.ATTRIBUTE_ORIGINALURI, wc.getContextPath()
             + wc.getAggregationState().getOriginalURI());
 
-        String actionParameter = RequestFormUtil.getParameter(request, MgnlStrutsUtils.PARAMETER_MGNLACTION);
+        String actionParameter = MgnlContext.getParameter(MgnlStrutsUtils.PARAMETER_MGNLACTION);
 
         // TODO da verificare
         String urifornavigation = actionParameter;

Modified: trunk/openutils-mgnlstruts11/src/main/resources/META-INF/magnolia/struts11.xml
===================================================================
--- trunk/openutils-mgnlstruts11/src/main/resources/META-INF/magnolia/struts11.xml	2009-02-19 12:10:36 UTC (rev 1035)
+++ trunk/openutils-mgnlstruts11/src/main/resources/META-INF/magnolia/struts11.xml	2009-02-19 12:22:53 UTC (rev 1036)
@@ -9,15 +9,11 @@
   <dependencies>
     <dependency>
       <name>adminInterface</name>
-      <version>3.6/*</version>
+      <version>4.0/*</version>
     </dependency>
     <dependency>
       <name>templating</name>
-      <version>3.6/*</version>
+      <version>4.0/*</version>
     </dependency>
-    <dependency>
-      <name>cache</name>
-      <version>3.6/*</version>
-    </dependency>
   </dependencies>
 </module>
\ No newline at end of file


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