Menu
▾
▴
[Openutils-svn] SF.net SVN: openutils:[4398] magnoliamodules/trunk
|
From: <fg...@us...> - 2013-10-20 12:41:50
|
Revision: 4398
http://openutils.svn.sourceforge.net/openutils/?rev=4398&view=rev
Author: fgiust
Date: 2013-10-20 12:41:45 +0000 (Sun, 20 Oct 2013)
Log Message:
-----------
refactorin packages
Modified Paths:
--------------
magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/configuration/DefaultMediaConfigurationManager.java
magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/configuration/DefaultMediaUsedInManager.java
magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/pages/MediaBrowserPage.java
magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/pages/MediaFolderViewPage.java
magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/tags/el/MediaEl.java
magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/types/impl/DocumentTypeHandler.java
magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/types/impl/ImageTypeHandler.java
magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/types/impl/VideoTypeHandler.java
magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/uri/MediaURI2RepositoryMapping.java
magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/utils/MediaLoadUtils.java
magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/playlist/pages/PlaylistView.java
magnoliamodules/trunk/openutils-mgnlmessages/src/main/java/net/sourceforge/openutils/mgnlmessages/configuration/MessagesConfigurationManager.java
magnoliamodules/trunk/openutils-mgnltagcloud/src/main/java/net/sourceforge/openutils/mgnltagcloud/manager/DefaultTagCloudManager.java
magnoliamodules/trunk/openutils-mgnltasks/src/main/java/it/openutils/mgnltasks/ChangePropertyForEachChildrenTask.java
magnoliamodules/trunk/openutils-mgnltasks/src/main/java/it/openutils/mgnltasks/DeleteNodeTask.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/ExistenceConditionalBootstrapTask.java
magnoliamodules/trunk/openutils-mgnltasks/src/main/java/it/openutils/mgnltasks/ModuleConfigBootstrapTask.java
magnoliamodules/trunk/openutils-mgnltasks/src/main/java/it/openutils/mgnltasks/SetPropertyTask.java
Added Paths:
-----------
magnoliamodules/trunk/openutils-mgnlutils/src/main/java/it/openutils/mgnlutils/util/NodeUtilsExt.java
magnoliamodules/trunk/openutils-mgnlutils/src/main/java/it/openutils/mgnlutils/util/ObservedManagerAdapter.java
Removed Paths:
-------------
magnoliamodules/trunk/openutils-mgnlutils/src/main/java/it/openutils/mgnlutils/api/
Modified: magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/configuration/DefaultMediaConfigurationManager.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/configuration/DefaultMediaConfigurationManager.java 2013-10-20 11:08:35 UTC (rev 4397)
+++ magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/configuration/DefaultMediaConfigurationManager.java 2013-10-20 12:41:45 UTC (rev 4398)
@@ -23,8 +23,8 @@
import info.magnolia.cms.beans.config.URI2RepositoryMapping;
import info.magnolia.jcr.util.NodeUtil;
import info.magnolia.jcr.util.PropertyUtil;
-import it.openutils.mgnlutils.api.NodeUtilsExt;
-import it.openutils.mgnlutils.api.ObservedManagerAdapter;
+import it.openutils.mgnlutils.util.NodeUtilsExt;
+import it.openutils.mgnlutils.util.ObservedManagerAdapter;
import java.util.Collection;
import java.util.Iterator;
Modified: magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/configuration/DefaultMediaUsedInManager.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/configuration/DefaultMediaUsedInManager.java 2013-10-20 11:08:35 UTC (rev 4397)
+++ magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/configuration/DefaultMediaUsedInManager.java 2013-10-20 12:41:45 UTC (rev 4398)
@@ -24,7 +24,7 @@
import info.magnolia.jcr.RuntimeRepositoryException;
import info.magnolia.jcr.util.NodeUtil;
import info.magnolia.objectfactory.Components;
-import it.openutils.mgnlutils.api.NodeUtilsExt;
+import it.openutils.mgnlutils.util.NodeUtilsExt;
import java.util.ArrayList;
import java.util.HashMap;
Modified: magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/pages/MediaBrowserPage.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/pages/MediaBrowserPage.java 2013-10-20 11:08:35 UTC (rev 4397)
+++ magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/pages/MediaBrowserPage.java 2013-10-20 12:41:45 UTC (rev 4398)
@@ -26,7 +26,7 @@
import info.magnolia.context.MgnlContext;
import info.magnolia.jcr.util.NodeUtil;
import info.magnolia.jcr.util.PropertyUtil;
-import it.openutils.mgnlutils.api.NodeUtilsExt;
+import it.openutils.mgnlutils.util.NodeUtilsExt;
import java.io.File;
import java.io.FileOutputStream;
Modified: magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/pages/MediaFolderViewPage.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/pages/MediaFolderViewPage.java 2013-10-20 11:08:35 UTC (rev 4397)
+++ magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/pages/MediaFolderViewPage.java 2013-10-20 12:41:45 UTC (rev 4398)
@@ -34,9 +34,9 @@
import info.magnolia.module.admininterface.commands.ActivationCommand;
import info.magnolia.objectfactory.Components;
import info.magnolia.templating.functions.TemplatingFunctions;
-import it.openutils.mgnlutils.api.NodeUtilsExt;
import it.openutils.mgnlutils.el.MgnlPagingElFunctions;
import it.openutils.mgnlutils.el.MgnlPagingElFunctions.Page;
+import it.openutils.mgnlutils.util.NodeUtilsExt;
import java.io.IOException;
import java.util.ArrayList;
Modified: magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/tags/el/MediaEl.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/tags/el/MediaEl.java 2013-10-20 11:08:35 UTC (rev 4397)
+++ magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/tags/el/MediaEl.java 2013-10-20 12:41:45 UTC (rev 4398)
@@ -27,7 +27,7 @@
import info.magnolia.module.ModuleRegistry;
import info.magnolia.objectfactory.Components;
import info.magnolia.repository.RepositoryConstants;
-import it.openutils.mgnlutils.api.NodeUtilsExt;
+import it.openutils.mgnlutils.util.NodeUtilsExt;
import java.awt.Point;
import java.util.ArrayList;
Modified: magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/types/impl/DocumentTypeHandler.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/types/impl/DocumentTypeHandler.java 2013-10-20 11:08:35 UTC (rev 4397)
+++ magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/types/impl/DocumentTypeHandler.java 2013-10-20 12:41:45 UTC (rev 4398)
@@ -25,7 +25,7 @@
import info.magnolia.jcr.util.NodeUtil;
import info.magnolia.jcr.util.PropertyUtil;
import info.magnolia.module.admininterface.SaveHandlerImpl;
-import it.openutils.mgnlutils.api.NodeUtilsExt;
+import it.openutils.mgnlutils.util.NodeUtilsExt;
import java.awt.image.BufferedImage;
import java.io.File;
Modified: magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/types/impl/ImageTypeHandler.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/types/impl/ImageTypeHandler.java 2013-10-20 11:08:35 UTC (rev 4397)
+++ magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/types/impl/ImageTypeHandler.java 2013-10-20 12:41:45 UTC (rev 4398)
@@ -24,7 +24,7 @@
import info.magnolia.jcr.util.NodeUtil;
import info.magnolia.jcr.util.PropertyUtil;
import info.magnolia.objectfactory.Components;
-import it.openutils.mgnlutils.api.NodeUtilsExt;
+import it.openutils.mgnlutils.util.NodeUtilsExt;
import java.awt.image.BufferedImage;
import java.io.InputStream;
Modified: magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/types/impl/VideoTypeHandler.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/types/impl/VideoTypeHandler.java 2013-10-20 11:08:35 UTC (rev 4397)
+++ magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/types/impl/VideoTypeHandler.java 2013-10-20 12:41:45 UTC (rev 4398)
@@ -22,7 +22,7 @@
import info.magnolia.cms.beans.runtime.FileProperties;
import info.magnolia.cms.core.MgnlNodeType;
import info.magnolia.jcr.util.PropertyUtil;
-import it.openutils.mgnlutils.api.NodeUtilsExt;
+import it.openutils.mgnlutils.util.NodeUtilsExt;
import java.io.InputStream;
Modified: magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/uri/MediaURI2RepositoryMapping.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/uri/MediaURI2RepositoryMapping.java 2013-10-20 11:08:35 UTC (rev 4397)
+++ magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/uri/MediaURI2RepositoryMapping.java 2013-10-20 12:41:45 UTC (rev 4398)
@@ -23,7 +23,7 @@
import info.magnolia.context.MgnlContext;
import info.magnolia.jcr.util.PropertyUtil;
import info.magnolia.link.Link;
-import it.openutils.mgnlutils.api.NodeUtilsExt;
+import it.openutils.mgnlutils.util.NodeUtilsExt;
import javax.jcr.Node;
import javax.jcr.PathNotFoundException;
Modified: magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/utils/MediaLoadUtils.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/utils/MediaLoadUtils.java 2013-10-20 11:08:35 UTC (rev 4397)
+++ magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/utils/MediaLoadUtils.java 2013-10-20 12:41:45 UTC (rev 4398)
@@ -25,7 +25,7 @@
import info.magnolia.context.SystemContext;
import info.magnolia.jcr.util.MetaDataUtil;
import info.magnolia.objectfactory.Components;
-import it.openutils.mgnlutils.api.NodeUtilsExt;
+import it.openutils.mgnlutils.util.NodeUtilsExt;
import java.io.File;
import java.io.FileOutputStream;
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-10-20 11:08:35 UTC (rev 4397)
+++ magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/playlist/pages/PlaylistView.java 2013-10-20 12:41:45 UTC (rev 4398)
@@ -24,7 +24,7 @@
import info.magnolia.jcr.util.PropertyUtil;
import info.magnolia.module.ModuleRegistry;
import info.magnolia.objectfactory.Components;
-import it.openutils.mgnlutils.api.NodeUtilsExt;
+import it.openutils.mgnlutils.util.NodeUtilsExt;
import java.io.IOException;
import java.io.PrintWriter;
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-10-20 11:08:35 UTC (rev 4397)
+++ magnoliamodules/trunk/openutils-mgnlmessages/src/main/java/net/sourceforge/openutils/mgnlmessages/configuration/MessagesConfigurationManager.java 2013-10-20 12:41:45 UTC (rev 4398)
@@ -26,8 +26,8 @@
import info.magnolia.jcr.util.PropertyUtil;
import info.magnolia.objectfactory.Components;
import info.magnolia.repository.RepositoryConstants;
-import it.openutils.mgnlutils.api.NodeUtilsExt;
-import it.openutils.mgnlutils.api.ObservedManagerAdapter;
+import it.openutils.mgnlutils.util.NodeUtilsExt;
+import it.openutils.mgnlutils.util.ObservedManagerAdapter;
import java.util.ArrayList;
import java.util.Collections;
Modified: magnoliamodules/trunk/openutils-mgnltagcloud/src/main/java/net/sourceforge/openutils/mgnltagcloud/manager/DefaultTagCloudManager.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnltagcloud/src/main/java/net/sourceforge/openutils/mgnltagcloud/manager/DefaultTagCloudManager.java 2013-10-20 11:08:35 UTC (rev 4397)
+++ magnoliamodules/trunk/openutils-mgnltagcloud/src/main/java/net/sourceforge/openutils/mgnltagcloud/manager/DefaultTagCloudManager.java 2013-10-20 12:41:45 UTC (rev 4398)
@@ -23,8 +23,8 @@
import info.magnolia.content2bean.Content2BeanException;
import info.magnolia.jcr.RuntimeRepositoryException;
import info.magnolia.jcr.util.NodeUtil;
-import it.openutils.mgnlutils.api.NodeUtilsExt;
-import it.openutils.mgnlutils.api.ObservedManagerAdapter;
+import it.openutils.mgnlutils.util.NodeUtilsExt;
+import it.openutils.mgnlutils.util.ObservedManagerAdapter;
import java.io.IOException;
import java.util.Arrays;
Modified: magnoliamodules/trunk/openutils-mgnltasks/src/main/java/it/openutils/mgnltasks/ChangePropertyForEachChildrenTask.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnltasks/src/main/java/it/openutils/mgnltasks/ChangePropertyForEachChildrenTask.java 2013-10-20 11:08:35 UTC (rev 4397)
+++ magnoliamodules/trunk/openutils-mgnltasks/src/main/java/it/openutils/mgnltasks/ChangePropertyForEachChildrenTask.java 2013-10-20 12:41:45 UTC (rev 4398)
@@ -23,7 +23,7 @@
import info.magnolia.module.InstallContext;
import info.magnolia.module.delta.AbstractRepositoryTask;
import info.magnolia.module.delta.TaskExecutionException;
-import it.openutils.mgnlutils.api.NodeUtilsExt;
+import it.openutils.mgnlutils.util.NodeUtilsExt;
import javax.jcr.Node;
import javax.jcr.RepositoryException;
Modified: magnoliamodules/trunk/openutils-mgnltasks/src/main/java/it/openutils/mgnltasks/DeleteNodeTask.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnltasks/src/main/java/it/openutils/mgnltasks/DeleteNodeTask.java 2013-10-20 11:08:35 UTC (rev 4397)
+++ magnoliamodules/trunk/openutils-mgnltasks/src/main/java/it/openutils/mgnltasks/DeleteNodeTask.java 2013-10-20 12:41:45 UTC (rev 4398)
@@ -22,7 +22,7 @@
import info.magnolia.module.InstallContext;
import info.magnolia.module.delta.AbstractRepositoryTask;
import info.magnolia.module.delta.TaskExecutionException;
-import it.openutils.mgnlutils.api.NodeUtilsExt;
+import it.openutils.mgnlutils.util.NodeUtilsExt;
import javax.jcr.RepositoryException;
import javax.jcr.Session;
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-10-20 11:08:35 UTC (rev 4397)
+++ magnoliamodules/trunk/openutils-mgnltasks/src/main/java/it/openutils/mgnltasks/DiffModuleConfigBootstrapTask.java 2013-10-20 12:41:45 UTC (rev 4398)
@@ -24,7 +24,7 @@
import info.magnolia.jcr.util.NodeUtil;
import info.magnolia.module.InstallContext;
import info.magnolia.repository.RepositoryConstants;
-import it.openutils.mgnlutils.api.NodeUtilsExt;
+import it.openutils.mgnlutils.util.NodeUtilsExt;
import java.io.File;
import java.io.FileInputStream;
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-10-20 11:08:35 UTC (rev 4397)
+++ magnoliamodules/trunk/openutils-mgnltasks/src/main/java/it/openutils/mgnltasks/DisableSubscribersTask.java 2013-10-20 12:41:45 UTC (rev 4398)
@@ -25,7 +25,7 @@
import info.magnolia.module.delta.AbstractRepositoryTask;
import info.magnolia.module.delta.TaskExecutionException;
import info.magnolia.repository.RepositoryConstants;
-import it.openutils.mgnlutils.api.NodeUtilsExt;
+import it.openutils.mgnlutils.util.NodeUtilsExt;
import javax.jcr.Node;
import javax.jcr.RepositoryException;
Modified: magnoliamodules/trunk/openutils-mgnltasks/src/main/java/it/openutils/mgnltasks/ExistenceConditionalBootstrapTask.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnltasks/src/main/java/it/openutils/mgnltasks/ExistenceConditionalBootstrapTask.java 2013-10-20 11:08:35 UTC (rev 4397)
+++ magnoliamodules/trunk/openutils-mgnltasks/src/main/java/it/openutils/mgnltasks/ExistenceConditionalBootstrapTask.java 2013-10-20 12:41:45 UTC (rev 4398)
@@ -22,7 +22,7 @@
import info.magnolia.jcr.RuntimeRepositoryException;
import info.magnolia.module.InstallContext;
import info.magnolia.module.delta.BootstrapResourcesTask;
-import it.openutils.mgnlutils.api.NodeUtilsExt;
+import it.openutils.mgnlutils.util.NodeUtilsExt;
import javax.jcr.RepositoryException;
import javax.jcr.Session;
Modified: magnoliamodules/trunk/openutils-mgnltasks/src/main/java/it/openutils/mgnltasks/ModuleConfigBootstrapTask.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnltasks/src/main/java/it/openutils/mgnltasks/ModuleConfigBootstrapTask.java 2013-10-20 11:08:35 UTC (rev 4397)
+++ magnoliamodules/trunk/openutils-mgnltasks/src/main/java/it/openutils/mgnltasks/ModuleConfigBootstrapTask.java 2013-10-20 12:41:45 UTC (rev 4398)
@@ -24,7 +24,7 @@
import info.magnolia.module.delta.BootstrapResourcesTask;
import info.magnolia.module.delta.TaskExecutionException;
import info.magnolia.repository.RepositoryConstants;
-import it.openutils.mgnlutils.api.NodeUtilsExt;
+import it.openutils.mgnlutils.util.NodeUtilsExt;
import java.io.IOException;
import java.util.ArrayList;
Modified: magnoliamodules/trunk/openutils-mgnltasks/src/main/java/it/openutils/mgnltasks/SetPropertyTask.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnltasks/src/main/java/it/openutils/mgnltasks/SetPropertyTask.java 2013-10-20 11:08:35 UTC (rev 4397)
+++ magnoliamodules/trunk/openutils-mgnltasks/src/main/java/it/openutils/mgnltasks/SetPropertyTask.java 2013-10-20 12:41:45 UTC (rev 4398)
@@ -25,7 +25,7 @@
import info.magnolia.module.InstallContext;
import info.magnolia.module.delta.AbstractRepositoryTask;
import info.magnolia.module.delta.TaskExecutionException;
-import it.openutils.mgnlutils.api.NodeUtilsExt;
+import it.openutils.mgnlutils.util.NodeUtilsExt;
import javax.jcr.Node;
import javax.jcr.RepositoryException;
Copied: magnoliamodules/trunk/openutils-mgnlutils/src/main/java/it/openutils/mgnlutils/util/NodeUtilsExt.java (from rev 4392, magnoliamodules/trunk/openutils-mgnlutils/src/main/java/it/openutils/mgnlutils/api/NodeUtilsExt.java)
===================================================================
--- magnoliamodules/trunk/openutils-mgnlutils/src/main/java/it/openutils/mgnlutils/util/NodeUtilsExt.java (rev 0)
+++ magnoliamodules/trunk/openutils-mgnlutils/src/main/java/it/openutils/mgnlutils/util/NodeUtilsExt.java 2013-10-20 12:41:45 UTC (rev 4398)
@@ -0,0 +1,258 @@
+/**
+ *
+ * Generic utilities for Magnolia CMS (http://www.openmindlab.com/lab/products/mgnlutils.html)
+ * Copyright(C) 2009-2012, 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 it.openutils.mgnlutils.util;
+
+import info.magnolia.cms.core.AggregationState;
+import info.magnolia.cms.core.Path;
+import info.magnolia.content2bean.Content2BeanException;
+import info.magnolia.content2bean.Content2BeanUtil;
+import info.magnolia.context.MgnlContext;
+import info.magnolia.jcr.RuntimeRepositoryException;
+import info.magnolia.jcr.decoration.ContentDecoratorUtil;
+import info.magnolia.jcr.util.NodeUtil;
+import info.magnolia.jcr.util.PropertyUtil;
+import info.magnolia.jcr.wrapper.ChannelVisibilityContentDecorator;
+import info.magnolia.jcr.wrapper.HTMLEscapingNodeWrapper;
+import info.magnolia.jcr.wrapper.I18nNodeWrapper;
+
+import java.util.regex.Pattern;
+
+import javax.jcr.ItemNotFoundException;
+import javax.jcr.Node;
+import javax.jcr.RepositoryException;
+import javax.jcr.Session;
+
+import org.apache.commons.lang.StringUtils;
+
+
+/**
+ * @author fgiust
+ * @version $Id: NodeUtilsExt.java 4292 2013-09-12 15:54:10Z fgiust $
+ */
+public class NodeUtilsExt
+{
+
+ private static Pattern UUID_PATTERN = Pattern
+ .compile("^[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}$");
+
+ public static boolean exists(Session session, String absolutepath)
+ {
+ try
+ {
+ return session.getRootNode().hasNode(StringUtils.stripStart(absolutepath, "/"));
+ }
+ catch (RepositoryException e)
+ {
+ throw new RuntimeRepositoryException(e);
+ }
+ }
+
+ public static Node getNodeIfExists(Session session, String absolutepath)
+ {
+ if (exists(session, absolutepath))
+ {
+ try
+ {
+ return session.getNode(absolutepath);
+ }
+ catch (RepositoryException e)
+ {
+ throw new RuntimeRepositoryException(e);
+ }
+ }
+ return null;
+ }
+
+ public static boolean deleteIfExisting(Session session, String absolutepath)
+ {
+ if (exists(session, absolutepath))
+ {
+ try
+ {
+ session.getNode(absolutepath).remove();
+ }
+ catch (RepositoryException e)
+ {
+ throw new RuntimeRepositoryException(e);
+ }
+ return true;
+ }
+ return false;
+ }
+
+ public static boolean setPropertyIfDifferent(Node node, String propertyname, Object propertyvalue)
+ {
+ return setPropertyIfDifferentFromValue(node, propertyname, propertyvalue, propertyvalue);
+ }
+
+ public static boolean setPropertyIfDifferentFromValue(Node node, String propertyname, Object propertyvalue,
+ Object oldvalue)
+ {
+ try
+ {
+ if (!node.hasProperty(propertyname)
+ || oldvalue == null
+ || !StringUtils.equals(node.getProperty(propertyname).getString(), oldvalue.toString()))
+ {
+ PropertyUtil.setProperty(node, propertyname, propertyvalue);
+ return true;
+ }
+ }
+ catch (RepositoryException e)
+ {
+ throw new RuntimeRepositoryException(e);
+ }
+ return false;
+ }
+
+ public static void deletePropertyIfExist(Node node, String propertyname)
+ {
+ try
+ {
+ if (node != null && node.hasProperty(propertyname))
+ {
+ node.getProperty(propertyname).remove();
+ }
+ }
+ catch (RepositoryException e)
+ {
+ throw new RuntimeRepositoryException(e);
+ }
+ }
+
+ public static Node getNodeByIdOrPath(String workspace, String uuidOrPath)
+ {
+ if (uuidOrPath == null)
+ {
+ return null;
+ }
+
+ if (isUUID(uuidOrPath))
+ {
+ try
+ {
+ return NodeUtil.getNodeByIdentifier(workspace, uuidOrPath);
+ }
+ catch (ItemNotFoundException e)
+ {
+ // ignore
+ }
+ catch (RepositoryException e)
+ {
+ throw new RuntimeRepositoryException(e);
+ }
+ }
+ else
+ {
+ try
+ {
+ return getNodeIfExists(MgnlContext.getJCRSession(workspace), uuidOrPath);
+ }
+ catch (RepositoryException e)
+ {
+ throw new RuntimeRepositoryException(e);
+ }
+ }
+
+ return null;
+ }
+
+ public static boolean isUUID(String string)
+ {
+ // 97ed692a-31a9-4670-9c36-4d8ee8f6128d
+ if (StringUtils.length(string) != 36)
+ {
+ return false;
+ }
+
+ return UUID_PATTERN.matcher(string).find();
+ }
+
+ public static Object toBean(Node node) throws Content2BeanException
+ {
+ return toBean(node, null);
+ }
+
+ public static Object toBean(Node node, Class outclass) throws Content2BeanException
+ {
+ return toBean(node, false, outclass);
+ }
+
+ @SuppressWarnings("deprecation")
+ public static Object toBean(Node node, boolean recursive, Class outclass) throws Content2BeanException
+ {
+ return Content2BeanUtil.toBean(info.magnolia.cms.util.ContentUtil.asContent(node), recursive, outclass);
+ }
+
+ @SuppressWarnings("deprecation")
+ public static String getUniqueLabel(Node parent, String label)
+ {
+ return Path.getUniqueLabel(info.magnolia.cms.util.ContentUtil.asContent(parent), label);
+ }
+
+ public static Node wrap(Node node)
+ {
+ if (node == null)
+ {
+ return null;
+ }
+ node = wrapWithChannelVisibilityWrapper(node);
+ if (!NodeUtil.isWrappedWith(node, I18nNodeWrapper.class))
+ {
+ node = new I18nNodeWrapper(node);
+ }
+ if (!NodeUtil.isWrappedWith(node, HTMLEscapingNodeWrapper.class))
+ {
+ node = new HTMLEscapingNodeWrapper(node, true);
+ }
+
+ return node;
+ }
+
+ private static Node wrapWithChannelVisibilityWrapper(Node content)
+ {
+ if (ContentDecoratorUtil.isDecoratedWith(content, ChannelVisibilityContentDecorator.class)
+ || !MgnlContext.isWebContext())
+ {
+ return content;
+ }
+
+ AggregationState aggregationState = MgnlContext.getAggregationState();
+ if (aggregationState == null)
+ {
+ return content;
+ }
+ String channel = aggregationState.getChannel().getName();
+ if (StringUtils.isEmpty(channel) || StringUtils.equalsIgnoreCase(channel, "all"))
+ {
+ return content;
+ }
+ return new ChannelVisibilityContentDecorator(channel).wrapNode(content);
+ }
+
+ public static String getBinaryPath(Node node)
+ {
+ if (node == null)
+ {
+ return null;
+ }
+ return NodeUtil.getPathIfPossible(node) + "/" + PropertyUtil.getString(node, "fileName");
+ }
+}
Copied: magnoliamodules/trunk/openutils-mgnlutils/src/main/java/it/openutils/mgnlutils/util/ObservedManagerAdapter.java (from rev 4371, magnoliamodules/trunk/openutils-mgnlutils/src/main/java/it/openutils/mgnlutils/api/ObservedManagerAdapter.java)
===================================================================
--- magnoliamodules/trunk/openutils-mgnlutils/src/main/java/it/openutils/mgnlutils/util/ObservedManagerAdapter.java (rev 0)
+++ magnoliamodules/trunk/openutils-mgnlutils/src/main/java/it/openutils/mgnlutils/util/ObservedManagerAdapter.java 2013-10-20 12:41:45 UTC (rev 4398)
@@ -0,0 +1,59 @@
+/**
+ *
+ * Generic utilities for Magnolia CMS (http://www.openmindlab.com/lab/products/mgnlutils.html)
+ * Copyright(C) 2009-2012, 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 it.openutils.mgnlutils.util;
+
+import info.magnolia.cms.beans.config.ObservedManager;
+
+import javax.jcr.Node;
+
+
+/**
+ * An adapter for using javax.jcr.Node instead of Content, till Magnolia will cleanup its APIs.
+ * @author fgiust
+ * @version $Id$
+ */
+public abstract class ObservedManagerAdapter extends ObservedManager
+{
+
+ /**
+ * {@inheritDoc}
+ */
+ @SuppressWarnings("deprecation")
+ @Override
+ protected final void onRegister(info.magnolia.cms.core.Content node)
+ {
+ onRegister(node.getJCRNode());
+ }
+
+ @SuppressWarnings("deprecation")
+ @Override
+ protected final void reload(info.magnolia.cms.core.Content node)
+ {
+ reload(node.getJCRNode());
+ }
+
+ protected void reload(Node node)
+ {
+ onRegister(node);
+ }
+
+ protected abstract void onRegister(Node node);
+
+}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
