openutils-svn

[Openutils-svn] SF.net SVN: openutils:[1825] trunk/openutils-mgnlmedia/src/main/java/net/ sourceforge/openutils/mgnlmedia/media/setup

[<fg...@us...>]

Revision: 1825
          http://openutils.svn.sourceforge.net/openutils/?rev=1825&view=rev
Author:   fgiust
Date:     2010-02-06 19:45:09 +0000 (Sat, 06 Feb 2010)

Log Message:
-----------
MEDIA-70 new enabled property for media type (set a default in the existing config)

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/CreateMissingPropertyTask.java

Added: trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/setup/CreateMissingPropertyTask.java
===================================================================
--- trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/setup/CreateMissingPropertyTask.java	                        (rev 0)
+++ trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/setup/CreateMissingPropertyTask.java	2010-02-06 19:45:09 UTC (rev 1825)
@@ -0,0 +1,78 @@
+/**
+ *
+ * Magnolia SimpleMedia Module (http://www.openmindlab.com/lab/products/media.html)
+ * Copyright (C)2008 - 2010, Openmind S.r.l. 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.setup;
+
+import info.magnolia.cms.core.Content;
+import info.magnolia.cms.core.HierarchyManager;
+import info.magnolia.cms.util.ContentUtil;
+import info.magnolia.cms.util.NodeDataUtil;
+import info.magnolia.module.InstallContext;
+import info.magnolia.module.delta.AbstractRepositoryTask;
+import info.magnolia.module.delta.TaskExecutionException;
+
+import javax.jcr.RepositoryException;
+
+
+/**
+ * Set a nodedata if not existing. Also creates the full path if missing.
+ * @author fgiust
+ * @version $Id$
+ */
+public class CreateMissingPropertyTask extends AbstractRepositoryTask
+{
+
+    private final String workspaceName;
+
+    private final String nodePath;
+
+    private final String propertyName;
+
+    private final Object propertyValue;
+
+    public CreateMissingPropertyTask(String workspaceName, String nodePath, String propertyName, Object propertyValue)
+    {
+        super("Create non-existent property", "Creating property "
+            + nodePath
+            + "/"
+            + propertyName
+            + " and setting its value to "
+            + propertyValue);
+        this.workspaceName = workspaceName;
+        this.nodePath = nodePath;
+        this.propertyName = propertyName;
+        this.propertyValue = propertyValue;
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    protected void doExecute(InstallContext ctx) throws RepositoryException, TaskExecutionException
+    {
+        final HierarchyManager hm = ctx.getHierarchyManager(workspaceName);
+
+        final Content node = ContentUtil.createPath(hm, nodePath, false);
+        if (!node.hasNodeData(propertyName))
+        {
+            NodeDataUtil.getOrCreateAndSet(node, propertyName, propertyValue);
+        }
+
+    }
+
+}


Property changes on: trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/setup/CreateMissingPropertyTask.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-06 18:23:07 UTC (rev 1824)
+++ trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/setup/MediaModuleVersionHandler.java	2010-02-06 19:45:09 UTC (rev 1825)
@@ -29,7 +29,6 @@
 import info.magnolia.module.InstallContext;
 import info.magnolia.module.delta.Task;
 import info.magnolia.module.delta.TaskExecutionException;
-import it.openutils.mgnltasks.CreateMissingPropertyTask;
 import it.openutils.mgnltasks.NodeSortTask;
 import it.openutils.mgnltasks.SimpleModuleVersionHandler;
 
@@ -139,13 +138,33 @@
         });
 
         tasks.add(new CreateMissingPropertyTask(
-            "name",
-            "desc",
             ContentRepository.CONFIG,
             "/modules/media/config",
             "singleinstance",
-            "false"));
+            Boolean.FALSE));
 
+        // MEDIA-70 new enabled property for media type
+        tasks.add(new CreateMissingPropertyTask(
+            ContentRepository.CONFIG,
+            "/modules/media/mediatypes/image",
+            "enabled",
+            Boolean.TRUE));
+        tasks.add(new CreateMissingPropertyTask(
+            ContentRepository.CONFIG,
+            "/modules/media/mediatypes/video",
+            "enabled",
+            Boolean.TRUE));
+        tasks.add(new CreateMissingPropertyTask(
+            ContentRepository.CONFIG,
+            "/modules/media/mediatypes/youtube",
+            "enabled",
+            Boolean.TRUE));
+        tasks.add(new CreateMissingPropertyTask(
+            ContentRepository.CONFIG,
+            "/modules/media/mediatypes/audio",
+            "enabled",
+            Boolean.TRUE));
+
         return tasks;
     }
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Openutils-svn] SF.net SVN: openutils:[1905] trunk/openutils-mgnlmedia/src/main/java/net/ sourceforge/openutils/mgnlmedia/media/setup

[<die...@us...>]

Revision: 1905
          http://openutils.svn.sourceforge.net/openutils/?rev=1905&view=rev
Author:   diego_schivo
Date:     2010-02-12 15:16:59 +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

Removed Paths:
-------------
    trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/setup/BootstrapDamSupportTask.java

Deleted: 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	2010-02-12 15:03:15 UTC (rev 1904)
+++ trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/setup/BootstrapDamSupportTask.java	2010-02-12 15:16:59 UTC (rev 1905)
@@ -1,33 +0,0 @@
-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);
-    }
-
-}

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 15:03:15 UTC (rev 1904)
+++ trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/setup/MediaModuleVersionHandler.java	2010-02-12 15:16:59 UTC (rev 1905)
@@ -22,9 +22,11 @@
 import info.magnolia.cms.beans.config.ContentRepository;
 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;
 import it.openutils.mgnltasks.NodeSortTask;
@@ -115,14 +117,13 @@
     @Override
     public List<Delta> getDeltas(InstallContext ctx, Version from)
     {
-        if (from == null)
+        List<Delta> deltas = super.getDeltas(ctx, from);
+        if (from == null && ModuleRegistry.Factory.getInstance().getDefinition("standard-templating-kit") != 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;
+                new BootstrapMissingNodesTask(ctx.getCurrentModuleDefinition().getName() + "-dam"));
         }
-        return super.getDeltas(ctx, from);
+        return deltas;
     }
 }


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Openutils-svn] SF.net SVN: openutils:[2368] trunk/openutils-mgnlmedia/src/main/java/net/ sourceforge/openutils/mgnlmedia/media/setup

[<fg...@us...>]

Revision: 2368
          http://openutils.svn.sourceforge.net/openutils/?rev=2368&view=rev
Author:   fgiust
Date:     2010-05-09 12:32:53 +0000 (Sun, 09 May 2010)

Log Message:
-----------
MEDIA-108 Don't add a subscription for the media repository when in single instance mode

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/ConditionallySubscribeMediaRepositoriesTask.java
    trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/setup/SetupModuleRepositoriesWithoutSubscriberTask.java

Added: trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/setup/ConditionallySubscribeMediaRepositoriesTask.java
===================================================================
--- trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/setup/ConditionallySubscribeMediaRepositoriesTask.java	                        (rev 0)
+++ trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/setup/ConditionallySubscribeMediaRepositoriesTask.java	2010-05-09 12:32:53 UTC (rev 2368)
@@ -0,0 +1,112 @@
+/**
+ *
+ * Magnolia SimpleMedia Module (http://www.openmindlab.com/lab/products/media.html)
+ * Copyright (C)2008 - 2010, Openmind S.r.l. 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.setup;
+
+import info.magnolia.cms.beans.config.ContentRepository;
+import info.magnolia.cms.core.Content;
+import info.magnolia.cms.core.ItemType;
+import info.magnolia.cms.exchange.ActivationManager;
+import info.magnolia.cms.exchange.ActivationManagerFactory;
+import info.magnolia.cms.exchange.Subscriber;
+import info.magnolia.cms.util.ContentUtil;
+import info.magnolia.module.InstallContext;
+import info.magnolia.module.delta.AbstractTask;
+import info.magnolia.module.delta.TaskExecutionException;
+import info.magnolia.module.model.ModuleDefinition;
+import info.magnolia.module.model.RepositoryDefinition;
+
+import javax.jcr.RepositoryException;
+
+
+/**
+ * Adds a subscription for the media repositories only if the single-instance flag is not set.
+ * @author fgiust
+ * @version $Id$
+ */
+public class ConditionallySubscribeMediaRepositoriesTask extends AbstractTask
+{
+
+    public ConditionallySubscribeMediaRepositoriesTask()
+    {
+        super("Register workspaces for activation", "Register workspaces for activation.");
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public void execute(InstallContext ctx) throws TaskExecutionException
+    {
+
+        // check for the sigleinstance flag directly in jcr, the module is not started yet
+        boolean singleinstance = false;
+        Content moduleConfigNode = ContentUtil.getContent(ContentRepository.CONFIG, "/modules/media/config");
+        if (moduleConfigNode != null)
+        {
+            singleinstance = moduleConfigNode.getNodeData("singleinstance").getBoolean();
+        }
+        if (singleinstance)
+        {
+            return;
+        }
+
+        final ModuleDefinition def = ctx.getCurrentModuleDefinition();
+
+        for (RepositoryDefinition repDef : def.getRepositories())
+        {
+            for (final String workspace : repDef.getWorkspaces())
+            {
+                subscribeRepository(workspace);
+            }
+        }
+
+    }
+
+    /**
+     * Register the repository to get used for activation TODO - use an API for this? But same remark as above, the
+     * component might not be ready yet.
+     */
+    private void subscribeRepository(String repository) throws TaskExecutionException
+    {
+        ActivationManager sManager = ActivationManagerFactory.getActivationManager();
+        for (Subscriber subscriber : sManager.getSubscribers())
+        {
+            if (!subscriber.isSubscribed("/", repository))
+            {
+                Content subscriptionsNode = ContentUtil.getContent(ContentRepository.CONFIG, sManager.getConfigPath()
+                    + "/"
+                    + subscriber.getName()
+                    + "/subscriptions");
+                try
+                {
+                    Content newSubscription = subscriptionsNode.createContent(repository, ItemType.CONTENTNODE);
+                    newSubscription.createNodeData("toURI").setValue("/");
+                    newSubscription.createNodeData("repository").setValue(repository);
+                    newSubscription.createNodeData("fromURI").setValue("/");
+                    // subscriptionsNode.save();
+                }
+                catch (RepositoryException re)
+                {
+                    throw new TaskExecutionException("wasn't able to subscribe repository [" + repository + "]", re);
+                }
+            }
+        }
+    }
+
+}


Property changes on: trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/setup/ConditionallySubscribeMediaRepositoriesTask.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-05-09 11:56:24 UTC (rev 2367)
+++ trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/setup/MediaModuleVersionHandler.java	2010-05-09 12:32:53 UTC (rev 2368)
@@ -23,6 +23,7 @@
 import info.magnolia.cms.core.SystemProperty;
 import info.magnolia.module.InstallContext;
 import info.magnolia.module.ModuleRegistry;
+import info.magnolia.module.delta.SetupModuleRepositoriesTask;
 import info.magnolia.module.delta.Task;
 import it.openutils.mgnltasks.BootstrapMissingNodesTask;
 import it.openutils.mgnltasks.ChangeExistingPropertyTask;
@@ -48,6 +49,31 @@
      * {@inheritDoc}
      */
     @Override
+    protected List<Task> getBasicInstallTasks(InstallContext installContext)
+    {
+        List<Task> basicInstallTasks = super.getBasicInstallTasks(installContext);
+
+        for (int j = 0; j < basicInstallTasks.size(); j++)
+        {
+            if (basicInstallTasks.get(j) instanceof SetupModuleRepositoriesTask)
+            {
+                // replace SetupModuleRepositoriesTask with SetupModuleRepositoriesWithoutSubscriberTask
+                basicInstallTasks.remove(j);
+                basicInstallTasks.add(j, new SetupModuleRepositoriesWithoutSubscriberTask());
+                break;
+            }
+
+        }
+
+        basicInstallTasks.add(new ConditionallySubscribeMediaRepositoriesTask());
+
+        return basicInstallTasks;
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
     protected List<Task> getStartupTasks(InstallContext installContext)
     {
         List<Task> tasks = new ArrayList<Task>();

Added: trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/setup/SetupModuleRepositoriesWithoutSubscriberTask.java
===================================================================
--- trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/setup/SetupModuleRepositoriesWithoutSubscriberTask.java	                        (rev 0)
+++ trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/setup/SetupModuleRepositoriesWithoutSubscriberTask.java	2010-05-09 12:32:53 UTC (rev 2368)
@@ -0,0 +1,94 @@
+/**
+ *
+ * Magnolia SimpleMedia Module (http://www.openmindlab.com/lab/products/media.html)
+ * Copyright (C)2008 - 2010, Openmind S.r.l. 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.setup;
+
+import info.magnolia.cms.beans.config.ContentRepository;
+import info.magnolia.cms.security.Permission;
+import info.magnolia.cms.security.Role;
+import info.magnolia.cms.security.Security;
+import info.magnolia.importexport.Bootstrapper;
+import info.magnolia.module.InstallContext;
+import info.magnolia.module.delta.AbstractTask;
+import info.magnolia.module.delta.TaskExecutionException;
+import info.magnolia.module.model.ModuleDefinition;
+import info.magnolia.module.model.RepositoryDefinition;
+
+
+/**
+ * A copy of SetupModuleRepositoriesTask without the activation subscription (not needed in case of single-instance
+ * configuration.
+ * @author fgiust
+ * @version $Id$
+ */
+public class SetupModuleRepositoriesWithoutSubscriberTask extends AbstractTask
+{
+
+    public SetupModuleRepositoriesWithoutSubscriberTask()
+    {
+        super(
+            "Setup module repositories",
+            "Bootstrap empty repositories and grant them to superuser.");
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public void execute(InstallContext ctx) throws TaskExecutionException
+    {
+        try
+        {
+            final ModuleDefinition def = ctx.getCurrentModuleDefinition();
+            // register repositories
+            for (RepositoryDefinition repDef : def.getRepositories())
+            {
+                for (final String workspace : repDef.getWorkspaces())
+                {
+                    // bootstrap the workspace if empty
+                    if (!ContentRepository.checkIfInitialized(workspace))
+                    {
+                        final String[] bootstrapDirs = Bootstrapper.getBootstrapDirs();
+                        Bootstrapper.bootstrapRepository(bootstrapDirs, workspace, new Bootstrapper.BootstrapFilter()
+                        {
+
+                            public boolean accept(String filename)
+                            {
+                                return filename.startsWith(workspace + ".");
+                            }
+                        });
+                    }
+
+                    grantRepositoryToSuperuser(workspace);
+                }
+            }
+        }
+        catch (Throwable e)
+        {
+            throw new TaskExecutionException("Could not bootstrap workspace: " + e.getMessage(), e);
+        }
+
+    }
+
+    private void grantRepositoryToSuperuser(String workspace)
+    {
+        final Role superuser = Security.getRoleManager().getRole("superuser");
+        superuser.addPermission(workspace, "/*", Permission.ALL);
+    }
+
+}


Property changes on: trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/setup/SetupModuleRepositoriesWithoutSubscriberTask.java
___________________________________________________________________
Added: svn:mime-type
   + text/plain
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.

[Openutils-svn] SF.net SVN: openutils:[2378] trunk/openutils-mgnlmedia/src/main/java/net/ sourceforge/openutils/mgnlmedia/media/setup

[<fg...@us...>]

Revision: 2378
          http://openutils.svn.sourceforge.net/openutils/?rev=2378&view=rev
Author:   fgiust
Date:     2010-05-09 18:08:21 +0000 (Sun, 09 May 2010)

Log Message:
-----------
source compatibility with magnolia 4.0

Modified Paths:
--------------
    trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/setup/ConditionallySubscribeMediaRepositoriesTask.java
    trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/setup/SetupModuleRepositoriesWithoutSubscriberTask.java

Modified: trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/setup/ConditionallySubscribeMediaRepositoriesTask.java
===================================================================
--- trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/setup/ConditionallySubscribeMediaRepositoriesTask.java	2010-05-09 17:57:11 UTC (rev 2377)
+++ trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/setup/ConditionallySubscribeMediaRepositoriesTask.java	2010-05-09 18:08:21 UTC (rev 2378)
@@ -19,6 +19,9 @@
 
 package net.sourceforge.openutils.mgnlmedia.media.setup;
 
+import java.util.Collection;
+import java.util.List;
+
 import info.magnolia.cms.beans.config.ContentRepository;
 import info.magnolia.cms.core.Content;
 import info.magnolia.cms.core.ItemType;
@@ -68,9 +71,11 @@
 
         final ModuleDefinition def = ctx.getCurrentModuleDefinition();
 
-        for (RepositoryDefinition repDef : def.getRepositories())
+        Collection<RepositoryDefinition> repositories = def.getRepositories();
+        for (RepositoryDefinition repDef : repositories)
         {
-            for (final String workspace : repDef.getWorkspaces())
+            List<String> workspaces = repDef.getWorkspaces();
+            for (final String workspace : workspaces)
             {
                 subscribeRepository(workspace);
             }
@@ -85,7 +90,8 @@
     private void subscribeRepository(String repository) throws TaskExecutionException
     {
         ActivationManager sManager = ActivationManagerFactory.getActivationManager();
-        for (Subscriber subscriber : sManager.getSubscribers())
+        Collection<Subscriber> subscribers = sManager.getSubscribers();
+        for (Subscriber subscriber : subscribers)
         {
             if (!subscriber.isSubscribed("/", repository))
             {

Modified: trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/setup/SetupModuleRepositoriesWithoutSubscriberTask.java
===================================================================
--- trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/setup/SetupModuleRepositoriesWithoutSubscriberTask.java	2010-05-09 17:57:11 UTC (rev 2377)
+++ trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/setup/SetupModuleRepositoriesWithoutSubscriberTask.java	2010-05-09 18:08:21 UTC (rev 2378)
@@ -19,6 +19,9 @@
 
 package net.sourceforge.openutils.mgnlmedia.media.setup;
 
+import java.util.Collection;
+import java.util.List;
+
 import info.magnolia.cms.beans.config.ContentRepository;
 import info.magnolia.cms.security.Permission;
 import info.magnolia.cms.security.Role;
@@ -42,9 +45,7 @@
 
     public SetupModuleRepositoriesWithoutSubscriberTask()
     {
-        super(
-            "Setup module repositories",
-            "Bootstrap empty repositories and grant them to superuser.");
+        super("Setup module repositories", "Bootstrap empty repositories and grant them to superuser.");
     }
 
     /**
@@ -56,9 +57,11 @@
         {
             final ModuleDefinition def = ctx.getCurrentModuleDefinition();
             // register repositories
-            for (RepositoryDefinition repDef : def.getRepositories())
+            Collection<RepositoryDefinition> repositories = def.getRepositories();
+            for (RepositoryDefinition repDef : repositories)
             {
-                for (final String workspace : repDef.getWorkspaces())
+                List<String> workspaces = repDef.getWorkspaces();
+                for (final String workspace : workspaces)
                 {
                     // bootstrap the workspace if empty
                     if (!ContentRepository.checkIfInitialized(workspace))


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Openutils-svn] SF.net SVN: openutils:[3458] trunk/openutils-mgnlmedia/src/main/java/net/ sourceforge/openutils/mgnlmedia/media/setup

[<fg...@us...>]

Revision: 3458
          http://openutils.svn.sourceforge.net/openutils/?rev=3458&view=rev
Author:   fgiust
Date:     2011-05-12 15:48:14 +0000 (Thu, 12 May 2011)

Log Message:
-----------
disable old migration task

Modified Paths:
--------------
    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/MoveOriginalNodeTask.java

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	2011-05-12 15:44:36 UTC (rev 3457)
+++ trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/setup/MediaModuleVersionHandler.java	2011-05-12 15:48:14 UTC (rev 3458)
@@ -84,7 +84,8 @@
             tasks.add(new SamplesExtractionTask());
         }
 
-        tasks.add(new MoveOriginalNodeTask());
+        // this task is now disabled, it can now be run manually if needed
+        // tasks.add(new MoveOriginalNodeTask());
 
         tasks.add(new CreateMissingPropertyTask(
             ContentRepository.CONFIG,

Modified: trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/setup/MoveOriginalNodeTask.java
===================================================================
--- trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/setup/MoveOriginalNodeTask.java	2011-05-12 15:44:36 UTC (rev 3457)
+++ trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/setup/MoveOriginalNodeTask.java	2011-05-12 15:48:14 UTC (rev 3458)
@@ -23,6 +23,7 @@
 import info.magnolia.cms.core.HierarchyManager;
 import info.magnolia.cms.core.NodeData;
 import info.magnolia.cms.core.search.Query;
+import info.magnolia.context.MgnlContext;
 import info.magnolia.module.InstallContext;
 import info.magnolia.module.delta.Task;
 import info.magnolia.module.delta.TaskExecutionException;
@@ -85,9 +86,19 @@
         }
     }
 
-    private void reset(HierarchyManager queryManager, String type, String nodedataOldName) throws RepositoryException
+    public static void execute() throws RepositoryException
     {
+        HierarchyManager mgr = MgnlContext.getHierarchyManager(MediaModule.REPO);
 
+        reset(mgr, "image", "image");
+        reset(mgr, "video", "video");
+        reset(mgr, "audio", "audio");
+    }
+
+    public static void reset(HierarchyManager queryManager, String type, String nodedataOldName)
+        throws RepositoryException
+    {
+
         DirectJcrQuery query = JCRCriteriaFactory.createDirectJcrQuery(queryManager, "//*[@jcr:primaryType = '"
             + MediaConfigurationManager.MEDIA.getSystemName()
             + "' and "


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.