[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.