Menu
▾
▴
[Openutils-svn] SF.net SVN: openutils:[3593] trunk/openutils-mgnlstripes/src/main
|
From: <fg...@us...> - 2011-08-08 10:59:33
|
Revision: 3593
http://openutils.svn.sourceforge.net/openutils/?rev=3593&view=rev
Author: fgiust
Date: 2011-08-08 10:59:27 +0000 (Mon, 08 Aug 2011)
Log Message:
-----------
MGNLSTRIPES-9 Template renderer configuration not applied on first install.
Modified Paths:
--------------
trunk/openutils-mgnlstripes/src/main/java/it/openutils/magnoliastripes/setup/StripesModuleVersionHandler.java
trunk/openutils-mgnlstripes/src/main/resources/mgnl-bootstrap/stripes/config.modules.stripes.paragraph-renderers.stripes.xml
trunk/openutils-mgnlstripes/src/main/resources/mgnl-bootstrap/stripes/config.modules.stripes.template-renderers.stripes.xml
Modified: trunk/openutils-mgnlstripes/src/main/java/it/openutils/magnoliastripes/setup/StripesModuleVersionHandler.java
===================================================================
--- trunk/openutils-mgnlstripes/src/main/java/it/openutils/magnoliastripes/setup/StripesModuleVersionHandler.java 2011-08-08 10:54:52 UTC (rev 3592)
+++ trunk/openutils-mgnlstripes/src/main/java/it/openutils/magnoliastripes/setup/StripesModuleVersionHandler.java 2011-08-08 10:59:27 UTC (rev 3593)
@@ -20,23 +20,16 @@
package it.openutils.magnoliastripes.setup;
import info.magnolia.cms.beans.config.ContentRepository;
-import info.magnolia.cms.core.Content;
-import info.magnolia.cms.core.ItemType;
import info.magnolia.module.DefaultModuleVersionHandler;
import info.magnolia.module.InstallContext;
import info.magnolia.module.delta.AddMimeMappingTask;
import info.magnolia.module.delta.FilterOrderingTask;
-import info.magnolia.module.delta.MoveAndRenamePropertyTask;
-import info.magnolia.module.delta.PropertyExistsDelegateTask;
import info.magnolia.module.delta.Task;
-import info.magnolia.module.model.Version;
import it.openutils.mgnltasks.CreateMissingPropertyTask;
import java.util.List;
-import javax.jcr.RepositoryException;
-
/**
* @author fgiust
* @version $Id: $
@@ -66,53 +59,6 @@
"stripes",
new String[]{"context", "login", "uriSecurity", "multipartRequest" }));
- // Didn't find a better way to get the current magnolia version...
- Content coreModule;
- try
- {
- coreModule = installContext
- .getConfigHierarchyManager()
- .getContent("/modules/core", false, ItemType.CONTENT);
- if ((coreModule != null) && (coreModule.hasNodeData("version")))
- {
- Version coreVersion = Version.parseVersion(coreModule.getNodeData("version").getString());
- // Any version from 4.4.0 onward need this patch.
- if (coreVersion.isStrictlyAfter(Version.parseVersion(4, 3, 99)))
- {
- tasks.add(new PropertyExistsDelegateTask(
- "Checking stripes renderer status",
- "Checking stripes module template renderers status",
- ContentRepository.CONFIG,
- "/modules/stripes/template-renderers/stripes",
- "class",
- new MoveAndRenamePropertyTask(
- "Moving strieps renderer \"class\" to \"renderer\"",
- "/modules/stripes/template-renderers/stripes",
- "class",
- "/modules/stripes/template-renderers/stripes",
- "renderer")));
- tasks.add(new PropertyExistsDelegateTask(
- "Checking stripes renderer status",
- "Checking stripes module template renderers status",
- ContentRepository.CONFIG,
- "/modules/stripes/template-renderers/stripes",
- "name",
- new MoveAndRenamePropertyTask(
- "Moving strieps renderer \"name\" to \"type\"",
- "/modules/stripes/template-renderers/stripes",
- "name",
- "/modules/stripes/template-renderers/stripes",
- "type")));
- }
-
- }
- }
- catch (RepositoryException e)
- {
-
- log.error("Unable to check the current magnolia version: {}", e.getMessage());
- }
-
return tasks;
}
}
Modified: trunk/openutils-mgnlstripes/src/main/resources/mgnl-bootstrap/stripes/config.modules.stripes.paragraph-renderers.stripes.xml
===================================================================
--- trunk/openutils-mgnlstripes/src/main/resources/mgnl-bootstrap/stripes/config.modules.stripes.paragraph-renderers.stripes.xml 2011-08-08 10:54:52 UTC (rev 3592)
+++ trunk/openutils-mgnlstripes/src/main/resources/mgnl-bootstrap/stripes/config.modules.stripes.paragraph-renderers.stripes.xml 2011-08-08 10:59:27 UTC (rev 3593)
@@ -9,13 +9,25 @@
<sv:property sv:name="class" sv:type="String">
<sv:value>it.openutils.magnoliastripes.StripesRenderer</sv:value>
</sv:property>
+ <sv:property sv:name="jcr:createdBy" sv:type="String">
+ <sv:value>admin</sv:value>
+ </sv:property>
<sv:property sv:name="name" sv:type="String">
<sv:value>stripes</sv:value>
</sv:property>
+ <sv:property sv:name="renderer" sv:type="String">
+ <sv:value>it.openutils.magnoliastripes.StripesRenderer</sv:value>
+ </sv:property>
+ <sv:property sv:name="type" sv:type="String">
+ <sv:value>stripes</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:createdBy" sv:type="String">
+ <sv:value>admin</sv:value>
+ </sv:property>
<sv:property sv:name="mgnl:activated" sv:type="Boolean">
<sv:value>false</sv:value>
</sv:property>
@@ -32,7 +44,7 @@
<sv:value>2007-07-23T22:39:14.178+01:00</sv:value>
</sv:property>
<sv:property sv:name="mgnl:lastmodified" sv:type="Date">
- <sv:value>2007-07-23T22:39:40.986+01:00</sv:value>
+ <sv:value>2011-08-05T12:09:27.489+02:00</sv:value>
</sv:property>
</sv:node>
</sv:node>
Modified: trunk/openutils-mgnlstripes/src/main/resources/mgnl-bootstrap/stripes/config.modules.stripes.template-renderers.stripes.xml
===================================================================
--- trunk/openutils-mgnlstripes/src/main/resources/mgnl-bootstrap/stripes/config.modules.stripes.template-renderers.stripes.xml 2011-08-08 10:54:52 UTC (rev 3592)
+++ trunk/openutils-mgnlstripes/src/main/resources/mgnl-bootstrap/stripes/config.modules.stripes.template-renderers.stripes.xml 2011-08-08 10:59:27 UTC (rev 3593)
@@ -9,13 +9,25 @@
<sv:property sv:name="class" sv:type="String">
<sv:value>it.openutils.magnoliastripes.StripesRenderer</sv:value>
</sv:property>
+ <sv:property sv:name="jcr:createdBy" sv:type="String">
+ <sv:value>admin</sv:value>
+ </sv:property>
<sv:property sv:name="name" sv:type="String">
<sv:value>stripes</sv:value>
</sv:property>
+ <sv:property sv:name="renderer" sv:type="String">
+ <sv:value>it.openutils.magnoliastripes.StripesRenderer</sv:value>
+ </sv:property>
+ <sv:property sv:name="type" sv:type="String">
+ <sv:value>stripes</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:createdBy" sv:type="String">
+ <sv:value>admin</sv:value>
+ </sv:property>
<sv:property sv:name="mgnl:activated" sv:type="Boolean">
<sv:value>false</sv:value>
</sv:property>
@@ -32,7 +44,7 @@
<sv:value>2007-07-23T22:39:14.178+01:00</sv:value>
</sv:property>
<sv:property sv:name="mgnl:lastmodified" sv:type="Date">
- <sv:value>2007-07-23T22:39:40.986+01:00</sv:value>
+ <sv:value>2011-08-05T12:09:15.512+02:00</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.
|
