Menu
▾
▴
[Openutils-svn] SF.net SVN: openutils:[1169] trunk/openutils-mgnlmedia/src
|
From: <fg...@us...> - 2009-04-29 20:40:02
|
Revision: 1169
http://openutils.svn.sourceforge.net/openutils/?rev=1169&view=rev
Author: fgiust
Date: 2009-04-29 20:39:50 +0000 (Wed, 29 Apr 2009)
Log Message:
-----------
basic support for autoactivate
Modified Paths:
--------------
trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/configuration/MediaConfigurationManager.java
trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/dialog/DialogSelectMedia.java
trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/dialog/LayerDialogMVC.java
trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/pages/MediaBrowserPage.java
trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/pages/MediaFolderViewPage.java
trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/pages/MediaLoadZipFilePage.java
trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/pages/MediaSearchPage.java
trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/save/MediaCustomSaveHandler.java
trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/setup/RemoveResolutionsNodeTask.java
trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/setup/RenameThumbToImageTask.java
trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/tags/el/MediaEl.java
trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/tree/MediaModuleTreeConfiguration.java
trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/types/impl/BaseTypeHandler.java
trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/utils/ImageUtils.java
trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/utils/MediaLoadUtils.java
trunk/openutils-mgnlmedia/src/main/resources/META-INF/magnolia/media.xml
trunk/openutils-mgnlmedia/src/site/changes/changes.xml
Added Paths:
-----------
trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/lifecycle/MediaModule.java
Removed Paths:
-------------
trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/lifecycle/MediaModuleLifecycle.java
Modified: trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/configuration/MediaConfigurationManager.java
===================================================================
--- trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/configuration/MediaConfigurationManager.java 2009-04-29 15:17:11 UTC (rev 1168)
+++ trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/configuration/MediaConfigurationManager.java 2009-04-29 20:39:50 UTC (rev 1169)
@@ -46,7 +46,7 @@
import javax.jcr.RepositoryException;
import javax.jcr.query.InvalidQueryException;
-import net.sourceforge.openutils.mgnlmedia.media.lifecycle.MediaModuleLifecycle;
+import net.sourceforge.openutils.mgnlmedia.media.lifecycle.MediaModule;
import net.sourceforge.openutils.mgnlmedia.media.pages.MediaFolderViewPage;
import net.sourceforge.openutils.mgnlmedia.media.types.MediaTypeHandler;
@@ -340,7 +340,7 @@
@SuppressWarnings("unchecked")
public Collection<Content> search(String text, final String type) throws RepositoryException
{
- QueryManager qm = MgnlContext.getQueryManager(MediaModuleLifecycle.REPO);
+ QueryManager qm = MgnlContext.getQueryManager(MediaModule.REPO);
StringBuilder sb = new StringBuilder();
sb.append("//*[jcr:contains(.,'");
sb.append(StringUtils.replace(text, "'", "''"));
@@ -406,7 +406,7 @@
.getInstance()
.getMappings())
{
- if (mapping.getRepository().equals(MediaModuleLifecycle.REPO))
+ if (mapping.getRepository().equals(MediaModule.REPO))
{
return mapping.getURIPrefix();
}
Modified: trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/dialog/DialogSelectMedia.java
===================================================================
--- trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/dialog/DialogSelectMedia.java 2009-04-29 15:17:11 UTC (rev 1168)
+++ trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/dialog/DialogSelectMedia.java 2009-04-29 20:39:50 UTC (rev 1169)
@@ -49,7 +49,7 @@
import net.sourceforge.openutils.mgnlmedia.media.configuration.MediaConfigurationManager;
import net.sourceforge.openutils.mgnlmedia.media.configuration.MediaTypeConfiguration;
-import net.sourceforge.openutils.mgnlmedia.media.lifecycle.MediaModuleLifecycle;
+import net.sourceforge.openutils.mgnlmedia.media.lifecycle.MediaModule;
import org.apache.commons.lang.exception.NestableRuntimeException;
import org.slf4j.Logger;
@@ -220,7 +220,7 @@
{
if (this.media == null && this.getValue() != null && this.getValue().length() > 0)
{
- HierarchyManager hm = MgnlContext.getHierarchyManager(MediaModuleLifecycle.REPO);
+ HierarchyManager hm = MgnlContext.getHierarchyManager(MediaModule.REPO);
this.media = hm.getContentByUUID(this.getValue());
}
return this.media;
Modified: trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/dialog/LayerDialogMVC.java
===================================================================
--- trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/dialog/LayerDialogMVC.java 2009-04-29 15:17:11 UTC (rev 1168)
+++ trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/dialog/LayerDialogMVC.java 2009-04-29 20:39:50 UTC (rev 1169)
@@ -35,7 +35,7 @@
import javax.servlet.http.HttpServletResponse;
import net.sourceforge.openutils.mgnlmedia.media.configuration.MediaConfigurationManager;
-import net.sourceforge.openutils.mgnlmedia.media.lifecycle.MediaModuleLifecycle;
+import net.sourceforge.openutils.mgnlmedia.media.lifecycle.MediaModule;
import org.apache.commons.lang.StringUtils;
import org.slf4j.Logger;
@@ -160,7 +160,7 @@
if (control.getNodeName().equals("mgnlNew"))
{
- HierarchyManager hm = MgnlContext.getHierarchyManager(MediaModuleLifecycle.REPO);
+ HierarchyManager hm = MgnlContext.getHierarchyManager(MediaModule.REPO);
Content c = null;
try
{
Copied: trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/lifecycle/MediaModule.java (from rev 1163, trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/lifecycle/MediaModuleLifecycle.java)
===================================================================
--- trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/lifecycle/MediaModule.java (rev 0)
+++ trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/lifecycle/MediaModule.java 2009-04-29 20:39:50 UTC (rev 1169)
@@ -0,0 +1,90 @@
+/**
+ * Copyright Openmind http://www.openmindonline.it
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+package net.sourceforge.openutils.mgnlmedia.media.lifecycle;
+
+import info.magnolia.module.ModuleLifecycle;
+import info.magnolia.module.ModuleLifecycleContext;
+import net.sourceforge.openutils.mgnlmedia.media.configuration.MediaConfigurationManager;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+
+/**
+ * @author molaschi
+ */
+public class MediaModule implements ModuleLifecycle
+{
+
+ /**
+ *
+ */
+ public static final String REPO = "media";
+
+ private Logger log = LoggerFactory.getLogger(MediaModule.class);
+
+ private boolean autoactivate;
+
+ private static MediaModule instance;
+
+ public MediaModule()
+ {
+ instance = this;
+ }
+
+ public static MediaModule getInstance()
+ {
+ return instance;
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public void start(ModuleLifecycleContext ctx)
+ {
+ log.info("Starting module media");
+ ctx.registerModuleObservingComponent("mediatypes", MediaConfigurationManager.getInstance());
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public void stop(ModuleLifecycleContext ctx)
+ {
+ log.info("Stopping module media");
+ }
+
+ /**
+ * Returns the autoactivate.
+ * @return the autoactivate
+ */
+ public boolean isAutoactivate()
+ {
+ return autoactivate;
+ }
+
+ /**
+ * Sets the autoactivate.
+ * @param autoactivate the autoactivate to set
+ */
+ public void setAutoactivate(boolean autoactivate)
+ {
+ this.autoactivate = autoactivate;
+ }
+
+}
Deleted: trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/lifecycle/MediaModuleLifecycle.java
===================================================================
--- trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/lifecycle/MediaModuleLifecycle.java 2009-04-29 15:17:11 UTC (rev 1168)
+++ trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/lifecycle/MediaModuleLifecycle.java 2009-04-29 20:39:50 UTC (rev 1169)
@@ -1,59 +0,0 @@
-/**
- * Copyright Openmind http://www.openmindonline.it
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- *
- */
-package net.sourceforge.openutils.mgnlmedia.media.lifecycle;
-
-import info.magnolia.module.ModuleLifecycle;
-import info.magnolia.module.ModuleLifecycleContext;
-import net.sourceforge.openutils.mgnlmedia.media.configuration.MediaConfigurationManager;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-
-/**
- * @author molaschi
- */
-public class MediaModuleLifecycle implements ModuleLifecycle
-{
- /**
- *
- */
- public static final String REPO = "media";
-
- private Logger log = LoggerFactory.getLogger(MediaModuleLifecycle.class);
-
- /**
- *
- * {@inheritDoc}
- */
- public void start(ModuleLifecycleContext ctx)
- {
- log.info("Starting module media");
- ctx.registerModuleObservingComponent("mediatypes", MediaConfigurationManager.getInstance());
- }
-
- /**
- *
- * {@inheritDoc}
- */
- public void stop(ModuleLifecycleContext ctx)
- {
- log.info("Stopping module media");
- }
-
-}
Modified: trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/pages/MediaBrowserPage.java
===================================================================
--- trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/pages/MediaBrowserPage.java 2009-04-29 15:17:11 UTC (rev 1168)
+++ trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/pages/MediaBrowserPage.java 2009-04-29 20:39:50 UTC (rev 1169)
@@ -20,17 +20,14 @@
import info.magnolia.cms.beans.runtime.Document;
import info.magnolia.cms.core.Content;
import info.magnolia.cms.core.HierarchyManager;
-import info.magnolia.cms.core.ItemType;
-import info.magnolia.cms.core.NodeData;
-import info.magnolia.cms.core.Path;
import info.magnolia.cms.i18n.Messages;
import info.magnolia.cms.security.AccessDeniedException;
-import info.magnolia.cms.util.NodeDataUtil;
import info.magnolia.context.MgnlContext;
import java.io.File;
import java.io.FileOutputStream;
import java.io.IOException;
+import java.io.InputStream;
import java.util.Date;
import java.util.Enumeration;
import java.util.zip.ZipEntry;
@@ -40,9 +37,8 @@
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
-import net.sourceforge.openutils.mgnlmedia.media.configuration.MediaConfigurationManager;
-import net.sourceforge.openutils.mgnlmedia.media.configuration.MediaTypeConfiguration;
-import net.sourceforge.openutils.mgnlmedia.media.lifecycle.MediaModuleLifecycle;
+import net.sourceforge.openutils.mgnlmedia.media.lifecycle.MediaModule;
+import net.sourceforge.openutils.mgnlmedia.media.utils.MediaLoadUtils;
import org.apache.commons.io.IOUtils;
import org.apache.commons.lang.StringUtils;
@@ -92,7 +88,7 @@
if (actMedia != null)
{
- HierarchyManager mgr = MgnlContext.getHierarchyManager(MediaModuleLifecycle.REPO);
+ HierarchyManager mgr = MgnlContext.getHierarchyManager(MediaModule.REPO);
try
{
Content media = mgr.getContentByUUID(actMedia);
@@ -110,7 +106,7 @@
{
try
{
- HierarchyManager mgr = MgnlContext.getSystemContext().getHierarchyManager(MediaModuleLifecycle.REPO);
+ HierarchyManager mgr = MgnlContext.getSystemContext().getHierarchyManager(MediaModule.REPO);
File temp = File.createTempFile("zipmedia", ".zip");
FileOutputStream fos = new FileOutputStream(temp);
IOUtils.copy(zipFile.getStream(), fos);
@@ -132,48 +128,18 @@
path = path.substring(0, path.length() - 1);
}
- if (entry.isDirectory())
+ if (!entry.isDirectory())
{
- getOrCreateFullPath(mgr, parentPath + path);
- }
- else
- {
+ InputStream inputStream = zip.getInputStream(entry);
+
String parent = StringUtils.substringBeforeLast(path, "/");
String filename = StringUtils.substringAfterLast(path, "/");
- if (StringUtils.isEmpty(parent))
- {
- parent = "/";
- }
- String extension = StringUtils.substringAfterLast(filename, ".");
- String cleanFilename = StringUtils.substringBeforeLast(filename, ".");
- MediaTypeConfiguration mtc = MediaConfigurationManager.getMediaHandlerFromExtension(extension);
- if (mtc != null)
- {
- Content parentNode = getOrCreateFullPath(mgr, parentPath + parent);
+ MediaLoadUtils.loadEntry(inputStream, StringUtils.defaultIfEmpty(parent, "/"), filename, false);
- Content media = mgr.createContent(parentPath + parent, Path.getUniqueLabel(
- parentNode,
- cleanFilename), MediaConfigurationManager.MEDIA.getSystemName());
-
- NodeData nd = NodeDataUtil.getOrCreate(media, "type");
- nd.setValue(mtc.getName());
-
- mgr.save();
-
- File f = File.createTempFile("entry", extension);
- FileOutputStream fTemp = new FileOutputStream(f);
-
- IOUtils.copy(zip.getInputStream(entry), fTemp);
-
- fTemp.close();
-
- mtc.getHandler().saveFromZipFile(media, f, cleanFilename, extension);
-
- mgr.save();
- }
}
+
}
}
catch (IOException e)
@@ -194,31 +160,6 @@
return this.show();
}
- public static Content getOrCreateFullPath(HierarchyManager mgr, String path) throws RepositoryException
- {
- try
- {
- return mgr.getContent(path);
- }
- catch (RepositoryException ex)
- {
- String parent = StringUtils.substringBeforeLast(path, "/");
- String label = StringUtils.substringAfterLast(path, "/");
- if (!StringUtils.isEmpty(parent))
- {
- getOrCreateFullPath(mgr, parent);
- }
- else
- {
- parent = "/";
- }
-
- Content c = mgr.createContent(parent, label, ItemType.CONTENT.getSystemName());
- mgr.save();
- return c;
- }
- }
-
/**
* Returns the cacheKiller.
* @return the cacheKiller
Modified: trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/pages/MediaFolderViewPage.java
===================================================================
--- trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/pages/MediaFolderViewPage.java 2009-04-29 15:17:11 UTC (rev 1168)
+++ trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/pages/MediaFolderViewPage.java 2009-04-29 20:39:50 UTC (rev 1169)
@@ -50,7 +50,7 @@
import net.sourceforge.openutils.mgnlmedia.media.configuration.MediaConfigurationManager;
import net.sourceforge.openutils.mgnlmedia.media.configuration.MediaTypeConfiguration;
-import net.sourceforge.openutils.mgnlmedia.media.lifecycle.MediaModuleLifecycle;
+import net.sourceforge.openutils.mgnlmedia.media.lifecycle.MediaModule;
import org.apache.commons.chain.Command;
import org.apache.commons.lang.StringUtils;
@@ -170,7 +170,7 @@
numberOfMedia = new HashMap<String, Integer>();
for (MediaTypeConfiguration mtc : types)
{
- QueryManager qm = MgnlContext.getQueryManager(MediaModuleLifecycle.REPO);
+ QueryManager qm = MgnlContext.getQueryManager(MediaModule.REPO);
try
{
Query q = qm.createQuery(
@@ -193,7 +193,7 @@
@Override
public String show()
{
- HierarchyManager hm = MgnlContext.getInstance().getHierarchyManager(MediaModuleLifecycle.REPO);
+ HierarchyManager hm = MgnlContext.getInstance().getHierarchyManager(MediaModule.REPO);
MediaTypeConfiguration mtc = MediaConfigurationManager.getInstance().getTypes().get(type);
Collection<Content> mediasOfType = null;
@@ -252,7 +252,8 @@
try
{
mb.setWritable(media.getParent().isGranted(Permission.WRITE));
- mb.setCanPublish(mb.isWritable()
+ mb.setCanPublish(!MediaModule.getInstance().isAutoactivate()
+ && mb.isWritable()
&& ActivationManagerFactory.getActivationManager().hasAnyActiveSubscriber());
mb.getUsedInWebPages().addAll(
@@ -275,7 +276,7 @@
*/
public String delete()
{
- HierarchyManager hm = MgnlContext.getInstance().getHierarchyManager(MediaModuleLifecycle.REPO);
+ HierarchyManager hm = MgnlContext.getInstance().getHierarchyManager(MediaModule.REPO);
try
{
@@ -355,7 +356,7 @@
public Content copyMoveNode(String source, String destination, boolean move) throws ExchangeException,
RepositoryException
{
- HierarchyManager hm = MgnlContext.getHierarchyManager(MediaModuleLifecycle.REPO);
+ HierarchyManager hm = MgnlContext.getHierarchyManager(MediaModule.REPO);
String goTo = destination;
@@ -422,7 +423,7 @@
actCmd.setItemTypes(sb.toString());
Context context = MgnlContext.getInstance();
- context.put(Context.ATTRIBUTE_REPOSITORY, MediaModuleLifecycle.REPO);
+ context.put(Context.ATTRIBUTE_REPOSITORY, MediaModule.REPO);
context.put(Context.ATTRIBUTE_PATH, this.node);
context.put(Context.ATTRIBUTE_RECURSIVE, false);
@@ -444,7 +445,7 @@
Command cmd = CommandsManager.getInstance().getCommand(CommandsManager.DEFAULT_CATALOG, "deactivate");
Context context = MgnlContext.getInstance();
- context.put(Context.ATTRIBUTE_REPOSITORY, MediaModuleLifecycle.REPO);
+ context.put(Context.ATTRIBUTE_REPOSITORY, MediaModule.REPO);
context.put(Context.ATTRIBUTE_PATH, this.node);
try
@@ -462,7 +463,7 @@
public String download()
{
- HierarchyManager hm = MgnlContext.getHierarchyManager(MediaModuleLifecycle.REPO);
+ HierarchyManager hm = MgnlContext.getHierarchyManager(MediaModule.REPO);
Content media;
try
Modified: trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/pages/MediaLoadZipFilePage.java
===================================================================
--- trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/pages/MediaLoadZipFilePage.java 2009-04-29 15:17:11 UTC (rev 1168)
+++ trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/pages/MediaLoadZipFilePage.java 2009-04-29 20:39:50 UTC (rev 1169)
@@ -34,7 +34,7 @@
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
-import net.sourceforge.openutils.mgnlmedia.media.lifecycle.MediaModuleLifecycle;
+import net.sourceforge.openutils.mgnlmedia.media.lifecycle.MediaModule;
import net.sourceforge.openutils.mgnlmedia.media.utils.MediaLoadUtils;
import org.apache.commons.io.IOUtils;
@@ -67,7 +67,7 @@
InputStream zipStream = null;
try
{
- HierarchyManager mgr = MgnlContext.getSystemContext().getHierarchyManager(MediaModuleLifecycle.REPO);
+ HierarchyManager mgr = MgnlContext.getSystemContext().getHierarchyManager(MediaModule.REPO);
File temp = File.createTempFile("zipmedia", ".zip");
FileOutputStream fos = new FileOutputStream(temp);
@@ -83,7 +83,7 @@
String path = entry.getName();
path = StringUtils.replace(path, "\\", "/");
- if (path.startsWith("/"))
+ if (!path.startsWith("/"))
{
path = "/" + path;
}
Modified: trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/pages/MediaSearchPage.java
===================================================================
--- trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/pages/MediaSearchPage.java 2009-04-29 15:17:11 UTC (rev 1168)
+++ trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/pages/MediaSearchPage.java 2009-04-29 20:39:50 UTC (rev 1169)
@@ -39,7 +39,7 @@
import net.sourceforge.openutils.mgnlmedia.media.configuration.MediaConfigurationManager;
import net.sourceforge.openutils.mgnlmedia.media.configuration.MediaTypeConfiguration;
-import net.sourceforge.openutils.mgnlmedia.media.lifecycle.MediaModuleLifecycle;
+import net.sourceforge.openutils.mgnlmedia.media.lifecycle.MediaModule;
import org.apache.commons.lang.StringUtils;
import org.slf4j.Logger;
@@ -99,7 +99,7 @@
mtc.add(entry.getValue());
}
- HierarchyManager mgr = MgnlContext.getHierarchyManager(MediaModuleLifecycle.REPO);
+ HierarchyManager mgr = MgnlContext.getHierarchyManager(MediaModule.REPO);
try
{
Collection<Content> contents = mgr.getRoot().getChildren(MediaConfigurationManager.FOLDER);
Modified: trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/save/MediaCustomSaveHandler.java
===================================================================
--- trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/save/MediaCustomSaveHandler.java 2009-04-29 15:17:11 UTC (rev 1168)
+++ trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/save/MediaCustomSaveHandler.java 2009-04-29 20:39:50 UTC (rev 1169)
@@ -28,7 +28,7 @@
import net.sourceforge.openutils.mgnlmedia.media.configuration.MediaConfigurationManager;
import net.sourceforge.openutils.mgnlmedia.media.configuration.MediaTypeConfiguration;
-import net.sourceforge.openutils.mgnlmedia.media.lifecycle.MediaModuleLifecycle;
+import net.sourceforge.openutils.mgnlmedia.media.lifecycle.MediaModule;
import org.apache.commons.lang.StringUtils;
@@ -59,7 +59,7 @@
return;
}
- HierarchyManager hm = MgnlContext.getHierarchyManager(MediaModuleLifecycle.REPO);
+ HierarchyManager hm = MgnlContext.getHierarchyManager(MediaModule.REPO);
Content media = hm.getContentByUUID(value);
Modified: trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/setup/RemoveResolutionsNodeTask.java
===================================================================
--- trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/setup/RemoveResolutionsNodeTask.java 2009-04-29 15:17:11 UTC (rev 1168)
+++ trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/setup/RemoveResolutionsNodeTask.java 2009-04-29 20:39:50 UTC (rev 1169)
@@ -31,7 +31,7 @@
import info.magnolia.module.delta.AbstractTask;
import info.magnolia.module.delta.TaskExecutionException;
import net.sourceforge.openutils.mgnlmedia.media.configuration.MediaConfigurationManager;
-import net.sourceforge.openutils.mgnlmedia.media.lifecycle.MediaModuleLifecycle;
+import net.sourceforge.openutils.mgnlmedia.media.lifecycle.MediaModule;
/**
@@ -55,7 +55,7 @@
*/
public void execute(InstallContext installContext) throws TaskExecutionException
{
- HierarchyManager hm = installContext.getHierarchyManager(MediaModuleLifecycle.REPO);
+ HierarchyManager hm = installContext.getHierarchyManager(MediaModule.REPO);
QueryManager mgr = hm.getQueryManager();
try
{
Modified: trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/setup/RenameThumbToImageTask.java
===================================================================
--- trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/setup/RenameThumbToImageTask.java 2009-04-29 15:17:11 UTC (rev 1168)
+++ trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/setup/RenameThumbToImageTask.java 2009-04-29 20:39:50 UTC (rev 1169)
@@ -34,7 +34,7 @@
import javax.jcr.RepositoryException;
import net.sourceforge.openutils.mgnlmedia.media.configuration.MediaConfigurationManager;
-import net.sourceforge.openutils.mgnlmedia.media.lifecycle.MediaModuleLifecycle;
+import net.sourceforge.openutils.mgnlmedia.media.lifecycle.MediaModule;
/**
@@ -58,7 +58,7 @@
*/
public void execute(InstallContext installContext) throws TaskExecutionException
{
- HierarchyManager hm = installContext.getHierarchyManager(MediaModuleLifecycle.REPO);
+ HierarchyManager hm = installContext.getHierarchyManager(MediaModule.REPO);
QueryManager mgr = hm.getQueryManager();
try
{
Modified: trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/tags/el/MediaEl.java
===================================================================
--- trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/tags/el/MediaEl.java 2009-04-29 15:17:11 UTC (rev 1168)
+++ trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/tags/el/MediaEl.java 2009-04-29 20:39:50 UTC (rev 1169)
@@ -36,7 +36,7 @@
import net.sourceforge.openutils.mgnlmedia.media.configuration.MediaConfigurationManager;
import net.sourceforge.openutils.mgnlmedia.media.configuration.MediaTypeConfiguration;
-import net.sourceforge.openutils.mgnlmedia.media.lifecycle.MediaModuleLifecycle;
+import net.sourceforge.openutils.mgnlmedia.media.lifecycle.MediaModule;
import net.sourceforge.openutils.mgnlmedia.media.utils.ImageUtils;
import org.apache.commons.collections.CollectionUtils;
@@ -78,7 +78,7 @@
if (obj instanceof String)
{
String uuid = (String) obj;
- HierarchyManager hm = MgnlContext.getHierarchyManager(MediaModuleLifecycle.REPO);
+ HierarchyManager hm = MgnlContext.getHierarchyManager(MediaModule.REPO);
try
{
return hm.getContentByUUID(uuid);
Modified: trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/tree/MediaModuleTreeConfiguration.java
===================================================================
--- trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/tree/MediaModuleTreeConfiguration.java 2009-04-29 15:17:11 UTC (rev 1168)
+++ trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/tree/MediaModuleTreeConfiguration.java 2009-04-29 20:39:50 UTC (rev 1169)
@@ -35,6 +35,7 @@
import net.sourceforge.openutils.mgnlmedia.media.configuration.MediaConfigurationManager;
import net.sourceforge.openutils.mgnlmedia.media.configuration.MediaTypeConfiguration;
+import net.sourceforge.openutils.mgnlmedia.media.lifecycle.MediaModule;
import org.apache.commons.lang.StringUtils;
@@ -191,12 +192,15 @@
tree.addMenuItem(menuCut);
tree.addMenuItem(menuCopy);
- if (MgnlContext.getUser().hasRole("media-publish") || MgnlContext.getUser().hasRole("superuser"))
+ if (!MediaModule.getInstance().isAutoactivate())
{
- tree.addSeparator();
- tree.addMenuItem(menuActivateExcl);
- tree.addMenuItem(menuActivate);
- tree.addMenuItem(menuDeactivate);
+ if (MgnlContext.getUser().hasRole("media-publish") || MgnlContext.getUser().hasRole("superuser"))
+ {
+ tree.addSeparator();
+ tree.addMenuItem(menuActivateExcl);
+ tree.addMenuItem(menuActivate);
+ tree.addMenuItem(menuDeactivate);
+ }
}
}
else
Modified: trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/types/impl/BaseTypeHandler.java
===================================================================
--- trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/types/impl/BaseTypeHandler.java 2009-04-29 15:17:11 UTC (rev 1168)
+++ trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/types/impl/BaseTypeHandler.java 2009-04-29 20:39:50 UTC (rev 1169)
@@ -27,6 +27,7 @@
import javax.jcr.RepositoryException;
+import net.sourceforge.openutils.mgnlmedia.media.lifecycle.MediaModule;
import net.sourceforge.openutils.mgnlmedia.media.types.MediaTypeHandler;
import org.slf4j.Logger;
@@ -110,6 +111,12 @@
}
media.save();
}
+
+ if (MediaModule.getInstance().isAutoactivate())
+ {
+ media.getMetaData().setActivated();
+ media.save();
+ }
}
catch (RepositoryException ex)
{
Modified: trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/utils/ImageUtils.java
===================================================================
--- trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/utils/ImageUtils.java 2009-04-29 15:17:11 UTC (rev 1168)
+++ trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/utils/ImageUtils.java 2009-04-29 20:39:50 UTC (rev 1169)
@@ -51,7 +51,7 @@
import javax.jcr.RepositoryException;
import net.sourceforge.openutils.mgnlmedia.media.configuration.MediaConfigurationManager;
-import net.sourceforge.openutils.mgnlmedia.media.lifecycle.MediaModuleLifecycle;
+import net.sourceforge.openutils.mgnlmedia.media.lifecycle.MediaModule;
import org.apache.commons.io.IOUtils;
import org.apache.commons.lang.ClassUtils;
@@ -514,7 +514,7 @@
*/
public void exec()
{
- HierarchyManager hm = MgnlContext.getHierarchyManager(MediaModuleLifecycle.REPO);
+ HierarchyManager hm = MgnlContext.getHierarchyManager(MediaModule.REPO);
String resolution = resolutionTarget;
if ("thumbnail".equals(resolution))
Modified: trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/utils/MediaLoadUtils.java
===================================================================
--- trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/utils/MediaLoadUtils.java 2009-04-29 15:17:11 UTC (rev 1168)
+++ trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/utils/MediaLoadUtils.java 2009-04-29 20:39:50 UTC (rev 1169)
@@ -35,7 +35,7 @@
import net.sourceforge.openutils.mgnlmedia.media.configuration.MediaConfigurationManager;
import net.sourceforge.openutils.mgnlmedia.media.configuration.MediaTypeConfiguration;
-import net.sourceforge.openutils.mgnlmedia.media.lifecycle.MediaModuleLifecycle;
+import net.sourceforge.openutils.mgnlmedia.media.lifecycle.MediaModule;
import org.apache.commons.io.IOUtils;
import org.apache.commons.lang.StringUtils;
@@ -61,7 +61,7 @@
log.debug("loading image {} {}", parent, filename);
- HierarchyManager mgr = MgnlContext.getSystemContext().getHierarchyManager(MediaModuleLifecycle.REPO);
+ HierarchyManager mgr = MgnlContext.getSystemContext().getHierarchyManager(MediaModule.REPO);
String extension = StringUtils.substringAfterLast(filename, ".");
String cleanFilename = StringUtils.substringBeforeLast(filename, ".");
@@ -105,6 +105,11 @@
nd = NodeDataUtil.getOrCreate(media, "modificationDate");
nd.setValue(Calendar.getInstance());
+ if (MediaModule.getInstance().isAutoactivate())
+ {
+ media.getMetaData().setActivated();
+ }
+
mgr.save();
File f = File.createTempFile("entry", extension);
@@ -122,7 +127,7 @@
return null;
}
- private static Content getOrCreateFullPath(HierarchyManager mgr, String path) throws RepositoryException
+ public static Content getOrCreateFullPath(HierarchyManager mgr, String path) throws RepositoryException
{
String[] contentNodeNames = path.split("/");
Content currContent = mgr.getRoot();
@@ -134,6 +139,11 @@
currContent,
contentNodeName,
MediaConfigurationManager.FOLDER);
+
+ if (MediaModule.getInstance().isAutoactivate() && !currContent.getMetaData().getIsActivated())
+ {
+ currContent.getMetaData().setActivated();
+ }
}
}
return currContent;
Modified: trunk/openutils-mgnlmedia/src/main/resources/META-INF/magnolia/media.xml
===================================================================
--- trunk/openutils-mgnlmedia/src/main/resources/META-INF/magnolia/media.xml 2009-04-29 15:17:11 UTC (rev 1168)
+++ trunk/openutils-mgnlmedia/src/main/resources/META-INF/magnolia/media.xml 2009-04-29 20:39:50 UTC (rev 1169)
@@ -4,7 +4,7 @@
<name>media</name>
<displayName>magnolia media module</displayName>
<description>magnolia media module</description>
- <class>net.sourceforge.openutils.mgnlmedia.media.lifecycle.MediaModuleLifecycle</class>
+ <class>net.sourceforge.openutils.mgnlmedia.media.lifecycle.MediaModule</class>
<versionHandler>net.sourceforge.openutils.mgnlmedia.media.setup.MediaModuleVersionHandler</versionHandler>
<version>${project.version}</version>
<dependencies>
Modified: trunk/openutils-mgnlmedia/src/site/changes/changes.xml
===================================================================
--- trunk/openutils-mgnlmedia/src/site/changes/changes.xml 2009-04-29 15:17:11 UTC (rev 1168)
+++ trunk/openutils-mgnlmedia/src/site/changes/changes.xml 2009-04-29 20:39:50 UTC (rev 1169)
@@ -11,8 +11,10 @@
<release version="4.0-b4" date="in svn" description="">
<action type="update" dev="fgiust">YouTubeVideoTypeHandler modified in order to work with generic external urls (not
only youtube)</action>
- <action type="update" dev="fgiust">new utility class net.sourceforge.openutils.mgnlmedia.media.utils.MediaLoadUtils
+ <action type="add" dev="fgiust">new utility class net.sourceforge.openutils.mgnlmedia.media.utils.MediaLoadUtils
</action>
+ <action type="add" dev="fgiust">new property "autoactivate" that can be set in module configuration
+ (/modules/media/config/autoactivate) to have imported media activated by default.</action>
</release>
<release version="4.0-b3" date="2009-04-23" description="">
<action type="update" dev="fgiust">Update openutils-mgnltasks dependency to 4.0</action>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
