Menu
▾
▴
[Openutils-svn] SF.net SVN: openutils:[4284] magnoliamodules/trunk
|
From: <fg...@us...> - 2013-09-12 08:20:07
|
Revision: 4284
http://openutils.svn.sourceforge.net/openutils/?rev=4284&view=rev
Author: fgiust
Date: 2013-09-12 08:20:02 +0000 (Thu, 12 Sep 2013)
Log Message:
-----------
cleanup some deprecations
Modified Paths:
--------------
magnoliamodules/trunk/magnolia-test-webapp/src/main/java/info/magnolia/module/development/DevModuleVersionHandler.java
magnoliamodules/trunk/magnolia-test-webapp/src/main/webapp/WEB-INF/tags/openutils/debug.tag
magnoliamodules/trunk/openutils-mgnlbootstrapsync/src/main/java/it/openutils/mgnlbootstrapsync/lifecycle/BootstrapSyncModuleLifecycle.java
magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/java/net/sourceforge/openutils/mgnlcontextmenu/setup/ContextMenuModuleVersionHandler.java
magnoliamodules/trunk/openutils-mgnlcontrols/src/main/java/net/sourceforge/openutils/mgnlcontrols/dialog/DialogButtonSet.java
magnoliamodules/trunk/openutils-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/advanced/impl/AccessibleResultItemResultIterator.java
magnoliamodules/trunk/openutils-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/advanced/impl/AdvancedResultImpl.java
magnoliamodules/trunk/openutils-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/advanced/impl/AdvancedResultItemResultIterator.java
magnoliamodules/trunk/openutils-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/jcr/query/AdvancedResult.java
magnoliamodules/trunk/openutils-mgnlcriteria/src/main/java/org/apache/jackrabbit/core/query/lucene/JackrabbitQueryParser.java
magnoliamodules/trunk/openutils-mgnlcriteria/src/test/java/net/sourceforge/openutils/mgnlcriteria/advanced/XpathEscapeTest.java
magnoliamodules/trunk/openutils-mgnlcriteria/src/test/java/net/sourceforge/openutils/mgnlcriteria/jcr/query/lucene/AclSearchIndexTest.java
magnoliamodules/trunk/openutils-mgnlcriteria/src/test/java/net/sourceforge/openutils/mgnlcriteria/tests/CriteriaTestUtils.java
magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/samples/listeners/StudentLevelListener.java
magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/setup/SetupModuleRepositoriesWithoutSubscriberTask.java
magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/playlist/pages/PlaylistView.java
magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/playlist/utils/PlaylistIterateUtils.java
magnoliamodules/trunk/openutils-mgnlmessages/src/main/java/net/sourceforge/openutils/mgnlmessages/configuration/MessagesConfigurationManager.java
magnoliamodules/trunk/openutils-mgnlmessages/src/main/java/net/sourceforge/openutils/mgnlmessages/pages/ExtractMessagesFromDialogsPage.java
magnoliamodules/trunk/openutils-mgnlrepoutils/src/main/java/net/sourceforge/openutils/mgnlrepoutils/RepositoryUtilsPage.java
magnoliamodules/trunk/openutils-mgnlstripes/src/main/java/it/openutils/magnoliastripes/setup/StripesModuleVersionHandler.java
magnoliamodules/trunk/openutils-mgnltagcloud/src/main/java/net/sourceforge/openutils/mgnltagcloud/manager/TagCloudManager.java
magnoliamodules/trunk/openutils-mgnltagcloud/src/main/java/net/sourceforge/openutils/mgnltagcloud/util/JackrabbitUtil.java
magnoliamodules/trunk/openutils-mgnltagcloud/src/test/java/net/sourceforge/openutils/mgnltagcloud/manager/TagCloudManagerTest.java
magnoliamodules/trunk/openutils-mgnltasks/src/main/java/it/openutils/mgnltasks/AddPermissionTask.java
magnoliamodules/trunk/openutils-mgnltasks/src/main/java/it/openutils/mgnltasks/AnonymousUserSetupTask.java
magnoliamodules/trunk/openutils-mgnltasks/src/main/java/it/openutils/mgnltasks/BaseCheckMissingTask.java
magnoliamodules/trunk/openutils-mgnltasks/src/main/java/it/openutils/mgnltasks/ChangeDefaultPasswordTask.java
magnoliamodules/trunk/openutils-mgnltasks/src/main/java/it/openutils/mgnltasks/CheckAndCreateGroupTask.java
magnoliamodules/trunk/openutils-mgnltasks/src/main/java/it/openutils/mgnltasks/CheckAndCreateRoleTask.java
magnoliamodules/trunk/openutils-mgnltasks/src/main/java/it/openutils/mgnltasks/CheckAndCreateUserTask.java
magnoliamodules/trunk/openutils-mgnltasks/src/main/java/it/openutils/mgnltasks/CreateDefaultRepositoryAclForAllUsersTask.java
magnoliamodules/trunk/openutils-mgnltasks/src/main/java/it/openutils/mgnltasks/DiffModuleConfigBootstrapTask.java
magnoliamodules/trunk/openutils-mgnltasks/src/main/java/it/openutils/mgnltasks/DisableSubscribersTask.java
magnoliamodules/trunk/openutils-mgnltasks/src/main/java/it/openutils/mgnltasks/dev/ModuleDevelopmentUtilsPage.java
magnoliamodules/trunk/openutils-mgnlutils/src/main/java/it/openutils/mgnlutils/el/MgnlUtilsDeprecatedAdapters.java
magnoliamodules/trunk/openutils-mgnlutils/src/main/java/it/openutils/mgnlutils/el/NodeElResolver.java
magnoliamodules/trunk/openutils-mgnlutils/src/main/java/it/openutils/mgnlutils/el/NodeElResolverUtils.java
magnoliamodules/trunk/openutils-mgnlutils/src/main/java/it/openutils/mgnlutils/save/SafeMultiValueSaveHandler.java
Modified: magnoliamodules/trunk/magnolia-test-webapp/src/main/java/info/magnolia/module/development/DevModuleVersionHandler.java
===================================================================
--- magnoliamodules/trunk/magnolia-test-webapp/src/main/java/info/magnolia/module/development/DevModuleVersionHandler.java 2013-09-12 08:05:01 UTC (rev 4283)
+++ magnoliamodules/trunk/magnolia-test-webapp/src/main/java/info/magnolia/module/development/DevModuleVersionHandler.java 2013-09-12 08:20:02 UTC (rev 4284)
@@ -1,11 +1,11 @@
package info.magnolia.module.development;
-import info.magnolia.cms.beans.config.ContentRepository;
import info.magnolia.cms.core.SystemProperty;
import info.magnolia.module.DefaultModuleVersionHandler;
import info.magnolia.module.InstallContext;
import info.magnolia.module.delta.SetPropertyTask;
import info.magnolia.module.delta.Task;
+import info.magnolia.repository.RepositoryConstants;
import it.openutils.mgnltasks.NodeSortTask;
import java.util.ArrayList;
@@ -41,7 +41,7 @@
}
// I hate spending time in looking through the unsorted list of modules...
- tasks.add(new NodeSortTask(ContentRepository.CONFIG, "/modules"));
+ tasks.add(new NodeSortTask(RepositoryConstants.CONFIG, "/modules"));
return tasks;
}
Modified: magnoliamodules/trunk/magnolia-test-webapp/src/main/webapp/WEB-INF/tags/openutils/debug.tag
===================================================================
--- magnoliamodules/trunk/magnolia-test-webapp/src/main/webapp/WEB-INF/tags/openutils/debug.tag 2013-09-12 08:05:01 UTC (rev 4283)
+++ magnoliamodules/trunk/magnolia-test-webapp/src/main/webapp/WEB-INF/tags/openutils/debug.tag 2013-09-12 08:20:02 UTC (rev 4284)
@@ -45,14 +45,14 @@
<td>state.originalURI</td>
<td>${state.originalURI}</td>
</tr>
-<!-- <tr>
+ <tr>
<td>state.mainContent</td>
<td>${state.mainContent} ${state.mainContent.class}</td>
- </tr>-->
-<!-- <tr>
+ </tr>
+ <tr>
<td>state.mainContent.JCRNode</td>
<td>${state.mainContent.JCRNode} ${state.mainContent.JCRNode.class}</td>
- </tr>-->
+ </tr>
<tr>
<td>state.mainContent.JCRNode.identifier</td>
<td>${state.mainContent.JCRNode.identifier}</td>
Modified: magnoliamodules/trunk/openutils-mgnlbootstrapsync/src/main/java/it/openutils/mgnlbootstrapsync/lifecycle/BootstrapSyncModuleLifecycle.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlbootstrapsync/src/main/java/it/openutils/mgnlbootstrapsync/lifecycle/BootstrapSyncModuleLifecycle.java 2013-09-12 08:05:01 UTC (rev 4283)
+++ magnoliamodules/trunk/openutils-mgnlbootstrapsync/src/main/java/it/openutils/mgnlbootstrapsync/lifecycle/BootstrapSyncModuleLifecycle.java 2013-09-12 08:20:02 UTC (rev 4284)
@@ -19,13 +19,13 @@
package it.openutils.mgnlbootstrapsync.lifecycle;
-import info.magnolia.cms.beans.config.ContentRepository;
import info.magnolia.cms.core.HierarchyManager;
import info.magnolia.cms.core.ItemType;
import info.magnolia.cms.core.SystemProperty;
import info.magnolia.context.MgnlContext;
import info.magnolia.module.ModuleLifecycle;
import info.magnolia.module.ModuleLifecycleContext;
+import info.magnolia.repository.RepositoryConstants;
import it.openutils.mgnlbootstrapsync.listener.AbstractBootstrapSyncListener;
import it.openutils.mgnlbootstrapsync.listener.BootstrapSyncListener;
import it.openutils.mgnlbootstrapsync.watch.BootstrapSyncRepositoryWatch;
@@ -95,15 +95,15 @@
{
// set default nodeType
nodeType = ItemType.CONTENT.getSystemName();
- if (ContentRepository.USERS.equalsIgnoreCase(repository))
+ if (RepositoryConstants.USERS.equalsIgnoreCase(repository))
{
nodeType = ItemType.USER.getSystemName();
}
- else if (ContentRepository.USER_ROLES.equalsIgnoreCase(repository))
+ else if (RepositoryConstants.USER_ROLES.equalsIgnoreCase(repository))
{
nodeType = ItemType.ROLE.getSystemName();
}
- else if (ContentRepository.USER_GROUPS.equalsIgnoreCase(repository))
+ else if (RepositoryConstants.USER_GROUPS.equalsIgnoreCase(repository))
{
nodeType = ItemType.GROUP.getSystemName();
}
Modified: magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/java/net/sourceforge/openutils/mgnlcontextmenu/setup/ContextMenuModuleVersionHandler.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/java/net/sourceforge/openutils/mgnlcontextmenu/setup/ContextMenuModuleVersionHandler.java 2013-09-12 08:05:01 UTC (rev 4283)
+++ magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/java/net/sourceforge/openutils/mgnlcontextmenu/setup/ContextMenuModuleVersionHandler.java 2013-09-12 08:20:02 UTC (rev 4284)
@@ -19,10 +19,10 @@
package net.sourceforge.openutils.mgnlcontextmenu.setup;
-import info.magnolia.cms.beans.config.ContentRepository;
import info.magnolia.cms.core.SystemProperty;
import info.magnolia.module.InstallContext;
import info.magnolia.module.delta.Task;
+import info.magnolia.repository.RepositoryConstants;
import it.openutils.mgnltasks.CreateMissingPropertyTask;
import it.openutils.mgnltasks.SimpleModuleVersionHandler;
@@ -66,19 +66,19 @@
}
tasks.add(new CreateMissingPropertyTask(
- ContentRepository.CONFIG,
+ RepositoryConstants.CONFIG,
"/modules/contextmenu/config/getGlobalEntriesNodeStrategy",
"class",
DefaultGetGlobalEntriesNodeStrategy.class.getName()));
tasks.add(new CreateMissingPropertyTask(
- ContentRepository.CONFIG,
+ RepositoryConstants.CONFIG,
"/modules/contextmenu/config/getGlobalEntriesNodeStrategy",
"ancestorLevel",
Long.valueOf(1)));
tasks.add(new CreateMissingPropertyTask(
- ContentRepository.CONFIG,
+ RepositoryConstants.CONFIG,
"/modules/contextmenu/config/persistenceStrategy",
"class",
DefaultPersistenceStrategy.class.getName()));
Modified: magnoliamodules/trunk/openutils-mgnlcontrols/src/main/java/net/sourceforge/openutils/mgnlcontrols/dialog/DialogButtonSet.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlcontrols/src/main/java/net/sourceforge/openutils/mgnlcontrols/dialog/DialogButtonSet.java 2013-09-12 08:05:01 UTC (rev 4283)
+++ magnoliamodules/trunk/openutils-mgnlcontrols/src/main/java/net/sourceforge/openutils/mgnlcontrols/dialog/DialogButtonSet.java 2013-09-12 08:20:02 UTC (rev 4284)
@@ -19,12 +19,12 @@
package net.sourceforge.openutils.mgnlcontrols.dialog;
-import info.magnolia.cms.beans.config.ContentRepository;
import info.magnolia.cms.core.Content;
import info.magnolia.cms.gui.control.Button;
import info.magnolia.cms.gui.control.ControlImpl;
import info.magnolia.cms.util.ContentUtil;
import info.magnolia.cms.util.NodeDataUtil;
+import info.magnolia.repository.RepositoryConstants;
import java.util.ArrayList;
import java.util.Iterator;
@@ -226,7 +226,7 @@
}
else
{
- String repository = control.getConfigValue("repository", ContentRepository.WEBSITE);
+ String repository = control.getConfigValue("repository", RepositoryConstants.WEBSITE);
String path = control.getConfigValue("path");
if (StringUtils.isNotEmpty(path))
{
Modified: magnoliamodules/trunk/openutils-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/advanced/impl/AccessibleResultItemResultIterator.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/advanced/impl/AccessibleResultItemResultIterator.java 2013-09-12 08:05:01 UTC (rev 4283)
+++ magnoliamodules/trunk/openutils-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/advanced/impl/AccessibleResultItemResultIterator.java 2013-09-12 08:20:02 UTC (rev 4284)
@@ -25,7 +25,6 @@
import java.util.NoSuchElementException;
-import javax.jcr.Node;
import javax.jcr.RepositoryException;
import javax.jcr.Session;
import javax.jcr.query.RowIterator;
Modified: magnoliamodules/trunk/openutils-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/advanced/impl/AdvancedResultImpl.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/advanced/impl/AdvancedResultImpl.java 2013-09-12 08:05:01 UTC (rev 4283)
+++ magnoliamodules/trunk/openutils-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/advanced/impl/AdvancedResultImpl.java 2013-09-12 08:20:02 UTC (rev 4284)
@@ -22,7 +22,6 @@
import info.magnolia.jcr.RuntimeRepositoryException;
import javax.jcr.Item;
-import javax.jcr.Node;
import javax.jcr.RepositoryException;
import javax.jcr.Value;
import javax.jcr.query.InvalidQueryException;
Modified: magnoliamodules/trunk/openutils-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/advanced/impl/AdvancedResultItemResultIterator.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/advanced/impl/AdvancedResultItemResultIterator.java 2013-09-12 08:05:01 UTC (rev 4283)
+++ magnoliamodules/trunk/openutils-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/advanced/impl/AdvancedResultItemResultIterator.java 2013-09-12 08:20:02 UTC (rev 4284)
@@ -22,7 +22,6 @@
import info.magnolia.cms.security.AccessDeniedException;
import javax.jcr.Item;
-import javax.jcr.Node;
import javax.jcr.RepositoryException;
import javax.jcr.query.Row;
import javax.jcr.query.RowIterator;
Modified: magnoliamodules/trunk/openutils-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/jcr/query/AdvancedResult.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/jcr/query/AdvancedResult.java 2013-09-12 08:05:01 UTC (rev 4283)
+++ magnoliamodules/trunk/openutils-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/jcr/query/AdvancedResult.java 2013-09-12 08:20:02 UTC (rev 4284)
@@ -21,9 +21,7 @@
import java.util.Iterator;
-import javax.jcr.Node;
-
/**
* The result of a jcr query. You can access to the actual result items using getItems(). This bean will also give you
* information about the total number of available items, the current page number, the total number of pages.
Modified: magnoliamodules/trunk/openutils-mgnlcriteria/src/main/java/org/apache/jackrabbit/core/query/lucene/JackrabbitQueryParser.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlcriteria/src/main/java/org/apache/jackrabbit/core/query/lucene/JackrabbitQueryParser.java 2013-09-12 08:05:01 UTC (rev 4283)
+++ magnoliamodules/trunk/openutils-mgnlcriteria/src/main/java/org/apache/jackrabbit/core/query/lucene/JackrabbitQueryParser.java 2013-09-12 08:20:02 UTC (rev 4284)
@@ -39,17 +39,17 @@
import java.io.IOException;
import java.io.StringReader;
+import java.util.ArrayList;
import java.util.List;
-import java.util.ArrayList;
import org.apache.lucene.analysis.Analyzer;
import org.apache.lucene.analysis.TokenStream;
import org.apache.lucene.analysis.standard.StandardTokenizer;
import org.apache.lucene.analysis.tokenattributes.TypeAttribute;
+import org.apache.lucene.queryParser.ParseException;
import org.apache.lucene.queryParser.QueryParser;
-import org.apache.lucene.queryParser.ParseException;
+import org.apache.lucene.search.BooleanClause;
import org.apache.lucene.search.Query;
-import org.apache.lucene.search.BooleanClause;
import org.apache.lucene.util.Version;
/**
Modified: magnoliamodules/trunk/openutils-mgnlcriteria/src/test/java/net/sourceforge/openutils/mgnlcriteria/advanced/XpathEscapeTest.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlcriteria/src/test/java/net/sourceforge/openutils/mgnlcriteria/advanced/XpathEscapeTest.java 2013-09-12 08:05:01 UTC (rev 4283)
+++ magnoliamodules/trunk/openutils-mgnlcriteria/src/test/java/net/sourceforge/openutils/mgnlcriteria/advanced/XpathEscapeTest.java 2013-09-12 08:20:02 UTC (rev 4284)
@@ -37,7 +37,6 @@
import javax.jcr.Node;
import net.sourceforge.openutils.mgnlcriteria.jcr.query.AdvancedResult;
-import net.sourceforge.openutils.mgnlcriteria.jcr.query.AdvancedResultItem;
import net.sourceforge.openutils.mgnlcriteria.jcr.query.Criteria;
import net.sourceforge.openutils.mgnlcriteria.jcr.query.JCRCriteriaFactory;
import net.sourceforge.openutils.mgnlcriteria.jcr.query.JCRQueryException;
Modified: magnoliamodules/trunk/openutils-mgnlcriteria/src/test/java/net/sourceforge/openutils/mgnlcriteria/jcr/query/lucene/AclSearchIndexTest.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlcriteria/src/test/java/net/sourceforge/openutils/mgnlcriteria/jcr/query/lucene/AclSearchIndexTest.java 2013-09-12 08:05:01 UTC (rev 4283)
+++ magnoliamodules/trunk/openutils-mgnlcriteria/src/test/java/net/sourceforge/openutils/mgnlcriteria/jcr/query/lucene/AclSearchIndexTest.java 2013-09-12 08:20:02 UTC (rev 4284)
@@ -40,7 +40,6 @@
import javax.jcr.Session;
import net.sourceforge.openutils.mgnlcriteria.jcr.query.AdvancedResult;
-import net.sourceforge.openutils.mgnlcriteria.jcr.query.AdvancedResultItem;
import net.sourceforge.openutils.mgnlcriteria.jcr.query.Criteria;
import net.sourceforge.openutils.mgnlcriteria.jcr.query.JCRCriteriaFactory;
import net.sourceforge.openutils.mgnlcriteria.jcr.query.ResultIterator;
Modified: magnoliamodules/trunk/openutils-mgnlcriteria/src/test/java/net/sourceforge/openutils/mgnlcriteria/tests/CriteriaTestUtils.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlcriteria/src/test/java/net/sourceforge/openutils/mgnlcriteria/tests/CriteriaTestUtils.java 2013-09-12 08:05:01 UTC (rev 4283)
+++ magnoliamodules/trunk/openutils-mgnlcriteria/src/test/java/net/sourceforge/openutils/mgnlcriteria/tests/CriteriaTestUtils.java 2013-09-12 08:20:02 UTC (rev 4284)
@@ -33,7 +33,6 @@
import javax.jcr.Node;
import net.sourceforge.openutils.mgnlcriteria.jcr.query.AdvancedResult;
-import net.sourceforge.openutils.mgnlcriteria.jcr.query.AdvancedResultItem;
import net.sourceforge.openutils.mgnlcriteria.jcr.query.Criteria;
import net.sourceforge.openutils.mgnlcriteria.jcr.query.JCRCriteriaFactory;
import net.sourceforge.openutils.mgnlcriteria.jcr.query.ResultIterator;
Modified: magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/samples/listeners/StudentLevelListener.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/samples/listeners/StudentLevelListener.java 2013-09-12 08:05:01 UTC (rev 4283)
+++ magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/samples/listeners/StudentLevelListener.java 2013-09-12 08:20:02 UTC (rev 4284)
@@ -35,6 +35,7 @@
import info.magnolia.cms.util.UrlPattern;
import info.magnolia.context.MgnlContext;
import info.magnolia.context.MgnlContext.VoidOp;
+import info.magnolia.repository.RepositoryConstants;
import java.security.Principal;
import java.util.ArrayList;
@@ -142,7 +143,7 @@
Content node = MgnlContext
.getSystemContext()
- .getHierarchyManager(ContentRepository.USER_ROLES)
+ .getHierarchyManager(RepositoryConstants.USER_ROLES)
.getContent(role);
Iterator it = node.getChildren(ItemType.CONTENTNODE.getSystemName(), "acl*").iterator();
Modified: magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/setup/SetupModuleRepositoriesWithoutSubscriberTask.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/setup/SetupModuleRepositoriesWithoutSubscriberTask.java 2013-09-12 08:05:01 UTC (rev 4283)
+++ magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/setup/SetupModuleRepositoriesWithoutSubscriberTask.java 2013-09-12 08:20:02 UTC (rev 4284)
@@ -19,7 +19,6 @@
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.RoleManager;
@@ -30,6 +29,8 @@
import info.magnolia.module.delta.TaskExecutionException;
import info.magnolia.module.model.ModuleDefinition;
import info.magnolia.module.model.RepositoryDefinition;
+import info.magnolia.objectfactory.Components;
+import info.magnolia.repository.RepositoryManager;
import java.util.Collection;
import java.util.List;
@@ -65,7 +66,7 @@
for (final String workspace : workspaces)
{
// bootstrap the workspace if empty
- if (!ContentRepository.checkIfInitialized(workspace))
+ if (!Components.getComponent(RepositoryManager.class).checkIfInitialized(workspace))
{
final String[] bootstrapDirs = Bootstrapper.getBootstrapDirs();
Bootstrapper.bootstrapRepository(bootstrapDirs, workspace, new Bootstrapper.BootstrapFilter()
Modified: magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/playlist/pages/PlaylistView.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/playlist/pages/PlaylistView.java 2013-09-12 08:05:01 UTC (rev 4283)
+++ magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/playlist/pages/PlaylistView.java 2013-09-12 08:20:02 UTC (rev 4284)
@@ -20,7 +20,6 @@
package net.sourceforge.openutils.mgnlmedia.playlist.pages;
import info.magnolia.cms.core.Content;
-import info.magnolia.cms.i18n.I18nContentSupportFactory;
import info.magnolia.cms.util.ContentUtil;
import info.magnolia.cms.util.NodeDataUtil;
import info.magnolia.context.MgnlContext;
@@ -32,20 +31,17 @@
import java.io.PrintWriter;
import java.util.ArrayList;
import java.util.Collection;
-import java.util.HashMap;
import java.util.Iterator;
import java.util.LinkedHashMap;
import java.util.List;
import java.util.Locale;
import java.util.Map;
-import java.util.Map.Entry;
import javax.jcr.Node;
import javax.jcr.RepositoryException;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
-import net.sourceforge.openutils.mgnlcriteria.jcr.query.AdvancedResultItem;
import net.sourceforge.openutils.mgnlmedia.media.configuration.MediaConfigurationManager;
import net.sourceforge.openutils.mgnlmedia.media.configuration.MediaTypeConfiguration;
import net.sourceforge.openutils.mgnlmedia.media.lifecycle.MediaModule;
@@ -57,7 +53,6 @@
import net.sourceforge.openutils.mgnlmedia.playlist.utils.PlaylistIterateUtils;
import net.sourceforge.openutils.mgnlmedia.playlist.utils.PlaylistIterateUtils.MediaNodeAndEntryPath;
-import org.apache.commons.lang.LocaleUtils;
import org.apache.commons.lang.StringUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
Modified: magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/playlist/utils/PlaylistIterateUtils.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/playlist/utils/PlaylistIterateUtils.java 2013-09-12 08:05:01 UTC (rev 4283)
+++ magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/playlist/utils/PlaylistIterateUtils.java 2013-09-12 08:20:02 UTC (rev 4284)
@@ -20,12 +20,8 @@
package net.sourceforge.openutils.mgnlmedia.playlist.utils;
import info.magnolia.cms.core.Content;
-import info.magnolia.cms.core.ItemType;
import info.magnolia.cms.core.MgnlNodeType;
-import info.magnolia.cms.util.NodeDataUtil;
import info.magnolia.context.MgnlContext;
-import info.magnolia.jcr.predicate.AbstractPredicate;
-import info.magnolia.jcr.util.ContentMap;
import info.magnolia.jcr.util.NodeUtil;
import info.magnolia.jcr.util.PropertyUtil;
@@ -51,7 +47,6 @@
import net.sourceforge.openutils.mgnlmedia.playlist.PlaylistConstants;
import org.apache.commons.collections.IteratorUtils;
-import org.apache.commons.lang.StringUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
Modified: magnoliamodules/trunk/openutils-mgnlmessages/src/main/java/net/sourceforge/openutils/mgnlmessages/configuration/MessagesConfigurationManager.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlmessages/src/main/java/net/sourceforge/openutils/mgnlmessages/configuration/MessagesConfigurationManager.java 2013-09-12 08:05:01 UTC (rev 4283)
+++ magnoliamodules/trunk/openutils-mgnlmessages/src/main/java/net/sourceforge/openutils/mgnlmessages/configuration/MessagesConfigurationManager.java 2013-09-12 08:20:02 UTC (rev 4284)
@@ -19,7 +19,6 @@
package net.sourceforge.openutils.mgnlmessages.configuration;
-import info.magnolia.cms.beans.config.ContentRepository;
import info.magnolia.cms.beans.config.ObservedManager;
import info.magnolia.cms.core.Content;
import info.magnolia.cms.core.HierarchyManager;
@@ -29,6 +28,7 @@
import info.magnolia.cms.util.FactoryUtil;
import info.magnolia.cms.util.NodeDataUtil;
import info.magnolia.context.MgnlContext;
+import info.magnolia.repository.RepositoryConstants;
import java.util.ArrayList;
import java.util.Collections;
@@ -122,7 +122,7 @@
@SuppressWarnings("unchecked")
public static List<String> getBaseNames()
{
- HierarchyManager mgr = MgnlContext.getSystemContext().getHierarchyManager(ContentRepository.CONFIG);
+ HierarchyManager mgr = MgnlContext.getSystemContext().getHierarchyManager(RepositoryConstants.CONFIG);
try
{
Content basenamesNode = mgr.getContent("/modules/messages/basenames");
Modified: magnoliamodules/trunk/openutils-mgnlmessages/src/main/java/net/sourceforge/openutils/mgnlmessages/pages/ExtractMessagesFromDialogsPage.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlmessages/src/main/java/net/sourceforge/openutils/mgnlmessages/pages/ExtractMessagesFromDialogsPage.java 2013-09-12 08:05:01 UTC (rev 4283)
+++ magnoliamodules/trunk/openutils-mgnlmessages/src/main/java/net/sourceforge/openutils/mgnlmessages/pages/ExtractMessagesFromDialogsPage.java 2013-09-12 08:20:02 UTC (rev 4284)
@@ -19,7 +19,6 @@
package net.sourceforge.openutils.mgnlmessages.pages;
-import info.magnolia.cms.beans.config.ContentRepository;
import info.magnolia.cms.core.Content;
import info.magnolia.cms.core.HierarchyManager;
import info.magnolia.cms.core.ItemType;
@@ -31,6 +30,7 @@
import info.magnolia.cms.util.NodeDataUtil;
import info.magnolia.context.MgnlContext;
import info.magnolia.module.admininterface.TemplatedMVCHandler;
+import info.magnolia.repository.RepositoryConstants;
import java.util.ArrayList;
import java.util.Collection;
@@ -79,7 +79,7 @@
public String show()
{
dialogsRoot = new ArrayList<String>();
- QueryManager qm = MgnlContext.getQueryManager(ContentRepository.CONFIG);
+ QueryManager qm = MgnlContext.getQueryManager(RepositoryConstants.CONFIG);
Query q;
try
{
@@ -115,7 +115,7 @@
*/
public String extract()
{
- HierarchyManager hmConfig = MgnlContext.getHierarchyManager(ContentRepository.CONFIG);
+ HierarchyManager hmConfig = MgnlContext.getHierarchyManager(RepositoryConstants.CONFIG);
QueryManager qm = hmConfig.getQueryManager();
HierarchyManager hm = MgnlContext.getHierarchyManager(MessagesModuleLifecycle.REPO);
for (String dialogRoot : this.request.getParameterValues("dialogsRoots"))
Modified: magnoliamodules/trunk/openutils-mgnlrepoutils/src/main/java/net/sourceforge/openutils/mgnlrepoutils/RepositoryUtilsPage.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlrepoutils/src/main/java/net/sourceforge/openutils/mgnlrepoutils/RepositoryUtilsPage.java 2013-09-12 08:05:01 UTC (rev 4283)
+++ magnoliamodules/trunk/openutils-mgnlrepoutils/src/main/java/net/sourceforge/openutils/mgnlrepoutils/RepositoryUtilsPage.java 2013-09-12 08:20:02 UTC (rev 4284)
@@ -23,6 +23,8 @@
import info.magnolia.cms.util.AlertUtil;
import info.magnolia.context.MgnlContext;
import info.magnolia.module.admininterface.TemplatedMVCHandler;
+import info.magnolia.objectfactory.Components;
+import info.magnolia.repository.RepositoryManager;
import java.lang.reflect.Field;
import java.lang.reflect.InvocationTargetException;
@@ -82,7 +84,7 @@
public Iterator<String> getRepositories()
{
- return ContentRepository.getAllRepositoryNames();
+ return Components.getComponent(RepositoryManager.class).getWorkspaceNames().iterator();
}
public String doIndexConsistencyFix() throws Exception
Modified: magnoliamodules/trunk/openutils-mgnlstripes/src/main/java/it/openutils/magnoliastripes/setup/StripesModuleVersionHandler.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlstripes/src/main/java/it/openutils/magnoliastripes/setup/StripesModuleVersionHandler.java 2013-09-12 08:05:01 UTC (rev 4283)
+++ magnoliamodules/trunk/openutils-mgnlstripes/src/main/java/it/openutils/magnoliastripes/setup/StripesModuleVersionHandler.java 2013-09-12 08:20:02 UTC (rev 4284)
@@ -19,13 +19,13 @@
package it.openutils.magnoliastripes.setup;
-import info.magnolia.cms.beans.config.ContentRepository;
import info.magnolia.cms.core.SystemProperty;
import info.magnolia.module.DefaultModuleVersionHandler;
import info.magnolia.module.InstallContext;
import info.magnolia.module.delta.AddMimeMappingTask;
import info.magnolia.module.delta.FilterOrderingTask;
import info.magnolia.module.delta.Task;
+import info.magnolia.repository.RepositoryConstants;
import it.openutils.mgnltasks.CreateMissingPropertyTask;
import it.openutils.mgnltasks.SamplesExtractionTask;
@@ -57,7 +57,7 @@
tasks.add(new CreateMissingPropertyTask(
"Adding property: /modules/stripes/config/i18nbasename",
"Adding property: /modules/stripes/config/i18nbasename",
- ContentRepository.CONFIG,
+ RepositoryConstants.CONFIG,
"/modules/stripes/config",
"i18nbasename",
"it.openutils.magnoliastripes"));
Modified: magnoliamodules/trunk/openutils-mgnltagcloud/src/main/java/net/sourceforge/openutils/mgnltagcloud/manager/TagCloudManager.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnltagcloud/src/main/java/net/sourceforge/openutils/mgnltagcloud/manager/TagCloudManager.java 2013-09-12 08:05:01 UTC (rev 4283)
+++ magnoliamodules/trunk/openutils-mgnltagcloud/src/main/java/net/sourceforge/openutils/mgnltagcloud/manager/TagCloudManager.java 2013-09-12 08:20:02 UTC (rev 4284)
@@ -25,7 +25,6 @@
import info.magnolia.cms.util.ObservationUtil;
import info.magnolia.content2bean.Content2BeanException;
import info.magnolia.content2bean.Content2BeanUtil;
-import info.magnolia.objectfactory.Components;
import java.io.IOException;
import java.util.Arrays;
Modified: magnoliamodules/trunk/openutils-mgnltagcloud/src/main/java/net/sourceforge/openutils/mgnltagcloud/util/JackrabbitUtil.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnltagcloud/src/main/java/net/sourceforge/openutils/mgnltagcloud/util/JackrabbitUtil.java 2013-09-12 08:05:01 UTC (rev 4283)
+++ magnoliamodules/trunk/openutils-mgnltagcloud/src/main/java/net/sourceforge/openutils/mgnltagcloud/util/JackrabbitUtil.java 2013-09-12 08:20:02 UTC (rev 4284)
@@ -20,9 +20,6 @@
package net.sourceforge.openutils.mgnltagcloud.util;
import info.magnolia.context.MgnlContext;
-import info.magnolia.objectfactory.ComponentFactory;
-import info.magnolia.objectfactory.ComponentProvider;
-import info.magnolia.objectfactory.Components;
import java.lang.reflect.InvocationTargetException;
import java.lang.reflect.Method;
@@ -33,7 +30,6 @@
import javax.jcr.RepositoryException;
import javax.jcr.Session;
import javax.jcr.query.InvalidQueryException;
-import javax.jws.Oneway;
import org.apache.commons.lang.UnhandledException;
import org.apache.jackrabbit.core.RepositoryImpl;
Modified: magnoliamodules/trunk/openutils-mgnltagcloud/src/test/java/net/sourceforge/openutils/mgnltagcloud/manager/TagCloudManagerTest.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnltagcloud/src/test/java/net/sourceforge/openutils/mgnltagcloud/manager/TagCloudManagerTest.java 2013-09-12 08:05:01 UTC (rev 4283)
+++ magnoliamodules/trunk/openutils-mgnltagcloud/src/test/java/net/sourceforge/openutils/mgnltagcloud/manager/TagCloudManagerTest.java 2013-09-12 08:20:02 UTC (rev 4284)
@@ -19,7 +19,9 @@
package net.sourceforge.openutils.mgnltagcloud.manager;
-import info.magnolia.cms.beans.config.ContentRepository;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotSame;
+import static org.junit.Assert.fail;
import info.magnolia.cms.core.Content;
import info.magnolia.cms.core.HierarchyManager;
import info.magnolia.cms.core.ItemType;
@@ -30,7 +32,6 @@
import info.magnolia.objectfactory.Components;
import info.magnolia.repository.RepositoryConstants;
import info.magnolia.test.RepositoryTestCase;
-import info.magnolia.test.mock.MockSimpleComponentProvider;
import java.util.Map;
import java.util.Set;
@@ -47,9 +48,6 @@
import org.junit.Test;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotSame;
-import static org.junit.Assert.fail;
/**
@@ -255,7 +253,7 @@
}
hm.save();
- HierarchyManager hmConfig = MgnlContext.getInstance().getHierarchyManager(ContentRepository.CONFIG);
+ HierarchyManager hmConfig = MgnlContext.getInstance().getHierarchyManager(RepositoryConstants.CONFIG);
Content contentTagcloud = ContentUtil.getOrCreateContent(
hm.getContent("/"),
Path.getValidatedLabel("clouds"),
Modified: magnoliamodules/trunk/openutils-mgnltasks/src/main/java/it/openutils/mgnltasks/AddPermissionTask.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnltasks/src/main/java/it/openutils/mgnltasks/AddPermissionTask.java 2013-09-12 08:05:01 UTC (rev 4283)
+++ magnoliamodules/trunk/openutils-mgnltasks/src/main/java/it/openutils/mgnltasks/AddPermissionTask.java 2013-09-12 08:20:02 UTC (rev 4284)
@@ -19,7 +19,6 @@
package it.openutils.mgnltasks;
-import info.magnolia.cms.beans.config.ContentRepository;
import info.magnolia.cms.core.Content;
import info.magnolia.cms.core.HierarchyManager;
import info.magnolia.cms.core.Path;
@@ -29,6 +28,7 @@
import info.magnolia.module.delta.AbstractRepositoryTask;
import info.magnolia.module.delta.Task;
import info.magnolia.module.delta.TaskExecutionException;
+import info.magnolia.repository.RepositoryConstants;
import java.util.Collection;
@@ -73,7 +73,7 @@
protected void doExecute(InstallContext installContext) throws RepositoryException, TaskExecutionException
{
- HierarchyManager hm = installContext.getHierarchyManager(ContentRepository.USER_ROLES);
+ HierarchyManager hm = installContext.getHierarchyManager(RepositoryConstants.USER_ROLES);
Content roleNode = hm.getContent("/" + role);
Modified: magnoliamodules/trunk/openutils-mgnltasks/src/main/java/it/openutils/mgnltasks/AnonymousUserSetupTask.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnltasks/src/main/java/it/openutils/mgnltasks/AnonymousUserSetupTask.java 2013-09-12 08:05:01 UTC (rev 4283)
+++ magnoliamodules/trunk/openutils-mgnltasks/src/main/java/it/openutils/mgnltasks/AnonymousUserSetupTask.java 2013-09-12 08:20:02 UTC (rev 4284)
@@ -19,7 +19,6 @@
package it.openutils.mgnltasks;
-import info.magnolia.cms.beans.config.ContentRepository;
import info.magnolia.cms.core.Content;
import info.magnolia.cms.core.HierarchyManager;
import info.magnolia.cms.security.AccessDeniedException;
@@ -30,6 +29,7 @@
import info.magnolia.module.delta.AbstractRepositoryTask;
import info.magnolia.module.delta.Task;
import info.magnolia.module.delta.TaskExecutionException;
+import info.magnolia.repository.RepositoryConstants;
import java.util.Collection;
@@ -64,7 +64,7 @@
protected void doExecute(InstallContext installContext) throws RepositoryException, TaskExecutionException
{
- HierarchyManager hm = installContext.getHierarchyManager(ContentRepository.USER_ROLES);
+ HierarchyManager hm = installContext.getHierarchyManager(RepositoryConstants.USER_ROLES);
Content role = hm.getContent("/" + UserManager.ANONYMOUS_USER);
Modified: magnoliamodules/trunk/openutils-mgnltasks/src/main/java/it/openutils/mgnltasks/BaseCheckMissingTask.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnltasks/src/main/java/it/openutils/mgnltasks/BaseCheckMissingTask.java 2013-09-12 08:05:01 UTC (rev 4283)
+++ magnoliamodules/trunk/openutils-mgnltasks/src/main/java/it/openutils/mgnltasks/BaseCheckMissingTask.java 2013-09-12 08:20:02 UTC (rev 4284)
@@ -19,7 +19,6 @@
package it.openutils.mgnltasks;
-import info.magnolia.cms.beans.config.ContentRepository;
import info.magnolia.cms.core.Content;
import info.magnolia.cms.core.HierarchyManager;
import info.magnolia.cms.core.search.Query;
@@ -76,7 +75,7 @@
{
QueryManager configQueryManager = installContext
- .getHierarchyManager(ContentRepository.CONFIG)
+ .getHierarchyManager(RepositoryConstants.CONFIG)
.getQueryManager();
Collection<Content> templates = configQueryManager.createQuery(
Modified: magnoliamodules/trunk/openutils-mgnltasks/src/main/java/it/openutils/mgnltasks/ChangeDefaultPasswordTask.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnltasks/src/main/java/it/openutils/mgnltasks/ChangeDefaultPasswordTask.java 2013-09-12 08:05:01 UTC (rev 4283)
+++ magnoliamodules/trunk/openutils-mgnltasks/src/main/java/it/openutils/mgnltasks/ChangeDefaultPasswordTask.java 2013-09-12 08:20:02 UTC (rev 4284)
@@ -19,7 +19,6 @@
package it.openutils.mgnltasks;
-import info.magnolia.cms.beans.config.ContentRepository;
import info.magnolia.cms.core.Content;
import info.magnolia.cms.core.HierarchyManager;
import info.magnolia.cms.core.NodeData;
@@ -27,6 +26,7 @@
import info.magnolia.module.delta.AbstractRepositoryTask;
import info.magnolia.module.delta.Task;
import info.magnolia.module.delta.TaskExecutionException;
+import info.magnolia.repository.RepositoryConstants;
import javax.jcr.RepositoryException;
@@ -75,7 +75,7 @@
protected void doExecute(InstallContext installContext) throws RepositoryException, TaskExecutionException
{
- HierarchyManager hm = installContext.getHierarchyManager(ContentRepository.USERS);
+ HierarchyManager hm = installContext.getHierarchyManager(RepositoryConstants.USERS);
Content role = hm.getContent(user);
Modified: magnoliamodules/trunk/openutils-mgnltasks/src/main/java/it/openutils/mgnltasks/CheckAndCreateGroupTask.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnltasks/src/main/java/it/openutils/mgnltasks/CheckAndCreateGroupTask.java 2013-09-12 08:05:01 UTC (rev 4283)
+++ magnoliamodules/trunk/openutils-mgnltasks/src/main/java/it/openutils/mgnltasks/CheckAndCreateGroupTask.java 2013-09-12 08:20:02 UTC (rev 4284)
@@ -19,13 +19,13 @@
package it.openutils.mgnltasks;
-import info.magnolia.cms.beans.config.ContentRepository;
import info.magnolia.cms.core.HierarchyManager;
import info.magnolia.module.InstallContext;
import info.magnolia.module.delta.AbstractRepositoryTask;
import info.magnolia.module.delta.BootstrapSingleResource;
import info.magnolia.module.delta.Task;
import info.magnolia.module.delta.TaskExecutionException;
+import info.magnolia.repository.RepositoryConstants;
import javax.jcr.PathNotFoundException;
import javax.jcr.RepositoryException;
@@ -61,7 +61,7 @@
protected void doExecute(InstallContext installContext) throws RepositoryException, TaskExecutionException
{
- HierarchyManager hm = installContext.getHierarchyManager(ContentRepository.USER_GROUPS);
+ HierarchyManager hm = installContext.getHierarchyManager(RepositoryConstants.USER_GROUPS);
try
{
Modified: magnoliamodules/trunk/openutils-mgnltasks/src/main/java/it/openutils/mgnltasks/CheckAndCreateRoleTask.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnltasks/src/main/java/it/openutils/mgnltasks/CheckAndCreateRoleTask.java 2013-09-12 08:05:01 UTC (rev 4283)
+++ magnoliamodules/trunk/openutils-mgnltasks/src/main/java/it/openutils/mgnltasks/CheckAndCreateRoleTask.java 2013-09-12 08:20:02 UTC (rev 4284)
@@ -19,13 +19,13 @@
package it.openutils.mgnltasks;
-import info.magnolia.cms.beans.config.ContentRepository;
import info.magnolia.cms.core.HierarchyManager;
import info.magnolia.module.InstallContext;
import info.magnolia.module.delta.AbstractRepositoryTask;
import info.magnolia.module.delta.BootstrapSingleResource;
import info.magnolia.module.delta.Task;
import info.magnolia.module.delta.TaskExecutionException;
+import info.magnolia.repository.RepositoryConstants;
import javax.jcr.PathNotFoundException;
import javax.jcr.RepositoryException;
@@ -61,7 +61,7 @@
protected void doExecute(InstallContext installContext) throws RepositoryException, TaskExecutionException
{
- HierarchyManager hm = installContext.getHierarchyManager(ContentRepository.USER_ROLES);
+ HierarchyManager hm = installContext.getHierarchyManager(RepositoryConstants.USER_ROLES);
try
{
Modified: magnoliamodules/trunk/openutils-mgnltasks/src/main/java/it/openutils/mgnltasks/CheckAndCreateUserTask.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnltasks/src/main/java/it/openutils/mgnltasks/CheckAndCreateUserTask.java 2013-09-12 08:05:01 UTC (rev 4283)
+++ magnoliamodules/trunk/openutils-mgnltasks/src/main/java/it/openutils/mgnltasks/CheckAndCreateUserTask.java 2013-09-12 08:20:02 UTC (rev 4284)
@@ -19,13 +19,13 @@
package it.openutils.mgnltasks;
-import info.magnolia.cms.beans.config.ContentRepository;
import info.magnolia.cms.core.HierarchyManager;
import info.magnolia.module.InstallContext;
import info.magnolia.module.delta.AbstractRepositoryTask;
import info.magnolia.module.delta.BootstrapSingleResource;
import info.magnolia.module.delta.Task;
import info.magnolia.module.delta.TaskExecutionException;
+import info.magnolia.repository.RepositoryConstants;
import javax.jcr.PathNotFoundException;
import javax.jcr.RepositoryException;
@@ -61,7 +61,7 @@
protected void doExecute(InstallContext installContext) throws RepositoryException, TaskExecutionException
{
- HierarchyManager hm = installContext.getHierarchyManager(ContentRepository.USERS);
+ HierarchyManager hm = installContext.getHierarchyManager(RepositoryConstants.USERS);
try
{
Modified: magnoliamodules/trunk/openutils-mgnltasks/src/main/java/it/openutils/mgnltasks/CreateDefaultRepositoryAclForAllUsersTask.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnltasks/src/main/java/it/openutils/mgnltasks/CreateDefaultRepositoryAclForAllUsersTask.java 2013-09-12 08:05:01 UTC (rev 4283)
+++ magnoliamodules/trunk/openutils-mgnltasks/src/main/java/it/openutils/mgnltasks/CreateDefaultRepositoryAclForAllUsersTask.java 2013-09-12 08:20:02 UTC (rev 4284)
@@ -19,7 +19,6 @@
package it.openutils.mgnltasks;
-import info.magnolia.cms.beans.config.ContentRepository;
import info.magnolia.cms.core.Content;
import info.magnolia.cms.core.HierarchyManager;
import info.magnolia.cms.core.ItemType;
@@ -27,6 +26,7 @@
import info.magnolia.module.InstallContext;
import info.magnolia.module.delta.AbstractRepositoryTask;
import info.magnolia.module.delta.TaskExecutionException;
+import info.magnolia.repository.RepositoryConstants;
import java.util.Collection;
@@ -67,7 +67,7 @@
@Override
protected void doExecute(InstallContext ctx) throws RepositoryException, TaskExecutionException
{
- HierarchyManager hm = ctx.getHierarchyManager(ContentRepository.USER_ROLES);
+ HierarchyManager hm = ctx.getHierarchyManager(RepositoryConstants.USER_ROLES);
final Content parentNode = hm.getContent("/");
final Collection<Content> childNodes = ContentUtil.collectAllChildren(parentNode, ItemType.ROLE);
Modified: magnoliamodules/trunk/openutils-mgnltasks/src/main/java/it/openutils/mgnltasks/DiffModuleConfigBootstrapTask.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnltasks/src/main/java/it/openutils/mgnltasks/DiffModuleConfigBootstrapTask.java 2013-09-12 08:05:01 UTC (rev 4283)
+++ magnoliamodules/trunk/openutils-mgnltasks/src/main/java/it/openutils/mgnltasks/DiffModuleConfigBootstrapTask.java 2013-09-12 08:20:02 UTC (rev 4284)
@@ -19,13 +19,13 @@
package it.openutils.mgnltasks;
-import info.magnolia.cms.beans.config.ContentRepository;
import info.magnolia.cms.core.Content;
import info.magnolia.cms.core.HierarchyManager;
import info.magnolia.cms.core.ItemType;
import info.magnolia.cms.util.ContentUtil;
import info.magnolia.importexport.DataTransporter;
import info.magnolia.module.InstallContext;
+import info.magnolia.repository.RepositoryConstants;
import java.io.File;
import java.io.FileInputStream;
@@ -90,7 +90,7 @@
@Override
protected void deleteNode(InstallContext installContext, String nodePath) throws RepositoryException
{
- HierarchyManager hm = installContext.getHierarchyManager(ContentRepository.CONFIG);
+ HierarchyManager hm = installContext.getHierarchyManager(RepositoryConstants.CONFIG);
if (hm.isExist(nodePath))
{
@@ -100,7 +100,7 @@
for (String name : resourcesToBootstrap)
{
String[] repositoryAndPath = getRepositoryAndPathFromBootstrapName(name);
- if (ContentRepository.CONFIG.equals(repositoryAndPath[0])
+ if (RepositoryConstants.CONFIG.equals(repositoryAndPath[0])
&& StringUtils.startsWith(repositoryAndPath[1], nodePath))
{
lookup.add(name);
Modified: magnoliamodules/trunk/openutils-mgnltasks/src/main/java/it/openutils/mgnltasks/DisableSubscribersTask.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnltasks/src/main/java/it/openutils/mgnltasks/DisableSubscribersTask.java 2013-09-12 08:05:01 UTC (rev 4283)
+++ magnoliamodules/trunk/openutils-mgnltasks/src/main/java/it/openutils/mgnltasks/DisableSubscribersTask.java 2013-09-12 08:20:02 UTC (rev 4284)
@@ -19,7 +19,6 @@
package it.openutils.mgnltasks;
-import info.magnolia.cms.beans.config.ContentRepository;
import info.magnolia.cms.core.Content;
import info.magnolia.cms.core.HierarchyManager;
import info.magnolia.cms.core.NodeData;
@@ -27,6 +26,7 @@
import info.magnolia.module.InstallContext;
import info.magnolia.module.delta.AbstractRepositoryTask;
import info.magnolia.module.delta.TaskExecutionException;
+import info.magnolia.repository.RepositoryConstants;
import java.util.List;
@@ -56,7 +56,7 @@
protected void doExecute(InstallContext installContext) throws RepositoryException, TaskExecutionException
{
- HierarchyManager hm = installContext.getHierarchyManager(ContentRepository.CONFIG);
+ HierarchyManager hm = installContext.getHierarchyManager(RepositoryConstants.CONFIG);
if (hm.isExist(subscribersPath))
{
Modified: magnoliamodules/trunk/openutils-mgnltasks/src/main/java/it/openutils/mgnltasks/dev/ModuleDevelopmentUtilsPage.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnltasks/src/main/java/it/openutils/mgnltasks/dev/ModuleDevelopmentUtilsPage.java 2013-09-12 08:05:01 UTC (rev 4283)
+++ magnoliamodules/trunk/openutils-mgnltasks/src/main/java/it/openutils/mgnltasks/dev/ModuleDevelopmentUtilsPage.java 2013-09-12 08:20:02 UTC (rev 4284)
@@ -34,6 +34,7 @@
import info.magnolia.module.admininterface.TemplatedMVCHandler;
import info.magnolia.module.delta.AbstractRepositoryTask;
import info.magnolia.module.delta.TaskExecutionException;
+import info.magnolia.repository.RepositoryConstants;
import java.io.File;
import java.io.FileNotFoundException;
@@ -276,7 +277,7 @@
public String backup()
{
- HierarchyManager hm = MgnlContext.getHierarchyManager(ContentRepository.CONFIG);
+ HierarchyManager hm = MgnlContext.getHierarchyManager(RepositoryConstants.CONFIG);
Session session = hm.getWorkspace().getSession();
try
@@ -284,32 +285,32 @@
Content moduleroot = hm.getContent("/modules/" + module);
if (templates)
{
- exportChildren(ContentRepository.CONFIG, session, moduleroot, "templates", new ItemType[]{
+ exportChildren(RepositoryConstants.CONFIG, session, moduleroot, "templates", new ItemType[]{
ItemType.CONTENT,
ItemType.CONTENTNODE }, false);
}
if (paragraphs)
{
- exportChildren(ContentRepository.CONFIG, session, moduleroot, "paragraphs", new ItemType[]{
+ exportChildren(RepositoryConstants.CONFIG, session, moduleroot, "paragraphs", new ItemType[]{
ItemType.CONTENT,
ItemType.CONTENTNODE }, false);
}
if (pages)
{
- exportChildren(ContentRepository.CONFIG, session, moduleroot, "pages", new ItemType[]{
+ exportChildren(RepositoryConstants.CONFIG, session, moduleroot, "pages", new ItemType[]{
ItemType.CONTENT,
ItemType.CONTENTNODE }, false);
}
if (dialogs)
{
- exportChildren(ContentRepository.CONFIG, session, moduleroot, "dialogs", new ItemType[]{
+ exportChildren(RepositoryConstants.CONFIG, session, moduleroot, "dialogs", new ItemType[]{
ItemType.CONTENT,
ItemType.CONTENTNODE }, true);
}
if (virtualURIs)
{
exportChildren(
- ContentRepository.CONFIG,
+ RepositoryConstants.CONFIG,
session,
moduleroot,
"virtualURIMapping",
@@ -327,7 +328,7 @@
if (website)
{
- extractWorkspaceRoots(ContentRepository.WEBSITE);
+ extractWorkspaceRoots(RepositoryConstants.WEBSITE);
}
if (media && ContentRepository.getRepositoryMapping("media") != null)
@@ -342,17 +343,17 @@
if (users)
{
- backupChildren(ContentRepository.USERS, "/admin");
+ backupChildren(RepositoryConstants.USERS, "/admin");
}
if (groups)
{
- extractWorkspaceRoots(ContentRepository.USER_GROUPS);
+ extractWorkspaceRoots(RepositoryConstants.USER_GROUPS);
}
if (roles)
{
- extractWorkspaceRoots(ContentRepository.USER_ROLES);
+ extractWorkspaceRoots(RepositoryConstants.USER_ROLES);
}
return this.show();
@@ -504,7 +505,7 @@
@Override
protected void doExecute(InstallContext installContext) throws RepositoryException, TaskExecutionException
{
- HierarchyManager hm = installContext.getHierarchyManager(ContentRepository.CONFIG);
+ HierarchyManager hm = installContext.getHierarchyManager(RepositoryConstants.CONFIG);
String pagename = "development-" + module2;
Content pages = hm.getContent("/modules/" + module2 + "/pages", true, ItemType.CONTENT);
Modified: magnoliamodules/trunk/openutils-mgnlutils/src/main/java/it/openutils/mgnlutils/el/MgnlUtilsDeprecatedAdapters.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlutils/src/main/java/it/openutils/mgnlutils/el/MgnlUtilsDeprecatedAdapters.java 2013-09-12 08:05:01 UTC (rev 4283)
+++ magnoliamodules/trunk/openutils-mgnlutils/src/main/java/it/openutils/mgnlutils/el/MgnlUtilsDeprecatedAdapters.java 2013-09-12 08:20:02 UTC (rev 4284)
@@ -19,8 +19,6 @@
package it.openutils.mgnlutils.el;
-import java.util.Properties;
-
import info.magnolia.cms.core.AggregationState;
import info.magnolia.cms.core.Content;
import info.magnolia.cms.core.DefaultContent;
@@ -29,6 +27,8 @@
import info.magnolia.context.WebContext;
import info.magnolia.jcr.util.ContentMap;
+import java.util.Properties;
+
import javax.jcr.Node;
import org.slf4j.Logger;
Modified: magnoliamodules/trunk/openutils-mgnlutils/src/main/java/it/openutils/mgnlutils/el/NodeElResolver.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlutils/src/main/java/it/openutils/mgnlutils/el/NodeElResolver.java 2013-09-12 08:05:01 UTC (rev 4283)
+++ magnoliamodules/trunk/openutils-mgnlutils/src/main/java/it/openutils/mgnlutils/el/NodeElResolver.java 2013-09-12 08:20:02 UTC (rev 4284)
@@ -19,9 +19,7 @@
package it.openutils.mgnlutils.el;
-import info.magnolia.jcr.util.ContentMap;
import info.magnolia.jcr.util.NodeUtil;
-import info.magnolia.jcr.util.PropertyUtil;
import java.beans.FeatureDescriptor;
import java.util.ArrayList;
Modified: magnoliamodules/trunk/openutils-mgnlutils/src/main/java/it/openutils/mgnlutils/el/NodeElResolverUtils.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlutils/src/main/java/it/openutils/mgnlutils/el/NodeElResolverUtils.java 2013-09-12 08:05:01 UTC (rev 4283)
+++ magnoliamodules/trunk/openutils-mgnlutils/src/main/java/it/openutils/mgnlutils/el/NodeElResolverUtils.java 2013-09-12 08:20:02 UTC (rev 4284)
@@ -19,15 +19,13 @@
package it.openutils.mgnlutils.el;
-import java.lang.reflect.InvocationTargetException;
-
-import info.magnolia.cms.beans.runtime.FileProperties;
import info.magnolia.jcr.util.ContentMap;
import info.magnolia.jcr.util.NodeUtil;
import info.magnolia.link.LinkException;
import info.magnolia.link.LinkTransformerManager;
-import javax.jcr.ItemNotFoundException;
+import java.lang.reflect.InvocationTargetException;
+
import javax.jcr.Node;
import javax.jcr.PathNotFoundException;
import javax.jcr.Property;
@@ -35,7 +33,6 @@
import javax.jcr.RepositoryException;
import javax.jcr.Value;
-import org.apache.commons.beanutils.BeanUtils;
import org.apache.commons.beanutils.PropertyUtils;
import org.apache.commons.lang.StringUtils;
import org.slf4j.Logger;
Modified: magnoliamodules/trunk/openutils-mgnlutils/src/main/java/it/openutils/mgnlutils/save/SafeMultiValueSaveHandler.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlutils/src/main/java/it/openutils/mgnlutils/save/SafeMultiValueSaveHandler.java 2013-09-12 08:05:01 UTC (rev 4283)
+++ magnoliamodules/trunk/openutils-mgnlutils/src/main/java/it/openutils/mgnlutils/save/SafeMultiValueSaveHandler.java 2013-09-12 08:20:02 UTC (rev 4284)
@@ -41,6 +41,7 @@
* @author fgiust
* @version $Id$
*/
+@SuppressWarnings("deprecation")
public class SafeMultiValueSaveHandler extends SaveHandlerImpl implements FieldSaveHandler
{
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
