Menu
▾
▴
[Openutils-svn] SF.net SVN: openutils:[1904] trunk/openutils-mgnlmedia/src/main
|
From: <die...@us...> - 2010-02-12 15:03:31
|
Revision: 1904
http://openutils.svn.sourceforge.net/openutils/?rev=1904&view=rev
Author: diego_schivo
Date: 2010-02-12 15:03:15 +0000 (Fri, 12 Feb 2010)
Log Message:
-----------
MEDIA-87 bootstrap dam-support only if stk module is present
Modified Paths:
--------------
trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/setup/MediaModuleVersionHandler.java
Added Paths:
-----------
trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/setup/BootstrapDamSupportTask.java
trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap/media-dam/
trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap/media-dam/config.modules.standard-templating-kit.config.site.damSupport.handlers.media.xml
Removed Paths:
-------------
trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap/media-nooverwrite/config.modules.standard-templating-kit.config.site.damSupport.handlers.media.xml
Added: trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/setup/BootstrapDamSupportTask.java
===================================================================
--- trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/setup/BootstrapDamSupportTask.java (rev 0)
+++ trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/setup/BootstrapDamSupportTask.java 2010-02-12 15:03:15 UTC (rev 1904)
@@ -0,0 +1,33 @@
+package net.sourceforge.openutils.mgnlmedia.media.setup;
+
+import info.magnolia.module.InstallContext;
+import info.magnolia.module.ModuleRegistry;
+import it.openutils.mgnltasks.BootstrapMissingNodesTask;
+
+
+/**
+ * @author dschivo
+ * @version $Id$
+ */
+public class BootstrapDamSupportTask extends BootstrapMissingNodesTask
+{
+
+ /**
+ *
+ */
+ public BootstrapDamSupportTask(String folder)
+ {
+ super(folder);
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ @Override
+ protected boolean acceptResource(InstallContext installContext, String name)
+ {
+ return ModuleRegistry.Factory.getInstance().getDefinition("standard-templating-kit") != null
+ && super.acceptResource(installContext, name);
+ }
+
+}
Property changes on: trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/setup/BootstrapDamSupportTask.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: svn:keywords
+ Author Date Id Revision
Added: svn:eol-style
+ native
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-02-12 14:32:25 UTC (rev 1903)
+++ trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/setup/MediaModuleVersionHandler.java 2010-02-12 15:03:15 UTC (rev 1904)
@@ -22,7 +22,9 @@
import info.magnolia.cms.beans.config.ContentRepository;
import info.magnolia.cms.core.SystemProperty;
import info.magnolia.module.InstallContext;
+import info.magnolia.module.delta.Delta;
import info.magnolia.module.delta.Task;
+import info.magnolia.module.model.Version;
import it.openutils.mgnltasks.ChangeExistingPropertyTask;
import it.openutils.mgnltasks.CreateMissingPropertyTask;
import it.openutils.mgnltasks.NodeSortTask;
@@ -107,4 +109,20 @@
return tasks;
}
+ /**
+ * {@inheritDoc}
+ */
+ @Override
+ public List<Delta> getDeltas(InstallContext ctx, Version from)
+ {
+ if (from == null)
+ {
+ List<Delta> deltas = super.getDeltas(ctx, from);
+ // adding the "-dam" in addiction to the standard bootstrap directory
+ deltas.get(0).getTasks().add(
+ new BootstrapDamSupportTask(ctx.getCurrentModuleDefinition().getName() + "-dam"));
+ return deltas;
+ }
+ return super.getDeltas(ctx, from);
+ }
}
Added: trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap/media-dam/config.modules.standard-templating-kit.config.site.damSupport.handlers.media.xml
===================================================================
--- trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap/media-dam/config.modules.standard-templating-kit.config.site.damSupport.handlers.media.xml (rev 0)
+++ trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap/media-dam/config.modules.standard-templating-kit.config.site.damSupport.handlers.media.xml 2010-02-12 15:03:15 UTC (rev 1904)
@@ -0,0 +1,118 @@
+<?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>6db0c3ed-cb44-4d68-8a4d-fa968dfbf240</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: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="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>6e1f7800-7722-4346-a3f7-70cdde0a5570</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="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>6b4ca7b5-f5d2-4d6b-8cf3-d42b7271ffb4</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="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="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-dam/config.modules.standard-templating-kit.config.site.damSupport.handlers.media.xml
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: svn:keywords
+ Author Date Id Revision
Added: svn:eol-style
+ native
Deleted: trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap/media-nooverwrite/config.modules.standard-templating-kit.config.site.damSupport.handlers.media.xml
===================================================================
--- trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap/media-nooverwrite/config.modules.standard-templating-kit.config.site.damSupport.handlers.media.xml 2010-02-12 14:32:25 UTC (rev 1903)
+++ trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap/media-nooverwrite/config.modules.standard-templating-kit.config.site.damSupport.handlers.media.xml 2010-02-12 15:03:15 UTC (rev 1904)
@@ -1,118 +0,0 @@
-<?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>6db0c3ed-cb44-4d68-8a4d-fa968dfbf240</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: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="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>6e1f7800-7722-4346-a3f7-70cdde0a5570</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="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>6b4ca7b5-f5d2-4d6b-8cf3-d42b7271ffb4</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="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="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>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
