Menu
▾
▴
[Openutils-svn] SF.net SVN: openutils:[1923] trunk/openutils-mgnlmedia/src/main
|
From: <fg...@us...> - 2010-02-14 18:35:43
|
Revision: 1923
http://openutils.svn.sourceforge.net/openutils/?rev=1923&view=rev
Author: fgiust
Date: 2010-02-14 18:35:36 +0000 (Sun, 14 Feb 2010)
Log Message:
-----------
cleaning up module version handler
Modified Paths:
--------------
trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/lifecycle/MediaModule.java
trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/setup/MediaModuleVersionHandler.java
Removed Paths:
-------------
trunk/openutils-mgnlmedia/src/main/resources/mgnl-resources/media/icons/audio.gif
trunk/openutils-mgnlmedia/src/main/resources/mgnl-resources/media/icons/browse16.gif
trunk/openutils-mgnlmedia/src/main/resources/mgnl-resources/media/icons/film.gif
trunk/openutils-mgnlmedia/src/main/resources/mgnl-resources/media/icons/icon24.gif
Modified: trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/lifecycle/MediaModule.java
===================================================================
--- trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/lifecycle/MediaModule.java 2010-02-14 10:09:10 UTC (rev 1922)
+++ trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/lifecycle/MediaModule.java 2010-02-14 18:35:36 UTC (rev 1923)
@@ -36,18 +36,18 @@
{
/**
- *
+ * Media repository name.
*/
public static final String REPO = "media";
+ private static MediaModule instance;
+
private Logger log = LoggerFactory.getLogger(MediaModule.class);
private boolean singleinstance;
private String player = "player.swf";
- private static MediaModule instance;
-
private String version;
/**
@@ -88,8 +88,6 @@
/**
* @deprecated use singleinstance
- * Returns the autoactivate.
- * @return the autoactivate
*/
@Deprecated
public boolean isAutoactivate()
@@ -99,8 +97,6 @@
/**
* @deprecated use singleinstance
- * Sets the autoactivate.
- * @param autoactivate the autoactivate to set
*/
@Deprecated
public void setAutoactivate(boolean autoactivate)
@@ -109,8 +105,9 @@
}
/**
- * Returns the singleinstance.
- * @return the singleinstance
+ * If the singleinstance flag is set, the media module expect that no activation is needed (usually it means the
+ * media repository is shared between the author and public instances).
+ * @return the value of the singleinstance property
*/
public boolean isSingleinstance()
{
@@ -118,8 +115,9 @@
}
/**
- * Sets the singleinstance.
- * @param singleinstance the singleinstance to set
+ * If the singleinstance flag is set, the media module expect that no activation is needed (usually it means the
+ * media repository is shared between the author and public instances).
+ * @param singleinstance true if no activation should be performed
*/
public void setSingleinstance(boolean singleinstance)
{
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-14 10:09:10 UTC (rev 1922)
+++ trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/setup/MediaModuleVersionHandler.java 2010-02-14 18:35:36 UTC (rev 1923)
@@ -23,9 +23,7 @@
import info.magnolia.cms.core.SystemProperty;
import info.magnolia.module.InstallContext;
import info.magnolia.module.ModuleRegistry;
-import info.magnolia.module.delta.Delta;
import info.magnolia.module.delta.Task;
-import info.magnolia.module.model.Version;
import it.openutils.mgnltasks.BootstrapMissingNodesTask;
import it.openutils.mgnltasks.ChangeExistingPropertyTask;
import it.openutils.mgnltasks.CreateMissingPropertyTask;
@@ -67,6 +65,12 @@
"singleinstance",
Boolean.FALSE));
+ tasks.add(new CreateMissingPropertyTask(
+ ContentRepository.CONFIG,
+ "/modules/media/config",
+ "player",
+ "player.swf"));
+
// MEDIA-70 new enabled property for media type
tasks.add(new CreateMissingPropertyTask(
ContentRepository.CONFIG,
@@ -105,25 +109,56 @@
"/.resources/media/icons/film.gif",
"/.resources/media/icons/type-youtube.png"));
+ // change "audio" icon
+ tasks.add(new ChangeExistingPropertyTask(
+ ContentRepository.CONFIG,
+ "/modules/media/mediatypes/audio",
+ "menuIcon",
+ "/.resources/media/icons/audio.gif",
+ "/.resources/media/icons/type-audio.png"));
+
+ // change "video" icon
+ tasks.add(new ChangeExistingPropertyTask(
+ ContentRepository.CONFIG,
+ "/modules/media/mediatypes/video",
+ "menuIcon",
+ "/.resources/media/icons/film.gif",
+ "/.resources/media/icons/type-video.png"));
+
+ // change "image" icon
+ tasks.add(new ChangeExistingPropertyTask(
+ ContentRepository.CONFIG,
+ "/modules/media/mediatypes/image",
+ "menuIcon",
+ "/.resources/media/icons/image16.gif",
+ "/.resources/media/icons/type-image.png"));
+
+ // change menu/media icon
+ tasks.add(new ChangeExistingPropertyTask(
+ ContentRepository.CONFIG,
+ "/modules/adminInterface/config/menu/media",
+ "icon",
+ "/.resources/media/icons/icon24.gif",
+ "/.resources/media/icons/ico24-media-menu.png"));
+
+ // change menu/media/browse icon
+ tasks.add(new ChangeExistingPropertyTask(
+ ContentRepository.CONFIG,
+ "/modules/adminInterface/config/menu/media/browse",
+ "icon",
+ "/.resources/media/icons/browse16.gif",
+ "/.resources/media/icons/ico16-browse.png"));
+
// sort mediatypes on the "order" property
tasks.add(new NodeSortTask("config", "/modules/media/mediatypes", "order"));
- return tasks;
- }
-
- /**
- * {@inheritDoc}
- */
- @Override
- public List<Delta> getDeltas(InstallContext ctx, Version from)
- {
- List<Delta> deltas = super.getDeltas(ctx, from);
- if (from == null && ModuleRegistry.Factory.getInstance().getDefinition("standard-templating-kit") != null)
+ // install stk support
+ if (ModuleRegistry.Factory.getInstance().getDefinition("standard-templating-kit") != null)
{
// adding the "-dam" in addiction to the standard bootstrap directory
- deltas.get(0).getTasks().add(
- new BootstrapMissingNodesTask(ctx.getCurrentModuleDefinition().getName() + "-dam"));
+ tasks.add(new BootstrapMissingNodesTask("media-dam"));
}
- return deltas;
+
+ return tasks;
}
}
Deleted: trunk/openutils-mgnlmedia/src/main/resources/mgnl-resources/media/icons/audio.gif
===================================================================
(Binary files differ)
Deleted: trunk/openutils-mgnlmedia/src/main/resources/mgnl-resources/media/icons/browse16.gif
===================================================================
(Binary files differ)
Deleted: trunk/openutils-mgnlmedia/src/main/resources/mgnl-resources/media/icons/film.gif
===================================================================
(Binary files differ)
Deleted: trunk/openutils-mgnlmedia/src/main/resources/mgnl-resources/media/icons/icon24.gif
===================================================================
(Binary files differ)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
