Menu
▾
▴
[Openutils-svn] SF.net SVN: openutils:[4402] magnoliamodules/trunk
|
From: <fg...@us...> - 2013-10-20 15:39:14
|
Revision: 4402
http://openutils.svn.sourceforge.net/openutils/?rev=4402&view=rev
Author: fgiust
Date: 2013-10-20 15:39:10 +0000 (Sun, 20 Oct 2013)
Log Message:
-----------
cleanup duplicate code
Modified Paths:
--------------
magnoliamodules/trunk/openutils-mgnlcontextmenu/pom.xml
magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/java/net/sourceforge/openutils/mgnlcontextmenu/dialog/EntrySaveHandler.java
magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/java/net/sourceforge/openutils/mgnlcontextmenu/el/ContextMenuElFunctions.java
magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/java/net/sourceforge/openutils/mgnlcontextmenu/setup/ContextMenuModuleVersionHandler.java
magnoliamodules/trunk/openutils-mgnlcontrols/pom.xml
magnoliamodules/trunk/openutils-mgnllms/pom.xml
magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/module/LMSModuleVersionHandler.java
magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/grid/MediaGridColumnType.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/configuration/UsedInWorkspace.java
magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/lifecycle/MediaModule.java
magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/pages/MediaBean.java
magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/pages/MediaBeanBuilder.java
magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/setup/MediaModuleVersionHandler.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-mgnlrepoutils/src/main/resources/net/sourceforge/openutils/mgnlrepoutils/RepositoryUtilsPage.html
magnoliamodules/trunk/openutils-mgnlrules/pom.xml
magnoliamodules/trunk/openutils-mgnlrules/src/main/java/net/sourceforge/openutils/mgnlrules/setup/RuleModuleVersionHandler.java
magnoliamodules/trunk/openutils-mgnltagcloud/pom.xml
magnoliamodules/trunk/openutils-mgnltagcloud/src/main/java/net/sourceforge/openutils/mgnltagcloud/setup/TagCloudModuleVersionHandler.java
magnoliamodules/trunk/openutils-mgnltasks/src/main/java/it/openutils/mgnltasks/SetPropertyTask.java
magnoliamodules/trunk/openutils-mgnltasks/src/main/java/it/openutils/mgnltasks/SimpleModuleVersionHandler.java
magnoliamodules/trunk/openutils-mgnlutils/src/main/java/it/openutils/mgnlutils/el/MgnlUtilsElFunctions.java
magnoliamodules/trunk/openutils-mgnlutils/src/main/java/it/openutils/mgnlutils/util/ClassicRenderExceptionHandler.java
magnoliamodules/trunk/openutils-mgnlutils/src/test/java/it/openutils/mgnlutils/el/MgnlUtilsElFunctionsTest.java
Added Paths:
-----------
magnoliamodules/trunk/openutils-mgnltasks/src/main/java/it/openutils/mgnltasks/FilesExtractionTask.java
Removed Paths:
-------------
magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/java/net/sourceforge/openutils/mgnlcontextmenu/setup/FilesExtractionTask.java
magnoliamodules/trunk/openutils-mgnlrules/src/main/java/net/sourceforge/openutils/mgnlrules/setup/FilesExtractionTask.java
Modified: magnoliamodules/trunk/openutils-mgnlcontextmenu/pom.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnlcontextmenu/pom.xml 2013-10-20 15:17:25 UTC (rev 4401)
+++ magnoliamodules/trunk/openutils-mgnlcontextmenu/pom.xml 2013-10-20 15:39:10 UTC (rev 4402)
@@ -1,5 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<parent>
<groupId>net.sourceforge.openutils</groupId>
<artifactId>openutils-parent</artifactId>
@@ -96,15 +97,8 @@
</exclusion>
</exclusions>
</dependency>
- <!--
<dependency>
<groupId>info.magnolia</groupId>
- <artifactId>magnolia-taglib-cms</artifactId>
- <version>${magnolia.version}</version>
- </dependency>
- -->
- <dependency>
- <groupId>info.magnolia</groupId>
<artifactId>magnolia-module-fckeditor</artifactId>
<version>${magnolia.version}</version>
</dependency>
@@ -116,10 +110,15 @@
<dependency>
<groupId>net.sourceforge.openutils</groupId>
<artifactId>openutils-mgnlutils</artifactId>
- <version>5.0.1</version>
+ <version>5.0.2-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>net.sourceforge.openutils</groupId>
+ <artifactId>openutils-mgnltasks</artifactId>
+ <version>5.0.1-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>net.sourceforge.openutils</groupId>
<artifactId>openutils-elfunctions</artifactId>
<version>1.1.1</version>
</dependency>
@@ -171,4 +170,4 @@
<properties>
<magnolia.version>4.5.11</magnolia.version>
</properties>
-</project>
+</project>
\ No newline at end of file
Modified: magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/java/net/sourceforge/openutils/mgnlcontextmenu/dialog/EntrySaveHandler.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/java/net/sourceforge/openutils/mgnlcontextmenu/dialog/EntrySaveHandler.java 2013-10-20 15:17:25 UTC (rev 4401)
+++ magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/java/net/sourceforge/openutils/mgnlcontextmenu/dialog/EntrySaveHandler.java 2013-10-20 15:39:10 UTC (rev 4402)
@@ -23,7 +23,6 @@
import info.magnolia.cms.core.Content;
import info.magnolia.cms.security.AccessDeniedException;
import info.magnolia.cms.util.NodeDataUtil;
-import info.magnolia.module.ModuleRegistry;
import info.magnolia.module.admininterface.FieldSaveHandler;
import info.magnolia.objectfactory.Components;
Modified: magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/java/net/sourceforge/openutils/mgnlcontextmenu/el/ContextMenuElFunctions.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/java/net/sourceforge/openutils/mgnlcontextmenu/el/ContextMenuElFunctions.java 2013-10-20 15:17:25 UTC (rev 4401)
+++ magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/java/net/sourceforge/openutils/mgnlcontextmenu/el/ContextMenuElFunctions.java 2013-10-20 15:39:10 UTC (rev 4402)
@@ -20,11 +20,9 @@
package net.sourceforge.openutils.mgnlcontextmenu.el;
import info.magnolia.cms.security.Permission;
-import info.magnolia.cms.util.DeprecationUtil;
import info.magnolia.context.MgnlContext;
import info.magnolia.context.WebContext;
import info.magnolia.jcr.util.NodeUtil;
-import info.magnolia.jcr.util.PropertyUtil;
import info.magnolia.jcr.wrapper.HTMLEscapingNodeWrapper;
import info.magnolia.objectfactory.Components;
import it.openutils.mgnlutils.el.MgnlUtilsDeprecatedAdapters;
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-10-20 15:17:25 UTC (rev 4401)
+++ magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/java/net/sourceforge/openutils/mgnlcontextmenu/setup/ContextMenuModuleVersionHandler.java 2013-10-20 15:39:10 UTC (rev 4402)
@@ -25,6 +25,7 @@
import info.magnolia.objectfactory.Components;
import info.magnolia.repository.RepositoryConstants;
import it.openutils.mgnltasks.CreateMissingPropertyTask;
+import it.openutils.mgnltasks.FilesExtractionTask;
import it.openutils.mgnltasks.SimpleModuleVersionHandler;
import java.util.ArrayList;
@@ -33,9 +34,7 @@
import net.sourceforge.openutils.mgnlcontextmenu.configuration.DefaultGetGlobalEntriesNodeStrategy;
import net.sourceforge.openutils.mgnlcontextmenu.configuration.DefaultPersistenceStrategy;
-import org.apache.commons.lang.StringUtils;
-
/**
* @author dschivo
*/
@@ -50,20 +49,9 @@
{
List<Task> tasks = new ArrayList<Task>();
- if (Components.getComponent(MagnoliaConfigurationProperties.class).getBooleanProperty("magnolia.bootstrap.samples"))
+ if (samplesEnabled())
{
- tasks.add(new FilesExtractionTask("Samples extraction", "Extracts jsp files for samples.")
- {
-
- /**
- * {@inheritDoc}
- */
- @Override
- protected boolean accept(String resource)
- {
- return super.accept(resource) && StringUtils.contains(resource, "/samples-contextmenu/");
- }
- });
+ tasks.add(new FilesExtractionTask("/samples-contextmenu/"));
}
tasks.add(new CreateMissingPropertyTask(
Deleted: magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/java/net/sourceforge/openutils/mgnlcontextmenu/setup/FilesExtractionTask.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/java/net/sourceforge/openutils/mgnlcontextmenu/setup/FilesExtractionTask.java 2013-10-20 15:17:25 UTC (rev 4401)
+++ magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/java/net/sourceforge/openutils/mgnlcontextmenu/setup/FilesExtractionTask.java 2013-10-20 15:39:10 UTC (rev 4402)
@@ -1,99 +0,0 @@
-/**
- *
- * ContextMenu Module for Magnolia CMS (http://www.openmindlab.com/lab/products/mgnlcontextmenu.html)
- * Copyright(C) 2010-2013, 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.mgnlcontextmenu.setup;
-
-import info.magnolia.cms.core.HierarchyManager;
-import info.magnolia.cms.core.Path;
-import info.magnolia.module.InstallContext;
-import info.magnolia.module.delta.AbstractTask;
-import info.magnolia.module.delta.TaskExecutionException;
-import info.magnolia.module.files.FileExtractionLogger;
-import info.magnolia.module.files.FileExtractor;
-import info.magnolia.module.files.MD5CheckingFileExtractor;
-
-import java.io.IOException;
-
-import org.apache.commons.lang.StringUtils;
-
-
-/**
- * Extract files to webapp root.
- * @author fgiust
- * @author dschivo
- */
-@SuppressWarnings("deprecation")
-public class FilesExtractionTask extends AbstractTask
-{
-
- public FilesExtractionTask(String taskName, String taskDescription)
- {
- super(taskName, taskDescription);
- }
-
- public FilesExtractionTask()
- {
- this("Files extraction", "Extracts files to webapp root.");
- }
-
- /**
- * {@inheritDoc}
- */
- public void execute(final InstallContext ctx) throws TaskExecutionException
- {
- final HierarchyManager hm = ctx.getConfigHierarchyManager();
- final MD5CheckingFileExtractor extractor = new MD5CheckingFileExtractor(new FileExtractionLogger()
- {
-
- public void error(String message)
- {
- ctx.warn(message);
- }
- }, hm);
- try
- {
- extractor.extractFiles(new FileExtractor.Transformer()
- {
-
- public String accept(String resourcePath)
- {
- if (!FilesExtractionTask.this.accept(resourcePath))
- {
- return null;
- }
- final String relTargetPath = StringUtils.removeStart(resourcePath, "/mgnl-files/");
- return Path.getAbsoluteFileSystemPath(relTargetPath);
- }
-
- });
- }
- catch (IOException e)
- {
- throw new TaskExecutionException("Could not extract files for module "
- + ctx.getCurrentModuleDefinition()
- + ": "
- + e.getMessage(), e);
- }
- }
-
- protected boolean accept(String resource)
- {
- return resource.startsWith("/mgnl-files/");
- }
-}
Modified: magnoliamodules/trunk/openutils-mgnlcontrols/pom.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnlcontrols/pom.xml 2013-10-20 15:17:25 UTC (rev 4401)
+++ magnoliamodules/trunk/openutils-mgnlcontrols/pom.xml 2013-10-20 15:39:10 UTC (rev 4402)
@@ -1,4 +1,5 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<parent>
<groupId>net.sourceforge.openutils</groupId>
<artifactId>openutils-parent</artifactId>
@@ -99,6 +100,11 @@
<version>2.2</version>
</dependency>
<dependency>
+ <groupId>net.sourceforge.openutils</groupId>
+ <artifactId>openutils-mgnlutils</artifactId>
+ <version>5.0.2-SNAPSHOT</version>
+ </dependency>
+ <dependency>
<groupId>javax.servlet</groupId>
<artifactId>servlet-api</artifactId>
<version>2.5</version>
Modified: magnoliamodules/trunk/openutils-mgnllms/pom.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnllms/pom.xml 2013-10-20 15:17:25 UTC (rev 4401)
+++ magnoliamodules/trunk/openutils-mgnllms/pom.xml 2013-10-20 15:39:10 UTC (rev 4402)
@@ -108,7 +108,7 @@
<dependency>
<groupId>net.sourceforge.openutils</groupId>
<artifactId>openutils-mgnltasks</artifactId>
- <version>5.0.0</version>
+ <version>5.0.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>net.sourceforge.openutils</groupId>
Modified: magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/module/LMSModuleVersionHandler.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/module/LMSModuleVersionHandler.java 2013-10-20 15:17:25 UTC (rev 4401)
+++ magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/module/LMSModuleVersionHandler.java 2013-10-20 15:39:10 UTC (rev 4402)
@@ -19,13 +19,12 @@
package net.sourceforge.openutils.mgnllms.module;
-import info.magnolia.cms.core.SystemProperty;
import info.magnolia.cms.security.Permission;
import info.magnolia.module.InstallContext;
import info.magnolia.module.delta.SetPropertyTask;
import info.magnolia.module.delta.Task;
import it.openutils.mgnltasks.AddPermissionTask;
-import it.openutils.mgnltasks.SamplesExtractionTask;
+import it.openutils.mgnltasks.FilesExtractionTask;
import it.openutils.mgnltasks.SimpleModuleVersionHandler;
import java.util.ArrayList;
@@ -58,9 +57,10 @@
{
List<Task> tasks = new ArrayList<Task>();
- if (SystemProperty.getBooleanProperty(SystemProperty.MAGNOLIA_BOOTSTRAP_SAMPLES))
+ if (samplesEnabled())
{
- tasks.add(new SamplesExtractionTask());
+ tasks.add(new FilesExtractionTask("/samples-lms/"));
+
tasks.add(new AddPermissionTask("anonymous", "website", "/sample-lms", Permission.READ));
tasks.add(new AddPermissionTask("anonymous", "website", "/sample-lms/*", Permission.NONE));
tasks.add(new AddPermissionTask("anonymous", "uri", "/sample-lms.html", Permission.READ));
Modified: magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/grid/MediaGridColumnType.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/grid/MediaGridColumnType.java 2013-10-20 15:17:25 UTC (rev 4401)
+++ magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/grid/MediaGridColumnType.java 2013-10-20 15:39:10 UTC (rev 4402)
@@ -22,7 +22,6 @@
import info.magnolia.cms.core.Content;
import info.magnolia.cms.i18n.Messages;
import info.magnolia.cms.security.AccessDeniedException;
-import info.magnolia.cms.util.ContentUtil;
import info.magnolia.cms.util.NodeDataUtil;
import info.magnolia.context.MgnlContext;
import info.magnolia.jcr.util.NodeUtil;
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 15:17:25 UTC (rev 4401)
+++ magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/configuration/DefaultMediaUsedInManager.java 2013-10-20 15:39:10 UTC (rev 4402)
@@ -19,13 +19,6 @@
package net.sourceforge.openutils.mgnlmedia.media.configuration;
-import info.magnolia.cms.core.MgnlNodeType;
-import info.magnolia.content2bean.Content2BeanException;
-import info.magnolia.jcr.RuntimeRepositoryException;
-import info.magnolia.jcr.util.NodeUtil;
-import info.magnolia.objectfactory.Components;
-import it.openutils.mgnlutils.util.NodeUtilsExt;
-
import java.util.ArrayList;
import java.util.HashMap;
import java.util.HashSet;
@@ -35,7 +28,6 @@
import javax.inject.Singleton;
import javax.jcr.Node;
-import javax.jcr.RepositoryException;
import net.sourceforge.openutils.mgnlcriteria.jcr.query.AdvancedResult;
import net.sourceforge.openutils.mgnlcriteria.jcr.query.Criteria;
Modified: magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/configuration/UsedInWorkspace.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/configuration/UsedInWorkspace.java 2013-10-20 15:17:25 UTC (rev 4401)
+++ magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/configuration/UsedInWorkspace.java 2013-10-20 15:39:10 UTC (rev 4402)
@@ -26,8 +26,6 @@
import org.apache.commons.lang.builder.ToStringBuilder;
import org.apache.commons.lang.builder.ToStringStyle;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
/**
Modified: magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/lifecycle/MediaModule.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/lifecycle/MediaModule.java 2013-10-20 15:17:25 UTC (rev 4401)
+++ magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/lifecycle/MediaModule.java 2013-10-20 15:39:10 UTC (rev 4402)
@@ -22,7 +22,6 @@
import info.magnolia.cms.beans.config.ObservedManager;
import info.magnolia.module.ModuleLifecycle;
import info.magnolia.module.ModuleLifecycleContext;
-import info.magnolia.objectfactory.Components;
import java.util.ArrayList;
import java.util.Collection;
@@ -33,10 +32,8 @@
import javax.inject.Inject;
import net.sourceforge.openutils.mgnlmedia.media.advancedsearch.configuration.SearchMediaQueryConfiguration;
-import net.sourceforge.openutils.mgnlmedia.media.configuration.ImageProcessorsManager;
import net.sourceforge.openutils.mgnlmedia.media.configuration.MediaConfigurationManager;
import net.sourceforge.openutils.mgnlmedia.media.configuration.MediaTypeConfiguration;
-import net.sourceforge.openutils.mgnlmedia.media.configuration.MediaUsedInManager;
import net.sourceforge.openutils.mgnlmedia.media.utils.LockUtils;
import net.sourceforge.openutils.mgnlmedia.media.zip.ZipImporter;
import net.sourceforge.openutils.mgnlmedia.playlist.pages.PlaylistLink;
Modified: magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/pages/MediaBean.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/pages/MediaBean.java 2013-10-20 15:17:25 UTC (rev 4401)
+++ magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/pages/MediaBean.java 2013-10-20 15:39:10 UTC (rev 4402)
@@ -22,7 +22,6 @@
import info.magnolia.cms.core.MetaData;
import java.util.HashMap;
-import java.util.List;
import java.util.Map;
import javax.jcr.Node;
Modified: magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/pages/MediaBeanBuilder.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/pages/MediaBeanBuilder.java 2013-10-20 15:17:25 UTC (rev 4401)
+++ magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/pages/MediaBeanBuilder.java 2013-10-20 15:39:10 UTC (rev 4402)
@@ -19,7 +19,6 @@
package net.sourceforge.openutils.mgnlmedia.media.pages;
-import info.magnolia.cms.beans.config.URI2RepositoryManager;
import info.magnolia.cms.exchange.ActivationManagerFactory;
import info.magnolia.cms.security.Permission;
import info.magnolia.jcr.util.MetaDataUtil;
@@ -28,7 +27,6 @@
import info.magnolia.objectfactory.Components;
import info.magnolia.repository.RepositoryConstants;
-import java.util.List;
import java.util.Map;
import javax.jcr.Node;
Modified: magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/setup/MediaModuleVersionHandler.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/setup/MediaModuleVersionHandler.java 2013-10-20 15:17:25 UTC (rev 4401)
+++ magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/setup/MediaModuleVersionHandler.java 2013-10-20 15:39:10 UTC (rev 4402)
@@ -19,7 +19,6 @@
package net.sourceforge.openutils.mgnlmedia.media.setup;
-import info.magnolia.init.MagnoliaConfigurationProperties;
import info.magnolia.module.InstallContext;
import info.magnolia.module.ModuleRegistry;
import info.magnolia.module.delta.SetupModuleRepositoriesTask;
@@ -84,8 +83,7 @@
{
List<Task> tasks = new ArrayList<Task>();
- if (Components.getComponent(MagnoliaConfigurationProperties.class).getBooleanProperty(
- "magnolia.bootstrap.samples"))
+ if (samplesEnabled())
{
tasks.add(new SamplesExtractionTask());
}
@@ -243,8 +241,6 @@
"wildcards",
Boolean.TRUE));
-
-
// empty placeholder
tasks.add(new CreateMissingPropertyTask(RepositoryConstants.CONFIG, "/modules/media/config", "baseurl", ""));
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 15:17:25 UTC (rev 4401)
+++ magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/types/impl/DocumentTypeHandler.java 2013-10-20 15:39:10 UTC (rev 4402)
@@ -25,7 +25,6 @@
import info.magnolia.jcr.util.NodeUtil;
import info.magnolia.jcr.util.PropertyUtil;
import info.magnolia.module.admininterface.SaveHandlerImpl;
-import it.openutils.mgnlutils.util.NodeUtilsExt;
import java.awt.image.BufferedImage;
import java.io.File;
@@ -36,10 +35,7 @@
import javax.imageio.ImageIO;
import javax.jcr.Node;
-import javax.jcr.Property;
-import javax.jcr.PropertyType;
import javax.jcr.RepositoryException;
-import javax.jcr.nodetype.NodeType;
import org.apache.commons.io.IOUtils;
import org.apache.commons.lang.StringUtils;
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 15:17:25 UTC (rev 4401)
+++ magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/types/impl/ImageTypeHandler.java 2013-10-20 15:39:10 UTC (rev 4402)
@@ -24,7 +24,6 @@
import info.magnolia.jcr.util.NodeUtil;
import info.magnolia.jcr.util.PropertyUtil;
import info.magnolia.objectfactory.Components;
-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 15:17:25 UTC (rev 4401)
+++ magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/types/impl/VideoTypeHandler.java 2013-10-20 15:39:10 UTC (rev 4402)
@@ -22,7 +22,6 @@
import info.magnolia.cms.beans.runtime.FileProperties;
import info.magnolia.cms.core.MgnlNodeType;
import info.magnolia.jcr.util.PropertyUtil;
-import it.openutils.mgnlutils.util.NodeUtilsExt;
import java.io.InputStream;
Modified: magnoliamodules/trunk/openutils-mgnlrepoutils/src/main/resources/net/sourceforge/openutils/mgnlrepoutils/RepositoryUtilsPage.html
===================================================================
--- magnoliamodules/trunk/openutils-mgnlrepoutils/src/main/resources/net/sourceforge/openutils/mgnlrepoutils/RepositoryUtilsPage.html 2013-10-20 15:17:25 UTC (rev 4401)
+++ magnoliamodules/trunk/openutils-mgnlrepoutils/src/main/resources/net/sourceforge/openutils/mgnlrepoutils/RepositoryUtilsPage.html 2013-10-20 15:39:10 UTC (rev 4402)
@@ -21,8 +21,7 @@
<p>
<strong>Warning:</strong>
this only works with Jackrabbit, and it works by using private APIs that are not guaranted to work in
- future versions (this is actually tested with versions from 1.5 to 2.2). The Persistence Manager check
- only works with "bundle" PMs.
+ future versions. The Persistence Manager check only works with "bundle" PMs.
<strong>Use it at your own risk.</strong>
</p>
</div>
Modified: magnoliamodules/trunk/openutils-mgnlrules/pom.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnlrules/pom.xml 2013-10-20 15:17:25 UTC (rev 4401)
+++ magnoliamodules/trunk/openutils-mgnlrules/pom.xml 2013-10-20 15:39:10 UTC (rev 4402)
@@ -1,5 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<parent>
<groupId>net.sourceforge.openutils</groupId>
<artifactId>openutils-parent</artifactId>
@@ -102,6 +103,11 @@
<version>5.0.0</version>
</dependency>
<dependency>
+ <groupId>net.sourceforge.openutils</groupId>
+ <artifactId>openutils-mgnltasks</artifactId>
+ <version>5.0.1-SNAPSHOT</version>
+ </dependency>
+ <dependency>
<groupId>info.magnolia</groupId>
<artifactId>magnolia-module-fckeditor</artifactId>
<version>${magnolia.version}</version>
Deleted: magnoliamodules/trunk/openutils-mgnlrules/src/main/java/net/sourceforge/openutils/mgnlrules/setup/FilesExtractionTask.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlrules/src/main/java/net/sourceforge/openutils/mgnlrules/setup/FilesExtractionTask.java 2013-10-20 15:17:25 UTC (rev 4401)
+++ magnoliamodules/trunk/openutils-mgnlrules/src/main/java/net/sourceforge/openutils/mgnlrules/setup/FilesExtractionTask.java 2013-10-20 15:39:10 UTC (rev 4402)
@@ -1,99 +0,0 @@
-/**
- *
- * Rules module for Magnolia CMS (http://www.openmindlab.com/lab/products/mgnlrules.html)
- * Copyright(C) 2010-2013, 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.mgnlrules.setup;
-
-import info.magnolia.cms.core.HierarchyManager;
-import info.magnolia.cms.core.Path;
-import info.magnolia.module.InstallContext;
-import info.magnolia.module.delta.AbstractTask;
-import info.magnolia.module.delta.TaskExecutionException;
-import info.magnolia.module.files.FileExtractionLogger;
-import info.magnolia.module.files.FileExtractor;
-import info.magnolia.module.files.MD5CheckingFileExtractor;
-
-import java.io.IOException;
-
-import org.apache.commons.lang.StringUtils;
-
-
-/**
- * Extract files to webapp root.
- * @author fgiust
- * @author dschivo
- */
-@SuppressWarnings("deprecation")
-public class FilesExtractionTask extends AbstractTask
-{
-
- public FilesExtractionTask(String taskName, String taskDescription)
- {
- super(taskName, taskDescription);
- }
-
- public FilesExtractionTask()
- {
- this("Files extraction", "Extracts files to webapp root.");
- }
-
- /**
- * {@inheritDoc}
- */
- public void execute(final InstallContext ctx) throws TaskExecutionException
- {
- final HierarchyManager hm = ctx.getConfigHierarchyManager();
- final MD5CheckingFileExtractor extractor = new MD5CheckingFileExtractor(new FileExtractionLogger()
- {
-
- public void error(String message)
- {
- ctx.warn(message);
- }
- }, hm);
- try
- {
- extractor.extractFiles(new FileExtractor.Transformer()
- {
-
- public String accept(String resourcePath)
- {
- if (!FilesExtractionTask.this.accept(resourcePath))
- {
- return null;
- }
- final String relTargetPath = StringUtils.removeStart(resourcePath, "/mgnl-files/");
- return Path.getAbsoluteFileSystemPath(relTargetPath);
- }
-
- });
- }
- catch (IOException e)
- {
- throw new TaskExecutionException("Could not extract files for module "
- + ctx.getCurrentModuleDefinition()
- + ": "
- + e.getMessage(), e);
- }
- }
-
- protected boolean accept(String resource)
- {
- return resource.startsWith("/mgnl-files/");
- }
-}
Modified: magnoliamodules/trunk/openutils-mgnlrules/src/main/java/net/sourceforge/openutils/mgnlrules/setup/RuleModuleVersionHandler.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlrules/src/main/java/net/sourceforge/openutils/mgnlrules/setup/RuleModuleVersionHandler.java 2013-10-20 15:17:25 UTC (rev 4401)
+++ magnoliamodules/trunk/openutils-mgnlrules/src/main/java/net/sourceforge/openutils/mgnlrules/setup/RuleModuleVersionHandler.java 2013-10-20 15:39:10 UTC (rev 4402)
@@ -19,18 +19,15 @@
package net.sourceforge.openutils.mgnlrules.setup;
-import info.magnolia.init.MagnoliaConfigurationProperties;
import info.magnolia.module.InstallContext;
import info.magnolia.module.delta.Task;
-import info.magnolia.objectfactory.Components;
+import it.openutils.mgnltasks.FilesExtractionTask;
import it.openutils.mgnltasks.SimpleModuleVersionHandler;
import java.util.ArrayList;
import java.util.List;
-import org.apache.commons.lang.StringUtils;
-
/**
* @author dschivo
* @version $Id$
@@ -46,34 +43,11 @@
{
List<Task> tasks = new ArrayList<Task>();
- tasks.add(new FilesExtractionTask()
- {
+ tasks.add(new FilesExtractionTask("/WEB-INF/jsps/"));
- /**
- * {@inheritDoc}
- */
- @Override
- protected boolean accept(String resource)
- {
- return super.accept(resource) && StringUtils.contains(resource, "/WEB-INF/jsps/");
- }
- });
-
- if (Components.getComponent(MagnoliaConfigurationProperties.class).getBooleanProperty(
- "magnolia.bootstrap.samples"))
+ if (samplesEnabled())
{
- tasks.add(new FilesExtractionTask("Samples extraction", "Extracts jsp files for samples.")
- {
-
- /**
- * {@inheritDoc}
- */
- @Override
- protected boolean accept(String resource)
- {
- return super.accept(resource) && StringUtils.contains(resource, "/samples-rules/");
- }
- });
+ tasks.add(new FilesExtractionTask("/samples-rules/"));
}
return tasks;
Modified: magnoliamodules/trunk/openutils-mgnltagcloud/pom.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnltagcloud/pom.xml 2013-10-20 15:17:25 UTC (rev 4401)
+++ magnoliamodules/trunk/openutils-mgnltagcloud/pom.xml 2013-10-20 15:39:10 UTC (rev 4402)
@@ -173,7 +173,7 @@
<dependency>
<groupId>net.sourceforge.openutils</groupId>
<artifactId>openutils-mgnltasks</artifactId>
- <version>5.0.0</version>
+ <version>5.0.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>net.sourceforge.openutils</groupId>
Modified: magnoliamodules/trunk/openutils-mgnltagcloud/src/main/java/net/sourceforge/openutils/mgnltagcloud/setup/TagCloudModuleVersionHandler.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnltagcloud/src/main/java/net/sourceforge/openutils/mgnltagcloud/setup/TagCloudModuleVersionHandler.java 2013-10-20 15:17:25 UTC (rev 4401)
+++ magnoliamodules/trunk/openutils-mgnltagcloud/src/main/java/net/sourceforge/openutils/mgnltagcloud/setup/TagCloudModuleVersionHandler.java 2013-10-20 15:39:10 UTC (rev 4402)
@@ -19,10 +19,8 @@
package net.sourceforge.openutils.mgnltagcloud.setup;
-import info.magnolia.init.MagnoliaConfigurationProperties;
import info.magnolia.module.InstallContext;
import info.magnolia.module.delta.Task;
-import info.magnolia.objectfactory.Components;
import it.openutils.mgnltasks.CreateMissingPropertyTask;
import it.openutils.mgnltasks.SamplesExtractionTask;
import it.openutils.mgnltasks.SimpleModuleVersionHandler;
@@ -49,8 +47,7 @@
List<Task> tasks = new ArrayList<Task>();
- if (Components.getComponent(MagnoliaConfigurationProperties.class).getBooleanProperty(
- "magnolia.bootstrap.samples"))
+ if (samplesEnabled())
{
tasks.add(new SamplesExtractionTask());
}
Added: magnoliamodules/trunk/openutils-mgnltasks/src/main/java/it/openutils/mgnltasks/FilesExtractionTask.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnltasks/src/main/java/it/openutils/mgnltasks/FilesExtractionTask.java (rev 0)
+++ magnoliamodules/trunk/openutils-mgnltasks/src/main/java/it/openutils/mgnltasks/FilesExtractionTask.java 2013-10-20 15:39:10 UTC (rev 4402)
@@ -0,0 +1,96 @@
+/**
+ *
+ * Tasks for for Magnolia CMS (http://www.openmindlab.com/lab/products/mgnltasks.html)
+ * Copyright(C) 2008-2013, 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.mgnltasks;
+
+import info.magnolia.cms.core.HierarchyManager;
+import info.magnolia.cms.core.Path;
+import info.magnolia.module.InstallContext;
+import info.magnolia.module.delta.AbstractTask;
+import info.magnolia.module.delta.TaskExecutionException;
+import info.magnolia.module.files.FileExtractionLogger;
+import info.magnolia.module.files.FileExtractor;
+import info.magnolia.module.files.MD5CheckingFileExtractor;
+
+import java.io.IOException;
+
+import org.apache.commons.lang.StringUtils;
+
+
+/**
+ * Extract files to webapp root. Files must be contained in a /mgnl-files folder in the classpath.
+ * @author fgiust
+ * @author dschivo
+ */
+@SuppressWarnings("deprecation")
+public class FilesExtractionTask extends AbstractTask
+{
+
+ private String path;
+
+ public FilesExtractionTask(String path)
+ {
+ super("Files extraction", "Extracts files from " + path + " to webapp root.");
+ this.path = path;
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public void execute(final InstallContext ctx) throws TaskExecutionException
+ {
+ final HierarchyManager hm = ctx.getConfigHierarchyManager();
+ final MD5CheckingFileExtractor extractor = new MD5CheckingFileExtractor(new FileExtractionLogger()
+ {
+
+ public void error(String message)
+ {
+ ctx.warn(message);
+ }
+ }, hm);
+ try
+ {
+ extractor.extractFiles(new FileExtractor.Transformer()
+ {
+
+ public String accept(String resourcePath)
+ {
+ if (!FilesExtractionTask.this.accept(resourcePath))
+ {
+ return null;
+ }
+ final String relTargetPath = StringUtils.removeStart(resourcePath, "/mgnl-files/");
+ return Path.getAbsoluteFileSystemPath(relTargetPath);
+ }
+
+ });
+ }
+ catch (IOException e)
+ {
+ throw new TaskExecutionException("Could not extract files for module "
+ + ctx.getCurrentModuleDefinition()
+ + ": "
+ + e.getMessage(), e);
+ }
+ }
+
+ protected boolean accept(String resource)
+ {
+ return resource.contains("/mgnl-files/") && StringUtils.contains(resource, path);
+ }
+}
Property changes on: magnoliamodules/trunk/openutils-mgnltasks/src/main/java/it/openutils/mgnltasks/FilesExtractionTask.java
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Added: svn:keywords
## -0,0 +1 ##
+Author Date Id Revision
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
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 15:17:25 UTC (rev 4401)
+++ magnoliamodules/trunk/openutils-mgnltasks/src/main/java/it/openutils/mgnltasks/SetPropertyTask.java 2013-10-20 15:39:10 UTC (rev 4402)
@@ -21,7 +21,6 @@
import info.magnolia.cms.core.MgnlNodeType;
import info.magnolia.jcr.util.NodeUtil;
-import info.magnolia.jcr.util.PropertyUtil;
import info.magnolia.module.InstallContext;
import info.magnolia.module.delta.AbstractRepositoryTask;
import info.magnolia.module.delta.TaskExecutionException;
@@ -31,9 +30,7 @@
import javax.jcr.RepositoryException;
import javax.jcr.Session;
-import org.apache.commons.lang.StringUtils;
-
/**
* Change a nodedata value.
* @author fgiust
Modified: magnoliamodules/trunk/openutils-mgnltasks/src/main/java/it/openutils/mgnltasks/SimpleModuleVersionHandler.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnltasks/src/main/java/it/openutils/mgnltasks/SimpleModuleVersionHandler.java 2013-10-20 15:17:25 UTC (rev 4401)
+++ magnoliamodules/trunk/openutils-mgnltasks/src/main/java/it/openutils/mgnltasks/SimpleModuleVersionHandler.java 2013-10-20 15:39:10 UTC (rev 4402)
@@ -164,4 +164,10 @@
{
delta.getTasks().add(new ModuleConfigBootstrapTask(modulename, includedRepositoriesInBootstrap));
}
+
+ protected boolean samplesEnabled()
+ {
+ return Components.getComponent(MagnoliaConfigurationProperties.class).getBooleanProperty(
+ "magnolia.bootstrap.samples");
+ }
}
Modified: magnoliamodules/trunk/openutils-mgnlutils/src/main/java/it/openutils/mgnlutils/el/MgnlUtilsElFunctions.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlutils/src/main/java/it/openutils/mgnlutils/el/MgnlUtilsElFunctions.java 2013-10-20 15:17:25 UTC (rev 4401)
+++ magnoliamodules/trunk/openutils-mgnlutils/src/main/java/it/openutils/mgnlutils/el/MgnlUtilsElFunctions.java 2013-10-20 15:39:10 UTC (rev 4402)
@@ -31,7 +31,6 @@
import info.magnolia.cms.security.User;
import info.magnolia.context.MgnlContext;
import info.magnolia.init.MagnoliaConfigurationProperties;
-import info.magnolia.jcr.util.ContentMap;
import info.magnolia.jcr.util.NodeUtil;
import info.magnolia.jcr.wrapper.HTMLEscapingNodeWrapper;
import info.magnolia.link.LinkException;
@@ -55,13 +54,11 @@
import java.util.Properties;
import java.util.Set;
-import javax.jcr.ItemNotFoundException;
import javax.jcr.Node;
import javax.jcr.NodeIterator;
import javax.jcr.Property;
import javax.jcr.PropertyIterator;
import javax.jcr.RepositoryException;
-import javax.jcr.Session;
import javax.security.auth.Subject;
import javax.servlet.http.HttpServletRequest;
Modified: magnoliamodules/trunk/openutils-mgnlutils/src/main/java/it/openutils/mgnlutils/util/ClassicRenderExceptionHandler.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlutils/src/main/java/it/openutils/mgnlutils/util/ClassicRenderExceptionHandler.java 2013-10-20 15:17:25 UTC (rev 4401)
+++ magnoliamodules/trunk/openutils-mgnlutils/src/main/java/it/openutils/mgnlutils/util/ClassicRenderExceptionHandler.java 2013-10-20 15:39:10 UTC (rev 4402)
@@ -19,7 +19,6 @@
package it.openutils.mgnlutils.util;
import info.magnolia.cms.beans.config.ServerConfiguration;
-import info.magnolia.context.MgnlContext;
import info.magnolia.init.MagnoliaConfigurationProperties;
import info.magnolia.rendering.context.RenderingContext;
import info.magnolia.rendering.engine.RenderException;
Modified: magnoliamodules/trunk/openutils-mgnlutils/src/test/java/it/openutils/mgnlutils/el/MgnlUtilsElFunctionsTest.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlutils/src/test/java/it/openutils/mgnlutils/el/MgnlUtilsElFunctionsTest.java 2013-10-20 15:17:25 UTC (rev 4401)
+++ magnoliamodules/trunk/openutils-mgnlutils/src/test/java/it/openutils/mgnlutils/el/MgnlUtilsElFunctionsTest.java 2013-10-20 15:39:10 UTC (rev 4402)
@@ -33,7 +33,6 @@
import it.openutils.mgnlutils.test.TestNgRepositoryTestcase;
import java.lang.reflect.Method;
-import java.util.Locale;
import org.testng.Assert;
import org.testng.annotations.BeforeClass;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
