openutils-svn Mailing List for openutils (Page 216)

SourceForge Headquarters 225 Broadway Suite 1600 San Diego, CA 92101 +1 (858) 422-6466

Revision: 395
          http://openutils.svn.sourceforge.net/openutils/?rev=395&view=rev
Author:   fgiust
Date:     2007-08-13 02:12:49 -0700 (Mon, 13 Aug 2007)

Log Message:
-----------
update to magnolia 3.1-m1

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/StripesModule.java
    trunk/openutils-mgnlstripes/src/main/resources/META-INF/magnolia/stripes.xml

Added Paths:
-----------
    trunk/openutils-mgnlstripes/src/main/java/it/openutils/magnoliastripes/setup/
    trunk/openutils-mgnlstripes/src/main/java/it/openutils/magnoliastripes/setup/AddMimeMappingTask.java
    trunk/openutils-mgnlstripes/src/main/java/it/openutils/magnoliastripes/setup/StripesModuleVersionHandler.java

Removed Paths:
-------------
    trunk/openutils-mgnlstripes/src/main/resources/mgnl-bootstrap/stripes/config.server.MIMEMapping.action.xml

Property Changed:
----------------
    trunk/openutils-mgnlstripes/


Property changes on: trunk/openutils-mgnlstripes
___________________________________________________________________
Name: svn:ignore
   - .checkstyle

   + target
.settings
.checkstyle
.classpath
.project


Modified: trunk/openutils-mgnlstripes/pom.xml
===================================================================

--- trunk/openutils-mgnlstripes/pom.xml	2007-08-10 07:01:44 UTC (rev 394)
+++ trunk/openutils-mgnlstripes/pom.xml	2007-08-13 09:12:49 UTC (rev 395)
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
   <parent>
     <groupId>net.sourceforge.openutils</groupId>
     <artifactId>openutils</artifactId>
@@ -11,12 +12,24 @@
   <artifactId>openutils-mgnlstripes</artifactId>
   <name>openutils-mgnlstripes</name>
   <version>0.1-SNAPSHOT</version>
-  <licenses>
-    <license>
-      <name>GPL v3</name>
-      <url>http://www.gnu.org/licenses/gpl-3.0.txt</url>
-    </license>
-  </licenses>
+  <build>
+    <resources>
+      <resource>
+        <filtering>false</filtering>
+        <directory>src/main/resources</directory>
+        <includes>
+          <include>**/*</include>
+        </includes>
+      </resource>
+      <resource>
+        <filtering>true</filtering>
+        <directory>src/main/resources</directory>
+        <includes>
+          <include>META-INF/magnolia/*</include>
+        </includes>
+      </resource>
+    </resources>
+  </build>
   <dependencies>
     <dependency>
       <groupId>net.sourceforge.stripes</groupId>
@@ -26,12 +39,12 @@
     <dependency>
       <groupId>info.magnolia</groupId>
       <artifactId>magnolia-core</artifactId>
-      <version>3.1-SNAPSHOT</version>
+      <version>3.1-m3</version>
     </dependency>
     <dependency>
       <groupId>info.magnolia</groupId>
       <artifactId>magnolia-module-admininterface</artifactId>
-      <version>3.1-SNAPSHOT</version>
+      <version>3.1-m3</version>
     </dependency>
     <dependency>
       <groupId>javax.servlet</groupId>

Modified: trunk/openutils-mgnlstripes/src/main/java/it/openutils/magnoliastripes/MgnlActionResolver.java
===================================================================
--- trunk/openutils-mgnlstripes/src/main/java/it/openutils/magnoliastripes/MgnlActionResolver.java	2007-08-10 07:01:44 UTC (rev 394)
+++ trunk/openutils-mgnlstripes/src/main/java/it/openutils/magnoliastripes/MgnlActionResolver.java	2007-08-13 09:12:49 UTC (rev 395)
@@ -35,26 +35,40 @@
         // Only process the class if it's properly annotated
         if (binding != null)
         {
-            registerSpringParagraph(binding);
+            String dialogName = actionNameToParagraphName(binding);
+            registerSpringParagraph(dialogName, binding);
             super.addActionBean(clazz);
         }
     }
 
     /**
+     * Generate a paragraph name from a Stripes binding. This method will take the last token after "/", strip any
+     * extension and convert everything to lowercase.
+     * @param binding Stripe action binding
+     * @return paragraph name
+     */
+    protected String actionNameToParagraphName(String binding)
+    {
+        String dialogName = StringUtils.lowerCase(StringUtils.substringBeforeLast(StringUtils.substringAfterLast(
+            binding,
+            "/"), "."));
+        return dialogName;
+    }
+
+    /**
      * Registers a Magnolia paragraph which will delegate to a Stripe action.
+     * @param name dialog name
      * @param binding Stripes action binding
      */
     @SuppressWarnings("unchecked")
-    private void registerSpringParagraph(String binding)
+    private void registerSpringParagraph(String name, String binding)
     {
         Paragraph paragraph = new Paragraph();
 
-        String dialogName = actionNameToParagraphName(binding);
-
-        paragraph.setName(dialogName);
-        paragraph.setTitle("paragraph." + dialogName + ".title");
-        paragraph.setDescription("paragraph." + dialogName + ".description");
-        paragraph.setDialog(dialogName);
+        paragraph.setName(name);
+        paragraph.setTitle("paragraph." + name + ".title");
+        paragraph.setDescription("paragraph." + name + ".description");
+        paragraph.setDialog(name);
         paragraph.setTemplatePath(binding);
         paragraph.setType("stripes");
 
@@ -62,18 +76,4 @@
         ParagraphManager.getInstance().getParagraphs().put(paragraph.getName(), paragraph);
     }
 
-    /**
-     * Generate a paragraph name from a Stripes binding. This method will take the last token after "/", strip any
-     * extension and convert everything to lowercase.
-     * @param binding Stripe action binding
-     * @return paragraph name
-     */
-    protected String actionNameToParagraphName(String binding)
-    {
-        String dialogName = StringUtils.lowerCase(StringUtils.substringBeforeLast(StringUtils.substringAfterLast(
-            binding,
-            "/"), "."));
-        return dialogName;
-    }
-
 }

Modified: trunk/openutils-mgnlstripes/src/main/java/it/openutils/magnoliastripes/StripesModule.java
===================================================================
--- trunk/openutils-mgnlstripes/src/main/java/it/openutils/magnoliastripes/StripesModule.java	2007-08-10 07:01:44 UTC (rev 394)
+++ trunk/openutils-mgnlstripes/src/main/java/it/openutils/magnoliastripes/StripesModule.java	2007-08-13 09:12:49 UTC (rev 395)
@@ -1,31 +1,24 @@
 package it.openutils.magnoliastripes;
 
-import info.magnolia.cms.module.RegisterException;
-import info.magnolia.module.admininterface.AbstractAdminModule;
+import info.magnolia.module.ModuleLifecycle;
+import info.magnolia.module.ModuleLifecycleContext;
 
 
 /**
- * Stripes module. Extends AbstractAdminModule which will take care of registering the Stripes paragraph renderer.
+ * Stripes module.
  * @author fgiust
  * @version $Id: $
  */
-public class StripesModule extends AbstractAdminModule
+public class StripesModule implements ModuleLifecycle
 {
 
     /**
      * {@inheritDoc}
      */
     @Override
-    public void onInit()
+    public void start(ModuleLifecycleContext moduleLifecycleContext)
     {
+        // anything to do?
     }
 
-    /**
-     * {@inheritDoc}
-     */
-    @Override
-    protected void onRegister(int registerState) throws RegisterException
-    {
-        // nothing to do
-    }
 }
\ No newline at end of file

Added: trunk/openutils-mgnlstripes/src/main/java/it/openutils/magnoliastripes/setup/AddMimeMappingTask.java
===================================================================
--- trunk/openutils-mgnlstripes/src/main/java/it/openutils/magnoliastripes/setup/AddMimeMappingTask.java	                        (rev 0)
+++ trunk/openutils-mgnlstripes/src/main/java/it/openutils/magnoliastripes/setup/AddMimeMappingTask.java	2007-08-13 09:12:49 UTC (rev 395)
@@ -0,0 +1,67 @@
+package it.openutils.magnoliastripes.setup;
+
+import info.magnolia.cms.beans.config.ContentRepository;
+import info.magnolia.cms.core.Content;
+import info.magnolia.cms.core.HierarchyManager;
+import info.magnolia.cms.core.ItemType;
+import info.magnolia.module.InstallContext;
+import info.magnolia.module.delta.AbstractRepositoryTask;
+import info.magnolia.module.delta.TaskExecutionException;
+
+import javax.jcr.RepositoryException;
+
+
+/**
+ * Task that adds a mime mapping to <code>server/MIMIMapping</code>.
+ * @author fgiust
+ * @version $Revision: $ ($Author: $)
+ */
+public class AddMimeMappingTask extends AbstractRepositoryTask
+{
+
+    /**
+     * Extension (without the <code>.</code>)
+     */
+    private String extension;
+
+    /**
+     * mime type.
+     */
+    private String mime;
+
+    /**
+     * Icon path.
+     */
+    private String icon;
+
+    /**
+     * @param extension Extension (without the <code>.</code>)
+     * @param mime mime type.
+     * @param icon Icon path.
+     */
+    public AddMimeMappingTask(String extension, String mime, String icon)
+    {
+        super("Add mime mapping task", "Adds a MIME mapping for the " + extension + " extension");
+        this.extension = extension;
+        this.mime = mime;
+        this.icon = icon;
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    protected void doExecute(InstallContext ctx) throws RepositoryException, TaskExecutionException
+    {
+        HierarchyManager hm = ctx.getHierarchyManager(ContentRepository.CONFIG);
+        Content mimeNode = hm.getContent("/server/MIMEMapping");
+
+        if (!mimeNode.hasContent(extension))
+        {
+            Content m = mimeNode.createContent(extension, ItemType.CONTENTNODE);
+            m.createNodeData("mime-type").setValue(mime);
+            m.createNodeData("icon").setValue(icon);
+        }
+    }
+
+}

Added: trunk/openutils-mgnlstripes/src/main/java/it/openutils/magnoliastripes/setup/StripesModuleVersionHandler.java
===================================================================
--- trunk/openutils-mgnlstripes/src/main/java/it/openutils/magnoliastripes/setup/StripesModuleVersionHandler.java	                        (rev 0)
+++ trunk/openutils-mgnlstripes/src/main/java/it/openutils/magnoliastripes/setup/StripesModuleVersionHandler.java	2007-08-13 09:12:49 UTC (rev 395)
@@ -0,0 +1,30 @@
+package it.openutils.magnoliastripes.setup;
+
+import info.magnolia.module.DefaultModuleVersionHandler;
+import info.magnolia.module.InstallContext;
+import info.magnolia.module.delta.Task;
+
+import java.util.List;
+
+
+/**
+ * @author fgiust
+ * @version $Id: $
+ */
+public class StripesModuleVersionHandler extends DefaultModuleVersionHandler
+{
+
+    /**
+     * {@inheritDoc}
+     */
+    @SuppressWarnings("unchecked")
+    @Override
+    protected List<Task> getBasicInstallTasks(InstallContext installContext)
+    {
+        List<Task> installTasks = super.getBasicInstallTasks(installContext);
+
+        installTasks.add(new AddMimeMappingTask("action", "text/plain", "/.resources/file-icons/htm.png"));
+
+        return installTasks;
+    }
+}

Modified: trunk/openutils-mgnlstripes/src/main/resources/META-INF/magnolia/stripes.xml
===================================================================
--- trunk/openutils-mgnlstripes/src/main/resources/META-INF/magnolia/stripes.xml	2007-08-10 07:01:44 UTC (rev 394)
+++ trunk/openutils-mgnlstripes/src/main/resources/META-INF/magnolia/stripes.xml	2007-08-13 09:12:49 UTC (rev 395)
@@ -4,6 +4,6 @@
   <name>stripes</name>
   <displayName>stripes</displayName>
   <description>Stripes integration module</description>
-  <class>it.openutils.magnoliastripes.StripesModule</class>
-  <version>0.1</version>
+  <versionHandler>it.openutils.magnoliastripes.setup.StripesModuleVersionHandler</versionHandler>
+  <version>${project.version}</version>
 </module>

Deleted: trunk/openutils-mgnlstripes/src/main/resources/mgnl-bootstrap/stripes/config.server.MIMEMapping.action.xml
===================================================================
--- trunk/openutils-mgnlstripes/src/main/resources/mgnl-bootstrap/stripes/config.server.MIMEMapping.action.xml	2007-08-10 07:01:44 UTC (rev 394)
+++ trunk/openutils-mgnlstripes/src/main/resources/mgnl-bootstrap/stripes/config.server.MIMEMapping.action.xml	2007-08-13 09:12:49 UTC (rev 395)
@@ -1,50 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<sv:node sv:name="action" xmlns:jcr="http://www.jcp.org/jcr/1.0" xmlns:mgnl="http://www.magnolia.info/jcr/mgnl"
-  xmlns:rep="internal" xmlns:mix="http://www.jcp.org/jcr/mix/1.0" xmlns:nt="http://www.jcp.org/jcr/nt/1.0"
-  xmlns:fn="http://www.w3.org/2005/xpath-functions" xmlns:xs="http://www.w3.org/2001/XMLSchema"
-  xmlns:fn_old="http://www.w3.org/2004/10/xpath-functions" xmlns:sv="http://www.jcp.org/jcr/sv/1.0" xmlns:jcrfn="http://www.jcp.org/jcr/xpath-functions/1.0">
-  <sv:property sv:name="jcr:primaryType" sv:type="Name">
-    <sv:value>mgnl:contentNode</sv:value>
-  </sv:property>
-  <sv:property sv:name="jcr:mixinTypes" sv:type="Name">
-    <sv:value>mix:versionable</sv:value>
-  </sv:property>
-  <sv:property sv:name="jcr:uuid" sv:type="String">
-    <sv:value>c0a3cfb0-2f94-4924-8da2-0f152c825891</sv:value>
-  </sv:property>
-  <sv:property sv:name="icon" sv:type="String">
-    <sv:value>/.resources/file-icons/htm.png</sv:value>
-  </sv:property>
-  <sv:property sv:name="mime-type" sv:type="String">
-    <sv:value>text/html</sv:value>
-  </sv:property>
-  <sv:node sv:name="MetaData">
-    <sv:property sv:name="jcr:primaryType" sv:type="Name">
-      <sv:value>mgnl:metaData</sv:value>
-    </sv:property>
-    <sv:property sv:name="jcr:uuid" sv:type="String">
-      <sv:value>11cf3c7b-3a09-4983-8761-867a1a8cdd14</sv:value>
-    </sv:property>
-    <sv:property sv:name="mgnl:authorid" sv:type="String">
-      <sv:value>superuser</sv:value>
-    </sv:property>
-    <sv:property sv:name="mgnl:lastaction" sv:type="Date">
-      <sv:value>2007-07-29T20:52:47.861+01:00</sv:value>
-    </sv:property>
-    <sv:property sv:name="mgnl:creationdate" sv:type="String">
-      <sv:value>2004-11-02T15:34:17.212+01:00</sv:value>
-    </sv:property>
-    <sv:property sv:name="mgnl:lastmodified" sv:type="Date">
-      <sv:value>2007-07-29T20:52:47.928+01:00</sv:value>
-    </sv:property>
-    <sv:property sv:name="mgnl:activatorid" sv:type="String">
-      <sv:value>superuser</sv:value>
-    </sv:property>
-    <sv:property sv:name="mgnl:Data" sv:type="String">
-      <sv:value>MetaData</sv:value>
-    </sv:property>
-    <sv:property sv:name="mgnl:activated" sv:type="Boolean">
-      <sv:value>false</sv:value>
-    </sv:property>
-  </sv:node>
-</sv:node>


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




2006	Jan	Feb	Mar	Apr	May	Jun	Jul	Aug	Sep	Oct (4)	Nov (39)	Dec (10)
2007	Jan (19)	Feb (150)	Mar (10)	Apr	May (8)	Jun (11)	Jul (27)	Aug (52)	Sep (35)	Oct (30)	Nov (18)	Dec (4)
2008	Jan (76)	Feb (121)	Mar (39)	Apr (55)	May (18)	Jun (49)	Jul (32)	Aug (4)	Sep (10)	Oct	Nov (3)	Dec (33)
2009	Jan (19)	Feb (87)	Mar (69)	Apr (38)	May (47)	Jun (20)	Jul (5)	Aug (76)	Sep (145)	Oct (34)	Nov (8)	Dec (68)
2010	Jan (150)	Feb (379)	Mar (191)	Apr (100)	May (525)	Jun (269)	Jul (127)	Aug (190)	Sep (190)	Oct (29)	Nov (147)	Dec (83)
2011	Jan (188)	Feb (81)	Mar (43)	Apr (97)	May (63)	Jun (129)	Jul (17)	Aug (124)	Sep (6)	Oct (20)	Nov (67)	Dec (23)
2012	Jan (6)	Feb (14)	Mar (181)	Apr (64)	May (102)	Jun (47)	Jul (26)	Aug (3)	Sep (1)	Oct (14)	Nov (13)	Dec (23)
2013	Jan (4)	Feb (14)	Mar (18)	Apr (14)	May (27)	Jun (27)	Jul (5)	Aug (2)	Sep (74)	Oct (79)	Nov (21)	Dec (97)
2014	Jan (6)	Feb (3)	Mar (8)	Apr	May (5)	Jun	Jul (9)	Aug (6)	Sep (3)	Oct (10)	Nov (6)	Dec
2015	Jan	Feb	Mar (1)	Apr (25)	May	Jun	Jul	Aug	Sep	Oct	Nov	Dec
2016	Jan	Feb	Mar	Apr (5)	May	Jun	Jul	Aug	Sep	Oct	Nov	Dec

openutils-svn Mailing List for openutils (Page 216)

openutils-svn — developer list with svn commits