Menu
▾
▴
[Openutils-svn] SF.net SVN: openutils:[2322] trunk/openutils-mgnlmedia/src/main
|
From: <fg...@us...> - 2010-05-01 16:33:20
|
Revision: 2322
http://openutils.svn.sourceforge.net/openutils/?rev=2322&view=rev
Author: fgiust
Date: 2010-05-01 16:33:13 +0000 (Sat, 01 May 2010)
Log Message:
-----------
MEDIA-112 dam configuration also for ETK
Modified Paths:
--------------
trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/setup/MediaModuleVersionHandler.java
Added Paths:
-----------
trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap/media-etk/
trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap/media-etk/config.modules.extended-templating-kit.config.sites.default.damSupport.handlers.media.xml
trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap/media-stk/
Removed Paths:
-------------
trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap/media-dam/
Modified: trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/setup/MediaModuleVersionHandler.java
===================================================================
--- trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/setup/MediaModuleVersionHandler.java 2010-04-30 16:18:48 UTC (rev 2321)
+++ trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/setup/MediaModuleVersionHandler.java 2010-05-01 16:33:13 UTC (rev 2322)
@@ -146,35 +146,46 @@
Boolean.TRUE));
// install stk support
- try
+ if (isModuleInstalled("standard-templating-kit"))
{
- if (ModuleRegistry.Factory.getInstance().getDefinition("standard-templating-kit") != null)
- {
- // adding the "-dam" in addiction to the standard bootstrap directory
- tasks.add(new BootstrapMissingNodesTask("media-dam"));
+ tasks.add(new BootstrapMissingNodesTask("media-stk"));
- // extended template renderer
- tasks.add(new ChangeExistingPropertyTask(
- ContentRepository.CONFIG,
- "/modules/standard-templating-kit/template-renderers/stk",
- "renderer",
- "info.magnolia.module.templatingkit.renderers.STKTemplateRenderer",
- "net.sourceforge.openutils.mgnlmedia.freemarker.SktSimpleMediaTemplateRenderer"));
+ // extended template renderer
+ tasks.add(new ChangeExistingPropertyTask(
+ ContentRepository.CONFIG,
+ "/modules/standard-templating-kit/template-renderers/stk",
+ "renderer",
+ "info.magnolia.module.templatingkit.renderers.STKTemplateRenderer",
+ "net.sourceforge.openutils.mgnlmedia.freemarker.SktSimpleMediaTemplateRenderer"));
- // extended paragraph renderer
- tasks.add(new ChangeExistingPropertyTask(
- ContentRepository.CONFIG,
- "/modules/standard-templating-kit/paragraph-renderers/stk",
- "class",
- "info.magnolia.module.templatingkit.renderers.STKParagraphRenderer",
- "net.sourceforge.openutils.mgnlmedia.freemarker.SktSimpleMediaParagraphRenderer"));
- }
+ // extended paragraph renderer
+ tasks.add(new ChangeExistingPropertyTask(
+ ContentRepository.CONFIG,
+ "/modules/standard-templating-kit/paragraph-renderers/stk",
+ "class",
+ "info.magnolia.module.templatingkit.renderers.STKParagraphRenderer",
+ "net.sourceforge.openutils.mgnlmedia.freemarker.SktSimpleMediaParagraphRenderer"));
}
- catch (IllegalArgumentException e)
+
+ // install etk support
+ if (isModuleInstalled("extended-templating-kit"))
{
- log.debug("Standard templating kit not installed {}", e.getMessage());
+ tasks.add(new BootstrapMissingNodesTask("media-etk"));
}
return tasks;
}
+
+ private boolean isModuleInstalled(String module)
+ {
+ try
+ {
+ return ModuleRegistry.Factory.getInstance().getDefinition(module) != null;
+ }
+ catch (IllegalArgumentException e)
+ {
+ log.debug("Module {} not installed ({} {})", new Object[]{module, e.getClass().getName(), e.getMessage() });
+ }
+ return false;
+ }
}
Added: trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap/media-etk/config.modules.extended-templating-kit.config.sites.default.damSupport.handlers.media.xml
===================================================================
--- trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap/media-etk/config.modules.extended-templating-kit.config.sites.default.damSupport.handlers.media.xml (rev 0)
+++ trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap/media-etk/config.modules.extended-templating-kit.config.sites.default.damSupport.handlers.media.xml 2010-05-01 16:33:13 UTC (rev 2322)
@@ -0,0 +1,136 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<sv:node sv:name="media" xmlns:sv="http://www.jcp.org/jcr/sv/1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+ <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:lockable</sv:value>
+ </sv:property>
+ <sv:property sv:name="jcr:uuid" sv:type="String">
+ <sv:value>d60c696b-fb70-4f6e-af10-b12d1aac0f32</sv:value>
+ </sv:property>
+ <sv:property sv:name="class" sv:type="String">
+ <sv:value>net.sourceforge.openutils.mgnlmedia.dam.SimpleMediaContentHandler</sv:value>
+ </sv:property>
+ <sv:property sv:name="damSelectorOptionLabel" sv:type="String">
+ <sv:value>Media</sv:value>
+ </sv:property>
+ <sv:property sv:name="enabled" sv:type="String">
+ <sv:value>true</sv:value>
+ </sv:property>
+ <sv:property sv:name="jcr:createdBy" sv:type="String">
+ <sv:value>admin</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>
+ <sv:property sv:name="mgnl:authorid" sv:type="String">
+ <sv:value>superuser</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:creationdate" sv:type="Date">
+ <sv:value>2009-04-28T11:06:28.122+02:00</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:lastmodified" sv:type="Date">
+ <sv:value>2009-11-25T18:54:03.791+01:00</sv:value>
+ </sv:property>
+ </sv:node>
+ <sv:node sv:name="controls">
+ <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:lockable</sv:value>
+ </sv:property>
+ <sv:property sv:name="jcr:uuid" sv:type="String">
+ <sv:value>36208289-c865-47ea-b4c1-a331556c96d5</sv:value>
+ </sv:property>
+ <sv:property sv:name="jcr:createdBy" sv:type="String">
+ <sv:value>admin</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>
+ <sv:property sv:name="mgnl:authorid" sv:type="String">
+ <sv:value>superuser</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:creationdate" sv:type="Date">
+ <sv:value>2009-05-08T09:09:15.183+02:00</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:lastmodified" sv:type="Date">
+ <sv:value>2009-11-19T08:40:57.194+01:00</sv:value>
+ </sv:property>
+ </sv:node>
+ <sv:node sv:name="MediaUUID">
+ <sv:property sv:name="jcr:primaryType" sv:type="Name">
+ <sv:value>mgnl:contentNode</sv:value>
+ </sv:property>
+ <sv:property sv:name="jcr:uuid" sv:type="String">
+ <sv:value>7e7e053d-9dbe-4b0a-b720-abc433259ac7</sv:value>
+ </sv:property>
+ <sv:property sv:name="controlType" sv:type="String">
+ <sv:value>mediaSelection</sv:value>
+ </sv:property>
+ <sv:property sv:name="description" sv:type="String">
+ <sv:value>stk.dam.mediauuid.description</sv:value>
+ </sv:property>
+ <sv:property sv:name="i18nBasename" sv:type="String">
+ <sv:value>net.sourceforge.openutils.mgnlmedia.media.lang</sv:value>
+ </sv:property>
+ <sv:property sv:name="jcr:createdBy" sv:type="String">
+ <sv:value>admin</sv:value>
+ </sv:property>
+ <sv:property sv:name="label" sv:type="String">
+ <sv:value>stk.dam.mediauuid.label</sv:value>
+ </sv:property>
+ <sv:property sv:name="mediaType" sv:type="String">
+ <sv:value>image</sv:value>
+ </sv:property>
+ <sv:property sv:name="type" sv:type="String">
+ <sv:value>Binary</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: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:property sv:name="mgnl:activatorid" sv:type="String">
+ <sv:value>superuser</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:creationdate" sv:type="String">
+ <sv:value>2004-11-02T15:34:29.357+01:00</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:lastaction" sv:type="Date">
+ <sv:value>2006-05-01T21:48:07.894+02:00</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:lastmodified" sv:type="Date">
+ <sv:value>2010-02-12T15:29:53.127+01:00</sv:value>
+ </sv:property>
+ </sv:node>
+ </sv:node>
+ </sv:node>
+</sv:node>
Property changes on: trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap/media-etk/config.modules.extended-templating-kit.config.sites.default.damSupport.handlers.media.xml
___________________________________________________________________
Added: svn:mime-type
+ text/xml
Added: svn:keywords
+ Author Date Id Revision
Added: svn:eol-style
+ native
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
