Menu
▾
▴
openutils-svn
|
From: <mol...@us...> - 2009-02-13 16:24:50
|
Revision: 989
http://openutils.svn.sourceforge.net/openutils/?rev=989&view=rev
Author: molaschi
Date: 2009-02-13 16:24:47 +0000 (Fri, 13 Feb 2009)
Log Message:
-----------
new release to support magnolia 4.0.x
Modified Paths:
--------------
trunk/openutils-mgnlmedia/pom.xml
trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/configuration/MediaConfigurationManager.java
trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/dialog/DialogSelectMedia.java
trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/lifecycle/MediaModuleLifecycle.java
trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/pages/MediaFolderViewPage.java
trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/pages/MediaLoadZipFilePage.java
trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/pages/MessagesTemplatedMVCHandler.java
trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/save/MediaCustomSaveHandler.java
trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/setup/MediaModuleVersionHandler.java
trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/setup/RemoveResolutionsNodeTask.java
trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/setup/RenameThumbToImageTask.java
trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/tree/JcrBrowserWithNodeTypeTreeConfiguration.java
trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/tree/MediaModuleTreeConfiguration.java
trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/tree/MediaModuleTreeMVCHandler.java
trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/types/impl/AudioTypeHandler.java
trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/types/impl/BaseTypeHandler.java
trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/types/impl/ImageTypeHandler.java
trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/types/impl/VideoTypeHandler.java
trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/types/impl/YouTubeVideoTypeHandler.java
trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/utils/ImageUtils.java
trunk/openutils-mgnlmedia/src/main/resources/info/magnolia/cms/gui/control/MediaTreeFooter.ftl
trunk/openutils-mgnlmedia/src/main/resources/mgnl-resources/media/js/mootips.js
trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/media/pages/MediaBrowserPage.html
trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/media/pages/MediaFolderViewPage.html
Added Paths:
-----------
trunk/openutils-mgnlmedia/src/main/resources/info/magnolia/cms/gui/control/MediaTreeAddress.ftl
Modified: trunk/openutils-mgnlmedia/pom.xml
===================================================================
--- trunk/openutils-mgnlmedia/pom.xml 2009-02-13 16:01:55 UTC (rev 988)
+++ trunk/openutils-mgnlmedia/pom.xml 2009-02-13 16:24:47 UTC (rev 989)
@@ -9,7 +9,7 @@
<packaging>jar</packaging>
<artifactId>openutils-mgnlmedia</artifactId>
<name>openutils-mgnlmedia</name>
- <version>0.2-SNAPSHOT</version>
+ <version>4.0-SNAPSHOT</version>
<licenses>
<license>
<name>GPLv3</name>
@@ -38,12 +38,12 @@
<dependency>
<groupId>info.magnolia</groupId>
<artifactId>magnolia-core</artifactId>
- <version>3.6.3</version>
+ <version>4.0-rc3</version>
</dependency>
<dependency>
<groupId>info.magnolia</groupId>
<artifactId>magnolia-module-admininterface</artifactId>
- <version>3.6.3</version>
+ <version>4.0-rc3</version>
</dependency>
<dependency>
<groupId>net.sourceforge.openutils</groupId>
Modified: trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/configuration/MediaConfigurationManager.java
===================================================================
--- trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/configuration/MediaConfigurationManager.java 2009-02-13 16:01:55 UTC (rev 988)
+++ trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/configuration/MediaConfigurationManager.java 2009-02-13 16:24:47 UTC (rev 989)
@@ -50,6 +50,8 @@
import net.sourceforge.openutils.mgnlmedia.media.pages.MediaFolderViewPage;
import net.sourceforge.openutils.mgnlmedia.media.types.MediaTypeHandler;
+import org.apache.commons.collections.CollectionUtils;
+import org.apache.commons.collections.Predicate;
import org.apache.commons.lang.StringUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -236,7 +238,6 @@
/**
* {@inheritDoc}
*/
- @Override
public boolean accept(Content content)
{
try
@@ -260,7 +261,6 @@
/**
* {@inheritDoc}
*/
- @Override
public int compare(Content o1, Content o2)
{
if (sorting.equals(MediaFolderViewPage.SORT_BY_FILENAME))
@@ -337,6 +337,41 @@
return medias;
}
+ @SuppressWarnings("unchecked")
+ public Collection<Content> search(String text, final String type) throws RepositoryException
+ {
+ QueryManager qm = MgnlContext.getQueryManager(MediaModuleLifecycle.REPO);
+ StringBuilder sb = new StringBuilder();
+ sb.append("//*[jcr:contains(.,'");
+ sb.append(StringUtils.replace(text, "'", "''"));
+ sb.append("')] order by @jcr:score descending");
+ Query q = qm.createQuery(sb.toString(), Query.XPATH);
+ QueryResult qr = q.execute();
+ Collection c = qr.getContent(MediaConfigurationManager.MGNL_MEDIA_TYPE);
+
+ if (!StringUtils.isBlank(type))
+ {
+ CollectionUtils.filter(c, new Predicate()
+ {
+
+ /**
+ * {@inheritDoc}
+ */
+ public boolean evaluate(Object object)
+ {
+ if (object instanceof Content)
+ {
+ return NodeDataUtil.getString((Content) object, "type").equals(type);
+ }
+ return false;
+ }
+
+ });
+ }
+
+ return c;
+ }
+
/**
* Get the type configuration for a media
* @param media media
Modified: trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/dialog/DialogSelectMedia.java
===================================================================
--- trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/dialog/DialogSelectMedia.java 2009-02-13 16:01:55 UTC (rev 988)
+++ trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/dialog/DialogSelectMedia.java 2009-02-13 16:24:47 UTC (rev 989)
@@ -19,7 +19,6 @@
import freemarker.template.TemplateException;
import freemarker.template.TemplateMethodModel;
-import freemarker.template.TemplateModel;
import freemarker.template.TemplateModelException;
import info.magnolia.cms.core.Content;
import info.magnolia.cms.core.HierarchyManager;
@@ -298,7 +297,6 @@
/**
* {@inheritDoc}
*/
- @Override
public Object exec(List arguments) throws TemplateModelException
{
if (arguments != null && arguments.size() == 3 && arguments.get(0) instanceof HttpServletRequest)
@@ -309,7 +307,7 @@
req.setAttribute(name, value);
}
- return TemplateModel.NOTHING;
+ return TemplateMethodModel.NOTHING;
}
}
@@ -325,7 +323,6 @@
/**
* {@inheritDoc}
*/
- @Override
public Object exec(List arguments) throws TemplateModelException
{
if (arguments != null && arguments.size() == 2 && arguments.get(0) instanceof HttpServletRequest)
Modified: trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/lifecycle/MediaModuleLifecycle.java
===================================================================
--- trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/lifecycle/MediaModuleLifecycle.java 2009-02-13 16:01:55 UTC (rev 988)
+++ trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/lifecycle/MediaModuleLifecycle.java 2009-02-13 16:24:47 UTC (rev 989)
@@ -30,18 +30,17 @@
*/
public class MediaModuleLifecycle implements ModuleLifecycle
{
-
/**
- *
+ *
*/
public static final String REPO = "media";
private Logger log = LoggerFactory.getLogger(MediaModuleLifecycle.class);
/**
+ *
* {@inheritDoc}
*/
- @Override
public void start(ModuleLifecycleContext ctx)
{
log.info("Starting module media");
@@ -49,9 +48,9 @@
}
/**
+ *
* {@inheritDoc}
*/
- @Override
public void stop(ModuleLifecycleContext ctx)
{
log.info("Stopping module media");
Modified: trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/pages/MediaFolderViewPage.java
===================================================================
--- trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/pages/MediaFolderViewPage.java 2009-02-13 16:01:55 UTC (rev 988)
+++ trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/pages/MediaFolderViewPage.java 2009-02-13 16:24:47 UTC (rev 989)
@@ -54,6 +54,7 @@
import org.apache.commons.chain.Command;
import org.apache.commons.lang.StringUtils;
+import org.apache.jackrabbit.util.ISO9075;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -113,6 +114,8 @@
private boolean develop;
+ private String search;
+
/**
* @param name
* @param request
@@ -151,7 +154,10 @@
types = MediaConfigurationManager.getInstance().getTypes().values();
}
- fillNumberOfMediaPerType();
+ if (!StringUtils.isBlank(path))
+ {
+ fillNumberOfMediaPerType();
+ }
if (sorting == null)
{
@@ -167,7 +173,9 @@
QueryManager qm = MgnlContext.getQueryManager(MediaModuleLifecycle.REPO);
try
{
- Query q = qm.createQuery(path.substring(1) + "/*[type='" + mtc.getName() + "']", Query.XPATH);
+ Query q = qm.createQuery(
+ ISO9075.encodePath(path.substring(1)) + "/*[type='" + mtc.getName() + "']",
+ Query.XPATH);
QueryResult qr = q.execute();
numberOfMedia.put(mtc.getName(), qr.getContent(MediaConfigurationManager.MEDIA.getSystemName()).size());
@@ -186,25 +194,48 @@
public String show()
{
HierarchyManager hm = MgnlContext.getInstance().getHierarchyManager(MediaModuleLifecycle.REPO);
+ MediaTypeConfiguration mtc = MediaConfigurationManager.getInstance().getTypes().get(type);
- try
+ Collection<Content> mediasOfType = null;
+ medias = new ArrayList<MediaBean>();
+
+ develop = SystemProperty.getBooleanProperty("magnolia.develop");
+
+ if (!StringUtils.isBlank(path))
{
- Content folder = hm.getContent(this.getPath());
+ try
+ {
+ Content folder = hm.getContent(this.getPath());
- writable = folder.isGranted(Permission.WRITE);
+ writable = folder.isGranted(Permission.WRITE);
+ canPublish = writable && ActivationManagerFactory.getActivationManager().hasAnyActiveSubscriber();
- canPublish = writable && ActivationManagerFactory.getActivationManager().hasAnyActiveSubscriber();
+ mediasOfType = MediaConfigurationManager.getInstance().getMediaNodes(folder, type, sorting);
- develop = SystemProperty.getBooleanProperty("magnolia.develop");
+ }
+ catch (RepositoryException ex)
+ {
+ log.error("Exception caught", ex);
+ }
+ }
+ else if (!StringUtils.isBlank(search))
+ {
+ try
+ {
+ writable = false;
+ canPublish = false;
- medias = new ArrayList<MediaBean>();
+ mediasOfType = MediaConfigurationManager.getInstance().search(search, type);
- MediaTypeConfiguration mtc = MediaConfigurationManager.getInstance().getTypes().get(type);
- Collection<Content> mediasOfType = MediaConfigurationManager.getInstance().getMediaNodes(
- folder,
- type,
- sorting);
+ }
+ catch (RepositoryException ex)
+ {
+ log.error("Exception caught", ex);
+ }
+ }
+ if (mediasOfType != null)
+ {
for (Content media : mediasOfType)
{
MediaBean mb = new MediaBean();
@@ -218,17 +249,23 @@
mb.setDescription(mtc.getHandler().getDescription(media));
mb.setUuid(media.getUUID());
- mb.getUsedInWebPages().addAll(
- MediaConfigurationManager.getInstance().getUsedInWebPages(media.getUUID()));
+ try
+ {
+ mb.setWritable(media.getParent().isGranted(Permission.WRITE));
+ mb.setCanPublish(mb.isWritable()
+ && ActivationManagerFactory.getActivationManager().hasAnyActiveSubscriber());
+ mb.getUsedInWebPages().addAll(
+ MediaConfigurationManager.getInstance().getUsedInWebPages(media.getUUID()));
+ }
+ catch (RepositoryException ex)
+ {
+ log.error("Exception caught", ex);
+ }
medias.add(mb);
}
+ }
- }
- catch (RepositoryException ex)
- {
- log.error("Exception caught", ex);
- }
return super.show();
}
@@ -557,6 +594,10 @@
private List<String> usedInWebPages = new ArrayList<String>();
+ private boolean canPublish;
+
+ private boolean writable;
+
/**
* Returns the metaData.
* @return the metaData
@@ -719,6 +760,42 @@
this.usedInWebPages = usedInWebPages;
}
+ /**
+ * Returns the canPublish.
+ * @return the canPublish
+ */
+ public boolean isCanPublish()
+ {
+ return canPublish;
+ }
+
+ /**
+ * Sets the canPublish.
+ * @param canPublish the canPublish to set
+ */
+ public void setCanPublish(boolean canPublish)
+ {
+ this.canPublish = canPublish;
+ }
+
+ /**
+ * Returns the writable.
+ * @return the writable
+ */
+ public boolean isWritable()
+ {
+ return writable;
+ }
+
+ /**
+ * Sets the writable.
+ * @param writable the writable to set
+ */
+ public void setWritable(boolean writable)
+ {
+ this.writable = writable;
+ }
+
}
/**
@@ -883,4 +960,22 @@
this.develop = develop;
}
+ /**
+ * Returns the search.
+ * @return the search
+ */
+ public String getSearch()
+ {
+ return search;
+ }
+
+ /**
+ * Sets the search.
+ * @param search the search to set
+ */
+ public void setSearch(String search)
+ {
+ this.search = search;
+ }
+
}
Modified: trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/pages/MediaLoadZipFilePage.java
===================================================================
--- trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/pages/MediaLoadZipFilePage.java 2009-02-13 16:01:55 UTC (rev 988)
+++ trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/pages/MediaLoadZipFilePage.java 2009-02-13 16:24:47 UTC (rev 989)
@@ -23,16 +23,20 @@
import info.magnolia.cms.core.ItemType;
import info.magnolia.cms.core.NodeData;
import info.magnolia.cms.core.Path;
+import info.magnolia.cms.i18n.Messages;
import info.magnolia.cms.security.AccessDeniedException;
import info.magnolia.cms.util.NodeDataUtil;
import info.magnolia.context.MgnlContext;
+import info.magnolia.module.admininterface.TemplatedMVCHandler;
import java.io.File;
+import java.io.FileInputStream;
import java.io.FileOutputStream;
import java.io.IOException;
import java.util.Enumeration;
import java.util.zip.ZipEntry;
import java.util.zip.ZipFile;
+import java.util.zip.ZipInputStream;
import javax.jcr.RepositoryException;
import javax.servlet.http.HttpServletRequest;
@@ -41,6 +45,7 @@
import net.sourceforge.openutils.mgnlmedia.media.configuration.MediaConfigurationManager;
import net.sourceforge.openutils.mgnlmedia.media.configuration.MediaTypeConfiguration;
import net.sourceforge.openutils.mgnlmedia.media.lifecycle.MediaModuleLifecycle;
+import net.sourceforge.openutils.mgnlmedia.media.types.MediaTypeHandler;
import org.apache.commons.io.IOUtils;
import org.apache.commons.lang.StringUtils;
Modified: trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/pages/MessagesTemplatedMVCHandler.java
===================================================================
--- trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/pages/MessagesTemplatedMVCHandler.java 2009-02-13 16:01:55 UTC (rev 988)
+++ trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/pages/MessagesTemplatedMVCHandler.java 2009-02-13 16:24:47 UTC (rev 989)
@@ -17,13 +17,13 @@
*/
package net.sourceforge.openutils.mgnlmedia.media.pages;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
import info.magnolia.cms.i18n.Messages;
import info.magnolia.module.admininterface.TemplatedMVCHandler;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
/**
* @author molaschi
* @version $Id$
Modified: trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/save/MediaCustomSaveHandler.java
===================================================================
--- trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/save/MediaCustomSaveHandler.java 2009-02-13 16:01:55 UTC (rev 988)
+++ trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/save/MediaCustomSaveHandler.java 2009-02-13 16:24:47 UTC (rev 989)
@@ -22,7 +22,7 @@
import info.magnolia.cms.core.HierarchyManager;
import info.magnolia.cms.security.AccessDeniedException;
import info.magnolia.context.MgnlContext;
-import info.magnolia.module.admininterface.CustomSaveHandler;
+import info.magnolia.module.admininterface.FieldSaveHandler;
import javax.jcr.RepositoryException;
@@ -37,13 +37,12 @@
* @author molaschi
* @version $Id$
*/
-public class MediaCustomSaveHandler implements CustomSaveHandler
+public class MediaCustomSaveHandler implements FieldSaveHandler
{
/**
* {@inheritDoc}
*/
- @Override
public void save(Content parentNode, Content configNode, String name, MultipartForm form, int type, int valueType,
int isRichEditValue, int encoding) throws RepositoryException, AccessDeniedException
{
Modified: trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/setup/MediaModuleVersionHandler.java
===================================================================
--- trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/setup/MediaModuleVersionHandler.java 2009-02-13 16:01:55 UTC (rev 988)
+++ trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/setup/MediaModuleVersionHandler.java 2009-02-13 16:24:47 UTC (rev 989)
@@ -17,9 +17,14 @@
*/
package net.sourceforge.openutils.mgnlmedia.media.setup;
+import info.magnolia.module.InstallContext;
+import info.magnolia.module.delta.Task;
import it.openutils.mgnltasks.SimpleModuleVersionHandler;
+import java.util.ArrayList;
+import java.util.List;
+
/**
* @author manuel
* @version $Id
@@ -27,4 +32,18 @@
public class MediaModuleVersionHandler extends SimpleModuleVersionHandler
{
+ /**
+ * {@inheritDoc}
+ */
+ @Override
+ protected List getStartupTasks(InstallContext installContext)
+ {
+ List<Task> tasks = new ArrayList<Task>();
+
+ // tasks.add(new RemoveResolutionsNodeTask());
+ // tasks.add(new RenameThumbToImageTask());
+
+ return tasks;
+ }
+
}
Modified: trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/setup/RemoveResolutionsNodeTask.java
===================================================================
--- trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/setup/RemoveResolutionsNodeTask.java 2009-02-13 16:01:55 UTC (rev 988)
+++ trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/setup/RemoveResolutionsNodeTask.java 2009-02-13 16:24:47 UTC (rev 989)
@@ -17,6 +17,10 @@
*/
package net.sourceforge.openutils.mgnlmedia.media.setup;
+import java.util.Collection;
+
+import javax.jcr.RepositoryException;
+
import info.magnolia.cms.core.Content;
import info.magnolia.cms.core.HierarchyManager;
import info.magnolia.cms.core.ItemType;
@@ -26,11 +30,6 @@
import info.magnolia.module.InstallContext;
import info.magnolia.module.delta.AbstractTask;
import info.magnolia.module.delta.TaskExecutionException;
-
-import java.util.Collection;
-
-import javax.jcr.RepositoryException;
-
import net.sourceforge.openutils.mgnlmedia.media.configuration.MediaConfigurationManager;
import net.sourceforge.openutils.mgnlmedia.media.lifecycle.MediaModuleLifecycle;
@@ -54,7 +53,6 @@
/**
* {@inheritDoc}
*/
- @Override
public void execute(InstallContext installContext) throws TaskExecutionException
{
HierarchyManager hm = installContext.getHierarchyManager(MediaModuleLifecycle.REPO);
Modified: trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/setup/RenameThumbToImageTask.java
===================================================================
--- trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/setup/RenameThumbToImageTask.java 2009-02-13 16:01:55 UTC (rev 988)
+++ trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/setup/RenameThumbToImageTask.java 2009-02-13 16:24:47 UTC (rev 989)
@@ -56,7 +56,6 @@
/**
* {@inheritDoc}
*/
- @Override
public void execute(InstallContext installContext) throws TaskExecutionException
{
HierarchyManager hm = installContext.getHierarchyManager(MediaModuleLifecycle.REPO);
Modified: trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/tree/JcrBrowserWithNodeTypeTreeConfiguration.java
===================================================================
--- trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/tree/JcrBrowserWithNodeTypeTreeConfiguration.java 2009-02-13 16:01:55 UTC (rev 988)
+++ trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/tree/JcrBrowserWithNodeTypeTreeConfiguration.java 2009-02-13 16:24:47 UTC (rev 989)
@@ -44,7 +44,7 @@
{
// TODO Auto-generated method stub
super.prepareTree(tree, browseMode, request);
-
+
tree.addItemType(MediaConfigurationManager.MEDIA);
tree.addItemType(MediaConfigurationManager.RESOLUTIONS);
@@ -54,7 +54,6 @@
/**
* {@inheritDoc}
*/
- @Override
public String renderHtml(TreeColumn treeColumn, Content content)
{
try
Modified: trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/tree/MediaModuleTreeConfiguration.java
===================================================================
--- trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/tree/MediaModuleTreeConfiguration.java 2009-02-13 16:01:55 UTC (rev 988)
+++ trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/tree/MediaModuleTreeConfiguration.java 2009-02-13 16:24:47 UTC (rev 989)
@@ -49,7 +49,6 @@
/**
* {@inheritDoc}
*/
- @Override
public void prepareContextMenu(Tree tree, boolean browseMode, HttpServletRequest request)
{
final Messages msgs = getMessages();
@@ -209,7 +208,6 @@
/**
* {@inheritDoc}
*/
- @Override
public void prepareFunctionBar(Tree tree, boolean browseMode, HttpServletRequest request)
{
tree.addFunctionBarItem(FunctionBarItem.getRefreshFunctionBarItem(tree, getMessages(), request));
@@ -218,7 +216,6 @@
/**
* {@inheritDoc}
*/
- @Override
public void prepareTree(Tree tree, boolean browseMode, HttpServletRequest request)
{
final Messages msgs = getMessages();
Modified: trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/tree/MediaModuleTreeMVCHandler.java
===================================================================
--- trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/tree/MediaModuleTreeMVCHandler.java 2009-02-13 16:01:55 UTC (rev 988)
+++ trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/tree/MediaModuleTreeMVCHandler.java 2009-02-13 16:24:47 UTC (rev 989)
@@ -17,11 +17,16 @@
*/
package net.sourceforge.openutils.mgnlmedia.media.tree;
+import info.magnolia.cms.core.ItemType;
+import info.magnolia.context.Context;
import info.magnolia.module.admininterface.AdminTreeMVCHandler;
+import info.magnolia.module.admininterface.commands.ActivationCommand;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
+import net.sourceforge.openutils.mgnlmedia.media.configuration.MediaConfigurationManager;
+
import org.apache.commons.chain.Command;
Modified: trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/types/impl/AudioTypeHandler.java
===================================================================
--- trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/types/impl/AudioTypeHandler.java 2009-02-13 16:01:55 UTC (rev 988)
+++ trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/types/impl/AudioTypeHandler.java 2009-02-13 16:24:47 UTC (rev 989)
@@ -44,7 +44,6 @@
/**
* {@inheritDoc}
*/
- @Override
public void init(Content typeDefinitionNode)
{
@@ -53,7 +52,6 @@
/**
* {@inheritDoc}
*/
- @Override
public String getUrl(Content media)
{
NodeData file = media.getNodeData("audio");
@@ -67,7 +65,6 @@
/**
* {@inheritDoc}
*/
- @Override
public String getUrl(Content media, Map<String, String> options)
{
return getUrl(media);
@@ -76,7 +73,6 @@
/**
* {@inheritDoc}
*/
- @Override
public String getFilename(Content media)
{
NodeData file = media.getNodeData("audio");
@@ -86,7 +82,6 @@
/**
* {@inheritDoc}
*/
- @Override
public String getExtension(Content media)
{
NodeData file = media.getNodeData("audio");
@@ -96,7 +91,6 @@
/**
* {@inheritDoc}
*/
- @Override
public String getFullFilename(Content media)
{
return getFilename(media) + "." + getExtension(media);
@@ -105,7 +99,6 @@
/**
* {@inheritDoc}
*/
- @Override
public String getThumbnailUrl(Content media)
{
return "/.resources/media/icons/audioThumb.jpg";
@@ -114,7 +107,6 @@
/**
* {@inheritDoc}
*/
- @Override
public String getPreviewUrl(Content media)
{
return getUrl(media);
@@ -143,7 +135,6 @@
/**
* {@inheritDoc}
*/
- @Override
public String getNewNodeName(MultipartForm form)
{
return form.getParameter("audio_" + FileProperties.PROPERTY_FILENAME);
@@ -152,7 +143,6 @@
/**
* {@inheritDoc}
*/
- @Override
public boolean onSavingPropertyMedia(Content media, Content parentNode, Content configNode, String name,
MultipartForm form, int type, int valueType, int isRichEditValue, int encoding) throws RepositoryException,
AccessDeniedException
Modified: trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/types/impl/BaseTypeHandler.java
===================================================================
--- trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/types/impl/BaseTypeHandler.java 2009-02-13 16:01:55 UTC (rev 988)
+++ trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/types/impl/BaseTypeHandler.java 2009-02-13 16:24:47 UTC (rev 989)
@@ -64,7 +64,6 @@
/**
* {@inheritDoc}
*/
- @Override
public String getTitle(Content media)
{
return getPropertyLocalized(media, "title");
@@ -73,7 +72,6 @@
/**
* {@inheritDoc}
*/
- @Override
public String getTags(Content media)
{
return getPropertyLocalized(media, "tags");
@@ -82,7 +80,6 @@
/**
* {@inheritDoc}
*/
- @Override
public String getDescription(Content media)
{
return getPropertyLocalized(media, "description");
@@ -91,7 +88,6 @@
/**
* {@inheritDoc}
*/
- @Override
public String getAbstract(Content media)
{
return getPropertyLocalized(media, "abstract");
@@ -101,7 +97,6 @@
* {@inheritDoc}
*/
@SuppressWarnings("unchecked")
- @Override
public boolean onPostSave(Content media)
{
try
Modified: trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/types/impl/ImageTypeHandler.java
===================================================================
--- trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/types/impl/ImageTypeHandler.java 2009-02-13 16:01:55 UTC (rev 988)
+++ trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/types/impl/ImageTypeHandler.java 2009-02-13 16:24:47 UTC (rev 989)
@@ -55,7 +55,6 @@
/**
* {@inheritDoc}
*/
- @Override
public void init(Content typeDefinitionNode)
{
@@ -64,7 +63,6 @@
/**
* {@inheritDoc}
*/
- @Override
public String getFilename(Content media)
{
NodeData file = media.getNodeData("image");
@@ -74,7 +72,6 @@
/**
* {@inheritDoc}
*/
- @Override
public String getExtension(Content media)
{
NodeData file = media.getNodeData("image");
@@ -84,7 +81,6 @@
/**
* {@inheritDoc}
*/
- @Override
public String getFullFilename(Content media)
{
return getFilename(media) + "." + getExtension(media);
@@ -93,7 +89,6 @@
/**
* {@inheritDoc}
*/
- @Override
public String getUrl(Content media)
{
NodeData file = media.getNodeData("image");
@@ -107,7 +102,6 @@
/**
* {@inheritDoc}
*/
- @Override
public String getUrl(Content media, Map<String, String> options)
{
return getUrl(media);
@@ -116,7 +110,6 @@
/**
* {@inheritDoc}
*/
- @Override
public String getThumbnailUrl(Content media)
{
if (!ImageUtils.checkOrCreateResolution(media, "thumbnail"))
@@ -132,7 +125,6 @@
/**
* {@inheritDoc}
*/
- @Override
public String getPreviewUrl(Content media)
{
if (!ImageUtils.checkOrCreateResolution(media, "preview"))
@@ -174,7 +166,6 @@
/**
* {@inheritDoc}
*/
- @Override
public void saveFromZipFile(Content media, File f, String cleanFileName, String extension)
throws AccessDeniedException, RepositoryException
{
@@ -189,7 +180,6 @@
/**
* {@inheritDoc}
*/
- @Override
public String getNewNodeName(MultipartForm form)
{
return form.getParameter("image_" + FileProperties.PROPERTY_FILENAME);
@@ -198,7 +188,6 @@
/**
* {@inheritDoc}
*/
- @Override
public boolean onSavingPropertyMedia(final Content media, final Content parentNode, final Content configNode,
final String name, final MultipartForm form, final int type, final int valueType, final int isRichEditValue,
final int encoding) throws RepositoryException, AccessDeniedException
Modified: trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/types/impl/VideoTypeHandler.java
===================================================================
--- trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/types/impl/VideoTypeHandler.java 2009-02-13 16:01:55 UTC (rev 988)
+++ trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/types/impl/VideoTypeHandler.java 2009-02-13 16:24:47 UTC (rev 989)
@@ -47,7 +47,6 @@
/**
* {@inheritDoc}
*/
- @Override
public void init(Content typeDefinitionNode)
{
@@ -56,7 +55,6 @@
/**
* {@inheritDoc}
*/
- @Override
public String getUrl(Content media)
{
NodeData file = media.getNodeData("video");
@@ -70,7 +68,6 @@
/**
* {@inheritDoc}
*/
- @Override
public String getUrl(Content media, Map<String, String> options)
{
return getUrl(media);
@@ -79,7 +76,6 @@
/**
* {@inheritDoc}
*/
- @Override
public String getFilename(Content media)
{
NodeData file = media.getNodeData("video");
@@ -89,7 +85,6 @@
/**
* {@inheritDoc}
*/
- @Override
public String getExtension(Content media)
{
NodeData file = media.getNodeData("video");
@@ -99,7 +94,6 @@
/**
* {@inheritDoc}
*/
- @Override
public String getFullFilename(Content media)
{
return getFilename(media) + "." + getExtension(media);
@@ -108,7 +102,6 @@
/**
* {@inheritDoc}
*/
- @Override
public String getThumbnailUrl(Content media)
{
if (!ImageUtils.checkOrCreateResolution(media, "thumbnail"))
@@ -124,7 +117,6 @@
/**
* {@inheritDoc}
*/
- @Override
public String getPreviewUrl(Content media)
{
return getUrl(media);
@@ -153,7 +145,6 @@
/**
* {@inheritDoc}
*/
- @Override
public String getNewNodeName(MultipartForm form)
{
return form.getParameter("video_" + FileProperties.PROPERTY_FILENAME);
@@ -162,7 +153,6 @@
/**
* {@inheritDoc}
*/
- @Override
public boolean onSavingPropertyMedia(Content media, Content parentNode, Content configNode, String name,
MultipartForm form, int type, int valueType, int isRichEditValue, int encoding) throws RepositoryException,
AccessDeniedException
Modified: trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/types/impl/YouTubeVideoTypeHandler.java
===================================================================
--- trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/types/impl/YouTubeVideoTypeHandler.java 2009-02-13 16:01:55 UTC (rev 988)
+++ trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/types/impl/YouTubeVideoTypeHandler.java 2009-02-13 16:24:47 UTC (rev 989)
@@ -54,7 +54,6 @@
/**
* {@inheritDoc}
*/
- @Override
public void init(Content typeDefinitionNode)
{
@@ -63,7 +62,6 @@
/**
* {@inheritDoc}
*/
- @Override
public String getUrl(Content media)
{
return media.getNodeData("videoUrl").getString();
@@ -72,7 +70,6 @@
/**
* {@inheritDoc}
*/
- @Override
public String getUrl(Content media, Map<String, String> options)
{
return getUrl(media);
@@ -81,7 +78,6 @@
/**
* {@inheritDoc}
*/
- @Override
public String getFilename(Content media)
{
return getUrl(media);
@@ -90,7 +86,6 @@
/**
* {@inheritDoc}
*/
- @Override
public String getExtension(Content media)
{
return null;
@@ -99,7 +94,6 @@
/**
* {@inheritDoc}
*/
- @Override
public String getFullFilename(Content media)
{
return null;
@@ -108,7 +102,6 @@
/**
* {@inheritDoc}
*/
- @Override
public String getThumbnailUrl(Content media)
{
if (!ImageUtils.checkOrCreateResolution(media, "thumbnail"))
@@ -124,7 +117,6 @@
/**
* {@inheritDoc}
*/
- @Override
public String getPreviewUrl(Content media)
{
return getUrl(media);
@@ -148,7 +140,6 @@
/**
* {@inheritDoc}
*/
- @Override
public String getNewNodeName(MultipartForm form)
{
String videoUrl = form.getParameter("videoUrl");
@@ -176,7 +167,6 @@
/**
* {@inheritDoc}
*/
- @Override
public boolean onSavingPropertyMedia(Content media, Content parentNode, Content configNode, String name,
MultipartForm form, int type, int valueType, int isRichEditValue, int encoding) throws RepositoryException,
AccessDeniedException
Modified: trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/utils/ImageUtils.java
===================================================================
--- trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/utils/ImageUtils.java 2009-02-13 16:01:55 UTC (rev 988)
+++ trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/utils/ImageUtils.java 2009-02-13 16:24:47 UTC (rev 989)
@@ -27,7 +27,6 @@
import java.awt.Graphics2D;
import java.awt.Image;
import java.awt.RenderingHints;
-import java.awt.Transparency;
import java.awt.image.BufferedImage;
import java.awt.image.ColorModel;
import java.io.BufferedOutputStream;
@@ -87,7 +86,7 @@
private static int getType(ColorModel cm)
{
- if (cm.getTransparency() == Transparency.BITMASK)
+ if (cm.getTransparency() == ColorModel.BITMASK)
{
if (cm.isAlphaPremultiplied())
{
@@ -98,7 +97,7 @@
return BufferedImage.TYPE_4BYTE_ABGR;
}
}
- if (cm.getTransparency() == Transparency.TRANSLUCENT)
+ if (cm.getTransparency() == ColorModel.TRANSLUCENT)
{
if (cm.isAlphaPremultiplied())
{
@@ -449,7 +448,6 @@
/**
* {@inheritDoc}
*/
- @Override
public void exec()
{
HierarchyManager hm = MgnlContext.getHierarchyManager(MediaModuleLifecycle.REPO);
Added: trunk/openutils-mgnlmedia/src/main/resources/info/magnolia/cms/gui/control/MediaTreeAddress.ftl
===================================================================
--- trunk/openutils-mgnlmedia/src/main/resources/info/magnolia/cms/gui/control/MediaTreeAddress.ftl (rev 0)
+++ trunk/openutils-mgnlmedia/src/main/resources/info/magnolia/cms/gui/control/MediaTreeAddress.ftl 2009-02-13 16:24:47 UTC (rev 989)
@@ -0,0 +1,2 @@
+<img src="${contextPath}/.resources/0.gif" height="3px"/>
+<input id="${tree.javascriptTree}SearchBar" type="text" onkeydown="if (mgnlIsKeyEnter(event)) parent.search(this.value);" class="mgnlDialogControlEdit" style="width:100%;" value="" />
\ No newline at end of file
Modified: trunk/openutils-mgnlmedia/src/main/resources/info/magnolia/cms/gui/control/MediaTreeFooter.ftl
===================================================================
--- trunk/openutils-mgnlmedia/src/main/resources/info/magnolia/cms/gui/control/MediaTreeFooter.ftl 2009-02-13 16:01:55 UTC (rev 988)
+++ trunk/openutils-mgnlmedia/src/main/resources/info/magnolia/cms/gui/control/MediaTreeFooter.ftl 2009-02-13 16:24:47 UTC (rev 989)
@@ -21,7 +21,11 @@
${menu.html}
</#if>
-<#if tree.browseMode && !selectMedia>
+<#if tree.browseMode && selectMedia?exists && selectMedia>
+ <#include "MediaTreeAddress.ftl"/>
+</#if>
+
+<#if tree.browseMode && (!selectMedia?exists || !selectMedia)>
<#include "TreeAddressBar.ftl"/>
</#if>
Modified: trunk/openutils-mgnlmedia/src/main/resources/mgnl-resources/media/js/mootips.js
===================================================================
--- trunk/openutils-mgnlmedia/src/main/resources/mgnl-resources/media/js/mootips.js 2009-02-13 16:01:55 UTC (rev 988)
+++ trunk/openutils-mgnlmedia/src/main/resources/mgnl-resources/media/js/mootips.js 2009-02-13 16:24:47 UTC (rev 989)
@@ -17,6 +17,29 @@
leaveTip : function() {
$clear(this.timer);
this.timer = this.hide.delay(this.options.hideDelay, this);
+ },
+
+ position : function(event) {
+ var size = window.getSize(), scroll = window.getScroll();
+ var tip = {
+ x :this.tip.offsetWidth,
+ y :this.tip.offsetHeight
+ };
+ var props = {
+ x :'left',
+ y :'top'
+ };
+ for ( var z in props) {
+ var pos = event.page[z] + this.options.offsets[z];
+ if ((pos + tip[z] - scroll[z]) > size[z]) {
+ pos = pos - ((pos + tip[z] - scroll[z]) - size[z]);
+ if (pos < 0)
+ {
+ pos = 0;
+ }
+ }
+ this.tip.setStyle(props[z], pos);
+ }
}
});
\ No newline at end of file
Modified: trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/media/pages/MediaBrowserPage.html
===================================================================
--- trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/media/pages/MediaBrowserPage.html 2009-02-13 16:01:55 UTC (rev 988)
+++ trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/media/pages/MediaBrowserPage.html 2009-02-13 16:24:47 UTC (rev 989)
@@ -29,6 +29,21 @@
return url;
}
+function search(textToSearch) {
+ viewport.getComponent('center-panel').setTitle("Search results for : "+ textToSearch);
+
+ var url = "${this.request.contextPath}/.magnolia/pages/mediaFolderView.html?search="+ textToSearch + "&mgnlCK=" + (new Date()).getTime();
+ if (selectMedia)
+ {
+ url += "&selectMedia=true&actMediaHandle="+ actMediaHandle;
+ }
+ if (mediaType != null && mediaType != 'null')
+ {
+ url += "&mediaType=" + mediaType;
+ }
+ frames['mediaFolderView'].location.href = url;
+}
+
Ext.onReady(function(){
Ext.state.Manager.setProvider(new Ext.state.CookieProvider());
Modified: trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/media/pages/MediaFolderViewPage.html
===================================================================
--- trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/media/pages/MediaFolderViewPage.html 2009-02-13 16:01:55 UTC (rev 988)
+++ trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/media/pages/MediaFolderViewPage.html 2009-02-13 16:24:47 UTC (rev 989)
@@ -25,7 +25,7 @@
function performAction(action, source, dest)
{
- if (action == "move" && dest == "${this.path}")
+ if (action == "move" && dest == "${this.path!""}")
{
alert("Non è possibile spostare all'interno dello stesso nodo.");
return;
@@ -88,7 +88,8 @@
<body>
<form action="" style="display:none" id="actionForm">
<input type="hidden" id="actionCmd" name="command" value="delete" />
- <input type="hidden" id="actionPath" name="path" value="${this.path}" />
+ <input type="hidden" id="actionPath" name="path" value="${this.path!""}" />
+ <input type="hidden" id="actionSearch" name="search" value="${this.search!""}" />
<input type="hidden" id="actionNode" name="node" />
<input type="hidden" id="actionDest" name="dest" />
<input type="hidden" name="type" value="${this.type}" />
@@ -102,14 +103,14 @@
</#if>
<div class="voice ${actual}">
<#if this.request.parameterMap['selectMedia']?exists>
- <a href="?type=${type.name}&path=${this.path}&selectMedia=true">
+ <a href="?type=${type.name}&path=${this.path!""}&selectMedia=true&search=${this.search!""}">
<img src="${this.request.contextPath}${type.menuIcon}" border="0" align="absmiddle" />
- ${this.msgs.get('media.types.' + type.name)} (${this.numberOfMedia[type.name]!'0'})
+ ${this.msgs.get('media.types.' + type.name)} <#if this.numberOfMedia?exists>(${this.numberOfMedia[type.name]!'0'})</#if>
</a>
<#else>
- <a href="?type=${type.name}&path=${this.path}">
+ <a href="?type=${type.name}&path=${this.path!""}&search=${this.search!""}">
<img src="${this.request.contextPath}${type.menuIcon}" border="0" align="absmiddle" />
- ${this.msgs.get('media.types.' + type.name)} (${this.numberOfMedia[type.name]!'0'})
+ ${this.msgs.get('media.types.' + type.name)} <#if this.numberOfMedia?exists>(${this.numberOfMedia[type.name]!'0'})</#if>
</a>
</#if>
</div>
@@ -150,7 +151,7 @@
${this.msgs.get('media.select')}
</a>
<#else>
- <#if this.canPublish && media.metaData.activationStatus < 2>
+ <#if media.canPublish && media.metaData.activationStatus < 2>
<a href="javascript:$empty()" onclick="performAction('activate', '${media.handle}','')" title="pubblica">
<img src="${this.request.contextPath}/.resources/icons/16/arrow_right_green.gif" border="0" align="middle" />
</a>
@@ -159,7 +160,7 @@
</#if>
</#if>
<#else>
- <#if this.writable>
+ <#if media.writable>
<a href="javascript:$empty()" onclick="openDialog('${media.handle}')" title="${this.msgs.get('media.edit')}">
<img src="${this.request.contextPath}/.resources/media/icons/edit.gif" border="0" align="middle" />
</a>
@@ -186,7 +187,7 @@
<img src="${this.request.contextPath}/.resources/icons/16/copy_inactive.gif" border="0" align="middle" />
</a>
</#if>
- <#if this.canPublish>
+ <#if media.canPublish>
<a href="javascript:$empty()" onclick="performAction('activate', '${media.handle}','')" title="${this.msgs.get('media.activate')}">
<img src="${this.request.contextPath}/.resources/icons/16/arrow_right_green.gif" border="0" align="middle" />
</a>
@@ -196,7 +197,7 @@
align="middle" />
</a>
</#if>
- <#if this.canPublish && media.metaData.activationStatus = 2>
+ <#if media.canPublish && media.metaData.activationStatus = 2>
<a href="javascript:$empty()" onclick="performAction('deactivate', '${media.handle}','')" title="${this.msgs.get('media.deactivate')}">
<img src="${this.request.contextPath}/.resources/icons/16/arrow_left_red.gif" border="0" align="middle" />
</a>
@@ -214,7 +215,7 @@
<#else>
<#assign pages = "">
<#list media.usedInWebPages as page>
- <#assign pages = pages + "<a href='${this.request.contextPath}" + page +".html' target='_blank'>"+ page +"</a><br/>">
+ <#assign pages = pages + "<a href='${this.request.contextPath}" + page +".html' target='_blank'>"+ page +"</a><br/>">
</#list>
<span class="tips" rel="${pages}">${this.msgs.get('media.pages')} (${media.usedInWebPages?size})</span>
</#if>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fg...@us...> - 2009-02-15 20:58:31
|
Revision: 999
http://openutils.svn.sourceforge.net/openutils/?rev=999&view=rev
Author: fgiust
Date: 2009-02-15 20:58:20 +0000 (Sun, 15 Feb 2009)
Log Message:
-----------
adding support for CMYK/YCCK jpegs
Modified Paths:
--------------
trunk/openutils-mgnlmedia/pom.xml
trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/utils/ImageUtils.java
trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/media/pages/MediaBrowserPage.html
Added Paths:
-----------
trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/utils/BadImageFormatException.java
trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/utils/JpegUtils.java
trunk/openutils-mgnlmedia/src/test/java/net/
trunk/openutils-mgnlmedia/src/test/java/net/sourceforge/
trunk/openutils-mgnlmedia/src/test/java/net/sourceforge/openutils/
trunk/openutils-mgnlmedia/src/test/java/net/sourceforge/openutils/mgnlmedia/
trunk/openutils-mgnlmedia/src/test/java/net/sourceforge/openutils/mgnlmedia/media/
trunk/openutils-mgnlmedia/src/test/java/net/sourceforge/openutils/mgnlmedia/media/utils/
trunk/openutils-mgnlmedia/src/test/java/net/sourceforge/openutils/mgnlmedia/media/utils/FileNodeData.java
trunk/openutils-mgnlmedia/src/test/java/net/sourceforge/openutils/mgnlmedia/media/utils/ImageUtilsTest.java
trunk/openutils-mgnlmedia/src/test/resources/images/
trunk/openutils-mgnlmedia/src/test/resources/images/badimage.jpg
trunk/openutils-mgnlmedia/src/test/resources/images/badimage.txt
trunk/openutils-mgnlmedia/src/test/resources/images/ycck.jpg
Property Changed:
----------------
trunk/openutils-mgnlmedia/
Property changes on: trunk/openutils-mgnlmedia
___________________________________________________________________
Modified: svn:ignore
-
.settings
.checkstyle
.classpath
.project
target
+ .settings
.checkstyle
.classpath
.project
target
test-output
temp-testng-customsuite.xml
Modified: trunk/openutils-mgnlmedia/pom.xml
===================================================================
--- trunk/openutils-mgnlmedia/pom.xml 2009-02-13 17:53:26 UTC (rev 998)
+++ trunk/openutils-mgnlmedia/pom.xml 2009-02-15 20:58:20 UTC (rev 999)
@@ -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</artifactId>
@@ -56,6 +57,11 @@
<version>2.1</version>
</dependency>
<dependency>
+ <groupId>com.drewnoakes</groupId>
+ <artifactId>metadata-extractor</artifactId>
+ <version>2.4.0-beta-1</version>
+ </dependency>
+ <dependency>
<groupId>org.testng</groupId>
<artifactId>testng</artifactId>
<classifier>jdk15</classifier>
Added: trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/utils/BadImageFormatException.java
===================================================================
--- trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/utils/BadImageFormatException.java (rev 0)
+++ trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/utils/BadImageFormatException.java 2009-02-15 20:58:20 UTC (rev 999)
@@ -0,0 +1,32 @@
+package net.sourceforge.openutils.mgnlmedia.media.utils;
+
+/**
+ * @author fgiust
+ * @version $Id$
+ */
+public class BadImageFormatException extends RuntimeException
+{
+
+ /**
+ * Stable serialVersionUID.
+ */
+ private static final long serialVersionUID = 42L;
+
+ /**
+ * @param message
+ */
+ public BadImageFormatException(String message)
+ {
+ super(message);
+ }
+
+ /**
+ * @param message
+ * @param cause
+ */
+ public BadImageFormatException(String message, Throwable cause)
+ {
+ super(message, cause);
+ }
+
+}
Property changes on: trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/utils/BadImageFormatException.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: svn:keywords
+ Author Date Id Revision
Added: svn:eol-style
+ native
Modified: trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/utils/ImageUtils.java
===================================================================
--- trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/utils/ImageUtils.java 2009-02-13 17:53:26 UTC (rev 998)
+++ trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/utils/ImageUtils.java 2009-02-15 20:58:20 UTC (rev 999)
@@ -51,6 +51,7 @@
import net.sourceforge.openutils.mgnlmedia.media.configuration.MediaConfigurationManager;
import net.sourceforge.openutils.mgnlmedia.media.lifecycle.MediaModuleLifecycle;
+import org.apache.commons.io.IOUtils;
import org.apache.commons.lang.ClassUtils;
import org.apache.commons.lang.StringUtils;
import org.apache.commons.lang.math.NumberUtils;
@@ -364,7 +365,7 @@
}
}
- private static InputStream getStream(BufferedImage image, String extension) throws IOException
+ public static InputStream getStream(BufferedImage image, String extension) throws IOException
{
ByteArrayOutputStream bos = new ByteArrayOutputStream();
BufferedOutputStream out = new BufferedOutputStream(bos);
@@ -497,16 +498,9 @@
}
extension = "jpg";
}
- BufferedImage original;
- try
- {
- original = ImageIO.read(image.getStream());
- }
- catch (IOException e)
- {
- throw new RuntimeException(e);
- }
+ BufferedImage original = createBufferedImage(image);
+
String resolutionName = "res-" + resolution;
BufferedImage img = ImageUtils.getImageForResolution(original, resolution);
@@ -617,4 +611,36 @@
return "jpg";
}
}
+
+ /**
+ * @param image
+ * @return
+ */
+ public static BufferedImage createBufferedImage(NodeData image)
+ {
+ InputStream is = image.getStream();
+ try
+ {
+ return ImageIO.read(is);
+ }
+ catch (IOException e)
+ {
+ // CMYK jpeg can't be read be ImageIO
+ // Caused by: javax.imageio.IIOException: Unsupported Image Type
+ BufferedImage result = JpegUtils.processNonStandardImage(image);
+
+ if (result == null)
+ {
+ // throw the original exception back
+ throw new BadImageFormatException("Unable to handle " + image.getHandle(), e);
+ }
+ return result;
+
+ }
+ finally
+ {
+ IOUtils.closeQuietly(is);
+ }
+ }
+
}
Added: trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/utils/JpegUtils.java
===================================================================
--- trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/utils/JpegUtils.java (rev 0)
+++ trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/utils/JpegUtils.java 2009-02-15 20:58:20 UTC (rev 999)
@@ -0,0 +1,198 @@
+package net.sourceforge.openutils.mgnlmedia.media.utils;
+
+import info.magnolia.cms.core.NodeData;
+
+import java.awt.Transparency;
+import java.awt.color.ColorSpace;
+import java.awt.image.BufferedImage;
+import java.awt.image.ColorModel;
+import java.awt.image.ComponentColorModel;
+import java.awt.image.DataBuffer;
+import java.awt.image.DataBufferByte;
+import java.awt.image.Raster;
+import java.awt.image.WritableRaster;
+import java.io.IOException;
+import java.io.InputStream;
+import java.util.Iterator;
+
+import javax.imageio.ImageIO;
+import javax.imageio.ImageReader;
+import javax.imageio.stream.ImageInputStream;
+
+import org.apache.commons.io.IOUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import com.drew.imaging.jpeg.JpegProcessingException;
+import com.drew.imaging.jpeg.JpegSegmentReader;
+
+
+/**
+ * Utility class for handling of CMYK/YCCK jpegs.
+ * @author fgiust
+ * @version $Id$
+ */
+public class JpegUtils
+{
+
+ /**
+ * Logger.
+ */
+ private static Logger log = LoggerFactory.getLogger(JpegUtils.class);
+
+ /**
+ * Java's ImageIO can't process 4-component images and Java2D can't apply AffineTransformOp either, so convert
+ * raster data to RGB. Technique due to MArk Stephens. Free for any use. See
+ * http://bugs.sun.com/bugdatabase/view_bug.do?bug_id=4799903 or
+ * http://www.mail-archive.com/jav...@ca.../msg03247.html
+ */
+ public static BufferedImage createJPEG4(Raster raster, boolean ycckProfile)
+ {
+ int w = raster.getWidth();
+ int h = raster.getHeight();
+ byte[] rgb = new byte[w * h * 3];
+
+ // if (Adobe_APP14 and transform==2) then YCCK else CMYK
+ if (ycckProfile)
+ { // YCCK -- Adobe
+
+ float[] Y = raster.getSamples(0, 0, w, h, 0, (float[]) null);
+ float[] Cb = raster.getSamples(0, 0, w, h, 1, (float[]) null);
+ float[] Cr = raster.getSamples(0, 0, w, h, 2, (float[]) null);
+ float[] K = raster.getSamples(0, 0, w, h, 3, (float[]) null);
+
+ for (int i = 0, imax = Y.length, base = 0; i < imax; i++, base += 3)
+ {
+ float k = 220 - K[i], y = 255 - Y[i], cb = 255 - Cb[i], cr = 255 - Cr[i];
+
+ double val = y + 1.402 * (cr - 128) - k;
+ val = (val - 128) * .65f + 128;
+ rgb[base] = val < 0.0 ? (byte) 0 : val > 255.0 ? (byte) 0xff : (byte) (val + 0.5);
+
+ val = y - 0.34414 * (cb - 128) - 0.71414 * (cr - 128) - k;
+ val = (val - 128) * .65f + 128;
+ rgb[base + 1] = val < 0.0 ? (byte) 0 : val > 255.0 ? (byte) 0xff : (byte) (val + 0.5);
+
+ val = y + 1.772 * (cb - 128) - k;
+ val = (val - 128) * .65f + 128;
+ rgb[base + 2] = val < 0.0 ? (byte) 0 : val > 255.0 ? (byte) 0xff : (byte) (val + 0.5);
+ }
+
+ }
+ else
+ {
+ // assert xform==0: xform; // CMYK
+
+ int[] C = raster.getSamples(0, 0, w, h, 0, (int[]) null);
+ int[] M = raster.getSamples(0, 0, w, h, 1, (int[]) null);
+ int[] Y = raster.getSamples(0, 0, w, h, 2, (int[]) null);
+ int[] K = raster.getSamples(0, 0, w, h, 3, (int[]) null);
+
+ for (int i = 0, imax = C.length, base = 0; i < imax; i++, base += 3)
+ {
+ int c = 255 - C[i];
+ int m = 255 - M[i];
+ int y = 255 - Y[i];
+ int k = 255 - K[i];
+ float kk = k / 255f;
+
+ rgb[base] = (byte) (255 - Math.min(255f, c * kk + k));
+ rgb[base + 1] = (byte) (255 - Math.min(255f, m * kk + k));
+ rgb[base + 2] = (byte) (255 - Math.min(255f, y * kk + k));
+ }
+ }
+
+ // from other image types we know InterleavedRaster's can be
+ // manipulated by AffineTransformOp, so create one of those.
+ raster = Raster.createInterleavedRaster(
+ new DataBufferByte(rgb, rgb.length),
+ w,
+ h,
+ w * 3,
+ 3,
+ new int[]{0, 1, 2 },
+ null);
+
+ ColorSpace cs = ColorSpace.getInstance(ColorSpace.CS_sRGB);
+ ColorModel cm = new ComponentColorModel(cs, false, true, Transparency.OPAQUE, DataBuffer.TYPE_BYTE);
+ return new BufferedImage(cm, (WritableRaster) raster, true, null);
+ }
+
+ /**
+ * @param image
+ */
+ public static BufferedImage processNonStandardImage(NodeData image)
+ {
+ InputStream is2 = image.getStream();
+ try
+ {
+ // Get an ImageReader.
+ ImageInputStream input = ImageIO.createImageInputStream(is2);
+ Iterator readers = ImageIO.getImageReaders(input);
+ if (readers == null || !readers.hasNext())
+ {
+ throw new RuntimeException("No ImageReaders found");
+ }
+
+ ImageReader reader = (ImageReader) readers.next();
+ reader.setInput(input);
+ String format = reader.getFormatName();
+
+ if ("JPEG".equalsIgnoreCase(format) || "JPG".equalsIgnoreCase(format))
+ {
+ Raster raster = reader.readRaster(0, reader.getDefaultReadParam());
+ boolean ycckProfile = false;
+
+ // yes, we need to read it once again to extract metadatas
+ InputStream is3 = image.getStream();
+ try
+ {
+
+ JpegSegmentReader segmentReader = new JpegSegmentReader(is3);
+ byte[] exifSegment = segmentReader.readSegment(JpegSegmentReader.SEGMENT_APPE);
+
+ switch (exifSegment[11])
+ {
+ case 2 :
+ ycckProfile = true;
+ break;
+ case 1 :
+ // "YCbCr"
+ break;
+ case 0 :
+ default :
+ // Unknown (RGB or CMYK)
+ break;
+ }
+ }
+ catch (JpegProcessingException e1)
+ {
+ log.warn("Unable to read color space");
+ }
+ finally
+ {
+ IOUtils.closeQuietly(is3);
+ }
+
+ if (input != null)
+ {
+ input.close();
+ }
+ reader.dispose();
+
+ return createJPEG4(raster, ycckProfile);
+ }
+ throw new BadImageFormatException("No ImageReaders found for " + image.getHandle());
+
+ }
+ catch (IOException e1)
+ {
+ log.error("Unable to handle " + image.getHandle() + ": " + e1.getMessage(), e1);
+ throw new BadImageFormatException(image.getHandle(), e1);
+ }
+ finally
+ {
+ IOUtils.closeQuietly(is2);
+ }
+ }
+}
Property changes on: trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/utils/JpegUtils.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: svn:keywords
+ Author Date Id Revision
Added: svn:eol-style
+ native
Modified: trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/media/pages/MediaBrowserPage.html
===================================================================
--- trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/media/pages/MediaBrowserPage.html 2009-02-13 17:53:26 UTC (rev 998)
+++ trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/media/pages/MediaBrowserPage.html 2009-02-15 20:58:20 UTC (rev 999)
@@ -9,16 +9,16 @@
<script type="text/javascript" src="${this.request.contextPath}/.resources/media/js/miframe.js"></script>
<script type="text/javascript">
// <![CDATA[
-var viewport;
-var nodeid = "${this.nodeid!''}";
-var selectMedia = ${this.selectMedia?string("true", "false")};
-var openPath = "${this.openPath!''}";
-var actMediaHandle = "${this.actMediaHandle!''}";
-var mediaType = "${this.mediaType!''}"; // get tree url
-function getTreeUrl() {
- var url = "${this.request.contextPath}/.magnolia/trees/media.html?mgnlCK=" + (new Date()).getTime();
+var viewport;
+var nodeid = "${this.nodeid!''}";
+var selectMedia = ${this.selectMedia?string("true", "false")};
+var openPath = "${this.openPath!''}";
+var actMediaHandle = "${this.actMediaHandle!''}";
+var mediaType = "${this.mediaType!''}"; // get tree url
+function getTreeUrl() {
+ var url = "${this.request.contextPath}/.magnolia/trees/media.html?mgnlCK=" + (new Date()).getTime();
if (selectMedia)
- {
+ {
url += "&selectMedia=true";
}
url += "&pathOpen="+ openPath +"&pathCurrent=" + openPath +"&pathSelected=" + openPath;
@@ -211,12 +211,12 @@
bodyBorder: false,
buttons: [
{
- text: "${this.msgs.get('buttons.ok')}",
+ text: "${this.msgs.get('buttons.ok')}",
handler: function() {
uploadDlg.hide();
var ch = uploadDlg.body.child(".formToSubmit");
ch.dom.submit();
- }
+ }
}, {text: "${this.msgs.get('buttons.cancel')}", handler: function() {uploadDlg.hide();uploadDlg.destroy();} }],
keys: [],//{key: 27, fn: function() {ulDialog.hide();ulDialog.destroy();}, scope: this}]
stateful: false
@@ -232,7 +232,7 @@
<iframe id="mediaFolderView" name="mediaFolderView" class="x-panel-body" src=""
style="width:100%;height:100%;border:none; overflow:auto"></iframe>
<div id="formDiv" style="display:none">
- <form class="formToSubmit" action="" enctype="multipart/form-data" method="POST">
+ <form class="formToSubmit" action="" enctype="multipart/form-data" method="post">
<input type="hidden" name="command" value="saveZip" />
<input id="parentPath" type="hidden" name="parentPath" value="{parentPath}" />
<input type="file" name="zipFile" />
Added: trunk/openutils-mgnlmedia/src/test/java/net/sourceforge/openutils/mgnlmedia/media/utils/FileNodeData.java
===================================================================
--- trunk/openutils-mgnlmedia/src/test/java/net/sourceforge/openutils/mgnlmedia/media/utils/FileNodeData.java (rev 0)
+++ trunk/openutils-mgnlmedia/src/test/java/net/sourceforge/openutils/mgnlmedia/media/utils/FileNodeData.java 2009-02-15 20:58:20 UTC (rev 999)
@@ -0,0 +1,384 @@
+package net.sourceforge.openutils.mgnlmedia.media.utils;
+
+import info.magnolia.cms.core.Content;
+import info.magnolia.cms.core.HierarchyManager;
+import info.magnolia.cms.core.NodeData;
+import info.magnolia.cms.security.AccessDeniedException;
+
+import java.io.ByteArrayInputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.util.Calendar;
+import java.util.Collection;
+
+import javax.jcr.ItemNotFoundException;
+import javax.jcr.PathNotFoundException;
+import javax.jcr.Property;
+import javax.jcr.RepositoryException;
+import javax.jcr.Value;
+
+import org.apache.commons.io.IOUtils;
+
+
+/**
+ * @author fgiust
+ * @version $Id$
+ */
+public class FileNodeData implements NodeData
+{
+
+ private byte[] content;
+
+ public FileNodeData(String classpathLocation) throws IOException
+ {
+ InputStream is = getClass().getResourceAsStream(classpathLocation);
+ if (is == null)
+ {
+ throw new IllegalArgumentException("Classpath resource " + classpathLocation + " cannot be found");
+ }
+ try
+ {
+ content = IOUtils.toByteArray(is);
+ }
+ finally
+ {
+ IOUtils.closeQuietly(is);
+ }
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public void delete() throws RepositoryException
+ {
+ // TODO Auto-generated method stub
+
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public String getAttribute(String arg0)
+ {
+ // TODO Auto-generated method stub
+ return null;
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public Collection getAttributeNames() throws RepositoryException
+ {
+ // TODO Auto-generated method stub
+ return null;
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public boolean getBoolean()
+ {
+ // TODO Auto-generated method stub
+ return false;
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public long getContentLength()
+ {
+ // TODO Auto-generated method stub
+ return 0;
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public Calendar getDate()
+ {
+ // TODO Auto-generated method stub
+ return null;
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public double getDouble()
+ {
+ // TODO Auto-generated method stub
+ return 0;
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public String getHandle()
+ {
+ // TODO Auto-generated method stub
+ return null;
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public HierarchyManager getHierarchyManager() throws RepositoryException
+ {
+ // TODO Auto-generated method stub
+ return null;
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public Property getJCRProperty()
+ {
+ // TODO Auto-generated method stub
+ return null;
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public long getLong()
+ {
+ // TODO Auto-generated method stub
+ return 0;
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public String getName()
+ {
+ // TODO Auto-generated method stub
+ return null;
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public Content getParent() throws AccessDeniedException, ItemNotFoundException, javax.jcr.AccessDeniedException,
+ RepositoryException
+ {
+ // TODO Auto-generated method stub
+ return null;
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public Content getReferencedContent() throws RepositoryException, PathNotFoundException, RepositoryException
+ {
+ // TODO Auto-generated method stub
+ return null;
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public Content getReferencedContent(String arg0) throws PathNotFoundException, RepositoryException
+ {
+ // TODO Auto-generated method stub
+ return null;
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public InputStream getStream()
+ {
+ return new ByteArrayInputStream(content);
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public String getString()
+ {
+ // TODO Auto-generated method stub
+ return null;
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public String getString(String arg0)
+ {
+ // TODO Auto-generated method stub
+ return null;
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public int getType()
+ {
+ // TODO Auto-generated method stub
+ return 0;
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public Value getValue()
+ {
+ // TODO Auto-generated method stub
+ return null;
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public Value[] getValues()
+ {
+ // TODO Auto-generated method stub
+ return null;
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public boolean isExist()
+ {
+ // TODO Auto-generated method stub
+ return false;
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public boolean isGranted(long arg0)
+ {
+ // TODO Auto-generated method stub
+ return false;
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public int isMultiValue()
+ {
+ // TODO Auto-generated method stub
+ return 0;
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public void refresh(boolean arg0) throws RepositoryException
+ {
+ // TODO Auto-generated method stub
+
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public void save() throws RepositoryException
+ {
+ // TODO Auto-generated method stub
+
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public void setAttribute(String arg0, String arg1) throws RepositoryException, AccessDeniedException,
+ UnsupportedOperationException
+ {
+ // TODO Auto-generated method stub
+
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public void setAttribute(String arg0, Calendar arg1) throws RepositoryException, AccessDeniedException,
+ UnsupportedOperationException
+ {
+ // TODO Auto-generated method stub
+
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public void setValue(String arg0) throws RepositoryException, AccessDeniedException
+ {
+ // TODO Auto-generated method stub
+
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public void setValue(int arg0) throws RepositoryException, AccessDeniedException
+ {
+ // TODO Auto-generated method stub
+
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public void setValue(long arg0) throws RepositoryException, AccessDeniedException
+ {
+ // TODO Auto-generated method stub
+
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public void setValue(InputStream arg0) throws RepositoryException, AccessDeniedException
+ {
+ // TODO Auto-generated method stub
+
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public void setValue(double arg0) throws RepositoryException, AccessDeniedException
+ {
+ // TODO Auto-generated method stub
+
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public void setValue(boolean arg0) throws RepositoryException, AccessDeniedException
+ {
+ // TODO Auto-generated method stub
+
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public void setValue(Calendar arg0) throws RepositoryException, AccessDeniedException
+ {
+ // TODO Auto-generated method stub
+
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public void setValue(Value arg0) throws RepositoryException, AccessDeniedException
+ {
+ // TODO Auto-generated method stub
+
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public void setValue(Value[] arg0) throws RepositoryException, AccessDeniedException
+ {
+ // TODO Auto-generated method stub
+
+ }
+
+}
Property changes on: trunk/openutils-mgnlmedia/src/test/java/net/sourceforge/openutils/mgnlmedia/media/utils/FileNodeData.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: svn:keywords
+ Author Date Id Revision
Added: svn:eol-style
+ native
Added: trunk/openutils-mgnlmedia/src/test/java/net/sourceforge/openutils/mgnlmedia/media/utils/ImageUtilsTest.java
===================================================================
--- trunk/openutils-mgnlmedia/src/test/java/net/sourceforge/openutils/mgnlmedia/media/utils/ImageUtilsTest.java (rev 0)
+++ trunk/openutils-mgnlmedia/src/test/java/net/sourceforge/openutils/mgnlmedia/media/utils/ImageUtilsTest.java 2009-02-15 20:58:20 UTC (rev 999)
@@ -0,0 +1,64 @@
+package net.sourceforge.openutils.mgnlmedia.media.utils;
+
+import info.magnolia.cms.core.NodeData;
+
+import java.awt.image.BufferedImage;
+import java.io.BufferedOutputStream;
+import java.io.File;
+import java.io.FileOutputStream;
+import java.io.InputStream;
+import java.io.OutputStream;
+
+import org.apache.commons.io.IOUtils;
+import org.testng.Assert;
+import org.testng.annotations.Test;
+
+
+/**
+ * @author fgiust
+ * @version $Id$
+ */
+public class ImageUtilsTest
+{
+
+ @Test
+ public void testYcck() throws Exception
+ {
+
+ NodeData cmyk = new FileNodeData("/images/ycck.jpg");
+ BufferedImage bufferedImage = ImageUtils.createBufferedImage(cmyk);
+ Assert.assertNotNull(bufferedImage);
+
+ bufferedImage = ImageUtils.resizeNoCrop(bufferedImage, 100, 100);
+
+ InputStream is = ImageUtils.getStream(bufferedImage, "jpg");
+
+ File tempFile = File.createTempFile("image", "jpg");
+ OutputStream os = new BufferedOutputStream(new FileOutputStream(tempFile));
+ IOUtils.copy(is, os);
+
+ IOUtils.closeQuietly(is);
+ IOUtils.closeQuietly(os);
+
+ tempFile.delete();
+
+ }
+
+ @Test
+ public void testBadImageTxt() throws Exception
+ {
+
+ NodeData cmyk = new FileNodeData("/images/badimage.txt");
+ BufferedImage bufferedImage = ImageUtils.createBufferedImage(cmyk);
+ Assert.assertNull(bufferedImage);
+ }
+
+ @Test
+ public void testBadImageJpg() throws Exception
+ {
+
+ NodeData cmyk = new FileNodeData("/images/badimage.jpg");
+ BufferedImage bufferedImage = ImageUtils.createBufferedImage(cmyk);
+ Assert.assertNull(bufferedImage);
+ }
+}
Property changes on: trunk/openutils-mgnlmedia/src/test/java/net/sourceforge/openutils/mgnlmedia/media/utils/ImageUtilsTest.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: svn:keywords
+ Author Date Id Revision
Added: svn:eol-style
+ native
Added: trunk/openutils-mgnlmedia/src/test/resources/images/badimage.jpg
===================================================================
(Binary files differ)
Property changes on: trunk/openutils-mgnlmedia/src/test/resources/images/badimage.jpg
___________________________________________________________________
Added: svn:mime-type
+ image/gif
Added: trunk/openutils-mgnlmedia/src/test/resources/images/badimage.txt
===================================================================
--- trunk/openutils-mgnlmedia/src/test/resources/images/badimage.txt (rev 0)
+++ trunk/openutils-mgnlmedia/src/test/resources/images/badimage.txt 2009-02-15 20:58:20 UTC (rev 999)
@@ -0,0 +1 @@
+just a sample bad image
\ No newline at end of file
Property changes on: trunk/openutils-mgnlmedia/src/test/resources/images/badimage.txt
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: svn:keywords
+ Author Date Id Revision
Added: svn:eol-style
+ native
Added: trunk/openutils-mgnlmedia/src/test/resources/images/ycck.jpg
===================================================================
(Binary files differ)
Property changes on: trunk/openutils-mgnlmedia/src/test/resources/images/ycck.jpg
___________________________________________________________________
Added: svn:mime-type
+ image/gif
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fg...@us...> - 2009-02-15 23:12:24
|
Revision: 1009
http://openutils.svn.sourceforge.net/openutils/?rev=1009&view=rev
Author: fgiust
Date: 2009-02-15 23:12:20 +0000 (Sun, 15 Feb 2009)
Log Message:
-----------
merged back from branch
Modified Paths:
--------------
trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/types/impl/ImageTypeHandler.java
trunk/openutils-mgnlmedia/src/main/resources/info/magnolia/cms/gui/control/MediaTreeFooter.ftl
Property Changed:
----------------
trunk/openutils-mgnlmedia/
trunk/openutils-mgnlmedia/src/main/resources/info/magnolia/cms/gui/control/MediaTreeAddress.ftl
trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/media/lang/
Property changes on: trunk/openutils-mgnlmedia
___________________________________________________________________
Modified: svnmerge-integrated
- /branches/openutils-mgnlmedia-3.6.x:1-982
+ /branches/openutils-mgnlmedia-3.6.x:1-982,1004
Added: svn:mergeinfo
+ /branches/openutils-mgnlmedia-3.6.x:1004
Modified: trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/types/impl/ImageTypeHandler.java
===================================================================
--- trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/types/impl/ImageTypeHandler.java 2009-02-15 22:52:12 UTC (rev 1008)
+++ trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/types/impl/ImageTypeHandler.java 2009-02-15 23:12:20 UTC (rev 1009)
@@ -140,8 +140,8 @@
/**
* {@inheritDoc}
*/
+ @Override
@SuppressWarnings("unchecked")
- @Override
public boolean onPostSave(Content media)
{
Collection<NodeData> nds = media.getNodeDataCollection("tags-*");
Property changes on: trunk/openutils-mgnlmedia/src/main/resources/info/magnolia/cms/gui/control/MediaTreeAddress.ftl
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: svn:eol-style
+ native
Modified: trunk/openutils-mgnlmedia/src/main/resources/info/magnolia/cms/gui/control/MediaTreeFooter.ftl
===================================================================
--- trunk/openutils-mgnlmedia/src/main/resources/info/magnolia/cms/gui/control/MediaTreeFooter.ftl 2009-02-15 22:52:12 UTC (rev 1008)
+++ trunk/openutils-mgnlmedia/src/main/resources/info/magnolia/cms/gui/control/MediaTreeFooter.ftl 2009-02-15 23:12:20 UTC (rev 1009)
@@ -1,10 +1,10 @@
<!-- line for moving to the bottom -->
<div id="${lineId}" class="mgnlTreeLineInter mgnlLineEnabled" onmouseover="${tree.javascriptTree}.moveNodeHighlightLine('${lineId}');" onmouseout="${tree.javascriptTree}.moveNodeResetLine('${lineId}');"
onmousedown="${tree.javascriptTree}.pasteNode('${tree.path}',${PASTETYPE_SUB},${permissionWrite?string},'${lineId}');"></div>
-
+
<!-- this is needed for IE else you can't scroll. Do not ask me why! -->
<div style="position:absolute;" > </div>
-
+
<!-- do we have write permission on the root? -->
<input type="hidden" name="${tree.javascriptTree}_${tree.path}_PermissionWrite" id="${tree.javascriptTree}_${tree.path}_PermissionWrite" value="${permissionWrite?string}" />
Property changes on: trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/media/lang
___________________________________________________________________
Modified: svn:mergeinfo
-
+ /branches/openutils-mgnlmedia-3.6.x/src/main/resources/net/sourceforge/openutils/mgnlmedia/media/lang:1004
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fg...@us...> - 2009-04-23 08:06:25
|
Revision: 1161
http://openutils.svn.sourceforge.net/openutils/?rev=1161&view=rev
Author: fgiust
Date: 2009-04-23 08:06:11 +0000 (Thu, 23 Apr 2009)
Log Message:
-----------
update openutils-mgnltasks dependency
Modified Paths:
--------------
trunk/openutils-mgnlmedia/pom.xml
trunk/openutils-mgnlmedia/src/site/changes/changes.xml
Modified: trunk/openutils-mgnlmedia/pom.xml
===================================================================
--- trunk/openutils-mgnlmedia/pom.xml 2009-04-23 08:03:25 UTC (rev 1160)
+++ trunk/openutils-mgnlmedia/pom.xml 2009-04-23 08:06:11 UTC (rev 1161)
@@ -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</artifactId>
@@ -38,17 +39,17 @@
<dependency>
<groupId>info.magnolia</groupId>
<artifactId>magnolia-core</artifactId>
- <version>4.0</version>
+ <version>4.0.1</version>
</dependency>
<dependency>
<groupId>info.magnolia</groupId>
<artifactId>magnolia-module-admininterface</artifactId>
- <version>4.0</version>
+ <version>4.0.1</version>
</dependency>
<dependency>
<groupId>net.sourceforge.openutils</groupId>
<artifactId>openutils-mgnltasks</artifactId>
- <version>3.5.5</version>
+ <version>4.0</version>
</dependency>
<dependency>
<groupId>net.sourceforge.openutils</groupId>
Modified: trunk/openutils-mgnlmedia/src/site/changes/changes.xml
===================================================================
--- trunk/openutils-mgnlmedia/src/site/changes/changes.xml 2009-04-23 08:03:25 UTC (rev 1160)
+++ trunk/openutils-mgnlmedia/src/site/changes/changes.xml 2009-04-23 08:06:11 UTC (rev 1161)
@@ -9,6 +9,7 @@
</properties>
<body>
<release version="4.0-b4" date="2009-04-23" description="">
+ <action type="update" dev="fgiust">Update openutils-mgnltasks dependency to 4.0</action>
<action type="add" dev="fgiust">Support for resize without crop to a fixed size with borders. Background color can
be specified with the syntax: "o100x100;background=FF0096"</action>
<action type="add" dev="fgiust">Alternative prefix for "fit in" resize. In previous versions you had to use < (not very handy in html), now you can use "L" (lower, case insensitive), e.g. "L100x100"</action>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fg...@us...> - 2009-08-21 14:37:33
|
Revision: 1284
http://openutils.svn.sourceforge.net/openutils/?rev=1284&view=rev
Author: fgiust
Date: 2009-08-21 14:37:24 +0000 (Fri, 21 Aug 2009)
Log Message:
-----------
bundle configuration
Modified Paths:
--------------
trunk/openutils-mgnlmedia/pom.xml
Added Paths:
-----------
trunk/openutils-mgnlmedia/src/main/assembly/
trunk/openutils-mgnlmedia/src/main/assembly/assembly-bundle.xml
trunk/openutils-mgnlmedia/src/main/bundle/
trunk/openutils-mgnlmedia/src/main/bundle/LICENSE.txt
trunk/openutils-mgnlmedia/src/main/bundle/README.txt
Modified: trunk/openutils-mgnlmedia/pom.xml
===================================================================
--- trunk/openutils-mgnlmedia/pom.xml 2009-08-21 14:26:05 UTC (rev 1283)
+++ trunk/openutils-mgnlmedia/pom.xml 2009-08-21 14:37:24 UTC (rev 1284)
@@ -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</artifactId>
@@ -8,7 +9,9 @@
<modelVersion>4.0.0</modelVersion>
<packaging>jar</packaging>
<artifactId>openutils-mgnlmedia</artifactId>
- <name>openutils-mgnlmedia</name>
+ <name>Magnolia SimpleMedia Module</name>
+ <description>Magnolia SimpleMedia Module: a module for Magnolia CMS for easier management of images and videos with
+ several features.</description>
<version>4.0-b6-SNAPSHOT</version>
<licenses>
<license>
@@ -16,6 +19,11 @@
<url>http://www.gnu.org/licenses/gpl-3.0.txt</url>
</license>
</licenses>
+ <url>http://lab.openmindonline.it/lab/products/media.html</url>
+ <issueManagement>
+ <system>jira</system>
+ <url>http://lab.openmindonline.it/browse/MEDIA</url>
+ </issueManagement>
<build>
<resources>
<resource>
@@ -33,6 +41,25 @@
</includes>
</resource>
</resources>
+ <plugins>
+ <plugin>
+ <artifactId>maven-assembly-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>bundle</id>
+ <phase>package</phase>
+ <goals>
+ <goal>single</goal>
+ </goals>
+ </execution>
+ </executions>
+ <configuration>
+ <descriptors>
+ <descriptor>${basedir}/src/main/assembly/assembly-bundle.xml</descriptor>
+ </descriptors>
+ </configuration>
+ </plugin>
+ </plugins>
</build>
<dependencies>
<dependency>
Added: trunk/openutils-mgnlmedia/src/main/assembly/assembly-bundle.xml
===================================================================
--- trunk/openutils-mgnlmedia/src/main/assembly/assembly-bundle.xml (rev 0)
+++ trunk/openutils-mgnlmedia/src/main/assembly/assembly-bundle.xml 2009-08-21 14:37:24 UTC (rev 1284)
@@ -0,0 +1,27 @@
+<assembly>
+ <id>bundle</id>
+ <formats>
+ <format>zip</format>
+ </formats>
+ <includeBaseDirectory>false</includeBaseDirectory>
+ <fileSets>
+ <fileSet>
+ <filtered>true</filtered>
+ <outputDirectory>/</outputDirectory>
+ <lineEnding>crlf</lineEnding>
+ <directory>${basedir}/src/main/bundle</directory>
+ <includes>
+ <include>*</include>
+ </includes>
+ </fileSet>
+ </fileSets>
+ <dependencySets>
+ <dependencySet>
+ <outputDirectory>${pom.artifactId}</outputDirectory>
+ <includes>
+ <include>com.drewnoakes:metadata-extractor</include>
+ <include>net.sourceforge.openutils:*</include>
+ </includes>
+ </dependencySet>
+ </dependencySets>
+</assembly>
\ No newline at end of file
Property changes on: trunk/openutils-mgnlmedia/src/main/assembly/assembly-bundle.xml
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: svn:keywords
+ Author Date Id Revision
Added: svn:eol-style
+ native
Added: trunk/openutils-mgnlmedia/src/main/bundle/LICENSE.txt
===================================================================
--- trunk/openutils-mgnlmedia/src/main/bundle/LICENSE.txt (rev 0)
+++ trunk/openutils-mgnlmedia/src/main/bundle/LICENSE.txt 2009-08-21 14:37:24 UTC (rev 1284)
@@ -0,0 +1,674 @@
+ GNU GENERAL PUBLIC LICENSE
+ Version 3, 29 June 2007
+
+ Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+ Preamble
+
+ The GNU General Public License is a free, copyleft license for
+software and other kinds of works.
+
+ The licenses for most software and other practical works are designed
+to take away your freedom to share and change the works. By contrast,
+the GNU General Public License is intended to guarantee your freedom to
+share and change all versions of a program--to make sure it remains free
+software for all its users. We, the Free Software Foundation, use the
+GNU General Public License for most of our software; it applies also to
+any other work released this way by its authors. You can apply it to
+your programs, too.
+
+ When we speak of free software, we are referring to freedom, not
+price. Our General Public Licenses are designed to make sure that you
+have the freedom to distribute copies of free software (and charge for
+them if you wish), that you receive source code or can get it if you
+want it, that you can change the software or use pieces of it in new
+free programs, and that you know you can do these things.
+
+ To protect your rights, we need to prevent others from denying you
+these rights or asking you to surrender the rights. Therefore, you have
+certain responsibilities if you distribute copies of the software, or if
+you modify it: responsibilities to respect the freedom of others.
+
+ For example, if you distribute copies of such a program, whether
+gratis or for a fee, you must pass on to the recipients the same
+freedoms that you received. You must make sure that they, too, receive
+or can get the source code. And you must show them these terms so they
+know their rights.
+
+ Developers that use the GNU GPL protect your rights with two steps:
+(1) assert copyright on the software, and (2) offer you this License
+giving you legal permission to copy, distribute and/or modify it.
+
+ For the developers' and authors' protection, the GPL clearly explains
+that there is no warranty for this free software. For both users' and
+authors' sake, the GPL requires that modified versions be marked as
+changed, so that their problems will not be attributed erroneously to
+authors of previous versions.
+
+ Some devices are designed to deny users access to install or run
+modified versions of the software inside them, although the manufacturer
+can do so. This is fundamentally incompatible with the aim of
+protecting users' freedom to change the software. The systematic
+pattern of such abuse occurs in the area of products for individuals to
+use, which is precisely where it is most unacceptable. Therefore, we
+have designed this version of the GPL to prohibit the practice for those
+products. If such problems arise substantially in other domains, we
+stand ready to extend this provision to those domains in future versions
+of the GPL, as needed to protect the freedom of users.
+
+ Finally, every program is threatened constantly by software patents.
+States should not allow patents to restrict development and use of
+software on general-purpose computers, but in those that do, we wish to
+avoid the special danger that patents applied to a free program could
+make it effectively proprietary. To prevent this, the GPL assures that
+patents cannot be used to render the program non-free.
+
+ The precise terms and conditions for copying, distribution and
+modification follow.
+
+ TERMS AND CONDITIONS
+
+ 0. Definitions.
+
+ "This License" refers to version 3 of the GNU General Public License.
+
+ "Copyright" also means copyright-like laws that apply to other kinds of
+works, such as semiconductor masks.
+
+ "The Program" refers to any copyrightable work licensed under this
+License. Each licensee is addressed as "you". "Licensees" and
+"recipients" may be individuals or organizations.
+
+ To "modify" a work means to copy from or adapt all or part of the work
+in a fashion requiring copyright permission, other than the making of an
+exact copy. The resulting work is called a "modified version" of the
+earlier work or a work "based on" the earlier work.
+
+ A "covered work" means either the unmodified Program or a work based
+on the Program.
+
+ To "propagate" a work means to do anything with it that, without
+permission, would make you directly or secondarily liable for
+infringement under applicable copyright law, except executing it on a
+computer or modifying a private copy. Propagation includes copying,
+distribution (with or without modification), making available to the
+public, and in some countries other activities as well.
+
+ To "convey" a work means any kind of propagation that enables other
+parties to make or receive copies. Mere interaction with a user through
+a computer network, with no transfer of a copy, is not conveying.
+
+ An interactive user interface displays "Appropriate Legal Notices"
+to the extent that it includes a convenient and prominently visible
+feature that (1) displays an appropriate copyright notice, and (2)
+tells the user that there is no warranty for the work (except to the
+extent that warranties are provided), that licensees may convey the
+work under this License, and how to view a copy of this License. If
+the interface presents a list of user commands or options, such as a
+menu, a prominent item in the list meets this criterion.
+
+ 1. Source Code.
+
+ The "source code" for a work means the preferred form of the work
+for making modifications to it. "Object code" means any non-source
+form of a work.
+
+ A "Standard Interface" means an interface that either is an official
+standard defined by a recognized standards body, or, in the case of
+interfaces specified for a particular programming language, one that
+is widely used among developers working in that language.
+
+ The "System Libraries" of an executable work include anything, other
+than the work as a whole, that (a) is included in the normal form of
+packaging a Major Component, but which is not part of that Major
+Component, and (b) serves only to enable use of the work with that
+Major Component, or to implement a Standard Interface for which an
+implementation is available to the public in source code form. A
+"Major Component", in this context, means a major essential component
+(kernel, window system, and so on) of the specific operating system
+(if any) on which the executable work runs, or a compiler used to
+produce the work, or an object code interpreter used to run it.
+
+ The "Corresponding Source" for a work in object code form means all
+the source code needed to generate, install, and (for an executable
+work) run the object code and to modify the work, including scripts to
+control those activities. However, it does not include the work's
+System Libraries, or general-purpose tools or generally available free
+programs which are used unmodified in performing those activities but
+which are not part of the work. For example, Corresponding Source
+includes interface definition files associated with source files for
+the work, and the source code for shared libraries and dynamically
+linked subprograms that the work is specifically designed to require,
+such as by intimate data communication or control flow between those
+subprograms and other parts of the work.
+
+ The Corresponding Source need not include anything that users
+can regenerate automatically from other parts of the Corresponding
+Source.
+
+ The Corresponding Source for a work in source code form is that
+same work.
+
+ 2. Basic Permissions.
+
+ All rights granted under this License are granted for the term of
+copyright on the Program, and are irrevocable provided the stated
+conditions are met. This License explicitly affirms your unlimited
+permission to run the unmodified Program. The output from running a
+covered work is covered by this License only if the output, given its
+content, constitutes a covered work. This License acknowledges your
+rights of fair use or other equivalent, as provided by copyright law.
+
+ You may make, run and propagate covered works that you do not
+convey, without conditions so long as your license otherwise remains
+in force. You may convey covered works to others for the sole purpose
+of having them make modifications exclusively for you, or provide you
+with facilities for running those works, provided that you comply with
+the terms of this License in conveying all material for which you do
+not control copyright. Those thus making or running the covered works
+for you must do so exclusively on your behalf, under your direction
+and control, on terms that prohibit them from making any copies of
+your copyrighted material outside their relationship with you.
+
+ Conveying under any other circumstances is permitted solely under
+the conditions stated below. Sublicensing is not allowed; section 10
+makes it unnecessary.
+
+ 3. Protecting Users' Legal Rights From Anti-Circumvention Law.
+
+ No covered work shall be deemed part of an effective technological
+measure under any applicable law fulfilling obligations under article
+11 of the WIPO copyright treaty adopted on 20 December 1996, or
+similar laws prohibiting or restricting circumvention of such
+measures.
+
+ When you convey a covered work, you waive any legal power to forbid
+circumvention of technological measures to the extent such circumvention
+is effected by exercising rights under this License with respect to
+the covered work, and you disclaim any intention to limit operation or
+modification of the work as a means of enforcing, against the work's
+users, your or third parties' legal rights to forbid circumvention of
+technological measures.
+
+ 4. Conveying Verbatim Copies.
+
+ You may convey verbatim copies of the Program's source code as you
+receive it, in any medium, provided that you conspicuously and
+appropriately publish on each copy an appropriate copyright notice;
+keep intact all notices stating that this License and any
+non-permissive terms added in accord with section 7 apply to the code;
+keep intact all notices of the absence of any warranty; and give all
+recipients a copy of this License along with the Program.
+
+ You may charge any price or no price for each copy that you convey,
+and you may offer support or warranty protection for a fee.
+
+ 5. Conveying Modified Source Versions.
+
+ You may convey a work based on the Program, or the modifications to
+produce it from the Program, in the form of source code under the
+terms of section 4, provided that you also meet all of these conditions:
+
+ a) The work must carry prominent notices stating that you modified
+ it, and giving a relevant date.
+
+ b) The work must carry prominent notices stating that it is
+ released under this License and any conditions added under section
+ 7. This requirement modifies the requirement in section 4 to
+ "keep intact all notices".
+
+ c) You must license the entire work, as a whole, under this
+ License to anyone who comes into possession of a copy. This
+ License will therefore apply, along with any applicable section 7
+ additional terms, to the whole of the work, and all its parts,
+ regardless of how they are packaged. This License gives no
+ permission to license the work in any other way, but it does not
+ invalidate such permission if you have separately received it.
+
+ d) If the work has interactive user interfaces, each must display
+ Appropriate Legal Notices; however, if the Program has interactive
+ interfaces that do not display Appropriate Legal Notices, your
+ work need not make them do so.
+
+ A compilation of a covered work with other separate and independent
+works, which are not by their nature extensions of the covered work,
+and which are not combined with it such as to form a larger program,
+in or on a volume of a storage or distribution medium, is called an
+"aggregate" if the compilation and its resulting copyright are not
+used to limit the access or legal rights of the compilation's users
+beyond what the individual works permit. Inclusion of a covered work
+in an aggregate does not cause this License to apply to the other
+parts of the aggregate.
+
+ 6. Conveying Non-Source Forms.
+
+ You may convey a covered work in object code form under the terms
+of sections 4 and 5, provided that you also convey the
+machine-readable Corresponding Source under the terms of this License,
+in one of these ways:
+
+ a) Convey the object code in, or embodied in, a physical product
+ (including a physical distribution medium), accompanied by the
+ Corresponding Source fixed on a durable physical medium
+ customarily used for software interchange.
+
+ b) Convey the object code in, or embodied in, a physical product
+ (including a physical distribution medium), accompanied by a
+ written offer, valid for at least three years and valid for as
+ long as you offer spare parts or customer support for that product
+ model, to give anyone who possesses the object code either (1) a
+ copy of the Corresponding Source for all the software in the
+ product that is covered by this License, on a durable physical
+ medium customarily used for software interchange, for a price no
+ more than your reasonable cost of physically performing this
+ conveying of source, or (2) access to copy the
+ Corresponding Source from a network server at no charge.
+
+ c) Convey individual copies of the object code with a copy of the
+ written offer to provide the Corresponding Source. This
+ alternative is allowed only occasionally and noncommercially, and
+ only if you received the object code with such an offer, in accord
+ with subsection 6b.
+
+ d) Convey the object code by offering access from a designated
+ place (gratis or for a charge), and offer equivalent access to the
+ Corresponding Source in the same way through the same place at no
+ further charge. You need not require recipients to copy the
+ Corresponding Source along with the object code. If the place to
+ copy the object code is a network server, the Corresponding Source
+ may be on a different server (operated by you or a third party)
+ that supports equivalent copying facilities, provided you maintain
+ clear directions next to the object code saying where to find the
+ Corresponding Source. Regardless of what server hosts the
+ Corresponding Source, you remain obligated to ensure that it is
+ available for as long as needed to satisfy these requirements.
+
+ e) Convey the object code using peer-to-peer transmission, provided
+ you inform other peers where the object code and Corresponding
+ Source of the work are being offered to the general public at no
+ charge under subsection 6d.
+
+ A separable portion of the object code, whose source code is excluded
+from the Corresponding Source as a System Library, need not be
+included in conveying the object code work.
+
+ A "User Product" is either (1) a "consumer product", which means any
+tangible personal property which is normally used for personal, family,
+or household purposes, or (2) anything designed or sold for incorporation
+into a dwelling. In determining whether a product is a consumer product,
+doubtful cases shall be resolved in favor of coverage. For a particular
+product received by a particular user, "normally used" refers to a
+typical or common use of that class of product, regardless of the status
+of the particular user or of the way in which the particular user
+actually uses, or expects or is expected to use, the product. A product
+is a consumer product regardless of whether the product has substantial
+commercial, industrial or non-consumer uses, unless such uses represent
+the only significant mode of use of the product.
+
+ "Installation Information" for a User Product means any methods,
+procedures, authorization keys, or other information required to install
+and execute modified versions of a covered work in that User Product from
+a modified version of its Corresponding Source. The information must
+suffice to ensure that the continued functioning of the modified object
+code is in no case prevented or interfered with solely because
+modification has been made.
+
+ If you convey an object code work under this section in, or with, or
+specifically for use in, a User Product, and the conveying occurs as
+part of a transaction in which the right of possession and use of the
+User Product is transferred to the recipient in perpetuity or for a
+fixed term (regardless of how the transaction is characterized), the
+Corresponding Source conveyed under this section must be accompanied
+by the Installation Information. But this requirement does not apply
+if neither you nor any third party retains the ability to install
+modified object code on the User Product (for example, the work has
+been installed in ROM).
+
+ The requirement to provide Installation Information does not include a
+requirement to continue to provide support service, warranty, or updates
+for a work that has been modified or installed by the recipient, or for
+the User Product in which it has been modified or installed. Access to a
+network may be denied when the modification itself materially and
+adversely affects the operation of the network or violates the rules and
+protocols for communication across the network.
+
+ Corresponding Source conveyed, and Installation Information provided,
+in accord with this section must be in a format that is publicly
+documented (and with an implementation available to the public in
+source code form), and must require no special password or key for
+unpacking, reading or copying.
+
+ 7. Additional Terms.
+
+ "Additional permissions" are terms that supplement the terms of this
+License by making exceptions from one or more of its conditions.
+Additional permissions that are applicable to the entire Program shall
+be treated as though they were included in this License, to the extent
+that they are valid under applicable law. If additional permissions
+apply only to part of the Program, that part may be used separately
+under those permissions, but the entire Program remains governed by
+this License without regard to the additional permissions.
+
+ When you convey a copy of a covered work, you may at your option
+remove any additional permissions from that copy, or from any part of
+it. (Additional permissions may be written to require their own
+removal in certain cases when you modify the work.) You may place
+additional permissions on material, added by you to a covered work,
+for which you have or can give appropriate copyright permission.
+
+ Notwithstanding any other provision of this License, for material you
+add to a covered work, you may (if authorized by the copyright holders of
+that material) supplement the terms of this License with terms:
+
+ a) Disclaiming warranty or limiting liability differently from the
+ terms of sections 15 and 16 of this License; or
+
+ b) Requiring preservation of specified reasonable legal notices or
+ author attributions in that material or in the Appropriate Legal
+ Notices displayed by works containing it; or
+
+ c) Prohibiting misrepresentation of the origin of that material, or
+ requiring that modified versions of such material be marked in
+ reasonable ways as different from the original version; or
+
+ d) Limiting the use for publicity purposes of names of licensors or
+ authors of the material; or
+
+ e) Declining to grant rights under trademark law for use of some
+ trade names, trademarks, or service marks; or
+
+ f) Requiring indemnification of licensors and authors of that
+ material by anyone who conveys the material (or modified versions of
+ it) with contractual assumptions of liability to the recipient, for
+ any liability that these contractual assumptions directly impose on
+ those licensors and authors.
+
+ All other non-permissive additional terms are considered "further
+restrictions" within the meaning of section 10. If the Program as you
+received it, or any part of it, contains a notice stating that it is
+governed by this License along with a term that is a further
+restriction, you may remove that term. If a license document contains
+a further restriction but permits relicensing or conveying under this
+License, you may add to a covered work material governed by the terms
+of that license document, provided that the further restriction does
+not survive such relicensing or conveying.
+
+ If you add terms to a covered work in accord with this section, you
+must place, in the relevant source files, a statement of the
+additional terms that apply to those files, or a notice indicating
+where to find the applicable terms.
+
+ Additional terms, permissive or non-permissive, may be stated in the
+form of a separately written license, or stated as exceptions;
+the above requirements apply either way.
+
+ 8. Termination.
+
+ You may not propagate or modify a covered work except as expressly
+provided under this License. Any attempt otherwise to propagate or
+modify it is void, and will automatically terminate your rights under
+this License (including any patent licenses granted under the third
+paragraph of section 11).
+
+ However, if you cease all violation of this License, then your
+license from a particular copyright holder is reinstated (a)
+provisionally, unless and until the copyright holder explicitly and
+finally terminates your license, and (b) permanently, if the copyright
+holder fails to notify you of the violation by some reasonable means
+prior to 60 days after the cessation.
+
+ Moreover, your license from a particular copyright holder is
+reinstated permanently if the copyright holder notifies you of the
+violation by some reasonable means, this is the first time you have
+received notice of violation of this License (for any work) from that
+copyright holder, and you cure the violation prior to 30 days after
+your receipt of the notice.
+
+ Termination of your rights under this section does not terminate the
+licenses of parties who have received copies or rights from you under
+this License. If your rights have been terminated and not permanently
+reinstated, you do not qualify to receive new licenses for the same
+material under section 10.
+
+ 9. Acceptance Not Required for Having Copies.
+
+ You are not required to accept this License in order to receive or
+run a copy of the Program. Ancillary propagation of a covered work
+occurring solely as a consequence of using peer-to-peer transmission
+to receive a copy likewise does not require acceptance. However,
+nothing other than this License grants you permission to propagate or
+modify any covered work. These actions infringe copyright if you do
+not accept this License. Therefore, by modifying or propagating a
+covered work, you indicate your acceptance of this License to do so.
+
+ 10. Automatic Licensing of Downstream Recipients.
+
+ Each time you convey a covered work, the recipient automatically
+receives a license from the original licensors, to run, modify and
+propagate that work, subject to this License. You are not responsible
+for enforcing compliance by third parties with this License.
+
+ An "entity transaction" is a transaction transferring control of an
+organization, or substantially all assets of one, or subdividing an
+organization, or merging organizations. If propagation of a covered
+work results from an entity transaction, each party to that
+transaction who receives a copy of the work also receives whatever
+licenses to the work the party's predecessor in interest had or could
+give under the previous paragraph, plus a right to possession of the
+Corresponding Source of the work from the predecessor in interest, if
+the predecessor has it or can get it with reasonable efforts.
+
+ You may not impose any further restrictions on the exercise of the
+rights granted or affirmed under this License. For example, you may
+not impose a license fee, royalty, or other charge for exercise of
+rights granted under this License, and you may not initiate litigation
+(including a cross-claim or counterclaim in a lawsuit) alleging that
+any patent claim is infringed by making, using, selling, offering for
+sale, or importing the Program or any portion of it.
+
+ 11. Patents.
+
+ A "contributor" is a copyright holder who authorizes use under this
+License of the Program or a work on which the Program is based. The
+work thus licensed is called the contributor's "contributor version".
+
+ A contributor's "essential patent claims" are all patent claims
+owned or controlled by the contributor, whether already acquired or
+hereafter acquired, that would be infringed by some manner, permitted
+by this License, of making, using, or selling its contributor version,
+but do not include claims that would be infringed only as a
+consequence of further modification of the contributor version. For
+purposes of this definition, "control" includes the right to grant
+patent sublicenses in a manner consistent with the requirements of
+this License.
+
+ Each contributor grants you a non-exclusive, worldwide, royalty-free
+patent license under the contributor's essential patent claims, to
+make, use, sell, offer for sale, import and otherwise run, modify and
+propagate the contents of its contributor version.
+
+ In the following three paragraphs, a "patent license" is any express
+agreement or commitment, however denominated, not to enforce a patent
+(such as an express permission to practice a patent or covenant not to
+sue for patent infringement). To "grant" such a patent license to a
+party means to make such an agreement or commitment not to enforce a
+patent against the party.
+
+ If you convey a covered work, knowingly relying on a patent license,
+and the Corresponding Source of the work is not available for anyone
+to copy, free of charge and under the terms of this License, through a
+publicly available network server or other readily accessible means,
+then you must either (1) cause the Corresponding Source to be so
+available, or (2) arrange to deprive yourself of the benefit of the
+patent license for this particular work, or (3) arrange, in a manner
+consistent with the requirements of this License, to extend the patent
+license to downstream recipients. "Knowingly relying" means you have
+actual knowledge that, but for the patent license, your conveying the
+covered work in a country, or your recipient's use of the covered work
+in a country, would infringe one or more identifiable patents in that
+country that you have reason to believe are valid.
+
+ If, pursuant to or in connection with a single transaction or
+arrangement, you convey, or propagate by procuring conveyance of, a
+covered work, and grant a patent license to some of the parties
+receiving the covered work authorizing them to use, propagate, modify
+or convey a specific copy of the covered work, then the patent license
+you grant is automatically extended to all recipients of the covered
+work and works based on it.
+
+ A patent license is "discriminatory" if it does not include within
+the scope of its coverage, prohibits the exercise of, or is
+conditioned on the non-exercise of one or more of the rights that are
+specifically granted under this License. You may not convey a covered
+work if you are a party to an arrangement with a third party that is
+in the business of distributing software, under which you make payment
+to the third party based on the extent of your activity of conveying
+the work, and under which the third party grants, to any of the
+parties who would receive the covered work from you, a discriminatory
+patent license (a) in connection with copies of the covered work
+conveyed by you (or copies made from those copies), or (b) primarily
+for and in connection with specific products or compilations that
+contain the covered work, unless you entered into that arrangement,
+or that patent license was granted, prior to 28 March 2007.
+
+ Nothing in this License shall be construed as excluding or limiting
+any implied license or other defenses to infringement that may
+otherwise be available to you under applicable patent law.
+
+ 12. No Surrender of Others' Freedom.
+
+ If conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License. If you cannot convey a
+covered work so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you may
+not convey it at all. For example, if you agree to terms that obligate you
+to collect a royalty for further conveying from those to whom you convey
+the Program, the only way you could satisfy both those terms and this
+License would be to refrain entirely from conveying the Program.
+
+ 13. Use with the GNU Affero General Public License.
+
+ Notwithstanding any other provision of this License, you have
+permission to link or combine any covered work with a work licensed
+under version 3 of the GNU Affero General Public License into a single
+combined work, and to convey the resulting work. The terms of this
+License will continue to apply to the part which is the covered work,
+but the special requirements of the GNU Affero General Public License,
+section 13, concerning interaction through a network will apply to the
+combination as such.
+
+ 14. Revised Versions of this License.
+
+ The Free Software Foundation may publish revised and/or new versions of
+the GNU General Public License from time to time. Such new versions will
+be similar in spirit to the present version, but may differ in detail to
+address new problems or concerns.
+
+ Each version is given a distinguishing version number. If the
+Program specifies that a certain numbered version of the GNU General
+Public License "or any later version" applies to it, you have the
+option of following the terms and conditions either of that numbered
+version or of any later version published by the Free Software
+Foundation. If the Program does not specify a version number of the
+GNU General Public License, you may choose any version ever published
+by the Free Software Foundation.
+
+ If the Program specifies that a proxy can decide which future
+versions of the GNU General Public License can be used, that proxy's
+public statement of acceptance of a version permanently authorizes you
+to choose that version for the Program.
+
+ Later license versions may give you additional or different
+permissions. However, no additional obligations are imposed on any
+author or copyright holder as a result of your choosing to follow a
+later version.
+
+ 15. Disclaimer of Warranty.
+
+ THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
+APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
+HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY
+OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,
+THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM
+IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF
+ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
+
+ 16. Limitation of Liability.
+
+ IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
+THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY
+GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE
+USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF
+DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD
+PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),
+EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF
+SUCH DAMAGES.
+
+ 17. Interpretation of Sections 15 and 16.
+
+ If the disclaimer of warranty and limitation of liability provided
+above cannot be given local legal effect according to their terms,
+reviewing courts shall apply local law that most closely approximates
+an absolute waiver of all civil liability in connection with the
+Program, unless a warranty or assumption of liability accompanies a
+copy of the Program in return for a fee.
+
+ END OF TERMS AND CONDITIONS
+
+ How to Apply These Terms to Your New Programs
+
+ If you develop a new program, and you want it to be of the greatest
+possible use to the public, the best way to achieve this is to make it
+free software which everyone can redistribute and change under these terms.
+
+ To do so, attach the following notices to the program. It is safest
+to attach them to the start of each source file to most effectively
+state the exclusion of warranty; and each file should have at least
+the "copyright" line and a pointer to where the full notice is found.
+
+ <one line to give the program's name and a brief idea of what it does.>
+ Copyright (C) <year> <name of author>
+
+ 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/>.
+
+Also add information on how to contact you by electronic and paper mail.
+
+ If the program does terminal interaction, make it output a short
+notice like this when it starts in an interactive mode:
+
+ <program> Copyright (C) <year> <name of author>
+ This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
+ This is free software, and you are welcome to redistribute it
+ under certain conditions; type `show c' for details.
+
+The hypothetical commands `show w' and `show c' should show the appropriate
+parts of the General Public License. Of course, your program's commands
+might be different; for a GUI interface, you would use an "about box".
+
+ You should also get your employer (if you work as a programmer) or school,
+if any, to sign a "copyright disclaimer" for the program, if necessary.
+For more information on this, and how to apply and follow the GNU GPL, see
+<http://www.gnu.org/licenses/>.
+
+ The GNU General Public License does not permit incorporating your program
+into proprietary programs. If your program is a subroutine library, you
+may consider it more useful to permit linking proprietary applications with
+the library. If this is what you want to do, use the GNU Lesser General
+Public License instead of this License. But first, please read
+<http://www.gnu.org/philosophy/why-not-lgpl.html>.
Property changes on: trunk/openutils-mgnlmedia/src/main/bundle/LICENSE.txt
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: svn:keywords
+ Author Date Id Revision
Added: svn:eol-style
+ native
Added: trunk/openutils-mgnlmedia/src/main/bundle/README.txt
===================================================================
--- trunk/openutils-mgnlmedia/src/main/bundle/README.txt (rev 0)
+++ trunk/openutils-mgnlmedia/src/main/bundle/README.txt 2009-08-21 14:37:24 UTC (rev 1284)
@@ -0,0 +1,62 @@
+===========================================================
+
+${pom.name} ${pom.version}
+by ${pom.organization.name}
+
+===========================================================
+
+${pom.description}
+
+More information about this project can be found at:
+${pom.url}
+
+Change log and known issues can be found at:
+${pom.issueManagement.url}
+
+Source is available from the subversion repository at:
+${pom.scm.url}
+
+
+=========================================
+ INSTALLATION
+=========================================
+
+The bundle is provided as a zip file; the archive contains a number of .jar files
+(the module itself plus the required dependencies not already available in a
+standard Magnolia installation.
+
+Copy to your all the jar files in the bundle into your Magnolia instances'
+WEB-INF/lib folder, just like any other module.
+
+Please check the documentation website for information about required Magnolia
+versions.
+
+
+
+=========================================
+ LICENSE
+=========================================
+
+Copyright Openmind 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/>.
+
+
+
+=========================================
+ GENERAL LEGAL NOTICES
+=========================================
+
+Magnolia is a registered trademark of Magnolia International Ltd.
+
Property changes on: trunk/openutils-mgnlmedia/src/main/bundle/README.txt
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: svn:keywords
+ Author Date Id Revision
Added: svn:eol-style
+ native
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <mol...@us...> - 2009-09-05 08:56:13
|
Revision: 1366
http://openutils.svn.sourceforge.net/openutils/?rev=1366&view=rev
Author: molaschi
Date: 2009-09-05 08:56:03 +0000 (Sat, 05 Sep 2009)
Log Message:
-----------
add license plugin to pom.xml and commit headers for all files
Modified Paths:
--------------
trunk/openutils-mgnlmedia/pom.xml
trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/commands/MediaActivationCommand.java
trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/configuration/ImageProcessorsManager.java
trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/configuration/MediaConfigurationManager.java
trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/configuration/MediaTypeConfiguration.java
trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/dialog/DialogCustomSaveHandler.java
trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/dialog/DialogFileAudio.java
trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/dialog/DialogFileImage.java
trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/dialog/DialogFileNoPreview.java
trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/dialog/DialogFileVideo.java
trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/dialog/DialogMetadata.java
trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/dialog/DialogSelectMedia.java
trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/dialog/LayerDialog.java
trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/dialog/LayerDialogMVC.java
trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/lifecycle/MediaModule.java
trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/pages/MediaBrowserPage.java
trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/pages/MediaFolderSelectionPage.java
trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/pages/MediaFolderViewPage.java
trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/pages/MediaSearchPage.java
trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/pages/MessagesTemplatedMVCHandler.java
trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/processors/BaseImageResolutionProcessor.java
trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/processors/FitInAndFillWithBandsImageResolutionProcessor.java
trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/processors/FitInImageResolutionProcessor.java
trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/processors/ImagePostProcessor.java
trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/processors/ImageResolutionProcessor.java
trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/processors/LogSizePostProcessor.java
trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/processors/ResizeCropCenteredImageResolutionProcessor.java
trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/processors/ResizeNoCropImageResolutionProcessor.java
trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/save/MediaCustomSaveHandler.java
trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/setup/MediaModuleVersionHandler.java
trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/setup/RemoveResolutionsNodeTask.java
trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/setup/RenameThumbToImageTask.java
trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/tags/el/MediaEl.java
trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/tree/JcrBrowserWithNodeTypeTreeConfiguration.java
trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/tree/MediaBrowserConfiguration.java
trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/tree/MediaModuleTree.java
trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/tree/MediaModuleTreeConfiguration.java
trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/tree/MediaModuleTreeMVCHandler.java
trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/types/MediaTypeHandler.java
trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/types/impl/AudioTypeHandler.java
trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/types/impl/BaseTypeHandler.java
trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/types/impl/ImageTypeHandler.java
trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/types/impl/MediaWithPreviewImageTypeHandler.java
trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/types/impl/VideoTypeHandler.java
trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/types/impl/YouTubeVideoTypeHandler.java
trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/uri/MediaURI2RepositoryMapping.java
trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/utils/BadImageFormatException.java
trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/utils/ImageUtils.java
trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/utils/JpegUtils.java
trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/utils/MediaLoadUtils.java
trunk/openutils-mgnlmedia/src/main/resources/META-INF/magnolia/media.xml
trunk/openutils-mgnlmedia/src/main/resources/dialog/selectMedia.ftl
trunk/openutils-mgnlmedia/src/main/resources/info/magnolia/cms/gui/control/MediaTreeAddress.ftl
trunk/openutils-mgnlmedia/src/main/resources/info/magnolia/cms/gui/control/MediaTreeFooter.ftl
trunk/openutils-mgnlmedia/src/main/resources/mgnl-resources/media/css/folderView.css
trunk/openutils-mgnlmedia/src/main/resources/mgnl-resources/media/css/upload.css
trunk/openutils-mgnlmedia/src/main/resources/mgnl-resources/media/js/media.js
trunk/openutils-mgnlmedia/src/main/resources/mgnl-resources/media/js/upload/FancyUpload2.js
trunk/openutils-mgnlmedia/src/main/resources/mgnl-resources/media/js/upload/Fx.ProgressBar.js
trunk/openutils-mgnlmedia/src/main/resources/mgnl-resources/media/js/upload/Swiff.Uploader.js
trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/media/lang/messages_en.properties
trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/media/lang/messages_it.properties
trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/media/pages/MediaBrowserPage.html
trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/media/pages/MediaFolderSelectionPage.html
trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/media/pages/MediaFolderViewPage.html
trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/media/pages/MediaSearchPage.html
trunk/openutils-mgnlmedia/src/test/java/net/sourceforge/openutils/mgnlmedia/media/utils/FileNodeData.java
trunk/openutils-mgnlmedia/src/test/java/net/sourceforge/openutils/mgnlmedia/media/utils/ImageProcessorsManagerMock.java
trunk/openutils-mgnlmedia/src/test/java/net/sourceforge/openutils/mgnlmedia/media/utils/ImageUtilsTest.java
trunk/openutils-mgnlmedia/src/test/resources/images/badimage.txt
Added Paths:
-----------
trunk/openutils-mgnlmedia/src/main/etc/
trunk/openutils-mgnlmedia/src/main/etc/header.txt
Modified: trunk/openutils-mgnlmedia/pom.xml
===================================================================
--- trunk/openutils-mgnlmedia/pom.xml 2009-09-04 17:03:57 UTC (rev 1365)
+++ trunk/openutils-mgnlmedia/pom.xml 2009-09-05 08:56:03 UTC (rev 1366)
@@ -12,6 +12,7 @@
<description>Magnolia SimpleMedia Module: a module for Magnolia CMS for easier management of images and videos with
several features.</description>
<version>4.0-b6-SNAPSHOT</version>
+ <inceptionYear>2008</inceptionYear>
<licenses>
<license>
<name>GPLv3</name>
@@ -58,6 +59,43 @@
</descriptors>
</configuration>
</plugin>
+ <plugin>
+ <groupId>com.google.code.maven-license-plugin</groupId>
+ <artifactId>maven-license-plugin</artifactId>
+ <version>1.4.0</version>
+ <configuration>
+ <header>src/main/etc/header.txt</header>
+ <includes>
+ <include>src/**</include>
+ </includes>
+ <excludes>
+ <exclude>target/**</exclude>
+ <exclude>src/site/**</exclude>
+ <exclude>src/main/bundle/**</exclude>
+ <exclude>src/main/assembly/**</exclude>
+ <exclude>src/main/resources/mgnl-bootstrap/**</exclude>
+ <exclude>src/main/resources/mgnl-nodetypes/**</exclude>
+ <exclude>src/main/resources/mgnl-resources/media/css/multibox.css</exclude>
+ <exclude>src/main/resources/mgnl-resources/media/js/multibox/**</exclude>
+ <exclude>src/main/resources/mgnl-resources/media/js/miframe.js</exclude>
+ <exclude>src/main/resources/mgnl-resources/media/js/moo*.*</exclude>
+ <exclude>src/main/resources/mgnl-resources/media/js/swfobject.js</exclude>
+ </excludes>
+ <properties>
+ <year>${project.inceptionYear} - 2009</year>
+ <name>${project.name}</name>
+ <description>${project.description}</description>
+ <url>${project.url}</url>
+ </properties>
+ </configuration>
+ <executions>
+ <execution>
+ <goals>
+ <goal>check</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
</plugins>
</build>
<reporting>
Added: trunk/openutils-mgnlmedia/src/main/etc/header.txt
===================================================================
--- trunk/openutils-mgnlmedia/src/main/etc/header.txt (rev 0)
+++ trunk/openutils-mgnlmedia/src/main/etc/header.txt 2009-09-05 08:56:03 UTC (rev 1366)
@@ -0,0 +1,23 @@
+
+${name} (${url})
+${description}
+Copyright (C)${year}, Openmind S.r.l. http://www.openmindonline.it
+
+
+This library is free software; you can redistribute it and/or
+modify it under the terms of the GNU Lesser General Public
+License as published by the Free Software Foundation; either
+version 2.1 of the License, or (at your option) any later version.
+You may obtain a copy of the License at
+
+http://www.gnu.org/licenses/lgpl-2.1.html
+
+This library 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
+Lesser General Public License for more details.
+
+You should have received a copy of the GNU Lesser General Public
+License along with this library; if not, write to the Free Software
+Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+
Modified: trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/commands/MediaActivationCommand.java
===================================================================
--- trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/commands/MediaActivationCommand.java 2009-09-04 17:03:57 UTC (rev 1365)
+++ trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/commands/MediaActivationCommand.java 2009-09-05 08:56:03 UTC (rev 1366)
@@ -1,19 +1,27 @@
/**
- * Copyright Openmind 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.
+ * Magnolia SimpleMedia Module (http://lab.openmindonline.it/lab/products/media.html)
+ * Magnolia SimpleMedia Module: a module for Magnolia CMS for easier management of images and videos with
+ * several features.
+ * Copyright (C)2008 - 2009, Openmind S.r.l. http://www.openmindonline.it
*
- * This program is distributed in the hope that it will be useful,
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ * You may obtain a copy of the License at
+ *
+ * http://www.gnu.org/licenses/lgpl-2.1.html
+ *
+ * This library 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.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser 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/>.
- *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
package net.sourceforge.openutils.mgnlmedia.media.commands;
Modified: trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/configuration/ImageProcessorsManager.java
===================================================================
--- trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/configuration/ImageProcessorsManager.java 2009-09-04 17:03:57 UTC (rev 1365)
+++ trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/configuration/ImageProcessorsManager.java 2009-09-05 08:56:03 UTC (rev 1366)
@@ -1,3 +1,28 @@
+/**
+ *
+ * Magnolia SimpleMedia Module (http://lab.openmindonline.it/lab/products/media.html)
+ * Magnolia SimpleMedia Module: a module for Magnolia CMS for easier management of images and videos with
+ * several features.
+ * Copyright (C)2008 - 2009, Openmind S.r.l. http://www.openmindonline.it
+ *
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ * You may obtain a copy of the License at
+ *
+ * http://www.gnu.org/licenses/lgpl-2.1.html
+ *
+ * This library 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
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
package net.sourceforge.openutils.mgnlmedia.media.configuration;
import info.magnolia.cms.beans.config.ObservedManager;
Modified: trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/configuration/MediaConfigurationManager.java
===================================================================
--- trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/configuration/MediaConfigurationManager.java 2009-09-04 17:03:57 UTC (rev 1365)
+++ trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/configuration/MediaConfigurationManager.java 2009-09-05 08:56:03 UTC (rev 1366)
@@ -1,19 +1,27 @@
/**
- * Copyright Openmind 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.
+ * Magnolia SimpleMedia Module (http://lab.openmindonline.it/lab/products/media.html)
+ * Magnolia SimpleMedia Module: a module for Magnolia CMS for easier management of images and videos with
+ * several features.
+ * Copyright (C)2008 - 2009, Openmind S.r.l. http://www.openmindonline.it
*
- * This program is distributed in the hope that it will be useful,
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ * You may obtain a copy of the License at
+ *
+ * http://www.gnu.org/licenses/lgpl-2.1.html
+ *
+ * This library 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.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser 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/>.
- *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
package net.sourceforge.openutils.mgnlmedia.media.configuration;
Modified: trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/configuration/MediaTypeConfiguration.java
===================================================================
--- trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/configuration/MediaTypeConfiguration.java 2009-09-04 17:03:57 UTC (rev 1365)
+++ trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/configuration/MediaTypeConfiguration.java 2009-09-05 08:56:03 UTC (rev 1366)
@@ -1,19 +1,27 @@
/**
- * Copyright Openmind 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.
+ * Magnolia SimpleMedia Module (http://lab.openmindonline.it/lab/products/media.html)
+ * Magnolia SimpleMedia Module: a module for Magnolia CMS for easier management of images and videos with
+ * several features.
+ * Copyright (C)2008 - 2009, Openmind S.r.l. http://www.openmindonline.it
*
- * This program is distributed in the hope that it will be useful,
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ * You may obtain a copy of the License at
+ *
+ * http://www.gnu.org/licenses/lgpl-2.1.html
+ *
+ * This library 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.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser 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/>.
- *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
package net.sourceforge.openutils.mgnlmedia.media.configuration;
Modified: trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/dialog/DialogCustomSaveHandler.java
===================================================================
--- trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/dialog/DialogCustomSaveHandler.java 2009-09-04 17:03:57 UTC (rev 1365)
+++ trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/dialog/DialogCustomSaveHandler.java 2009-09-05 08:56:03 UTC (rev 1366)
@@ -1,19 +1,27 @@
/**
- * Copyright Openmind 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.
+ * Magnolia SimpleMedia Module (http://lab.openmindonline.it/lab/products/media.html)
+ * Magnolia SimpleMedia Module: a module for Magnolia CMS for easier management of images and videos with
+ * several features.
+ * Copyright (C)2008 - 2009, Openmind S.r.l. http://www.openmindonline.it
*
- * This program is distributed in the hope that it will be useful,
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ * You may obtain a copy of the License at
+ *
+ * http://www.gnu.org/licenses/lgpl-2.1.html
+ *
+ * This library 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.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser 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/>.
- *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
package net.sourceforge.openutils.mgnlmedia.media.dialog;
Modified: trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/dialog/DialogFileAudio.java
===================================================================
--- trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/dialog/DialogFileAudio.java 2009-09-04 17:03:57 UTC (rev 1365)
+++ trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/dialog/DialogFileAudio.java 2009-09-05 08:56:03 UTC (rev 1366)
@@ -1,19 +1,27 @@
/**
- * Copyright Openmind 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.
+ * Magnolia SimpleMedia Module (http://lab.openmindonline.it/lab/products/media.html)
+ * Magnolia SimpleMedia Module: a module for Magnolia CMS for easier management of images and videos with
+ * several features.
+ * Copyright (C)2008 - 2009, Openmind S.r.l. http://www.openmindonline.it
*
- * This program is distributed in the hope that it will be useful,
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ * You may obtain a copy of the License at
+ *
+ * http://www.gnu.org/licenses/lgpl-2.1.html
+ *
+ * This library 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.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser 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/>.
- *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
package net.sourceforge.openutils.mgnlmedia.media.dialog;
Modified: trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/dialog/DialogFileImage.java
===================================================================
--- trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/dialog/DialogFileImage.java 2009-09-04 17:03:57 UTC (rev 1365)
+++ trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/dialog/DialogFileImage.java 2009-09-05 08:56:03 UTC (rev 1366)
@@ -1,19 +1,27 @@
/**
- * Copyright Openmind 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.
+ * Magnolia SimpleMedia Module (http://lab.openmindonline.it/lab/products/media.html)
+ * Magnolia SimpleMedia Module: a module for Magnolia CMS for easier management of images and videos with
+ * several features.
+ * Copyright (C)2008 - 2009, Openmind S.r.l. http://www.openmindonline.it
*
- * This program is distributed in the hope that it will be useful,
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ * You may obtain a copy of the License at
+ *
+ * http://www.gnu.org/licenses/lgpl-2.1.html
+ *
+ * This library 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.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser 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/>.
- *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
package net.sourceforge.openutils.mgnlmedia.media.dialog;
Modified: trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/dialog/DialogFileNoPreview.java
===================================================================
--- trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/dialog/DialogFileNoPreview.java 2009-09-04 17:03:57 UTC (rev 1365)
+++ trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/dialog/DialogFileNoPreview.java 2009-09-05 08:56:03 UTC (rev 1366)
@@ -1,3 +1,28 @@
+/**
+ *
+ * Magnolia SimpleMedia Module (http://lab.openmindonline.it/lab/products/media.html)
+ * Magnolia SimpleMedia Module: a module for Magnolia CMS for easier management of images and videos with
+ * several features.
+ * Copyright (C)2008 - 2009, Openmind S.r.l. http://www.openmindonline.it
+ *
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ * You may obtain a copy of the License at
+ *
+ * http://www.gnu.org/licenses/lgpl-2.1.html
+ *
+ * This library 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
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
package net.sourceforge.openutils.mgnlmedia.media.dialog;
import info.magnolia.cms.beans.runtime.Document;
Modified: trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/dialog/DialogFileVideo.java
===================================================================
--- trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/dialog/DialogFileVideo.java 2009-09-04 17:03:57 UTC (rev 1365)
+++ trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/dialog/DialogFileVideo.java 2009-09-05 08:56:03 UTC (rev 1366)
@@ -1,19 +1,27 @@
/**
- * Copyright Openmind 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.
+ * Magnolia SimpleMedia Module (http://lab.openmindonline.it/lab/products/media.html)
+ * Magnolia SimpleMedia Module: a module for Magnolia CMS for easier management of images and videos with
+ * several features.
+ * Copyright (C)2008 - 2009, Openmind S.r.l. http://www.openmindonline.it
*
- * This program is distributed in the hope that it will be useful,
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ * You may obtain a copy of the License at
+ *
+ * http://www.gnu.org/licenses/lgpl-2.1.html
+ *
+ * This library 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.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser 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/>.
- *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
package net.sourceforge.openutils.mgnlmedia.media.dialog;
Modified: trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/dialog/DialogMetadata.java
===================================================================
--- trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/dialog/DialogMetadata.java 2009-09-04 17:03:57 UTC (rev 1365)
+++ trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/dialog/DialogMetadata.java 2009-09-05 08:56:03 UTC (rev 1366)
@@ -1,19 +1,27 @@
/**
- * Copyright Openmind 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.
+ * Magnolia SimpleMedia Module (http://lab.openmindonline.it/lab/products/media.html)
+ * Magnolia SimpleMedia Module: a module for Magnolia CMS for easier management of images and videos with
+ * several features.
+ * Copyright (C)2008 - 2009, Openmind S.r.l. http://www.openmindonline.it
*
- * This program is distributed in the hope that it will be useful,
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ * You may obtain a copy of the License at
+ *
+ * http://www.gnu.org/licenses/lgpl-2.1.html
+ *
+ * This library 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.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser 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/>.
- *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
package net.sourceforge.openutils.mgnlmedia.media.dialog;
Modified: trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/dialog/DialogSelectMedia.java
===================================================================
--- trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/dialog/DialogSelectMedia.java 2009-09-04 17:03:57 UTC (rev 1365)
+++ trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/dialog/DialogSelectMedia.java 2009-09-05 08:56:03 UTC (rev 1366)
@@ -1,19 +1,27 @@
/**
- * Copyright Openmind 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.
+ * Magnolia SimpleMedia Module (http://lab.openmindonline.it/lab/products/media.html)
+ * Magnolia SimpleMedia Module: a module for Magnolia CMS for easier management of images and videos with
+ * several features.
+ * Copyright (C)2008 - 2009, Openmind S.r.l. http://www.openmindonline.it
*
- * This program is distributed in the hope that it will be useful,
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ * You may obtain a copy of the License at
+ *
+ * http://www.gnu.org/licenses/lgpl-2.1.html
+ *
+ * This library 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.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser 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/>.
- *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
package net.sourceforge.openutils.mgnlmedia.media.dialog;
Modified: trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/dialog/LayerDialog.java
===================================================================
--- trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/dialog/LayerDialog.java 2009-09-04 17:03:57 UTC (rev 1365)
+++ trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/dialog/LayerDialog.java 2009-09-05 08:56:03 UTC (rev 1366)
@@ -1,19 +1,27 @@
/**
- * Copyright Openmind 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.
+ * Magnolia SimpleMedia Module (http://lab.openmindonline.it/lab/products/media.html)
+ * Magnolia SimpleMedia Module: a module for Magnolia CMS for easier management of images and videos with
+ * several features.
+ * Copyright (C)2008 - 2009, Openmind S.r.l. http://www.openmindonline.it
*
- * This program is distributed in the hope that it will be useful,
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ * You may obtain a copy of the License at
+ *
+ * http://www.gnu.org/licenses/lgpl-2.1.html
+ *
+ * This library 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.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser 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/>.
- *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
package net.sourceforge.openutils.mgnlmedia.media.dialog;
Modified: trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/dialog/LayerDialogMVC.java
===================================================================
--- trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/dialog/LayerDialogMVC.java 2009-09-04 17:03:57 UTC (rev 1365)
+++ trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/dialog/LayerDialogMVC.java 2009-09-05 08:56:03 UTC (rev 1366)
@@ -1,19 +1,27 @@
/**
- * Copyright Openmind 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.
+ * Magnolia SimpleMedia Module (http://lab.openmindonline.it/lab/products/media.html)
+ * Magnolia SimpleMedia Module: a module for Magnolia CMS for easier management of images and videos with
+ * several features.
+ * Copyright (C)2008 - 2009, Openmind S.r.l. http://www.openmindonline.it
*
- * This program is distributed in the hope that it will be useful,
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ * You may obtain a copy of the License at
+ *
+ * http://www.gnu.org/licenses/lgpl-2.1.html
+ *
+ * This library 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.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser 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/>.
- *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
package net.sourceforge.openutils.mgnlmedia.media.dialog;
Modified: trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/lifecycle/MediaModule.java
===================================================================
--- trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/lifecycle/MediaModule.java 2009-09-04 17:03:57 UTC (rev 1365)
+++ trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/lifecycle/MediaModule.java 2009-09-05 08:56:03 UTC (rev 1366)
@@ -1,19 +1,27 @@
/**
- * Copyright Openmind 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.
+ * Magnolia SimpleMedia Module (http://lab.openmindonline.it/lab/products/media.html)
+ * Magnolia SimpleMedia Module: a module for Magnolia CMS for easier management of images and videos with
+ * several features.
+ * Copyright (C)2008 - 2009, Openmind S.r.l. http://www.openmindonline.it
*
- * This program is distributed in the hope that it will be useful,
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ * You may obtain a copy of the License at
+ *
+ * http://www.gnu.org/licenses/lgpl-2.1.html
+ *
+ * This library 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.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser 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/>.
- *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
package net.sourceforge.openutils.mgnlmedia.media.lifecycle;
Modified: trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/pages/MediaBrowserPage.java
===================================================================
--- trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/pages/MediaBrowserPage.java 2009-09-04 17:03:57 UTC (rev 1365)
+++ trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/pages/MediaBrowserPage.java 2009-09-05 08:56:03 UTC (rev 1366)
@@ -1,19 +1,27 @@
/**
- * Copyright Openmind 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.
+ * Magnolia SimpleMedia Module (http://lab.openmindonline.it/lab/products/media.html)
+ * Magnolia SimpleMedia Module: a module for Magnolia CMS for easier management of images and videos with
+ * several features.
+ * Copyright (C)2008 - 2009, Openmind S.r.l. http://www.openmindonline.it
*
- * This program is distributed in the hope that it will be useful,
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ * You may obtain a copy of the License at
+ *
+ * http://www.gnu.org/licenses/lgpl-2.1.html
+ *
+ * This library 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.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser 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/>.
- *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
package net.sourceforge.openutils.mgnlmedia.media.pages;
Modified: trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/pages/MediaFolderSelectionPage.java
===================================================================
--- trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/pages/MediaFolderSelectionPage.java 2009-09-04 17:03:57 UTC (rev 1365)
+++ trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/pages/MediaFolderSelectionPage.java 2009-09-05 08:56:03 UTC (rev 1366)
@@ -1,19 +1,27 @@
/**
- * Copyright Openmind 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.
+ * Magnolia SimpleMedia Module (http://lab.openmindonline.it/lab/products/media.html)
+ * Magnolia SimpleMedia Module: a module for Magnolia CMS for easier management of images and videos with
+ * several features.
+ * Copyright (C)2008 - 2009, Openmind S.r.l. http://www.openmindonline.it
*
- * This program is distributed in the hope that it will be useful,
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ * You may obtain a copy of the License at
+ *
+ * http://www.gnu.org/licenses/lgpl-2.1.html
+ *
+ * This library 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.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser 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/>.
- *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
package net.sourceforge.openutils.mgnlmedia.media.pages;
Modified: trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/pages/MediaFolderViewPage.java
===================================================================
--- trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/pages/MediaFolderViewPage.java 2009-09-04 17:03:57 UTC (rev 1365)
+++ trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/pages/MediaFolderViewPage.java 2009-09-05 08:56:03 UTC (rev 1366)
@@ -1,19 +1,27 @@
/**
- * Copyright Openmind 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.
+ * Magnolia SimpleMedia Module (http://lab.openmindonline.it/lab/products/media.html)
+ * Magnolia SimpleMedia Module: a module for Magnolia CMS for easier management of images and videos with
+ * several features.
+ * Copyright (C)2008 - 2009, Openmind S.r.l. http://www.openmindonline.it
*
- * This program is distributed in the hope that it will be useful,
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ * You may obtain a copy of the License at
+ *
+ * http://www.gnu.org/licenses/lgpl-2.1.html
+ *
+ * This library 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.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser 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/>.
- *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
package net.sourceforge.openutils.mgnlmedia.media.pages;
Modified: trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/pages/MediaSearchPage.java
===================================================================
--- trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/pages/MediaSearchPage.java 2009-09-04 17:03:57 UTC (rev 1365)
+++ trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/pages/MediaSearchPage.java 2009-09-05 08:56:03 UTC (rev 1366)
@@ -1,19 +1,27 @@
/**
- * Copyright Openmind 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.
+ * Magnolia SimpleMedia Module (http://lab.openmindonline.it/lab/products/media.html)
+ * Magnolia SimpleMedia Module: a module for Magnolia CMS for easier management of images and videos with
+ * several features.
+ * Copyright (C)2008 - 2009, Openmind S.r.l. http://www.openmindonline.it
*
- * This program is distributed in the hope that it will be useful,
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ * You may obtain a copy of the License at
+ *
+ * http://www.gnu.org/licenses/lgpl-2.1.html
+ *
+ * This library 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.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser 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/>.
- *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
package net.sourceforge.openutils.mgnlmedia.media.pages;
Modified: trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/pages/MessagesTemplatedMVCHandler.java
===================================================================
--- trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/pages/MessagesTemplatedMVCHandler.java 2009-09-04 17:03:57 UTC (rev 1365)
+++ trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/pages/MessagesTemplatedMVCHandler.java 2009-09-05 08:56:03 UTC (rev 1366)
@@ -1,19 +1,27 @@
/**
- * Copyright Openmind 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.
+ * Magnolia SimpleMedia Module (http://lab.openmindonline.it/lab/products/media.html)
+ * Magnolia SimpleMedia Module: a module for Magnolia CMS for easier management of images and videos with
+ * several features.
+ * Copyright (C)2008 - 2009, Openmind S.r.l. http://www.openmindonline.it
*
- * This program is distributed in the hope that it will be useful,
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ * You may obtain a copy of the License at
+ *
+ * http://www.gnu.org/licenses/lgpl-2.1.html
+ *
+ * This library 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.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser 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/>.
- *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
package net.sourceforge.openutils.mgnlmedia.media.pages;
Modified: trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/processors/BaseImageResolutionProcessor.java
===================================================================
--- trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/processors/BaseImageResolutionProcessor.java 2009-09-04 17:03:57 UTC (rev 1365)
+++ trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/processors/BaseImageResolutionProcessor.java 2009-09-05 08:56:03 UTC (rev 1366)
@@ -1,3 +1,28 @@
+/**
+ *
+ * Magnolia SimpleMedia Module (http://lab.openmindonline.it/lab/products/media.html)
+ * Magnolia SimpleMedia Module: a module for Magnolia CMS for easier management of images and videos with
+ * several features.
+ * Copyright (C)2008 - 2009, Openmind S.r.l. http://www.openmindonline.it
+ *
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ * You may obtain a copy of the License at
+ *
+ * http://www.gnu.org/licenses/lgpl-2.1.html
+ *
+ * This library 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
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
package net.sourceforge.openutils.mgnlmedia.media.processors;
import java.awt.Color;
Modified: trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/processors/FitInAndFillWithBandsImageResolutionProcessor.java
===================================================================
--- trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/processors/FitInAndFillWithBandsImageResolutionProcessor.java 2009-09-04 17:03:57 UTC (rev 1365)
+++ trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/processors/FitInAndFillWithBandsImageResolutionProcessor.java 2009-09-05 08:56:03 UTC (rev 1366)
@@ -1,3 +1,28 @@
+/**
+ *
+ * Magnolia SimpleMedia Module (http://lab.openmindonline.it/lab/products/media.html)
+ * Magnolia SimpleMedia Module: a module for Magnolia CMS for easier management of images and videos with
+ * several features.
+ * Copyright (C)2008 - 2009, Openmind S.r.l. http://www.openmindonline.it
+ *
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ * You may obtain a copy of the License at
+ *
+ * http://www.gnu.org/licenses/lgpl-2.1.html
+ *
+ * This library 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
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
package net.sourceforge.openutils.mgnlmedia.media.processors;
import java.awt.Color;
Modified: trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/processors/FitInImageResolutionProcessor.java
===================================================================
--- trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/processors/FitInImageResolutionProcessor.java 2009-09-04 17:03:57 UTC (rev 1365)
+++ trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/processors/FitInImageResolutionProcessor.java 2009-09-05 08:56:03 UTC (rev 1366)
@@ -1,3 +1,28 @@
+/**
+ *
+ * Magnolia SimpleMedia Module (http://lab.openmindonline.it/lab/products/media.html)
+ * Magnolia SimpleMedia Module: a module for Magnolia CMS for easier management of images and videos with
+ * several features.
+ * Copyright (C)2008 - 2009, Openmind S.r.l. http://www.openmindonline.it
+ *
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU...
[truncated message content] |
|
From: <mol...@us...> - 2009-09-09 08:05:22
|
Revision: 1445
http://openutils.svn.sourceforge.net/openutils/?rev=1445&view=rev
Author: molaschi
Date: 2009-09-09 08:05:12 +0000 (Wed, 09 Sep 2009)
Log Message:
-----------
remove license from ftl
Modified Paths:
--------------
trunk/openutils-mgnlmedia/pom.xml
trunk/openutils-mgnlmedia/src/main/resources/dialog/selectMedia.ftl
Modified: trunk/openutils-mgnlmedia/pom.xml
===================================================================
--- trunk/openutils-mgnlmedia/pom.xml 2009-09-09 08:01:47 UTC (rev 1444)
+++ trunk/openutils-mgnlmedia/pom.xml 2009-09-09 08:05:12 UTC (rev 1445)
@@ -71,6 +71,7 @@
<exclude>target/**</exclude>
<exclude>src/site/**</exclude>
<exclude>src/main/bundle/**</exclude>
+ <exclude>src/main/resources/**/*.ftl</exclude>
<exclude>src/main/assembly/**</exclude>
<exclude>src/main/resources/mgnl-bootstrap/**</exclude>
<exclude>src/main/resources/mgnl-nodetypes/**</exclude>
Modified: trunk/openutils-mgnlmedia/src/main/resources/dialog/selectMedia.ftl
===================================================================
--- trunk/openutils-mgnlmedia/src/main/resources/dialog/selectMedia.ftl 2009-09-09 08:01:47 UTC (rev 1444)
+++ trunk/openutils-mgnlmedia/src/main/resources/dialog/selectMedia.ftl 2009-09-09 08:05:12 UTC (rev 1445)
@@ -1,30 +1,3 @@
-<#--
-
-
- Magnolia SimpleMedia Module (http://lab.openmindonline.it/lab/products/media.html)
- Magnolia SimpleMedia Module: a module for Magnolia CMS for easier management of images and videos with
- several features.
- Copyright (C)2008 - 2009, Openmind S.r.l. http://www.openmindonline.it
-
-
- This library is free software; you can redistribute it and/or
- modify it under the terms of the GNU Lesser General Public
- License as published by the Free Software Foundation; either
- version 2.1 of the License, or (at your option) any later version.
- You may obtain a copy of the License at
-
- http://www.gnu.org/licenses/lgpl-2.1.html
-
- This library 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
- Lesser General Public License for more details.
-
- You should have received a copy of the GNU Lesser General Public
- License along with this library; if not, write to the Free Software
- Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
-
--->
[#if !reqGet(request, "js_media_included")?exists]
<script type="text/javascript">
function selectMedia(name, value, mediaType) {
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fg...@us...> - 2010-01-31 15:33:05
|
Revision: 1720
http://openutils.svn.sourceforge.net/openutils/?rev=1720&view=rev
Author: fgiust
Date: 2010-01-31 15:32:59 +0000 (Sun, 31 Jan 2010)
Log Message:
-----------
javadocs
Modified Paths:
--------------
trunk/openutils-mgnlmedia/pom.xml
trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/types/MediaTypeHandler.java
trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/types/impl/BaseTypeHandler.java
Modified: trunk/openutils-mgnlmedia/pom.xml
===================================================================
--- trunk/openutils-mgnlmedia/pom.xml 2010-01-30 16:44:51 UTC (rev 1719)
+++ trunk/openutils-mgnlmedia/pom.xml 2010-01-31 15:32:59 UTC (rev 1720)
@@ -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>
@@ -88,7 +89,38 @@
<plugin>
<groupId>net.sourceforge.maven-taglib</groupId>
<artifactId>maven-taglib-plugin</artifactId>
+ <version>2.4-SNAPSHOT</version>
+ <configuration>
+ <parseHtml>true</parseHtml>
+ <dontRecurseIntoSubdirs>true</dontRecurseIntoSubdirs>
+ </configuration>
</plugin>
+ <plugin>
+ <artifactId>maven-changes-plugin</artifactId>
+ <version>2.0-beta-3</version>
+ <configuration>
+ <xmlPath>${basedir}/src/site/changes/changes.xml</xmlPath>
+ </configuration>
+ <reportSets>
+ <reportSet>
+ <reports>
+ <report>jira-report</report>
+ <report>announcement-generate</report>
+ </reports>
+ </reportSet>
+ </reportSets>
+ </plugin>
+ <plugin>
+ <artifactId>maven-changelog-plugin</artifactId>
+ <version>2.1</version>
+ <reportSets>
+ <reportSet>
+ <reports>
+ <!-- <report>changes-report</report>-->
+ </reports>
+ </reportSet>
+ </reportSets>
+ </plugin>
</plugins>
</reporting>
<dependencies>
Modified: trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/types/MediaTypeHandler.java
===================================================================
--- trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/types/MediaTypeHandler.java 2010-01-30 16:44:51 UTC (rev 1719)
+++ trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/types/MediaTypeHandler.java 2010-01-31 15:32:59 UTC (rev 1720)
@@ -61,7 +61,6 @@
/**
* @param media
* @param options
- * @param aaaa
* @return url
*/
String getUrl(Content media, Map<String, String> options);
Modified: trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/types/impl/BaseTypeHandler.java
===================================================================
--- trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/types/impl/BaseTypeHandler.java 2010-01-30 16:44:51 UTC (rev 1719)
+++ trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/types/impl/BaseTypeHandler.java 2010-01-31 15:32:59 UTC (rev 1720)
@@ -241,7 +241,7 @@
* </ol>
* @param media media
* @param property base property name
- * @return
+ * @return nodedata value for a given name and current locale
*/
protected String getPropertyLocalized(Content media, String property)
{
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fg...@us...> - 2010-02-20 18:14:51
|
Revision: 2016
http://openutils.svn.sourceforge.net/openutils/?rev=2016&view=rev
Author: fgiust
Date: 2010-02-20 18:14:39 +0000 (Sat, 20 Feb 2010)
Log Message:
-----------
MEDIA-89 Create thumbnail for pdf documents
Modified Paths:
--------------
trunk/openutils-mgnlmedia/pom.xml
trunk/openutils-mgnlmedia/src/main/assembly/assembly-bundle.xml
trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/types/impl/BaseTypeHandler.java
trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/types/impl/DocumentTypeHandler.java
trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/media/lang/messages_en.properties
trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/media/lang/messages_it.properties
Modified: trunk/openutils-mgnlmedia/pom.xml
===================================================================
--- trunk/openutils-mgnlmedia/pom.xml 2010-02-20 18:10:43 UTC (rev 2015)
+++ trunk/openutils-mgnlmedia/pom.xml 2010-02-20 18:14:39 UTC (rev 2016)
@@ -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>
@@ -118,6 +119,17 @@
<scope>provided</scope>
</dependency>
<dependency>
+ <groupId>org.apache.pdfbox</groupId>
+ <artifactId>pdfbox</artifactId>
+ <version>1.0.0</version>
+ <exclusions>
+ <exclusion>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
<groupId>org.testng</groupId>
<artifactId>testng</artifactId>
<classifier>jdk15</classifier>
@@ -147,4 +159,4 @@
<properties>
<magnolia.version>4.2.3</magnolia.version>
</properties>
-</project>
+</project>
\ No newline at end of file
Modified: trunk/openutils-mgnlmedia/src/main/assembly/assembly-bundle.xml
===================================================================
--- trunk/openutils-mgnlmedia/src/main/assembly/assembly-bundle.xml 2010-02-20 18:10:43 UTC (rev 2015)
+++ trunk/openutils-mgnlmedia/src/main/assembly/assembly-bundle.xml 2010-02-20 18:14:39 UTC (rev 2016)
@@ -30,6 +30,7 @@
<include>com.drewnoakes:metadata-extractor</include>
<include>net.sourceforge.openutils:*</include>
<include>com.google.collections:*</include>
+ <include>org.apache.pdfbox:*</include>
</includes>
</dependencySet>
</dependencySets>
Modified: trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/types/impl/BaseTypeHandler.java
===================================================================
--- trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/types/impl/BaseTypeHandler.java 2010-02-20 18:10:43 UTC (rev 2015)
+++ trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/types/impl/BaseTypeHandler.java 2010-02-20 18:14:39 UTC (rev 2016)
@@ -360,13 +360,21 @@
}
}
- addToInfo(media, info, METADATA_WIDTH);
- addToInfo(media, info, METADATA_HEIGHT);
- addToInfo(media, info, METADATA_BITDEPTH);
+ Collection<NodeData> propertyList = media.getNodeDataCollection("media_*");
+ for (NodeData property : propertyList)
+ {
+ addToInfo(media, info, property.getName());
+ }
return info;
}
+ /**
+ * Adds a new metadata to the map, converting an existing nodedata
+ * @param media main media node
+ * @param info map containing metadata keys/values
+ * @param key nodedata name
+ */
protected void addToInfo(Content media, Map<String, String> info, String key)
{
NodeData data = media.getNodeData(key);
Modified: trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/types/impl/DocumentTypeHandler.java
===================================================================
--- trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/types/impl/DocumentTypeHandler.java 2010-02-20 18:10:43 UTC (rev 2015)
+++ trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/types/impl/DocumentTypeHandler.java 2010-02-20 18:14:39 UTC (rev 2016)
@@ -18,12 +18,38 @@
*/
package net.sourceforge.openutils.mgnlmedia.media.types.impl;
+import info.magnolia.cms.beans.runtime.Document;
+import info.magnolia.cms.beans.runtime.FileProperties;
import info.magnolia.cms.core.Content;
+import info.magnolia.cms.core.NodeData;
+import info.magnolia.cms.util.NodeDataUtil;
+import info.magnolia.module.admininterface.SaveHandlerImpl;
+import java.awt.image.BufferedImage;
+import java.io.File;
+import java.io.IOException;
+import java.io.InputStream;
import java.util.Collections;
+import java.util.List;
+import javax.imageio.ImageIO;
+import javax.jcr.PropertyType;
+import javax.jcr.RepositoryException;
+import net.sourceforge.openutils.mgnlmedia.media.configuration.MediaConfigurationManager;
+import net.sourceforge.openutils.mgnlmedia.media.utils.ImageUtils;
+
+import org.apache.commons.io.IOUtils;
+import org.apache.commons.lang.StringUtils;
+import org.apache.pdfbox.exceptions.WrappedIOException;
+import org.apache.pdfbox.pdmodel.PDDocument;
+import org.apache.pdfbox.pdmodel.PDPage;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+
/**
+ * Type handler for generic "document" handling (pdf files).
* @author dschivo
* @version $Id$
*/
@@ -31,11 +57,47 @@
{
/**
+ * Nodedata name where preview media content is saved
+ */
+ public static final String PREVIEW_NODEDATA_NAME = "image";
+
+ /**
+ * metadata containing the number of pages
+ */
+ private static final String METADATA_PAGES = "media_pages";
+
+ /**
+ * Logger.
+ */
+ private Logger log = LoggerFactory.getLogger(DocumentTypeHandler.class);
+
+ /**
* {@inheritDoc}
*/
public String getThumbnailUrl(Content media)
{
- return "/.resources/media/icons/thumb-document.png";
+ try
+ {
+ // check if a thumbnail has been generated
+ if (media == null
+ || !media.hasNodeData(PREVIEW_NODEDATA_NAME)
+ || !ImageUtils.checkOrCreateResolution(media, "thumbnail", PREVIEW_NODEDATA_NAME))
+ {
+ return "/.resources/media/icons/thumb-document.png";
+ }
+ }
+ catch (RepositoryException e)
+ {
+ return "/.resources/media/icons/thumb-document.png";
+ }
+
+ return MediaConfigurationManager.getInstance().getURIMappingPrefix()
+ + media.getHandle()
+ + "/resolutions/thumbnail/"
+ + media.getName()
+ + "."
+ + ImageUtils.getExtension(media, "thumbnail");
+
}
/**
@@ -47,4 +109,132 @@
return getUrl(media, Collections.<String, String> emptyMap());
}
+ /**
+ * {@inheritDoc}
+ */
+ @Override
+ public boolean onPostSave(Content media)
+ {
+
+ NodeData data = getOriginalFileNodeData(media);
+ if (data.getType() == PropertyType.BINARY)
+ {
+
+ if (StringUtils.equalsIgnoreCase(data.getAttribute(FileProperties.EXTENSION), "pdf"))
+ {
+
+ String filename = data.getAttribute(FileProperties.PROPERTY_FILENAME) + ".png";
+
+ InputStream stream = data.getStream();
+ try
+ {
+ createPdfPreview(media, stream, filename);
+ }
+ finally
+ {
+ IOUtils.closeQuietly(stream);
+ }
+ }
+
+ }
+
+ return super.onPostSave(media);
+ }
+
+ /**
+ * Automatically create a thumbnail from the pdf.
+ * @param media main media node
+ * @param stream inputStream for the original pdf
+ * @param filename original filename
+ */
+ protected void createPdfPreview(Content media, InputStream stream, String filename)
+ {
+
+ PDDocument document = null;
+ try
+ {
+
+ document = PDDocument.load(stream);
+
+ List<PDPage> pages = document.getDocumentCatalog().getAllPages();
+
+ NodeDataUtil.getOrCreateAndSet(media, METADATA_PAGES, document.getNumberOfPages());
+
+ if (!pages.isEmpty())
+ {
+
+ PDPage page = pages.get(0);
+
+ java.awt.image.BufferedImage image = page.convertToImage(BufferedImage.TYPE_INT_ARGB, 36);
+
+ File file = File.createTempFile(filename, ".png");
+ ImageIO.write(image, "png", file);
+
+ copyPreviewImageToRepository(media, file, filename);
+
+ media.save();
+
+ file.delete();
+ }
+ }
+ catch (NoClassDefFoundError e)
+ {
+ log.warn("Apache pdfbox 1.0.0 not available, not generating preview for pdf document");
+ }
+ catch (WrappedIOException e)
+ {
+ if (e.getCause() instanceof ClassCastException)
+ {
+ log.warn("Two conflicting versions of pdfbox are loaded, only one pdfbox jar version 1.x must be loaded in order to make thumbnail generation work. "
+ + "Not generating preview for pdf document");
+ }
+ else
+ {
+ log.error("Error creating preview for " + media.getHandle(), e);
+ }
+ }
+ catch (Throwable e)
+ {
+ log.error("Error creating preview for " + media.getHandle(), e);
+ }
+ finally
+ {
+ if (document != null)
+ {
+ try
+ {
+ document.close();
+ }
+ catch (IOException e)
+ {
+ // ignore
+ }
+ }
+ }
+ }
+
+ /**
+ * Copy a preview image to a nodedata.
+ * @param media main media node
+ * @param file File to be copied
+ * @param filename filename
+ */
+ protected void copyPreviewImageToRepository(Content media, File file, String filename)
+ {
+
+ Document doc = new Document(file, "image/png");
+ try
+ {
+ SaveHandlerImpl.saveDocument(media, doc, DocumentTypeHandler.PREVIEW_NODEDATA_NAME, filename, null);
+ }
+ catch (RepositoryException e)
+ {
+ log.error(e.getMessage(), e);
+ }
+ finally
+ {
+ doc.delete();
+ }
+
+ }
}
Modified: trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/media/lang/messages_en.properties
===================================================================
--- trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/media/lang/messages_en.properties 2010-02-20 18:10:43 UTC (rev 2015)
+++ trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/media/lang/messages_en.properties 2010-02-20 18:14:39 UTC (rev 2016)
@@ -94,6 +94,7 @@
media.info.media_bitdepth=Bit depth: {0}
media.info.media_duration=Duration: {0}
media.info.media_framerate=Frame rate: {0} fps
+media.info.media_pages= Number of pages: {0}
media.bgselector.white=White
media.bgselector.transparent=Transparent
Modified: trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/media/lang/messages_it.properties
===================================================================
--- trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/media/lang/messages_it.properties 2010-02-20 18:10:43 UTC (rev 2015)
+++ trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/media/lang/messages_it.properties 2010-02-20 18:14:39 UTC (rev 2016)
@@ -96,6 +96,7 @@
media.info.media_bitdepth=Profondit\u00E0 di colore: {0}
media.info.media_duration=Durata: {0}
media.info.media_framerate=Frame rate: {0} fps
+media.info.media_pages= Numero di pagine: {0}
media.bgselector.white=Bianco
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fg...@us...> - 2010-05-02 17:30:27
|
Revision: 2331
http://openutils.svn.sourceforge.net/openutils/?rev=2331&view=rev
Author: fgiust
Date: 2010-05-02 17:30:21 +0000 (Sun, 02 May 2010)
Log Message:
-----------
MEDIA-113 cleaning up DialogSelectMedia before adding support for existing binary properties
Modified Paths:
--------------
trunk/openutils-mgnlmedia/pom.xml
trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/dialog/DialogSelectMedia.java
trunk/openutils-mgnlmedia/src/main/resources/META-INF/tags/media/media.tag
trunk/openutils-mgnlmedia/src/main/resources/dialog/selectMedia.ftl
Modified: trunk/openutils-mgnlmedia/pom.xml
===================================================================
--- trunk/openutils-mgnlmedia/pom.xml 2010-05-02 17:19:37 UTC (rev 2330)
+++ trunk/openutils-mgnlmedia/pom.xml 2010-05-02 17:30:21 UTC (rev 2331)
@@ -105,6 +105,11 @@
</dependency>
<dependency>
<groupId>net.sourceforge.openutils</groupId>
+ <artifactId>openutils-mgnlcontrols</artifactId>
+ <version>4.0.7-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>net.sourceforge.openutils</groupId>
<artifactId>openutils-mgnlext</artifactId>
<version>2.1</version>
</dependency>
Modified: trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/dialog/DialogSelectMedia.java
===================================================================
--- trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/dialog/DialogSelectMedia.java 2010-05-02 17:19:37 UTC (rev 2330)
+++ trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/dialog/DialogSelectMedia.java 2010-05-02 17:30:21 UTC (rev 2331)
@@ -19,44 +19,30 @@
package net.sourceforge.openutils.mgnlmedia.media.dialog;
-import freemarker.template.TemplateException;
-import freemarker.template.TemplateMethodModel;
-import freemarker.template.TemplateModelException;
import info.magnolia.cms.core.Content;
import info.magnolia.cms.core.HierarchyManager;
-import info.magnolia.cms.core.ItemType;
import info.magnolia.cms.core.NodeData;
-import info.magnolia.cms.core.SystemProperty;
-import info.magnolia.cms.gui.control.ControlImpl;
-import info.magnolia.cms.gui.control.FreemarkerControl;
-import info.magnolia.cms.gui.dialog.DialogBox;
import info.magnolia.cms.i18n.Messages;
import info.magnolia.cms.i18n.MessagesUtil;
-import info.magnolia.cms.security.AccessDeniedException;
import info.magnolia.cms.util.NodeDataUtil;
import info.magnolia.context.MgnlContext;
-import java.io.IOException;
-import java.io.Writer;
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.Map;
import javax.jcr.PathNotFoundException;
-import javax.jcr.PropertyType;
import javax.jcr.RepositoryException;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
+import net.sourceforge.openutils.mgnlcontrols.dialog.ConfigurableFreemarkerDialog;
import net.sourceforge.openutils.mgnlmedia.media.configuration.MediaConfigurationManager;
import net.sourceforge.openutils.mgnlmedia.media.configuration.MediaTypeConfiguration;
import net.sourceforge.openutils.mgnlmedia.media.lifecycle.MediaModule;
+import net.sourceforge.openutils.mgnlmedia.media.save.MediaCustomSaveHandler;
-import org.apache.commons.lang.exception.NestableRuntimeException;
+import org.apache.commons.lang.StringUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -66,8 +52,7 @@
* @author molaschi
* @version $Id$
*/
-@SuppressWarnings("unchecked")
-public class DialogSelectMedia extends DialogBox
+public class DialogSelectMedia extends ConfigurableFreemarkerDialog
{
/**
@@ -77,8 +62,6 @@
private Content media;
- private Map configuration;
-
private Long width;
private Long height;
@@ -87,10 +70,10 @@
* {@inheritDoc}
*/
@Override
- protected List readValues()
+ protected List<Object> readValues()
{
- List values = new ArrayList();
+ List<Object> values = new ArrayList<Object>();
if (this.getStorageNode() != null)
{
@@ -117,50 +100,6 @@
}
/**
- * Get a recursive map view of a content node
- * @param node content node
- * @return recursive map view on content node properties and children
- * @throws RepositoryException repository exception
- * @throws AccessDeniedException access denied
- */
- protected Map getSubNodes(Content node) throws RepositoryException, AccessDeniedException
- {
-
- Map values = new LinkedHashMap();
-
- // cycles on properties and stores them in map
- Collection properties = node.getNodeDataCollection();
-
- if (properties != null && properties.size() > 0)
- {
- Iterator propertiesIt = properties.iterator();
- while (propertiesIt.hasNext())
- {
- NodeData property = (NodeData) propertiesIt.next();
- values.put(property.getName(), NodeDataUtil.getValueObject(property));
- }
- }
-
- // cycle on children
- Collection children = node.getChildren(ItemType.CONTENTNODE);
- if (children != null && children.size() > 0)
- {
- Iterator childrenIt = children.iterator();
- while (childrenIt.hasNext())
- {
- Content child = (Content) childrenIt.next();
-
- // gets sub map
- Map subValues = getSubNodes(child);
- // stores it in map
- values.put(child.getName(), subValues);
- }
- }
-
- return values;
- }
-
- /**
* {@inheritDoc}
*/
@@ -169,52 +108,28 @@
throws RepositoryException
{
super.init(request, response, websiteNode, configNode);
- configuration = this.getSubNodes(configNode);
+ if (StringUtils.isEmpty(getConfigValue("saveHandler")))
+ {
+ setConfig("saveHandler", MediaCustomSaveHandler.class.getName());
+ }
}
/**
* {@inheritDoc}
*/
@Override
- public void drawHtml(Writer out) throws IOException
+ protected void addToParameters(Map parameters)
{
- Map parameters = new HashMap();
- parameters.put("name", this.getName());
- parameters.put("value", this.getValue());
- parameters.put("values", this.getValues());
- parameters.put("request", this.getRequest());
- parameters.put("debug", SystemProperty.getBooleanProperty("magnolia.develop"));
- parameters.put("configuration", this.configuration);
parameters.put("thumbnailUrl", this.getThumbnailUrl());
- parameters.put("filename", this.getFilename());
- parameters.put("reqGet", new RequestGetAttribute());
- parameters.put("reqSet", new RequestSetAttribute());
parameters.put("msgs", this.getMessages());
+ parameters.put("filename", this.getFilename());
+
if ("true".equals(this.getConfigValue("resizing")))
{
parameters.put("width", this.getWidth());
parameters.put("height", this.getHeight());
}
- this.drawHtmlPre(out);
-
- try
- {
- FreemarkerControl control = new FreemarkerControl("multiple".equals(this.getConfigValue("valueType"))
- ? ControlImpl.VALUETYPE_MULTIPLE
- : ControlImpl.VALUETYPE_SINGLE);
- control.setType(this.getConfigValue("type", PropertyType.TYPENAME_STRING));
- control.setName(this.getName());
- control.drawHtml(out, getPath(), parameters);
- }
-
- catch (TemplateException ex)
- {
- log.error("Error processing dialog template:", ex);
- throw new NestableRuntimeException(ex);
- }
-
- this.drawHtmlPost(out);
}
/**
@@ -226,6 +141,7 @@
return MessagesUtil.chain("net.sourceforge.openutils.mgnlmedia.media.lang.messages", super.getMessages());
}
+ @Override
protected String getPath()
{
return "dialog/selectMedia.ftl";
@@ -332,78 +248,4 @@
return height;
}
- /**
- * Freemarker method for setting request attributes
- * @author molaschi
- * @version $Id$
- */
- public class RequestSetAttribute implements TemplateMethodModel
- {
-
- /**
- * {@inheritDoc}
- */
- public Object exec(List arguments) throws TemplateModelException
- {
- if (arguments != null && arguments.size() == 3 && arguments.get(0) instanceof HttpServletRequest)
- {
- HttpServletRequest req = (HttpServletRequest) arguments.get(0);
- String name = (String) arguments.get(1);
- Object value = arguments.get(2);
- req.setAttribute(name, value);
- }
-
- return TemplateMethodModel.NOTHING;
- }
-
- }
-
- /**
- * Freemarker method for getting request attributes
- * @author molaschi
- * @version $Id$
- */
- public class RequestGetAttribute implements TemplateMethodModel
- {
-
- /**
- * {@inheritDoc}
- */
- public Object exec(List arguments) throws TemplateModelException
- {
- if (arguments != null && arguments.size() == 2 && arguments.get(0) instanceof HttpServletRequest)
- {
- HttpServletRequest req = (HttpServletRequest) arguments.get(0);
- String name = (String) arguments.get(1);
- return req.getAttribute(name);
- }
-
- return null;
- }
-
- }
-
- /**
- * {@inheritDoc}
- */
- @Override
- public void drawHtmlPost(Writer out) throws IOException
- {
- out.write(this.getHtmlDescription());
-
- out.write("<input type=\"hidden\" name=\"");
- out.write(this.getName());
- out.write("_saveHandler\" value=\"");
- out.write("net.sourceforge.openutils.mgnlmedia.media.save.MediaCustomSaveHandler");
- out.write("\" />");
-
- out.write("<input type=\"hidden\" name=\"");
- out.write(this.getName());
- out.write("_configNode\" value=\"");
- out.write(this.getConfigValue("handle"));
- out.write("\" />");
-
- out.write("</td></tr>\n"); //$NON-NLS-1$
- }
-
}
Modified: trunk/openutils-mgnlmedia/src/main/resources/META-INF/tags/media/media.tag
===================================================================
--- trunk/openutils-mgnlmedia/src/main/resources/META-INF/tags/media/media.tag 2010-05-02 17:19:37 UTC (rev 2330)
+++ trunk/openutils-mgnlmedia/src/main/resources/META-INF/tags/media/media.tag 2010-05-02 17:30:21 UTC (rev 2331)
@@ -30,6 +30,12 @@
<jsp:directive.attribute name="videoImagePreview" required="false" rtexprvalue="true" type="java.lang.Boolean" description="if set to true, the tag will not insert the player for videos but only a preview image. For videos or mp3s it needs the following scripts loaded in page: <ul><li>.resources/media/js/mootools-1.2-core.js</li><li>.resources/media/js/mootools-1.2-more.js</li><li>.resources/media/js/mootools-1.2-swfobject.js</li></ul>"/>
<jsp:directive.attribute name="controlbar" required="false" rtexprvalue="true" type="java.lang.String" description="defines controlbar position. Possible values are: 'none' (for hiding), 'over', 'bottom', 'top'. If not set, this value will be 'bottom' by default." />
<jsp:directive.attribute name="share" required="false" rtexprvalue="true" type="java.lang.Boolean" description="if set to true the pluging share-1 is show"/>
+
+
+
+_${item.class.name}_
+
+
<c:if test="${empty item}">
<c:if test="${empty node}">
<c:set var="node" value="${content}" />
Modified: trunk/openutils-mgnlmedia/src/main/resources/dialog/selectMedia.ftl
===================================================================
--- trunk/openutils-mgnlmedia/src/main/resources/dialog/selectMedia.ftl 2010-05-02 17:19:37 UTC (rev 2330)
+++ trunk/openutils-mgnlmedia/src/main/resources/dialog/selectMedia.ftl 2010-05-02 17:30:21 UTC (rev 2331)
@@ -1,4 +1,4 @@
-[#if !reqGet(request, "js_media_included")?exists]
+[#if !alreadyrendered]
<script type="text/javascript">
function selectMedia(name, value, mediaType) {
var url = "${request.contextPath}/.magnolia/pages/mediaBrowser.html?nodeid=" + name + "&selectMedia=true&mgnlCK="+
@@ -33,7 +33,6 @@
document.getElementById("dispRem"+ name + "Txt").innerHTML = filename;
}
</script>
-${reqSet(request, "js_media_included", 1)}
[/#if]
<input type="hidden" id="${name}" name="${name}" value="${value}" />
[#if value?exists && value?length > 0]
@@ -66,13 +65,13 @@
<tr>
<td class="mgnlDialogBoxLabel">Width</td>
<td class="mgnlDialogBoxInput">
- <input type="text" id="${name}_width" name="${name}_width" value="${width!''}" class="mgnlDialogControlEdit" style="width: 60px;">
+ <input type="text" id="${name}_width" name="${name}_width" value="${width!''}" class="mgnlDialogControlEdit" style="width: 60px;" />
</td>
</tr>
<tr>
<td class="mgnlDialogBoxLabel">Height</td>
<td class="mgnlDialogBoxInput">
- <input type="text" id="${name}_height" name="${name}_height" value="${height!''}" class="mgnlDialogControlEdit" style="width: 60px;">
+ <input type="text" id="${name}_height" name="${name}_height" value="${height!''}" class="mgnlDialogControlEdit" style="width: 60px;" />
</td>
</tr>
</tbody>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fg...@us...> - 2010-05-04 21:19:45
|
Revision: 2350
http://openutils.svn.sourceforge.net/openutils/?rev=2350&view=rev
Author: fgiust
Date: 2010-05-04 21:19:37 +0000 (Tue, 04 May 2010)
Log Message:
-----------
MEDIA-136 RTMP support: handle flv metadata fetching
Modified Paths:
--------------
trunk/openutils-mgnlmedia/pom.xml
trunk/openutils-mgnlmedia/src/main/assembly/assembly-bundle.xml
trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/types/impl/ExternalVideoTypeHandler.java
trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/utils/FLVMedataUtils.java
Added Paths:
-----------
trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/utils/RtmpMedatadaFetcher.java
Modified: trunk/openutils-mgnlmedia/pom.xml
===================================================================
--- trunk/openutils-mgnlmedia/pom.xml 2010-05-04 20:44:52 UTC (rev 2349)
+++ trunk/openutils-mgnlmedia/pom.xml 2010-05-04 21:19:37 UTC (rev 2350)
@@ -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>
@@ -141,6 +142,25 @@
<scope>provided</scope>
</dependency>
<dependency>
+ <groupId>com.flazr</groupId>
+ <artifactId>flazr</artifactId>
+ <version>0.7-snv20100505</version>
+ <exclusions>
+ <exclusion>
+ <groupId>org.slf4j</groupId>
+ <artifactId>jcl104-over-slf4j</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>commons-cli</groupId>
+ <artifactId>commons-cli</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>commons-httpclient</groupId>
+ <artifactId>commons-httpclient</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
<groupId>org.apache.pdfbox</groupId>
<artifactId>pdfbox</artifactId>
<version>1.0.0</version>
@@ -167,9 +187,9 @@
</dependencies>
<repositories>
<repository>
- <id>repository.magnolia-cms.com</id>
- <name>magnolia repository</name>
- <url>http://repository.magnolia-cms.com/m2</url>
+ <id>repository.openmindonline.it</id>
+ <name>openmindonline repository</name>
+ <url>http://repository.openmindonline.it</url>
<releases>
<enabled>true</enabled>
</releases>
@@ -179,6 +199,6 @@
</repository>
</repositories>
<properties>
- <magnolia.version>4.3</magnolia.version>
+ <magnolia.version>4.3.1</magnolia.version>
</properties>
</project>
\ No newline at end of file
Modified: trunk/openutils-mgnlmedia/src/main/assembly/assembly-bundle.xml
===================================================================
--- trunk/openutils-mgnlmedia/src/main/assembly/assembly-bundle.xml 2010-05-04 20:44:52 UTC (rev 2349)
+++ trunk/openutils-mgnlmedia/src/main/assembly/assembly-bundle.xml 2010-05-04 21:19:37 UTC (rev 2350)
@@ -31,6 +31,8 @@
<include>net.sourceforge.openutils:*</include>
<include>com.google.collections:*</include>
<include>org.apache.pdfbox:*</include>
+ <include>com.flazr:flazr:*</include>
+ <include>org.jboss.netty:netty:*</include>
</includes>
</dependencySet>
</dependencySets>
Modified: trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/types/impl/ExternalVideoTypeHandler.java
===================================================================
--- trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/types/impl/ExternalVideoTypeHandler.java 2010-05-04 20:44:52 UTC (rev 2349)
+++ trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/types/impl/ExternalVideoTypeHandler.java 2010-05-04 21:19:37 UTC (rev 2350)
@@ -42,6 +42,7 @@
import net.sourceforge.openutils.mgnlmedia.media.types.externals.ExternalVideoSupport;
import net.sourceforge.openutils.mgnlmedia.media.utils.FLVMedataUtils;
+import net.sourceforge.openutils.mgnlmedia.media.utils.RtmpMedatadaFetcher;
import net.sourceforge.openutils.mgnlmedia.media.utils.FLVMedataUtils.FLVMetaData;
import org.apache.commons.io.IOUtils;
@@ -238,8 +239,16 @@
try
{
- URL url = new URL(downloadUrl);
- return FLVMedataUtils.parseFLVfromUrl(url);
+ if (StringUtils.startsWith(downloadUrl, "http"))
+ {
+ URL url = new URL(downloadUrl);
+ return FLVMedataUtils.parseFLVfromUrl(url);
+ }
+ else if (StringUtils.startsWith(downloadUrl, "rtmp"))
+ {
+ return RtmpMedatadaFetcher.fetchMetadata(downloadUrl, 10000);
+ }
+
}
catch (Throwable e)
{
@@ -249,8 +258,8 @@
+ e.getMessage()
+ ") while parsing URL "
+ downloadUrl);
- return null;
}
+ return null;
}
/**
Modified: trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/utils/FLVMedataUtils.java
===================================================================
--- trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/utils/FLVMedataUtils.java 2010-05-04 20:44:52 UTC (rev 2349)
+++ trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/utils/FLVMedataUtils.java 2010-05-04 21:19:37 UTC (rev 2350)
@@ -21,7 +21,6 @@
import java.io.IOException;
import java.io.InputStream;
-import java.net.HttpURLConnection;
import java.net.URL;
import java.net.URLConnection;
import java.nio.ByteBuffer;
@@ -198,17 +197,7 @@
// Reading the data from the input stream
fis.read(bytes);
- // Fetching the properties. If the output shows -1 or null then consider that the FLV doesn't have that
- // info on metadata
- meta.setDuration(getLong(bytes, "duration"));
- meta.setWidth(getLong(bytes, "width"));
- meta.setHeight(getLong(bytes, "height"));
- meta.setAudioDataRate(getDouble(bytes, "audiodatarate"));
- meta.setVideoDataRate(getDouble(bytes, "videodatarate"));
- meta.setFileSize(getLong(bytes, "filesize"));
- meta.setCreatedDate(getString(bytes, "creationdate"));
- meta.setMimeType(getString(bytes, "mimetype"));
- meta.setFrameRate(getDouble(bytes, "framerate"));
+ meta = getMetaData(bytes);
}
finally
@@ -219,6 +208,30 @@
return meta;
}
+ /**
+ * @param meta
+ * @param bytes
+ */
+ protected static FLVMetaData getMetaData(byte[] bytes)
+ {
+
+ FLVMetaData meta = new FLVMetaData();
+
+ // Fetching the properties. If the output shows -1 or null then consider that the FLV doesn't have that
+ // info on metadata
+ meta.setDuration(getLong(bytes, "duration"));
+ meta.setWidth(getLong(bytes, "width"));
+ meta.setHeight(getLong(bytes, "height"));
+ meta.setAudioDataRate(getDouble(bytes, "audiodatarate"));
+ meta.setVideoDataRate(getDouble(bytes, "videodatarate"));
+ meta.setFileSize(getLong(bytes, "filesize"));
+ meta.setCreatedDate(getString(bytes, "creationdate"));
+ meta.setMimeType(getString(bytes, "mimetype"));
+ meta.setFrameRate(getDouble(bytes, "framerate"));
+
+ return meta;
+ }
+
private static double getDouble(byte[] bytes, String property)
{
// Checking whether the property exists on the metadata
Added: trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/utils/RtmpMedatadaFetcher.java
===================================================================
--- trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/utils/RtmpMedatadaFetcher.java (rev 0)
+++ trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/utils/RtmpMedatadaFetcher.java 2010-05-04 21:19:37 UTC (rev 2350)
@@ -0,0 +1,203 @@
+/**
+ *
+ * Magnolia SimpleMedia Module (http://www.openmindlab.com/lab/products/media.html)
+ * Copyright (C)2008 - 2010, Openmind S.r.l. http://www.openmindonline.it
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sourceforge.openutils.mgnlmedia.media.utils;
+
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
+import java.net.InetSocketAddress;
+import java.util.concurrent.Executor;
+import java.util.concurrent.Executors;
+
+import net.sourceforge.openutils.mgnlmedia.media.utils.FLVMedataUtils.FLVMetaData;
+
+import org.apache.commons.lang.StringUtils;
+import org.jboss.netty.bootstrap.ClientBootstrap;
+import org.jboss.netty.buffer.ChannelBuffer;
+import org.jboss.netty.channel.ChannelFactory;
+import org.jboss.netty.channel.ChannelFuture;
+import org.jboss.netty.channel.socket.nio.NioClientSocketChannelFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import com.flazr.io.flv.FlvAtom;
+import com.flazr.rtmp.RtmpHeader;
+import com.flazr.rtmp.RtmpMessage;
+import com.flazr.rtmp.RtmpWriter;
+import com.flazr.rtmp.client.ClientOptions;
+import com.flazr.rtmp.client.ClientPipelineFactory;
+
+
+/**
+ * <p>Utility class to fetch flv headers from a rtmp URL using flazr (http://flazr.com)</p>
+ * @author fgiust
+ * @version $Id$
+ */
+public final class RtmpMedatadaFetcher
+{
+
+ private RtmpMedatadaFetcher()
+ {
+ // don't instantiate
+ }
+
+ /**
+ * Fetch flv metadata from a rtmp URL
+ * @param url URL
+ * @param timeoutInMs timeout for fetching metadata (milliseconds)
+ * @return parsed FLVMetadata
+ * @throws IOException
+ */
+ public static FLVMetaData fetchMetadata(String url, long timeoutInMs) throws IOException
+ {
+
+ String validUrl = StringUtils.substringBeforeLast(url, ".flv");
+
+ // sample url: "rtmp://edge01.fms.dutchview.nl/botr/bunny"
+ ClientOptions options = new ClientOptions(validUrl, null);
+
+ options.setLoad(1);
+ options.getSwfHash();
+ options.setLength(1);
+ MetadataWriter writer = new MetadataWriter();
+ options.setWriterToSave(writer);
+
+ final ClientBootstrap bootstrap = getBootstrap(Executors.newCachedThreadPool(), options);
+ final ChannelFuture future = bootstrap.connect(new InetSocketAddress(options.getHost(), options.getPort()));
+
+ for (int j = 0; j < (timeoutInMs / 10); j++)
+ {
+ if (writer.getByteArray().size() >= 400)
+ {
+ break;
+ }
+ future.getChannel().getCloseFuture().awaitUninterruptibly(10);
+ }
+
+ bootstrap.getFactory().releaseExternalResources();
+
+ return FLVMedataUtils.getMetaData(writer.getByteArray().toByteArray());
+ }
+
+ private static ClientBootstrap getBootstrap(final Executor executor, final ClientOptions options)
+ {
+ final ChannelFactory factory = new NioClientSocketChannelFactory(executor, executor);
+ final ClientBootstrap bootstrap = new ClientBootstrap(factory);
+ bootstrap.setPipelineFactory(new ClientPipelineFactory(options));
+ bootstrap.setOption("tcpNoDelay", true);
+ bootstrap.setOption("keepAlive", true);
+ return bootstrap;
+ }
+
+ static class MetadataWriter implements RtmpWriter
+ {
+
+ /**
+ * Logger.
+ */
+ private Logger log = LoggerFactory.getLogger(RtmpMedatadaFetcher.MetadataWriter.class);
+
+ private final ByteArrayOutputStream bos;
+
+ private final int[] channelTimes = new int[RtmpHeader.MAX_CHANNEL_ID];
+
+ private int primaryChannel = -1;
+
+ private final int seekTime;
+
+ public MetadataWriter()
+ {
+ bos = new ByteArrayOutputStream();
+
+ this.seekTime = 0;
+
+ try
+ {
+ bos.write(FlvAtom.flvHeader().toByteBuffer().array());
+ }
+ catch (IOException e)
+ {
+ throw new RuntimeException(e);
+ }
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public void close()
+ {
+ // nothing to do
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public void write(final RtmpMessage message)
+ {
+ final RtmpHeader header = message.getHeader();
+ if (header.isAggregate())
+ {
+ final ChannelBuffer in = message.encode();
+ while (in.readable())
+ {
+ final FlvAtom flvAtom = new FlvAtom(in);
+ final int absoluteTime = flvAtom.getHeader().getTime();
+ channelTimes[primaryChannel] = absoluteTime;
+ write(flvAtom);
+ }
+ }
+ else
+ {
+ final int channelId = header.getChannelId();
+ channelTimes[channelId] = seekTime + header.getTime();
+ if (primaryChannel == -1 && (header.isAudio() || header.isVideo()))
+ {
+ log.info("first media packet for channel: {}", header);
+ primaryChannel = channelId;
+ }
+ if (header.getSize() <= 2)
+ {
+ return;
+ }
+ write(new FlvAtom(header.getMessageType(), channelTimes[channelId], message.encode()));
+ }
+ }
+
+ private void write(final FlvAtom flvAtom)
+ {
+ try
+ {
+ bos.write(flvAtom.write().toByteBuffer().array());
+ }
+ catch (IOException e)
+ {
+ throw new RuntimeException(e);
+ }
+ }
+
+ /**
+ * Returns the ByteArrayOutputStream.
+ * @return the ByteArrayOutputStream
+ */
+ public ByteArrayOutputStream getByteArray()
+ {
+ return bos;
+ }
+
+ }
+}
Property changes on: trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/utils/RtmpMedatadaFetcher.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: svn:keywords
+ Author Date Id Revision
Added: svn:eol-style
+ native
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fg...@us...> - 2010-05-09 12:52:41
|
Revision: 2369
http://openutils.svn.sourceforge.net/openutils/?rev=2369&view=rev
Author: fgiust
Date: 2010-05-09 12:52:33 +0000 (Sun, 09 May 2010)
Log Message:
-----------
MEDIA-136 rtmp support: commons-cli is needed for flazr also if not used + add parsed metadata to samples
Modified Paths:
--------------
trunk/openutils-mgnlmedia/pom.xml
trunk/openutils-mgnlmedia/src/main/assembly/assembly-bundle.xml
trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/types/impl/ExternalVideoTypeHandler.java
trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap-samples/media/media.samples.xml
Modified: trunk/openutils-mgnlmedia/pom.xml
===================================================================
--- trunk/openutils-mgnlmedia/pom.xml 2010-05-09 12:32:53 UTC (rev 2368)
+++ trunk/openutils-mgnlmedia/pom.xml 2010-05-09 12:52:33 UTC (rev 2369)
@@ -150,10 +150,6 @@
<artifactId>jcl104-over-slf4j</artifactId>
</exclusion>
<exclusion>
- <groupId>commons-cli</groupId>
- <artifactId>commons-cli</artifactId>
- </exclusion>
- <exclusion>
<groupId>commons-httpclient</groupId>
<artifactId>commons-httpclient</artifactId>
</exclusion>
Modified: trunk/openutils-mgnlmedia/src/main/assembly/assembly-bundle.xml
===================================================================
--- trunk/openutils-mgnlmedia/src/main/assembly/assembly-bundle.xml 2010-05-09 12:32:53 UTC (rev 2368)
+++ trunk/openutils-mgnlmedia/src/main/assembly/assembly-bundle.xml 2010-05-09 12:52:33 UTC (rev 2369)
@@ -32,6 +32,7 @@
<include>com.google.collections:*</include>
<include>org.apache.pdfbox:*</include>
<include>com.flazr:flazr:*</include>
+ <include>commons-cli:commons-cli:*</include>
<include>org.jboss.netty:netty:*</include>
</includes>
</dependencySet>
Modified: trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/types/impl/ExternalVideoTypeHandler.java
===================================================================
--- trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/types/impl/ExternalVideoTypeHandler.java 2010-05-09 12:32:53 UTC (rev 2368)
+++ trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/types/impl/ExternalVideoTypeHandler.java 2010-05-09 12:52:33 UTC (rev 2369)
@@ -250,7 +250,7 @@
}
}
- catch (Throwable e)
+ catch (IOException e)
{
log.warn("Got a "
+ ClassUtils.getShortClassName(e.getClass())
@@ -259,6 +259,15 @@
+ ") while parsing URL "
+ downloadUrl);
}
+ catch (Throwable e)
+ {
+ log.warn("Got a "
+ + ClassUtils.getShortClassName(e.getClass())
+ + " ("
+ + e.getMessage()
+ + ") while parsing URL "
+ + downloadUrl, e);
+ }
return null;
}
Modified: trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap-samples/media/media.samples.xml
===================================================================
--- trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap-samples/media/media.samples.xml 2010-05-09 12:32:53 UTC (rev 2368)
+++ trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap-samples/media/media.samples.xml 2010-05-09 12:52:33 UTC (rev 2369)
@@ -133,121 +133,6 @@
<sv:value>320</sv:value>
</sv:property>
</sv:node>
- <sv:node sv:name="resolutions">
- <sv:property sv:name="jcr:primaryType" sv:type="Name">
- <sv:value>mgnl:resolutions</sv:value>
- </sv:property>
- <sv:property sv:name="jcr:mixinTypes" sv:type="Name">
- <sv:value>mix:lockable</sv:value>
- </sv:property>
- <sv:property sv:name="jcr:uuid" sv:type="String">
- <sv:value>2655a830-4b1d-4fe3-ab0e-b460673adcb3</sv:value>
- </sv:property>
- <sv:node sv:name="MetaData">
- <sv:property sv:name="jcr:primaryType" sv:type="Name">
- <sv:value>mgnl:metaData</sv:value>
- </sv:property>
- <sv:property sv:name="mgnl:creationdate" sv:type="Date">
- <sv:value>2010-04-30T16:00:36.341+02:00</sv:value>
- </sv:property>
- </sv:node>
- <sv:node sv:name="thumbnail">
- <sv:property sv:name="jcr:primaryType" sv:type="Name">
- <sv:value>mgnl:resource</sv:value>
- </sv:property>
- <sv:property sv:name="jcr:uuid" sv:type="String">
- <sv:value>b841d86c-8073-4c6f-a1b7-95c8672a6e03</sv:value>
- </sv:property>
- <sv:property sv:name="extension" sv:type="String">
- <sv:value>jpg</sv:value>
- </sv:property>
- <sv:property sv:name="fileName" sv:type="String">
- <sv:value>bliptv</sv:value>
- </sv:property>
- <sv:property sv:name="height" sv:type="String">
- <sv:value>75</sv:value>
- </sv:property>
- <sv:property sv:name="jcr:data" sv:type="Binary">
- <sv:value>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</sv:value>
- </sv:property>
- <sv:property sv:name="jcr:lastModified" sv:type="Date">
- <sv:value>2010-04-30T16:00:36.343+02:00</sv:value>
- </sv:property>
- <sv:property sv:name="jcr:mimeType" sv:type="String">
- <sv:value>image/jpeg</sv:value>
- </sv:property>
- <sv:property sv:name="resolution" sv:type="String">
- <sv:value>thumbnail</sv:value>
- </sv:property>
- <sv:property sv:name="width" sv:type="String">
- <sv:value>100</sv:value>
- </sv:property>
- </sv:node>
- <sv:node sv:name="res-50x30">
- <sv:property sv:name="jcr:primaryType" sv:type="Name">
- <sv:value>mgnl:resource</sv:value>
- </sv:property>
- <sv:property sv:name="jcr:uuid" sv:type="String">
- <sv:value>be46b807-6ec7-4a9b-8b55-525ba99b94d9</sv:value>
- </sv:property>
- <sv:property sv:name="extension" sv:type="String">
- <sv:value>jpg</sv:value>
- </sv:property>
- <sv:property sv:name="fileName" sv:type="String">
- <sv:value>bliptv</sv:value>
- </sv:property>
- <sv:property sv:name="height" sv:type="String">
- <sv:value>30</sv:value>
- </sv:property>
- <sv:property sv:name="jcr:data" sv:type="Binary">
- <sv:value>/9j/4AAQSkZJRgABAgAAAQABAAD/2wBDAAYEBQYFBAYGBQYHBwYIChAKCgkJChQODwwQFxQYGBcUFhYaHSUfGhsjHBYWICwgIyYnKSopGR8tMC0oMCUoKSj/2wBDAQcHBwoIChMKChMoGhYaKCgoKCgoKCgoKCgoKCgoKCgoKCgoKCgoKCgoKCgoKCgoKCgoKCgoKCgoKCgoKCgoKCj/wgARCAAeADIDASIAAhEBAxEB/8QAGgAAAgMBAQAAAAAAAAAAAAAAAAQBAgMGBf/EABUBAQEAAAAAAAAAAAAAAAAAAAAB/9oADAMBAAIQAxAAAAHs2WrQjo3rSUPwc2SR7etJq1yQKBzoEf/EAB0QAAICAwEBAQAAAAAAAAAAAAECABEDEiIyEzH/2gAIAQEAAQUCRAMeqziciYxcqmde8WOsPzN/ODlV/WFs/pQwSmioVmpiLrD6f2TWNXubTaNk1l2X9//EABQRAQAAAAAAAAAAAAAAAAAAADD/2gAIAQMBAT8BD//EABQRAQAAAAAAAAAAAAAAAAAAADD/2gAIAQIBAT8BD//EACEQAAIBBAICAwAAAAAAAAAAAAABAiExQXEQERIyIkJR/9oACAEBAAY/Ak62sjJaRTyPs9mYolXJ1+iMcoZD5nsUkexfsWh7IM75sLRLZ//EACEQAAMAAQMFAQEAAAAAAAAAAAABESFBYcExUXGBobHR/9oACAEBAAE/IUalJHAVI9cJOzZwZHC5lSJXXsaS5JwY1PfBNxqIVqrCSLiz1CTUQ1d7LkVT2fAz97MgHVqthMf8iSMnaDb1+DKy8j7nB9Ip2k/CBIjxPAQlYV6auD6B/9oADAMBAAIAAwAAABC7BD7yhwD/xAAVEQEBAAAAAAAAAAAAAAAAAAAhMP/aAAgBAwEBPxAh/8QAGREAAQUAAAAAAAAAAAAAAAAAEQABECBB/9oACAECAQE/EBDnEa//xAAiEAEAAgIBBAIDAAAAAAAAAAABABEhMWFBUXHwkdHB4fH/2gAIAQEAAT8QLEghC3YB8yld0rHasO9Su7xbO66t8QSFU6pvr4Jg+oOhtZWDiAeIQbDXank+J0y8D38xWFJXmtEM3KG7xNIiWvOd/cE+4xuyYOC9XmB43Tmaja/7SvaUIHc/iABWZEnHQIHXpBEVGENmNFjz9z0PePSd4ZxQYHnCYaXq81D3Z73CKkWsPH6hnIFi+Y9x3n//2Q==</sv:value>
- </sv:property>
- <sv:property sv:name="jcr:lastModified" sv:type="Date">
- <sv:value>2010-04-30T16:07:28.745+02:00</sv:value>
- </sv:property>
- <sv:property sv:name="jcr:mimeType" sv:type="String">
- <sv:value>image/jpeg</sv:value>
- </sv:property>
- <sv:property sv:name="resolution" sv:type="String">
- <sv:value>res-50x30</sv:value>
- </sv:property>
- <sv:property sv:name="width" sv:type="String">
- <sv:value>50</sv:value>
- </sv:property>
- </sv:node>
- <sv:node sv:name="res-640x460">
- <sv:property sv:name="jcr:primaryType" sv:type="Name">
- <sv:value>mgnl:resource</sv:value>
- </sv:property>
- <sv:property sv:name="jcr:uuid" sv:type="String">
- <sv:value>7cbb8569-875f-49a1-ac91-daca917a5c2d</sv:value>
- </sv:property>
- <sv:property sv:name="extension" sv:type="String">
- <sv:value>jpg</sv:value>
- </sv:property>
- <sv:property sv:name="fileName" sv:type="String">
- <sv:value>bliptv</sv:value>
- </sv:property>
- <sv:property sv:name="height" sv:type="String">
- <sv:value>460</sv:value>
- </sv:property>
- <sv:property sv:name="jcr:data" sv:type="Binary">
- <sv:value>/9j/4AAQSkZJRgABAgAAAQABAAD/2wBDAAYEBQYFBAYGBQYHBwYIChAKCgkJChQODwwQFxQYGBcUFhYaHSUfGhsjHBYWICwgIyYnKSopGR8tMC0oMCUoKSj/2wBDAQcHBwoIChMKChMoGhYaKCgoKCgoKCgoKCgoKCgoKCgoKCgoKCgoKCgoKCgoKCgoKCgoKCgoKCgoKCgoKCgoKCj/wgARCAHMAoADASIAAhEBAxEB/8QAGwABAAIDAQEAAAAAAAAAAAAAAAQFAQIDBgf/xAAZAQEBAQEBAQAAAAAAAAAAAAAAAQIDBAX/2gAMAwEAAhADEAAAAYnpZPpc3yz1vPWfMY9TueRz6nc8nj13I8rj1uTx23rsHlNfWjyefWdDxfD2w8S91zPEva9Twr3KvDPcjwr3SPC59yPD490rwj3Y8Ln3I8N09qPFvaDxb2o8Rx96Pn76APn+PoI+fPoI+e4+hD54+hj53n6GPnz6CPAvfo8E96PBPeq8P19mPF49oPG7+vHkt/VI8vt6Yeb39EPP0fvPGEm68DY88+z28F6jS2zU4u7lGrNS8UltHbFbJlkOPLNmOPTU2zG6xvmP2021jbEnMXJ3cOZLzB6knHMdWvM7NdDpnnqdnPJu11OjhgkOeh3cR1dhydhxdhydRydRydRyx21ObjJNGsYlZ8d7AzjO5o23OTqOTqOLsOTfmjx3p/LFL3t7flx8T7GX11uB0ltdNqi113OMmBtlrLjFlQejFl9YONSX0gYyWEDG0vnw1JPWAJ3ONg69og6cdhvjUTI/MN+eTrG6YOm/Ib9Y42xqJWYY9A8+PQPPj0CgF+8+PQKAX6hwX2KMTZ1ILWJG5kH0tbriWulL23bWVRcT0eaHU9Dmk2LhUC3r+BJ/jfReaJt1RehyqKj1+K8/H9PvVRR+00PLW0mZm1XWftZV95eagpogdZSonGyRWc7URONjsV+0wtdtYYIXOzJV9J+SvxYCtxZCF37jo5jo5jo5jo0G+NRsj5Xui8CxzWQs9PQPPbZei2qLLpz7gMhw7ZKqVLFLPl6pxhWNdU+DOgRM68eys6jbDZIfl/ZePWN6GB6BIUW23qn3s9Cqk2OxS95U4pu8zlXOtuZUVsC16nCTy3jpE6bGOUzZdNO2SH07jEWXg17a4OjkOuOZN2o2ajZqN2g3aDdoN8ajWvsy1mluKWt9Wz08zy9WzayRz69OU3DBswAMsDOMCp8J9Qj9MR4lzT43K44ixN35ci146azXGjsq1uR6TxttvzXvXpmdIuJVZhYcucsj98xpdNuOjUuTHk6zC6o2Z2xnpsxI0jZXdsWXmNI6Rlgyix3Oyxth0whc8WxV9h0znGUuM6cdYko/bOsuUPGrFB66kphWWI9zIQ5K9NM0Ut/im73Nm03zqsxjSrFxHZxHZxHZxHfXjvHRyyb102IWXXXqaNxo3Jr4r2/iDja0vpuN7WcLp3QK2/hYzGvqmdNyYvSFiVUa885r6F16Cnn9PHmntI3LEHMuR6Oc7HBjdZz76c5wvY3fvO8PrWcd1fLfpvzem6x8u8ePu52rv/H+h9GLnXkxvzm29f6vNa+gqZ/n77UdxC82uVV2j+jHsNo+c7ha7+R8eu/rfI+y+jzkUdtX4cc46akqfWzM7jd4WYukETkETkETaztzNKuyh459Idjne+sdBX0fXz8mLjEOuL7HmLQs/Ee38RZX+sovRHVxy1vS2+CtueODvWzMJXaWuIq7zjiu8TpgqbnUdnHJWc7YtTecsJ2cS1feZiSRjkqJzn4K6R26HVxEaHa5rbrwya1VvjNq1os5zI4jQrXaSmu9dbetLaiFxs8FTfxtjWTElk0AADGRhkARq2yqyy7R+kdcaDbGNCb4f2/iEndItjby9DVYLjFaLJkYyFdX2PAlyoOSa4yTTzt9EK3SyyT9oPQlK6QSXLJvG2FPa47FfD9JWnXrvqUe1p0IUuVwKK2xgsMQtiYyAMMjGQYyAAKqXFlk0AAAAAESmuarLp0kdcyEmiCsIm7Y+H9x4c6yYnerbMYd3OQXAAK7SPDLmDtALydVWpHidqom4gZLbevkGEDsWu3CWR9a3JY9qC2JsKZRlpnnxJGtP2Lzjw2I3St6k7MDYvwAAAAAAU8uNJJoAAAAAIvn/Q0mE3o6ebHJ1G0SVX+vd34b3Xz8lzYk2us12Kr0NXbGwAKKJbcTWHbcTNpElEWouYhXZnYNO+/Qr9JvQ2dOxWc5GCstuE470d7WnTPXiVFrz1LKHt0KSx27EtsAAAAgAKAqZMaSTQAAAAARa6wr4t+nPomQsOstKurzwHvvn0WFjV2mdWCD03nF3T3JsACu05dDtB05ltNpLMRZFSTEEW+1dkmc+GC065EHSP1MTaS0JsXNWWrnscdYXcm7xOxHmU/cu8UHUvABGebnWmDUx05cdLJyi4T8x5EtTJjSSaAAAAACJX2FeW/Tn0QCLV2tVLd/PvoXz0ufUeY9VLjGzWdWxQAMMjXORhkMZGGRjGwwyAMMjDI1zkYZGucjDIxkMZABpvzNWc2c2u9c+uvQj6ddCXnLNqZMaSTQAAAAARK+wry36c+iARqq1qpbz579C+fFz6ryvqrAAUAAAAAAAAAAAAAAAAAABz6czXn03rhrttrOenDrly57Y1ZpnFqJMaSTQAAAAARK+wry36c+iARqq1qpbz599B+fFz6ryvqrAAUAAAAAAAAADGK6mz09Y031zAAAAAAAabjhrI5VprprrMnMTmTOO/BZvfl0xamTGkk0AAAAAESvsK8t+nPogEaqtaqW8+ffQPn5c+q8p6qzLAywXLAyAAAAAAABhg8lS+8hcvZJsdc9fHlgZYGQAAAAM4GcBpjdZF6cdjfj2hVOzw2IkmNJymhQAAAAIlfYV5b9OfRAI1Va1Ut38/8AoHz46ekoPS2cknkb8ZPJYtpBnGWmxlkYZGGRhkYZGGRhnJrX2Mcib7d0r5mu66R5uCvuIk40bDVkYZGGRhkYbDVsNWwxx76SUNrX2WefKdB79OnCXBnRNCgAAAARK+wry36c+iARau0q1u/n30L55lzu8+jsoHpleZemL5nT1Oh4iTazSkelHmnpR5p6UeaelHmnpR5p6Uea29F0PM7enHl3qEnl3qFvmMeoHmMeoHmXph5l6YeZemHmXph5l6YeZemHmHpx5h6dHmHpx5nHp1eYz6YlHdbbmAoAAAAESvsK8t+nPogEOqtahfQ/PPofzzK69H5z0VkkUCtN9ClmRJpKAAAAAA302NwAAAAAAAAAAAAAAAAAAAAAARK+wry36c+iARau0q1vPnn0P55ldei876KySKBWm+hTTYU0lAAAAAAb6bmwAAAAAAAAAAAAAAAAAAAAAAIlfYV5b9OfRAItZZ1i3fzz6H88yuvRed9FZJFArTfQppsKaSgAAAAAN9NzYAAAAAAAAAAAAAAAAAAAAAAESvsK8t+nPogEWss6xbv559D+eZXXovO+iskigVpvoU02FNJQAAAAAG+m5sAAAAAAAAAAAAAAAAAAAAAACJX2FeW/Tn0QCLWWdYt388+h/PMrr0XnfRWSRQK030KabCmkoAAAAADfTc2AAAAAAAAAAAAAAAAAAAAAABEr7CvLfpz6IBFrLOsW7+efQ/nmV16LzvorJIoFab6FNNhTSUAAAAABvpubAAAAAAAAAAAAAAAAAAAAAAAiV9hXlv059EAi1lnWLd/PPofzzK69F530VkkUCtN+ZTzYM0lsDLAywMsDLAywM789zcAAAAAAAAAAAAAAAABgZYGWBkAAESvnwC36c+iARayzrFu/nn0P55ldei876KySKBWm/MpuvOSaZrtSz1jRyyxA0LbbfdOLrk4uxeOO+Ti7I4uo5Ow4uw4uyuLqOTqOTqOTqOTqOTqOTqOTqOTqOTqOTqOTsOMKzo9ZndOfPOuvSHHLLersTq6jk7CNG68y36cuoBFq7Sti6+efQ/nhdei876JJIoFYyKSPf6FCvRRL0UEX00EquNnBzK+y3waLnnLTcZORmTYFKuhSLsUi7FIu1VPWz6aVKzFWtBVrQVa0FWtBVrQVa0FWtBVrMVi00K5akqsWqWqzaKqlqKpairWgq1oKyTL3Je0UScxOhrDncolfPPofzwuvRec9UYCAAAAAaxZgjJSWIloi4lKi5lRzTPTBo6ZOTbJo66mjrqaRpqqnFsKpaZKpa5KlaZKpcaFUtMlUtslQtNipzbYipj3+pUrjlVatRVYtsRVrbYps2m5ULbUq1qKpdikXgppM/JH1lB88+h/Oy39R4a0r0qtskwAyMMjDIwyAADIwyXHHqI+3dXHfcc8dRzx1HN0GjcaNxz22HPXsOboNMdRzx0HN0HLPQc9tkc9ewjZkCPiUI2soR+nQR8SRHxJEdIGGRhkYxsDIx8/+hfPj/8QAMRAAAQMDAgQFBAMBAQADAAAAAgABAwQREhMUBiEyMwUQMTQ1ICIkMCNAUBVBNkJg/9oACAEBAAEFAvCqQpPD44SjWDrB1i6xJnxJYljY2TMbKxXITJMMjLEliaxO/wDKm1GTibrRNaJrRNaJrRNaJLRJaJLRNaJrRNaJrSNaJLRNaJrRNaJrRNaJrTJaRLSJaRLSJaZJ4DWhItCRaEi0JFoGtCRaEi0JFoSLQkWhItCRaJrRkWia0TWia0TWiS0TTRmtMlpEtIlpEmjJaS0mWmy0xWkK0gTRiy8e5eE8N/DMT+WSZ7+WaZ/LNZeTumJZLJM/ldZeTpi/2eJvjuHLN4K9TEyGUSbJlmyz8+a5rn5c1z+jmrOua5qy5rnbmua5rmua5rmua5rmua5rmua5rmudvLmuf6Oa5rmua5rmua5+XP6OflzXNc/1cS/G+HzaXg8H3BHVYndO+LuTMQPylqZCnoao5/LXcUBPa9m1Ffl6piZ0ZRxoJoJE5ALPPCykmACCaI0EkZPrQp54mHcxIZYyHOFEcTFlEzucLEzxumOGzlFZ5IcyKMVlEzM8SyiuEsBsckbJyiFtWFPJELtJE5YssWWLLFliyxZYssWWLLFliyxZYsnxZZc7Da7OEhYRy+IyDIzgT/bl9qbF1iywZYMsGWDLBlgywZS4iAkuI/jKSB5fBad7BDSvIdnuWRJ4xI29JYZgmgaQIslpZODuwk7OL6muz2bJrfayl05X245/YpQjMijyKOMQQMAtJHBIRRiUb04WGMBUdLCKakieLaQMDUsagjjijkp4iaKnHLaxOtAGAqVrhSxBIdPG5baHDSAXGlgFjpYiaSKI3jiiCXWBawLWBawLWBawLWBawLWBawLWBawLWBPLG6u2GqFicGCVgkiq6R55BIGd3B3fBBpitWNaoLUBagLMVmKzFZiqhtV/sYOIfjOHhN/CHpHdRwECxmWMywkWnKsJkwynI9Kd9ma2ct9nKtnItnKtnItnKtnLfZyraSLayLamnpjW2NbY1tpFtZFtTW1kW2kW2kW2NbaRbY1tpE9Kd9tItsa2pramtrItrItqa2pramtqa2pramtqa2prbGtsa2pramtqa2prayLayLamtqa2pramtqa2557Q09LJfRe7Uxk50hiIxZGdNIAmxxG2S+5WNWNfcvvViXj1/wDmcOyMPgxTWXiFbJTjT+NyBA3jbo/GZHlpvFhmGTxaphg8O8UKaZ62JjpatnmjqDxCeV0FRKnmnTTzk+tMJTTy6sc0rzlPMxnJMiqZQZppGJ5Z9NpZU0sq1ZsdWZi1ZXcpZWRzTWaWa4zyu7yzM7zS2eeZmllMVTzESzZZssxWYrMVmKzFZisxWYrMVmKzFZisxWYrNlmKa3lZWVlZWRt95BkWVn0PuYmZyLIYI9I5HzCv6wblirKysrI8lxF8bw7AB+D7WJbaNk9LE7DRwiO2jdbaNPTRWjpImPbxrbRW24X20a28a20bLbxrbRLbxstvGtqC2oLax22ka2oLahfbAtsC20a2oW2oLaAtqC2oLagtrGtrGtrGtrGtqC2oLagtqC2oLagtqC2oLagtqCmpwaMo4LlHDhLoxmTR6GrEtQcNWJRt+NHdxxdYusXWLqxLF1ZWVlzs5YtDWwzFndq/uR3x5uua5rmrEsHXEXxvgNPMXhhRHqU4zRyxQmCeKUpTCZ5BArCDjFGxlI8E13hkyp4pReWAzkennNoY5QHSnAhGZnjYmUjO4PqMf8l2Ga8WWE2K/lUOozn0/wAjqLL+pIOcekd9E0VOTqSnIo/+cS2UuH/NJSR6Ph9N0fpL08RNxpdTBqQdKm8R9CLSp3q4BaWoGN91TuiZrVEzQQxVblNxJ8f4A+PgZHGBakJKNgMTERTlE7gEZDJiyEoWJul5FrRrVBc7NPHeMxlUp6SzFPKIyakaG7tZ7WWLrF1i6xe2LrF1i6xWKwWCxWKxWKxWKxdYusXWLrFYrF1i6xdYurOrOrOrOrOrOqz2lN0fpdWu0kEZu48vEU7OcA0kbI4gNbeBX5VdPuaaCgMajiW//P8AAI9TwRqccdvGyCNo1NE8jtBGgFgRxMZPTxpmxZ6e5beNPBGn9Gp1HE0anieVaA3KECfRBWt9fr/YZ2d7fRW+0pn+y6urq6urq6urrJZK6d+VY38kYjjgyxFYssBWLKzLia3/ADvAym/5LVkkBt5MtQshl+7n5TkbJ6hgY62IRglGYFM74DK6CRzHU5okxlcZXJZ828vRpJWFoqsDLymIxLXxDMwfzZ8nkdwaORjH/wBN3s0hMtwmmZevk78s3daxCAvkKqCGKoaeV2erZpQNjZVvtKbourq6urq6urpnv9Dqr64/T6uJ/juHCv4fNJlB4dk1D/7USytKUspKOS7+VRZVEZ5x0+TeGA8Zeil6ZCcVFKbPTya6/wDC9JXYXCcRlebOpjawKYxzliMltsGid8FP01HNSVRG1PLrQovQWMRqtGWKg07qXoqpHCSFspKqR56xmsyqnLMpcI5KqYgo2dqf/wBqoBebTkZrO6obtAqr21N0fXNLKMj9cMv8hS/wR1TsTqr64/T6uJ/jvAWP/n4s4x/aF+bvdF9s84kRN6XsqnlHMJHEe5AqRiAVJ0w2KKmYxZrZ3V1HzNo7TvZ1dM6qWJQ6glIFRKmflkqm+EokR4OMtBkMN1dVEBiWFQapYdEEV3EfuN4ZMfDKcwnv5VEbyKp3N4ITlQ8mVQDk8Qysnka0RXe6q3tS08rYay1lrLWWstZarLNk/rJBFI7N9vJOVm8S1sgGrwhap14753qWjCWqkGled5VxR8f4DVEHhtPK8jXV0TuwtWODx1hm/wD4jlkGRqt3hOskyirTMlfnUGQRSVpZRFkCZ0dQcdRvCZDWuTM/JXUlTIB0lQ85+VXKUaardPWOA00zzF5SGQyRVshNDJqRqc3GMqs42esJzaqJhp5HOK6qZTF944uFcZQgV2J7MdXJG7VJOctRIMpVkivyqfaU3R+jl5clyVR2a0maWOULaoLVBaoJpQWoHlxR8fw+Tf8AIzBZimkFagrIVmzrMVmKzFZisxWoy1BWYpzFZgsxWQpzF1qCswWYrMVmyzZag3zFZMsxWbLMF/GsxdObLIVmK1BdZinMVmyzFagLMFmKzFZC6zFZCsxWYrNlm18xxYgEcxU/Ojph/jxWKxWKxWKxWKxWKxWKqWtDW92N+WSyWSyRPyXFHx/DPwrVM0aOrmFMuS5OuS5Ll5T56u9N1TG5w35K/kFRMwFPMbtVzOo+llyvy87sql3CFqo2Klkc4a4phT1UxFTSaoTP/FuagDKqlF6aY5CqXIad6qYHpiJw5Llfy5Ll5cly8uS5eXLy5Kr9tTdH7KrseIdcfpf6L8lxR8f4AWPgQ1bEnqARTiCkk00JuTYrFYrFSSiDhVgQHPFGW4gtGYSrG7yu0ce4B1uReLcxoJ4zFpgJBUiaKeMVEQyhKQxBJKEaCQDLXidQlqBZFUxAUbtIJGLS68ecBjKOKkkCNNUxE7VUGG4iW4hd8VisVisVisVisVisVisViqv21N0/sqezXP8AyRm9snWbrN0/oJG8S4o+P8Ca/gAxcyphdaDM8kBSSxwHH9JU8ZHtgs9PE6OgC0FOELqYRMNrHd6UHbaQoYAFmjFlto8npYXUQDHHIDGOmKaIWTRAyAWEVogoYmhE42NaQXCIY03pJGMjlQw3kpIifaxpqSJj/dV+2pun9lT2a6+pEndXV0V05vkuKfYeCf8Ax6j+2U6ad0UEylCfOi1cvolpymlClkEZKeR0cdVGqQJhNVIkUTUxitsejtTUNMTCETioqU2I6eV1TBpQqpp5JJIoDBxpTVIBRwoqV3KlEwhrYSlEaeUFJTHKcUbjPUxma29QJFBIw6E6CCdj/dV+2puj9lR2q4byRxvbTdabrTdE1nPvLir2ngj24epZnkkOukZQzkTD4hcPX6Z5pdYKqZ45KkwL/oFejqCmdVRkEG4N1uj0dzIoZZDGOQ1AcpvLUGqUyOGpcgiMpHkjmN5RqZFRSFJCpJpWKlkeWKU3CVqmfKnIsb3VTM8K35ZQTEZ/0Kv21N0fsqezVdUfp5y9Zd5cVP8AieB2bwCB4XnetgTTAZa9M4t9M07RuFWBMVREDnPTEMckchKY2jDchbdi8e6iQVEZMM4O8dRmjnjFopGljR1IgYVAGY1YO0JtICOqijeM2MJ5RiTVQKWrCM4Z2kOSWONNVwXinjlL+hV+2puj9lT2avrj9POXrLuriv23gIZ+AUsH3FSwumphF9iGNvpKANTbAip4nR0EeMEAQeUosY7aO+3icNrFeOEGTRAyaKMU9LC7xRtGKkgjN2po0NNEzxA0Y3WAXhiGIZQF01NEKKmjdRQRxPLGMieigdDEAvdXb6ndObitRaiY1dX86v21N0fsqezV9cfp5y9Zd1cV+18DN4uH6Az1DpJXUMMzOVKer9M0BFIIG8x00yennT08hQQsQhUi5QtSmz7aTT2hKKmkYdtInpX0KemeKTylpyKoGEo1tJGajjKOGoj1IipHM6QDCKoi1W2curLCbqmgeOWpiKRbaoZ9CVlJTTZDBJf6MmTurXWKsyMbKPplfnF5Vftqbo/ZU9mr64/Tzl6y7y4q9rwz8KzeVvK3+QfpiyszLkuSJkLM42dnIHybl5Vftqbo/ZU9mr64/Tzl6y7y4q9rwx8L/mH0/wD2Vyu/S6DpJvuti/lV+2puj9lT2avrj9POXrLvLir2vDHwv+YfSsSXNWeyb0dvuezF5Vftqbo/ZU9mr64/Tzl6y7y4q9rwx8L/AJh9LJ3V+ZdJoPQ2bJ7ZeVX7am6P2VPZq+uP085esu8uKva8MfC/2r/0i9HVnVnVnt6oixYGuifEwK/lV+2puj9lT2avrj9POXrLvLir2vDHwv8AZq6pqcY/FRc2dnb+k6I7PqrUdPcnEnFEzkYDbyq/bU3R+yp7NX1x+nnL1l3lxV7Xhj4X+z4nynYmaOhYmpf6eLOsGRRimcbY3d3tJkgK6q/bU3R+yp7NX1x+nnL1l3lxV7Xhn4X+xyU0ISiPh9OL/wDn9U2Ii0lm1na5OCiYlV+2puj9lT2avrj9POXrLvLiv2vD9TCHhbzjpy1ARPHVU0pPI2u1RC63tMyFhdYrFYrFYrFYrFYrFYrFYrFYrFYrcWcKqIk04uLVsGTSxvTtI2mdUALexszCsFgsVisVisVisVisVisVisVisVK7RBu3BH1QyM5uCqXvS03R+yp7NX1x+nnL1l3VxX7Xh6CI/CdCPGWAJE1NCniHLbix7SDG2AtIzpjuslkslkslkslkslkslk6ydXdXdHCBk1LCK0hW2huMARg0Q2eGMltYXLnbmua5rmua5rmua5rmua5rmua5rmuaMchKkOQpYzUEJAUubqZrUdN2/wBlT2avrj9POXrPuriv23gev/y33Wf5K/KX5V/yl+Ui3KgepeWDdPF+Uvyl+Uvyl+Uvyl+Uvyl+Uvyl+Uvyl+UvylaqVqpflq1UrVStVK1UrVS/KVqlflL8pflL8pflL8pflL8pflL8pflL8pflL8pflL8pflK1UvyrWqmVqpM1UgjkJCNv21PZq+uP085nZizY5FxX7bhlr+DEzauLLFliyxZWZGzWpWbXpmbQsysysysysysysysysysysysyxZMLKzKzLFliyxZYssWWLLFliyxZYssWWLLFliyxZYssWWLLFliyxZYssWWLLFliyxZYssWWLLl+6p7NX1x+nnOORsGma4r9twz8KXc+k/Sl79L2f2t/n1PZq+uP085O6XdXFftuGfhi7n0n00vuKXs/tb/PqezV9cfp5yd0+6uK/bcM/DF3PpPppfcUvZ/a3+fU9mr64/Tzk7p91cV+24Z+GLufSfTS+4pez+1v8+p7NX1x+nnJ3T7q4r9twz8MXc+k+ml9xS9n9rf59T2avrj9POTun3VxX7bhn4Yu59J9NL7il7P7W/z6ns1fXH6ecndPuriv23DPwxdz6T6aX3FL2f2t/n1PZq+uP085O6fdXFftuGfhi7n0n00vuKXs/tb/AD6ns1fXH6ecndPuriv23DPwxdz6T6aX3FL2f2t/n1PZq+uP085O6fdXFftuGfhi7n0n00vuKXs/tb/PqezV9cfp5yd0+6uK/bcM/DF3PpPppfcUvZ/a3+fU9mr64/Tzk7p91cV+24Z+GLufSfTS+4pez+1v8+p7NX1x+nnJ3T7q4r9twz8MXc+k+ml9xTdn9rf59T2avrj9POTun3VxX7bhn4Yu59J9NN36Xsftb/PqX/iqu5H6ecndPuriv23DPwxdz6T6aX3MbCrDfFkAsadhZrNaw2aPJtJaS0nWk60nWk60nWm603Wm603Wm603Wm603Wm603Wm603Wm603Wm603Wm603Wm603Wm603Wm603Wm603Wm603Wm603Wm603Wm603Wm6kLAuSGxMDias1nsJYLTdabrTdabo4vsquuP085O6feXFftuGfhi7n0n6U3ubDfZtaKiEFDTNETUAKOiGN9iAkNhDMVqCsmWbLNlmyzFZMs2WYrMVmyzZZss2WbLNlmKzFZMsmWTLJlkyyZZMsmWTLJlkyyZZMsmWTLJlkyyZZMsmWTLJlmy8QiORHExxxwiMhU+aehHUKjExp4hgHJlkyzFZipSyVXfUj9PObkb3eVcV+24Z+GLufSXpIJgb1Uy3cy3Uy3c63cyermudXMt3MpaqoUVeRvu5mW7mW7mR1MzoqmcCasmtu5lu5lu5lu5lu5lu5lu5lu5lu5k1VMt1Mt1Mt1Mt3Mt3Mt3Mt3Mt3Mt3Mt3Mt3Mt3Mt3Mt3Mt3Mt3Mt3Mt3Mt3Mt3Mt3Mt3Ot3Ot3Mt3Ot1Mt3Ot1Ot3Mt1Ot3Mt3Mt3Mt1Mt1MmqZULFKTennLyQyhNGuK/bcM/DF3PqxWmy0hWkK0hWkKKJryRjeoA2CQ5XcjkBxeUm02UgMwActmkkwjYnm0mtpMtJlpMtJlpMtJlpstNr4My+2/lZWVlZWVlZWVlZWVlZWVlZMyGzqysrKysrKysrKysrKysrJnJlqGtQ00j5OavkpGsK4r9twz8MXXkyyZZMsmWTLJlkyyZZMsmWTLJle7kNysrXWKxXNWdWVlirOsVZWVlZWVlbmgBgG8ivKspFlIspFlIspFlIspFlIspFlIspVlIspFlIspFlIspEEZAspVeVXkV5FeRZSK8ivIspFeRXlV5VeVXkV5VeVXkV5FHm8swNKDWsfSuK/bcM/C/wBbUWYrUZCV1k7NqstRlm1tRrMbO2oy1GTGzpjWoK1BRSWWoK1AWsK1RWX25rUFaop5GWTLUZajWE2dCeSYrojxTyCtRlqCnlFObMtQVqCme7ZrMVqCtUVqitQf1cV+24bLHwXPnmyyWbLNlmyzZZss2WbLNlmyzZZrNZss2WbLNlms1my+1YgrAhxFZNa4q4q4r7UziyuKuyuzL7VyTYsnJnVxT4psV9quK+1XFfavtV2X2q4q7LNMTMisSsK+1WFYivtdWFMwpnFmsKxFWFWFWG9hvks1ms1myzWbLNlnz4qf8bwf4ncyY0Uxy/8A4yy4q5Uv/8QAJhEAAQMDBAIBBQAAAAAAAAAAAQACEQMQIRIgMEATUGAiMUFwgP/aAAgBAwEBPwE1CfUGoAg6UEcIHuY4HslU2RYoDuaVHHKnqspFwQov4ye415avO4b4Qu0BPhF+3xn8IiN+sWN9SChC0qeHG91MIoC9B4hV8uVTIwhZyatMhGnmzkLfUmlylAm2gIWA3BPB4J4ZsMWjhj2sqficepHxxtIu9RTrhohHPFHc+608oCH81E/oP//EACYRAAICAAYCAgIDAAAAAAAAAAABAhEQEiAhMFAxQAMEEyIjMkH/2gAIAQIBAT8ByL3LL02XpbIsYlZJVg5UWJ9BKJCOCZKVF2OJlEvYXBlsSrCiUMwo16rZn1pXqsv2XEya4OiW+LEUeCUqIyslLKZhjlvSI7jIzs/3RmvxjRTJTp0XtgljXCttMJyse58ttELtn2FcRf2EJfzWRGfCqRLyfI2nsS8bC8I+BVJ2PD8cGrJV4HD9iv1Gtthr7F7MfgS4HxtWUMe+NYpVqe5WCKQ9xbdk2ZzP0z3MrMshdLWKEOVC9ikUPkQ17b5F1C5r46MuD5FysceSxDXIvbV8q6hdQuoXULqF1C6hdQveS4lxNllmYzGYzF9BWiiiiiuKyyyyyyyyyyy+WvQoooooooooorR//8QAOxAAAQIEBAQFAwIFAwQDAAAAAAECAxEhMRASMjMgIkGhEzBRYYEjUHFAQgRSYrHhgqLBFCRgkUPR8f/aAAgBAQAGPwKG5vLPqUSppJ5DSTRtRURhLKUaUbY0k8tT2NBVpNG1LFGmg9ixYsWLFixYsWLFixpNJpNJYsWLFixYsWLFixYsWLFixYsWLFixYsWLFixYsWLFjSaSrTSLJqmk0qRkT2IHyW4dJbybFsbFvutixYsWI/wQJ+5LMcrsb/8AhUf4P4ds9UxYjllCS6iLPlJFRGKtXHuOhwG0h6lH5kyywVHazmJqVtggklEz9TlUrYl0JOSvQWVkE9XFxV9OhS3QVeiFxEVaqXMmaqjZL+C5cRFWvQT3FrYoLWpNFJJVSqlxUVbCMS6+fP8A+M9jMwc6WaQxrkvqQy/uTgsWLFixYsWMyoKRvg/hnSnlmOhvTNCX9oiftwqNeqcyYPifw669TT6jsyr7FSbnVKrbBzpcq9MLlEsNVV0iL41PSQs3TE55DlWN2HZIlxnPNWk3LXoK10SvrIWUX8UFTxOVRfqTmZXRa+pkz0E+pROhlzz9CSRJDs0SnQn4n5GoyJJU6k4caUzMjybYsiTnzJw4sh3Ncb9SUieeo16OsXLly5cuXLly5cuai5lzULkmCteMciycl19RVnzKaijzUXLly5cuXLmWfISQj/BBy2qTJNQrfC88KLIyo45o3YSUahv9je+JG/f2N7sUjdjf7G9T8C/Wp+BF8avShvdjd7G98yF+r8SN7sb3YX6vY3uxvdje7G92N3sUjU/BWNT8G9b2N6/sb3Y3uxvdje7G92N7sbvY3exu9jd7G72N3sbvY3exvdje7G72N3sbvY3exu9jd7G72N3sbvY3exvdhqeL2KxxPrdikbsNyx+xN8fl/BJP4jm/BPxp/AiLWfkR5+xBn7iyWSELwKznNBqRoSvjfuIqp/D6Pch5WK1qavcjq5isSHYWHFb/ANwn7yIjoWVR/irL0IuVPp/tKukqmr8qLNJInQmSXlErMVGaRmdZM6jkS3qahFctB9MydEERdadSpUYsxZLQb6KUv1FyX6Dsyy9D/g9fY/Hcd/tLnNjcv+mYqdLk85D9rk/E7EP2uKjVyr6k0fTqkiTSDxyY2ZG+CErupbuW+CStQyo1ENKSKNQ0pL1KNkTkkjT8FqlUkhW+NiZYlIqWmW47FixbCxYsW8tVwVUSQqK3uOdLDNkp+cGREJly5cvxzWxJrrFKoQC5OdS5cuUUuRvghPa+SdBtJtb7iufp/uRFSjlsvoKvi8vT3Jq7Knp6HJEkq9iJDiuGSic3Uh5XflTmdX9y/wAxFzrKdlFdnoOk6ok6r1GzSaLc1UOZRUS5JBalxM9xJ0w58Eyuoc/6RWmkXkNArcnc09zLKhpMvp5j8qTf0Qyq1Wq641kiEeIiTkcy1HTSnQbJ2GYY1zZZrH8R8EFfyJJ1UNdRUhuoWoc61Fyn1LKKqOJo85l5fUo+nqbhehV9vYXK6YnWZrMjnFH1Lmo1FVLly5qLl/LuXLl8bly5cuXLlzUah3m8zUwgoZM2U51znMJS2GWdRkWLFnlI/pQ/h+aUpnNzL6kpHKgnPlLXuUJrYsIkibnE8ppw5lzTOWgnNJUOWidSapU0lP16p1Thd58AthbC2Mb4ICM5Erzep9fnYv7vQmllxlmkgnviklJrWROc5meGTOVSribKEsVSIo5EKqTwqXoSW+M80moT1KZom3/bhncm0mik2qLmdYtzdBM1FXGeGZWk0wivz5XiLKhIRWijhKcdEFmeh6E+p74QPIjfBAatqj0RbewzPqwysSadBVRLENVEwQXKvL0L8xFb0wUaqNnMRMttQtJKl8XOVJjlYkxWK2SqJgiKtCcJczDM50jmvg4RG0mKwa+0+mK+BFyp6HIq5xvgU/nx0zRbjndPUSHDWnTGSWKj0zTathqzw5E+q4RqrIcqw83uScklwcJ5DPDhZk6ir6jljvr6CxGf+hsPX/VhB8iL8H8M5qTakzM1s3qImElIaSknT3GpCbQ9Vwok2n0t1LEsnMthEdfrimZtUFztymZuL2ubM0cqWUonMVwmiCyheJ8yOeHX+wmFp+o1zeiVOZBGrZMVdCSiiNyyP6uuEmrUiNdRR3h6v5Rz4iWtjy0cZIjREROQyppwzNucyz9hyO5RZYOEqXLly5cuXLk0JvuZZ0/BT+xq7EHIIqLT0JvX6foRJ/AmURzHTT8XIqxaN/bhF+CEzwqfzDszcuM0qpJ31P5RJwcuEh/WG26CPdDElDkgxroUsxJMPp3EytWRNUxiJqRLIKuRVahSHJeC3Klx2Zsk9MW5aIpt0UVz4Q+aSxVnR2kX6NrCO6rhRZe4smeInRTTKVxzn83tLSc18MrCT2zX1M3hZcJtoTRmZFMiw6jkReX0kNVkLlcIo4TzVIJfC5c9C+EX4ICdanrhTBPb2P8AGFz8lP7ElXsf4K40/semFT3/AAf4P8cFP7H+CuHr8H+BT+roVJ9FPb8Cz/sehWxUtT8Huvsey+xQue5KXY9vwTKEv+MJL/YyyoheqjhPNUg+RF+CF8i5m5lNqaFpYWLcEPw1k1bpI5YfN0T1Ec9sl642FHLE6ewqImVw7NDyogirhbgmKqLKXsJSc/YRXpJwz/p0vcoyidyqCqy41j2XHq1mZv7R2fl/p9BVhajw3N5/5j6mr14rcVuCw4TzVIPkRfggunKUxPD5lXqVjf7SsfsIr40kdaguWNNU9uFyXd1EVifg5nZVUcue1xUY62Cud0Jp0uI9Gzn0KV/5HrOjR3q0hp1cO5tFzO3SpmdZBMy1JJ0GZaq7TQzSoog5F6exmSw1vVSXUm3Cb1KuSRnzcqC85LPXz3ecpA4Ulc+o3w1wi/BCS96DWSk5LG3KXuJOGn/sa79qftHolc3DncdKWEmlhfCXI5eoqsSq3wk7SMX+Uve6ijpSqLLqIqf/AKVQRrdKGV1lOasjlWo2UuWxJunB1qkmaRFs5LKTpMXK6RKY3P0ElfCxOXnuE81T+G4WyWU+pl9cIvwQ/khtnzGuczTP5GNhs5EvUieIkk6L68Lv2t6e4nKqS9xMrh0udv8AL6j1juzTtg5G36CTZOd6mlf6UnYWne5FR/7h6rXMQ6Sl72Hrn13Ea6q4TZb+5Vs/edxvJL5ER9+pQiLWvcRIlxPDWUiStzN/Nh86MWVB3LJv5EyOkci1W6nLWd0NRV3nuE81SBwsEwiEIhullVRU8KvQzOSSG2t+JYcDoVdJetLDU8PNMf8AR+R84eREwcrboN51rZJXKvVHesh3Nb2sRM37bDyE5zqVzIRMv+kRz7mZtzNDfypdJCo6w3Mq5vSVxHPvhEyLORmW4z0W4iE4j5/BQTIzNMksJTnbln+hcJ5qkDhYJhEIOawzLzL6i81r0JJVFsXoU4fVxyt/BJ9BUcqSS4qMrLDOuknKbUv7CKjblvx7jlT9txyJ0GSbJHD1WXKI9lsHN/luS9bKJSpmbg/+m5nZZREVLlE5evsK1dXQeiJY+pSZdDkX9C4TzVIPC0TB5CT8jctGIJmSxyrKZlR/EsRaqI1Pj2KpYXw18NVFyUzYK11lGKlMp7KKtJjpfuuKIvoTVJqvuZWJJMOYVUuIpJpMfOXNckywmcklvQVy3OQTOWoTbRfJqpfjcJ5qkHhaJg8hK1JrUVrkooqZ6E3utpFex0lXiVzVM7m3/wBouV3MKubn/m9SHnXnbcRshUbcbNJ+tRKWskxf/u5ETNlnb2GSfly3/qGQ2OlLqNrytxVyaRVbVVGo76nuIj7ioPn17mWKs1JOEf4mZR7kbzu9yJEc6eboJlWxyvKO5iaO+S9f5vXjq00licqcLhPNUg8LRMIhB+S3B7/b+VaE74uE81SDwtEwiEH5+4W4Ztri4TzVIPC0TCIQPn7dQuai/By3xcJ5qkHhaJhEIHz9uvx8uLhPNUg8LRMIhA+ft1DWajVjUomLhPNUg8LRMIhA+f1Var0T1Ezsyt9RFT9JcuXwlwOE81SDwtEwiED5/VQ1iaOgrJc629xviav0tixQmuHuKijhPNUg8LRMIhA+f1WWJURyMqnuS/VT6i5hwnmqQeFomDyCyI6S1JsTNMqgxGu5nWPCl+TULmfYmn6FSUduRehlavMPcqaDK9cqnit5mDXSuNmnKoxyN5H2X9GrhHvShlZRB7FumDhPNUg8LBMHkFysm+plVlPQ5mDV8PTYR6sr/YmxtOvuS8KiiIjeVCRORYsWLFixYsWLFixYsaRMzBXNh1FRG0UmsMyZeUlkoaLGbJzdEJSLFixYsWLFixYsWLFixYSgrVQRIkXMz8CKxZKPdEdNVKNoK2VRPNUg8LBMHELI/l6IM+pX8G5U3OxuGs3OxPxB/wBQT6huG4bnY3Oxudjc7G52NzsbnY3OxudjcNzsbnY1m52NzsazWbhuG4bnY1m4bhuG4bhuG4bhuG4bhuG4bhuG4bhuGspENZWJMTO7MUp5qkHhYqiK3BxA+RnG8T76pB4WoNTBxA+RnHEE++qQeFg3BxA+SHxxBv31SDwsEwcQPkh8cQb99Ug8LBMHED5IfHEG/fVIPCwTBxA+SHxxBv31SDwsEwcQPkh8cQb99Ug8LBMHED5IfHEG/fVIPCwTBxA+SHxxBv31SDwsEwcQPkh8cQb99Ug8LBMHED5IfHEG/fVIPCwTBxA+SHxxBv31SDwsEwcQPkh8cQb99Ug8LBMHED5IfHEG/fVIPCwTBxA+SHxvG/cr+WpB4WCYOIHyQ+OIZM1SWc1nK8msShPOT8Qo41Go1Go1FzUajUajUajUajUajUajUajUajUajUajUajUajUajUajUajUajUajUaiQ2b9VibXnK81iNV9VsajUajUairiBwsEwcQPkh8bxfUn4iqcsRUUmj1kN+qvKcsVZiu8RUcJXC/BcouNy/2BfCbUa2dUH1p0Go6Lp9hqseqJ1JLFVTlWc+FSCnCxSfTBxA+SHx52mg2zQaDbE+mO5DbOWEZUgrMl4Ztm2aCaMoT8M2zQbZoNBoNBoNBoNBtm2bZtm2bZtm2bZtm2bZtm2bZtm2bZtmg0Gg0G2bZoNBtmg2zbNs0Gg2jM/hQVYVsHED5Ifk2LFiw0iH/bpz+orYbP9YycHUI5IcvbCaDfo5s3UmsIkrfplqFixYsWLFhKGkmiUNs2zbNs2zbNs2zbNs2zbNs2zbNs2zbNsow2zbNs2zbNs2zbNs2zbNs2zbNs2zQaDKrZFShL9uDiB8jPbzUHz6iVLi1r64XLlaly5OZcuXLly5cvhlQsWLFixYsWLFixYsWLFixY04WLFixYsWLFixYsWLFixYsNzURDK7CSYOIHz+qXKgs2lShNCpQqXw0424Z8KlsVwTya+e4gfP6qmFixYsUQsWKIWLFixYsWLFixYsWLFi2FsbFixYsWLfoXH8F/qHVHZ+n/AIa4/8QAKhAAAgEDAwMEAgMBAQAAAAAAAAERITFhQVFxkaGxECCB8DDxQFDB4dH/2gAIAQEAAT8hYlcsmRUm7ePVcqVDLFKyBCmCT1JZXeRUDa3YwluxMSZJ53HFWV2TyhvgNEVMkqxkEqgkkVNKyExGogqxheEGUZRkmSZZlmWZJkmSZIt6ZZmGcZxkGSVLyneZZlmWZY990NA3Qyehk9DJ6GT0MroZHQyDIMkyTLMkzzNM/oZ3QyTJM8yRbWZhkGcLdCGosVciRWUirtrfkSnKZbYI1BPSpQufoQqpKLPk2X0zYYJUadC+y6G2XQfx0E2wk0k006DZOy6HBdCcLoRbdDAuhwXQ4LoS6T4nBdDguhC2FGgk0XQVdF0KY6FMdCmOhTHQpjoUx0KY6FMdCFjoQsdCmOhTHQpjoUx0KY6FMdCmOhTHQpjoUx0OnQ6dCeOhPHQnjoTx0J46E8dCmy6FNl0KbLoU2XQpsuhTZdCmy6FNl0J46E8dCeOhPHQnjoTx0OnQnjoSsdCVjoUx0KY6E8dCeOh8D4HwPgTKqhow8livkT7V8E+mRWubDITDEdxTUmyRL0KxMkNqKqhXchkOmTYKpUiQ4EhKrBqTQkTVgn0PgKXqTK5O4kWei4cPRqTQrMSS9yfQqVKlSpUqcjkcjkcjkcidxUigrXFypLLoK+wV3K7ldyu5UqVqVG2bANpSw/kY1zEVyCbYdAkQQ1bQ3VO4kyVASO+2NzJQ3AqaVGqHXKHI1STEtYYNKmPVepiVL2ItRvHNTkIVJECrtEMSv8iuk4/6KBM3BJWrvDvPeY5FTLyIHaFSYUKZEtgpqyZKTRTqUaxF8kE9eK3HMli9bCCc0/kXWgsAvcgUTbEgUpyTpGOI7hzv5T1VVVmqKogo1yFVpDVlPUXVXRMECmUbOw5o6CbNFiRS15PsfuSSX1Mn/wCiSoFkpi5nXyFukpr5Jt7uwXBODkbJw1CEbuNgKjpIlRao42ssRNd1YNE1KcDZvKkRzBQhzOmxJptdYVGhwIFCIlYIRzfzFLhJE0Z3pcayRFpAiqrtsG7w6VFiUazWLlsZdsIft/iIpB2iMcGComazBKA5/AlUaZIdbQaC10WKJB3oJsdC3YaV16haMIZSKPMYWEx+UWVNlBSUv4Er2WqkSidlOdCP7wYl0/mttttttpIytKytAqYy0gahM2FnmTKjBCTZPHEZFcZKW8gNWCnz7Q21eRFU9TG2mSynk8jW8/0SlFRRRrcmabL4FKZSe2w10+aLCYsbjUlYXKIEGlsDdHAcFupaBumJxcMx7h8cVYNWigTI69QoIJo0qwOaoOUoKmMBfKIQxNgiuC8CJ+AmuW0HM9GKKQKcgQqQIorOoUsBHTR/JIkQzMzMzZjMzEXd3V4DPYe2/BA1QxKwkBUYYKBcNTjlpGmsD2IDKczIZCN5G4u1FSdr5CQaHMOopKVsxp2f+AXeLe3gbbtqEvVJppMuIOpJt2xnxtmGzICLGoomSiyRZtcFJkj8YsLnEH09iqKvDLatQtBrghqOkyt1JmpPEMdCkSI1nOmwQcqcFREH20hVe5T0CC6JG1YKnkqZGhohbIpI0tUTTF9kVTCUS2HGLV2bGikxLUlyDKQ1N6KBSTdOG5FQrm5dKrczozowDAMiMiMiMiMiMiE7VGRGRGRGZDRqjKhM1RJZiS9oKqSllJC+HQSIJtqUhygfgRBaUoFyWWhMCkHhLqjboW7o2Li2qEJsRrSxHY4kNh0XICpM3FXWrXJFELOwUZJXPKB2idYIogd1/vE6ZO0aEysxqyO7Q2qE2hzWQ9A+cE9KLZNh3fnCaqxyNhVayPhS0kpUfqTKGONLrkcML9ZKrVrINAhoq2rk7uTKJ1CknSVaESmG/krIVrVKa3XqNlu4mv3Gp5E9Wn1Iv+ib/o5HycD5ML6mF9TD3MPcwvqYX1ML6mF9TC+phfUhZEtai1jlrc+WJNyQF4FvcZFC6VWSZKAN6tHyVjo5kdZH7UknvC1WS37Et+xKtew0l/YZJJprBGDvoKpdbyGlqpcknoLzUiGUqs17Rp36YnclYXqn5FRyOG1RqF7BiiK1xKZs3pDgTWLAgwRVBWTiWzWnDkqZVqm2wlK0nAOKn/qeDTN9c+DSTVvxHu8yMGaw7jXniTROfwGk8rciJUtBDYIEVjUWEputBGZQh62nDEn8pQhTsPk+T5Pn2djv+POQ0TrnJQRynIxbpnIitDEDJVnqDg1/IyK5OgymxKJWxK2J9JyTklySM2DrGo0W0QTcF2zQOVNBTJaFNxocKR8jngSAmtTbIrkU2oc52XFsbisVZgvkoI3qF5yUJMOqguacgxuVLYNFAsC5RErfAs2LggdrulbSbLEsN1cEQLtDUGLQErZtBUb/APEkVJ70sdYuBVV0BU/EvPAm/wDgyHx67QQfaJCp2euk9ye5Lcluczmczmczn7ZJJ7k9/wAUiW2y+pDdVDUcEslkslkslksljVSpDiRHyJbegUqBJSsmoFiRzNZiDAmRAdoouI2bmoJGpA6JVaMliSBeQjpuKdCC5FpAk2rbm4mhfga2ylkMrSxawSk1aoUqBtaGsiNpDhCpbWmEQSaWXk7D24oLTySpeHZUBQRYawOqmxDi5tkgQugfpBAlLII9YrBq1saT6QaSUrgj0p6RgggTB7i9FCBVkWOVFFwTJEiRIkTJzApFklXBbTUeJtqvomrMelW2QWrMEFZUNIFhtkuE5TaimA6hOkHRNlCbiEQyzLUEwCdBvAzFIQFpcTYXGytTHoSqibGVrPA10Alcjq749GaVBaAtEiKoUY0kNNFUf4Nytrk/CYKWknc1GpNUoNko+0QiKjjR2J9JJJqNII1aheohOVLoT8AKPAIBVxHclJbCLDoCdHpBONOUqDdUKyLVaZNqROogU6IpJWi8x0tXkqVjtIroaokifI+Z8z5nzPkWMJxqaC8mxK2kS8tQ3DdI2jUPO/B915DrS9RV21rQLmA1bDfCLC/rYhStCrJWdhVsoUULMWsi5ORkRbAkQXMk0JiWYyKk6nDwa4fq3JoKqbkTAolkFE4EsewGIjUqNRaJahzW3wUk5NxtIxAuqiSnSUKmeigqjl6fAqGhQxqX42L9ZepkV2o3dSZc2Vk2HpWUSlWxJ1qXYc2asgX+ypEUsEakIK44W4j8kpQOBJiV2/YdXmZFVB6bkXJJQWCOhq9Rp5vU/bH2x9sfbejSgSG75iB4aq06EUQbaQo50QdZPfGIGPJ9LSfSfZ3/AJCIGYDUZE9vJyKhE/6NvEkJkC6juCdHQlU/kVpuNWI7SegJqRXW47nITDeqJt4qxEFwFVI3uV1jVR6Zmo5fA9jr1kmKLIbKNBqGtQ7x+3QI5ySvIg4CQ8kQNqRSAVAJ7JNRkBAcjkb8bUjdZJvuKiBOkzQbkoO0iS1BZLNp1kPbf0GycscyIm+KMrMpbj5ukuIlWBLdLidRUmHIVjEJz0uIhmkTacXNpVQtUr4OXofWD6wfWD6wcvQe86GV0KpkfBW4FQWkLt6CnuaewbTVWoiJ4qHjIn2DDcyVYRSwaWPDz6stLOq4UMtWW5l8FmWQJguQGc7ogRzPkSnLcl/+x7JAH8UpFGTHcd7rSxONhig8DZftEEJJdjVchekliGDhUbjb2abCsmDQw5RNTrNULZIfrF23CdY9GSvqKTBatlqbE1fZiSh0hEkicJ3fgTO6e8SAt5E6aaE2lYDrZQ0i9LrQPTcsQVowa2hEfD3KnFbCxLMNDKqhO5E1BNE5QX2DNsogElUi46hRxUuMoiqaJWyJWCVglYJWCVgpjoUx0K7opokjdCknYi8UKq9CIGriB25ccH3I4nwaF8IEtXRtHqy7OuFLVHqSu8RBG6txwIqpzwKSU3XArBInjDeb6CU5TVtQpQ530FcWquKykMStJqGrCRyzrgc130G7z0JKfIOa73UJrS/guh9BwXlxFlMbiE12+hnfQzvoKua4cyURwHFdPBXhT0Lcc1oGxxtqLmWt1BJtGA3KmBrqngJFdvSxISvi4cEQ0WBF1OGsDutK2gn8AiT+QOd/IM5fBldCmvDWCk4J3DckmuAmh242gcbTPFBcJBSn3grETkIibChAqNwF8pYiqE9ye5PcnuT3J7k9ye5PcnuT3J7nytEZWbNHBHBHBEJsjTpGx3I2amzqNlrGxFxUVZBpODRUsql0FFDToRtFGiNFFQUY6DutMpgTF1qEQobZsJKoU8FEphQJNhSGhS1QRpKYalaSiwwtEpiw0xdcEFFpeCpFCWJsnCVMEqYhEpOy6FhkugscwJlyJQI6uwUUTfgaaWhAdLEt4uMpCW1C4/cyyobb7kbNFgVClpoOuWgU9W6BMrIboQuhK2T+BQtuhwXQo0FK0RFFERKYRTZFiopGqqCmygodEoKRp0HqhKNEtULH5bxBrYz0slsyXsyXsxN3hj15NvQlZpPkZzLa4gXmH/BQJmZJwGNvQKlV9fmNrQCuLbei4oZDEyeIIrzaxoybFnYR4ltbCSl2RMqkisoFG2CaWIlMIrgr3E/xAoprRENvoJL4NKDQ6YS0JWZSMkXFGFCbYeRDBHYnpgcvXhELLXfA2w8QQiFCergVqjdqDsmNNLiEWmmLGmsxYpfoEPRyORyORyORyORyORyOR3aLPH5e/Ro25pKKVkYEYEO5Er0JDOu1xaHeihUH5BqVW0J3I9R3AnhyLB80nvLCdSLKk2FZex3hc5G9VKbLsPYO1yY2q6C0sbhUGu+uQoNTOKjJQnqLlpTFbCooBdQm4SoKdajXCbuTAADeqQkilrWxa4kxYg92039DSllYnbuTFuWgZThHPvSmqRtDaH4mAy5I5CM4Sas5EtzDFR2VOv5+7R2X5i/UyNQqeo7JDileVcLQZJOoZRNx/wBCOUNZlscUZHqOXZtRKEiEg2Sp7T6lqukKxSGUjt2vdiWsyIlAjUocDwV/XDqYo7JsSYr1xxcZsohFSHDZIuMtskmNdc2NoG0eXIqxwm31FbjpA1MymuktDZDpQX0NUmsIhWpBgmng856kvA9ZsShhDadBSjWDXh7zcVdS/wDSoKPIrL83cfnue4s+22mIvPoNEeETx1v5G1WRJWwpVDMxHYbK4qJkhJWzXtYlG7lFhDbHOGCdBdZeGUb7iUfBht3OBjRK2jRgJs0B11TUuqJQR2acA05TRUIcLWNxSSNRE46lNBxpdKCNMUKQxKqIzwSBjmrQi8UZTxwhQLd1oLXSYabTV5cETXbWCVZa53OwrZHZkdY2gi7VyK/n7j818Up+b2vkeuVFwO6pqr8j6S/FkCroSRQQkBf0g4sQhaPbBUluFFjmyLk+FK1JHrUNCsN3TRmCdboaEynY0tdRAZOkqSlgqaehA/DfYUzIk12gzJBeokVpbVCsKnRE5UpSQkxLpoJKonQ02FA7wsFdi0hhOO0Zhoa3hFlER3NLXruKFL4Ch9q5rS4v+SPb3H5r4vuL5J35oeEMX61L5I3rVyh+yNlRizIpKSaclCSdfbf83UkagJXKBhm1yRHeV4JLBoTU46n/ALsRHFPKkjrLSuVOwSbFj4BTCK3KOra5N3AbhHgehF8lrk9ajju2uxDlJ8mjQglJ0G64FY+UaQjIwiSyFBL3kgSEsjaFN6YGidjSRNUkakN0Zl7lI0g9OO5kIQQ3J9O4/NfF9xfJO/NDwSUYWfIk2qyyLGlcTpDKa2FJot9va8flbl+dYiQ7Kqdx6B5/WCZapdcaizUv/bEglwUCcvgDp4cLQJT6O8TTZUjcNu6yFUblj1nSndTcfTEIZLdwm6IGRTsG6y9B2O1BQ5CXENRKXQtGhpYfUJS6AfwSMbBCsQ2g2IkuQgGp02i8271CrL10INR7sP8A7hH9xrYZQCpRSi7kmq+ncfmvj+4vkne+ngFc9f8AoQtCI1PIj52HLCa+2rb02ZhqhFVqQJXerGqVq/TOpHQS6FbETdETcrTbb2Rt6PbQiqN5OKCEoshyRUrwfZMEZF66DaSXQiWOJG0XEQQNqg4UUKzgJCnp3H5r4/uL5J3vp4B9LP8AW3BNUQS5iCTYMRrLBcxQev20i9O4/NfH9xfJO99PCPoZ/rbo5bqKG8S9CdylSeegifS9e4/NfH9xfJO99PCPoZ/rNi6PUINMgpiSkTuHFl0ERbn6aHcfmvj+4vkne+nhH0M/ypIROn8JG3SM0HC+Cv8A+Rtg+0apFxK4hZSfXyux3H5r4/uL5J3vp4R9DP8AKkyygSrNW4rhJmv8GEKM/wDIfSCkItlUqpBSKM7hfmvj+4vkne+nhH0M+joafxmU61hK0TMiv0j+IblV6JBSu4QBNaGWF1GsRIZqCO4/NfH9xfJO99PGGiD6kbW4nFLk5RKvoJypJKP+BJT4KKK5E1LobDiFICiJW5Km9id3Umlf4MIsh0UZAmjHtaqidPQFHpM7j8x8f3F8k700PAH/AOyUZIaKajmCLsjUcHdnuQCdSxHyyeq2LwKx0Eqqp2IwRmKkSJEiRIkSJEiRIkckciWqJiwldyjMjN0fQZ+iOtysl9lclPNZ2PlvqMGbVljYI3RN/giZ7ECBEiRIkSJEiRIkSJH0xfIyswiJLu4eBtwKWxCLJFXNBTCtK/MfH9xfIO/NDxDfFicjelKtIQ63IlBF3JKkC5Cjin3C51Vaioy0pHkFYciQSEhISEhISEhISEvYAjh/9DtmjJ3gIk53qPXTkjPGpEEtLVFymmyo0DcxYsVUskhP4QAAJKSkJCQkE0Cx4yGYudAw6cwcFTFWuqGuIMamr/L4/uL5Z3QtDxxZ8VVDJ831ELWrgadoXA4Isc/gubZU21TwIJWYJFueh9IPpH4gAAAB9I9AkBVK+g6vQITlcfajQtVqErrZah9SIVFnBGJiGzdLkfqI/UR+oj9RH6iP1EfqI/UR+oj9RH6iP1EfqI/UR+oj9RH6iXLgebiLFhJmLCk27wVHaDKiCkUPyvH9xWoQlI2olSLQ8cTKX0yyNzEYjEYDEaKWXoWzqzEYjEYjEYjEYjEYjEYihYgWMRiMBgMBgMBgMBgMBgMBgMBgMBgMBgMBgMBgMBgMBgMBgMBgEk0/N4/uL8li0m5seOfYyeR7UXztBOu/zWf1/j+4vnlM25seOfeyed7VcvnYndP+9eP7i+ed+LQ8c+9k872q5fOxO6f968f3F8878Wh4597J53tVy+did0/714/uL5534tDxz72Tzvarl87E7p/3rx/cXzzvxaHjn3snne1XL52J3T/vXj+4vnnfi0PHPvZPO9quXzsTun/evH9xfPO/FoeOfeyed7VcvnYndP8AvXj+4vnnfi0PHPvZPO9quXzsTun/AHrx/cXzzvxaHjn3snne1XL52J3T/vXj+4vnnfi0PHPvZPO9quXzsTun/evH9xfPO/FoeOfeyed7VcvnYndP+9eP7i+ed+LQ8c+9k872q5fOzKeR/wB68H3F8878Wh4597J53tVy+X+DWvVk5JyTknJOSck5JyTknJ8nyONxluStyVuStyVuStyVuStyVuStyVuStyVuStyVuStyVuStyVuStyVuStyVuStyVuStyVuStyVuStyVuStyVuStyVuSiRK3JyStyVuStyVuStyVuStyVuKv7FPtXzzvxaHjn3snne1XLxUCEpCdhoRq3YoSlaEEzETgpoYKmCERDkTJCX4kAokkzDMMwzDIMz+TJJJJJJJJJJJJvl7py1epKJogRCUmf7aoKxxhCxZEpNpTjb2ySSP8hy0pn2vmnei0PHPvZPO95rHcrDlbiBUgzpcQNpWJJaTXoVhsqpF5FRINpAkHuI6jRgidXf0SeqGUyjXcT0DOZfUDKZTKZTKZTkOQ5znOc5znOc5znOc5znOc5znOc5znOc5znOQ5Bw1lsnzmzVZGGgjYnVpRxHyRq6IF40jCKOLEQetzZznOchyFHSehUVq+1Z6IpFp9Bqjxz72Tzvck0F5rFWVVn/oS4vNTXodB3JOoI4ZFPRNQ5Er1OrQiQ1efSJlgjVolyUuQzUMmjd+Ahtv1S+aM/wAPskkkkkkklVgUZ9ZMKrMgqu8nc0TkudJWhyW5R0/JtQRd0P2pfsQn8pFFERYSBoT6QRnZDqm5XagWh4597J53vcrj2/aABBoFKGwu1+4UKNOXwRUtLWNCJwnUasDWipVMM5nEQOpbOo+1wkbWt70kknX9LUk9lyJkWlz4dSMOpwdTg6nB1ODqcHU4OpwdTg6nB1ODqcHU4OpwdTg6nB1ODqM2dRrA/kns6k9nUls6ktnUls6ktnUls6ktnUls6ktnUls6ktnUls6ktnUns6lg7j6WfSyEqtqkGKuxsk0CWwSwFoeOfcyX2kpM5nMxmMxmMplMplMplGjSdiQWQglsvWg2uo2gklCTWhYdd6rWCJV7SRQ+0azDSesWKbdhPjwN3hJGf6n3gn+pP9Sf6jb9RPB+JEacFfjSsZJmmWZZlmWZ5lmWZ5lmWVEpmWZZlmSZZQalCyO5SbZkGYZxnGcZRnGcZRnGYZhkmcZBmGcZxKk3RV+q3GRU1OhBvXFoeOfYyO9UQQQQQQQQQQQQRsRv7alSYUkZgzGUTFJA2qwJlggTFl9L2RwPqQyo+xuIhqu4+CaIRQCq69isq9jZ8H3gU3oKE5gzdj6wULgcbQUhsCTxgQmGBLRAtJK4groSnUaHcR2NnOIToS1I1qKixGZFcolSIMR8I+EfB8FvYok8cVIevkaEGAjsYDAYjEYDAYDAYDAQIGIxGAwECBIrEM7ehgNBgboM5ZwhLUKgldxQoCHcyqE1IJhJNaLIXgzNBkQTlUJFFQTq9AkJmtBd0khQEVUiCohJQh4pXpof0ttLV709OHeiAJWJLowlWxTsbY2tCOxDYjsR2MBHb1BIFv4xZm+pFCW8FQE9FB2JJ/o5J/hySST+GSSSSCCGwig4P//aAAwDAQACAAMAAAAQ7p/LjnrPr7/L9t/PtBRR9BhNdNNN99PPxh9NzPySBQ36qTsXmo4s8sYM8sc004s8AwAAAUQApY8AAwDbgk6CsuMgeSIQcUIAc8cQsAMMMAMAk04EeVIgAwD7Y2GE4JQY8ynLOyz7SejDDDHfSKP20EwYwJ9JYsUoLX5pP1PFbXKaO2OOTzzzHPPf2yiO4cAwAwBYQMqm9gMiSfA18WwtinxCtXxKckmx+KFPQAAAP777ecca/EbWfo+xhMo2ss6x6y7xjGKys9U5YMMMz0BI0AQoz8McRfpFkgszwpY8d1JXQNlz0FvJMMMMc9M80Q07eCPTj7OyGyO67/RpZhLrRRhxhBAQgMMMMMMmLziOeGnX/wC7JKNHuqDGSZTV5ydfffffOIPPPPPPJEAjtKmu3/60HKFDtvIMbbaa8/fffdtvKAPPPPPPPFzrCKIMPPKDAOOGNDCNMEBGBENIyirA6gPPPPPPMFfYoABTPPDPDLLHDPPPLPDHLLPBfejIsAPPPPPPAFfQklTPPPPPPPPPPPHPPPPPPPPHng32CAPPPPPPAFfQglffPPPPPPPPPCMiPPPPPPPOLHSxIgPPPPPPAFfQgnRYOMMMMMMMMEGwQEMMMMMAEHSvhQfPPPPPAFfQhMSdOPMMMMMMOKP4HMMPPPPMMMShZzPPPPPPAFfZKk/bPOAMMMMMGIY4EMAAAAAMMMoksafPPPPPAFbQKjTTIMAAAAAABPPPPPPPPPPPPPPPPLPPPPPPAFffKvffAAAAAAAAAPPPPPPPPPPPPPPPPPPPPPPPAFfaKvffAAAAAAAAAPPPPPPPPPPPPPPPPPPPPPPPAFfaKvffAAAAAAAAAPPPPPPPPPPPPPPPPPPPPPPPAFfaKvffAAAAAAAAAPPPPPPPPPPPPPPPPPPPPPPPAFfaKvffAAAAAAAAAPPPPPPPPPPPPPPPPPPPPPPPAFfaKvffBCDDDDDDDMMMMMMMMMMMMMMMMIIHDMEMKFfaKvffDMFMOKXfEKjjjjMPPPPPPPPPPMYAOMPMFHPMqPffDGIEEKgvBEjvvuoBMMMMMMMPOAPjHHPPELINqmDDTTTTcQknBKulpmlljuihvogqktAHhrstnguornlv/wDP/wDPDPCegwwwQ8cMgQ8ww8iyCCySSyO+CWCi/8QAIhEAAwABBQEBAAMBAAAAAAAAAAERIRAgMDFAQWFQYHGA/9oACAEDAQE/EMASkIQhCEIQhCEIQhCEIQhCEIQhCEIQhCEJpCzkP8FCIiJ6aKttZWNao+wsEugyjfpQSrbCaNvSljZlelLvpdl22g2xqY2wbSE7rkwZXZCEIQhCEIQmsIQnCighN3O5sJqo8i/AhOCyqJpjEr9E3pSiMkyyrTC7G18KpRWhTBCaYyBr8LlEo1BqhUNjf6J1bf8ACp2N0T1aHWIOiNLAwg2k+qJRYMqoxUEYhW+hGuyQYL0hsCsfQmr6JsouFgnexN7EGmMYlNv6GHgXW550Jwbo6/osDdE5qoG6Mw86GqJTSCqKLAx/oSmicG7uTm6f00yR+ul45sStU++ZvW8yeBq/M9VzrHGv0qFkfGvU8i6pDwd8a9Sw8l+Q9NixxIVfCsvoYXGYxg2PTRrmhP8Aiyl8jF144Tx9CV5LrSl0pfG8ixyP+H//xAAfEQADAAICAwEBAAAAAAAAAAAAAREhMRAwIEFQQFH/2gAIAQIBAT8QSnSwpSlKUpSlKUpSlKUpSlKUpeSlKXkpeZsSxpo9w9QVmS6ISNUsP86aY/PII4WhTZIXAtsaJD1+hGPzbBonBWxLgabGmy9kJ4pXkWB5HISPPLwLIn8NKUv47i8y0yNWOWGJ9DYw6hNY0bjP4LSUJJuLTI0GLTKh8Veh6oqQNNCMNshsShBUjEnNjmNQqGNeKG0iCbFKbEhB09XgSRIRar+DorYm70YNUaqaGSRnTaENYKa0PfsITWQ6FsyxlnkYAlSCHlyIY0FSS7EsY35K6LwXGP4Qj/ok17EbECVQQJQgoUR7pFIxb3l5FgrtGSaHTo8qEL0ZLOQvksDzzGR/FRIkn4uuJmqCVCdf6YTrYMGhsOaIaq/mSIuCDDqhoQozS/LOINvtPk89memiY2htCH1vuaJW+pGfcPvGNi6aV8GTEeuvaHz3Y66UWi9fo3L2zrhCjz1+jf4/o3+P6N/j+jf4/o3+P6N/j+jf4/o36UMjIyMjIyPteBT30vAk6U+CyyiiihBdbyKrpYuKVlZSlKYDXQBY6lFFFFFFFcKKG6JkIQhCE5nCE8oQnEJxOwAEIQ//xAAqEAEAAgEDAwMEAwEBAQAAAAABABEhMVFhQXGRobHwECCB8TDB4VDRQP/aAAgBAQABPxBtqWTQO0LoRTrWK0ZrUCFhNCWqpLrCmkAVDJ8TulLuiLdI6XSHWzdNdYH614Rkh/GQhWtd0yVfVzFNvNCHT3qgttIBWsRLxtVN9ZSH/mVgFbT/ANp+kn6Sfo5+jn6WfpY/4s/Uz9FP0Uf8+G18cf8AGj/ifWIP82H+HAcK+0N89p+pn6mfoZ+hjyhSLtvfvCEITjfo4/5c/Wz9bP1MP82P+bAP/H6qcf5LH/JYCf0wu/rjdNPadYv7R/z4/wCHAn9M1rwy7WI11ijZW1kXulLYujjRb3Qo0K1s7yjVnXLBBsXpbiajtZEHMhppfdArk7CCNcoQIgNZgYFkGY9Ai/8AhI1WIYlIWkLwUcELdZBQKgbX4iOn9JGjBcakwf1Rix4iIpADPgStsK2wrbCtsK2wrbCtsK2w44ccL2wvbC9sL2wvbC9sKkqS9sL2w+cJ84Sv6pX9Ur+qV/VKbeOU28X8NVVVVVX9Ur+qV/VK/qnxpPjSW7+KW38U4IcML2wvbCkKQo/yJR/kT4UT4UToh+JjiBfviCFlPKYEhrVoTI+mKlNE32gCA28RWgvtB0YNkKadNYjuPEQt1GjVlwuAKdILRFmsyBCkDYjeFmdJRgGzMpJbLzEuDGsoopZAgIZ5imU9ZYAm6OlEYLsqIajdELyYg3Cy3SaVvDWJqEuXfUl1WyiCUBcQapcFcJLubKIKaEuCkCWaywClukFA2UxRaIU2C4iCinSYFso1lZaY5gvSvMvhL4T8Z+P1L2JexL2JexL2JexO1HYTOtM6TgZ0zGqWQMHGeYLCy6jXMB3VRoXipe4l7iXsS9iXtS9qX8Mv5ZXUMa5gIEddMygiaa5l7XBc75lojfEqK0gtpdvTHebI6N8xNbSg33hli6r3mrxX4yjbBhmnJsvWyyWGoAS7iimtYZcxVAXFY05C5UGNBBIlHTeVS0Q7GtCy10UPxHOAKOek1f1gNwIBHSywmkSlzr0iF0bquR1hCXN15esMclxmKMhWUiQBNnPeR5iBsnPu8R6uHWzekW70Egby62iOafqyM8wUgalNjWdZW0Mwda1jWFWkrrFWHr0wIsFpbmWUaTQ3BBiVDbb3ipu4ZwaICWLgEYyUk0itweqVmeqr1F8FBoyl3KW7OrFyzDchek42cbONnGzjZxs42cbONnGzjZxsA6J+ZakgVeWMoUs6rtizldPZCNXFLVjqRnec+qKErDay5dmI7wNl2d43RuKdIfMz5mfMz5mfM/TEQ3uBQLRhc4o1mETWuBByKPW8opQnVomme88EcxdkDKoF1sSw2XVlbR9iaC9bgjV/l/MwCa4Ggw3LKN0CmeJippjRTAGWbIdDepXiVIJW8P8A7ApDSKtBEKDcfhHRIJQJt3d3rAFiXpuRDGytRwz0gY6JwNJkSM5bhoWs25rB0Egt+UNzctPKJ9pYlu0Yy5ZpUdK6xgAle58wMFCnpxRgjZEgS5JKti9IMt1RW8cwKilEG88zLM3vWvWPlovJmJmAFD394wS2Rzt2i4rthS9cMb20y2597gTxYG0L1gFJ6g1esteJWIMVUIYaJM6xqUrtVplhtl4WcykIg02xLEItFPWcXxOL4nF8Ti+JwfE4PicXxOL4nB8Tg+JwfE4vicTxBJGStIy8BY6mZR1hVJUUlA3M3gFDWRhH1NGgqsQv2/FRURkXaLSw4lwHe4gSs6gpotglNOsE0hHX6kswZvSor7dszaFioAxrMO5WATpZewh1RbACGBPpqjeK6FMyqnqNBl9eTgkCFW0xxFG9e1XMb/U1AjD1GUXMB0SbROp1IAkUCm76D0qlbS4D2F8wAima6pnV0GETRnrMZRN+43hZA9eKY02+3rVLVNdN0l63OsiWvFc0BALbulosB12S4LbddkLwHbp1S8FaPXqiLzjNtpxlWTfQuAV6hBvXjgwnu11Tyo5X1AHL+huX9xmZm5kcz+MzMxEzMxdtqE0OrwBUFtWGvAueEcAy6YciWyn11Jm7RxItC5+UftRDo1ZXVJTp0gZZGcfAfYUKEZG8c72Ij+IXr1Svml1LvWE84CzbWV9JfOUaQXhWkxM5/jdpnTRQ1TBdYqCBFO3SFHeYVixYtYUY0xELCquvGWaC/g7b6RyRsVW1nXma1E3qw0lYl2cO1XM0GCWDV6N86xnMGIao6wjHt6kQole4LG21mEZIHDeMQpEjOY9oiGKXghZB6EBuEouCFk1viUpSKlMi4KjBYQdSAGgpvJjaOFYAY0uM1ULx3Q8uK7GKg+kNCzDpKiV6w7/MKKxhGxr5jqzRZGYv7OMRrY2oavao0sOoSTrAGtYY/ZHqVMv9k/fT91P3U/dT91P2U/ZT9lP2USQxbsyBmeZrdLXM1ulzB2s3eIA3OmYKWVHMAsq7xDYJ3iKrr9S+0vtB0o5fQs2vSHaGnS0AAQo0vSEpBa5Jc9rHRRgmq8TriMuSqua94MyMhKumYE0mwjM0GGFc1OkzDVqiTTlKVemYpL2l9VVAMZVs6ZhAWVzCqgdTdS1wFJ0N9SPC9NFw+oZFde8U0ztCVBNKDle8IIxrCGvLAOWAdYrVxpbQ6fehnIGi0XaHUOt6QRWXCde0KQI6dt3xMBvv+75lBsO9okFHa2JYje2IbHkxqh6mWCvHCwOq7spVFDcpm36mCIeTG9ac2XFo8oFavIhk1e6maTygCm8pW1Y90tZzuhpF5R6x5Q6S7lHrLsU/cJ+4TmeU5nlP3CfuE/aJ+0T9on7RFG9QtjMHOAYtjEtXdhndW0VlEKCzjeIslSs5dG44zmfVmYCusPXMu1dTnELWB9oAHRfTnjxx4DcEKMIajZWgqKUFIWswHLgI2FHNZYApSypgANQqdJzpWsK0BsxrBGIdouYU7QSWriG83AKVxoaNUVy1oplMvOY/lVLN6cdqiAtVaDecdbjMcowt1OMxOO7ejHe4IdSWl/7uUhpNrqSzCrQ6VCipfeNMR7E6BR2NkbmSztBriWGFTTohGK+GarCJjULddpaMZv7TQxjDSNOz8SlO0t+cwO+ghLLAWqHgq7vBL9UrZLtI7W56SyahjTSOH4S4re3iZ6BcKkLGmdYhjdrxCjSGmLBrIii0mO8+az5rL2izrFnxlnxlm3rLNvWWbess29ZR8ZR8ZiYjqN4p+IlNeHGKaSG+uAbSYb3KStMBiPOuyCyMsCtXrJvLD8Ww2AaobuYdU4WcqcqAOjFHeW/SW/SFzJKKWXHASDzEpekoOG4ZkMtN1eSY67LadY8MYz6osRIqnJlduvK7HWF2DYcoFAb51gF7VrzDSorq4EyYoy+YdluHqIC0uzldxTZbFo1qwtCKUSi6uMpACB894IPWIxJQF6Jo/QJXONRB3AmzP4dIldeol6OsS55iuuBYxCqQqO21s7y4EMaVR5ilgg6HatuRVVxiBCw6GMXzgzmcGdri7Bjn6gNbMaDoYH6r/lzly02m8Xi8X/nJJJbEkg/CfQmbX9kpw9EdqOxOCcE4JwTgnBALXAa0EQVbLjHjKwIy6aCdYdwyVBLgqW0OrRLEuiGnQjrm3ZVxUBVwGOkr6Uid7mNcoNdSpqb3K+YY9TcrtQ9OuFi/xGQHGt9Z3pN1iNkdC2ICa9W1ntPyo20jAYly87MxzkSJkAunWK6Ho3/UMLcWpomiSVVaQmmwkO3O6xhNhlznPD6LuxpDPQF3Fv5C5TgQ2p4rWABYSi2mUdHDMarjTmJt61LBdBKBaMQq6x3lsZcwToxUByawSCOHSWlTFD0dJqdRrK5GqAL6SYxhzGjkfMQAhp0mjDlBJY4ha0MMLqUVdQC0ZQCKGDmBUKy8wez1DJKUNYeZVLpxLXRqwNB01l3vX3Ii5kp9DmnNOac05ohedJgWy6R3QWwtQYgLKL4TAuPR1lQELqNWV9C+8RoDxGpoFaQfTnWUbJjIJ2LgTFjrmUPvpnmKStMw/AmmqI9ITHXLGbhTpEZKmG7g9fT1ZeOXDvAqRhg40GIJA64Jm7a3e5YEdM6IORdEsb1jWOtArrSGcfT4Rosmr0qBzdJGdYzdXSW+VgqK6b01Hc+xUOqWxSjwhZ0ixBsb1gQ6aF6zBAYYJg6Q6PKNY2O6nHVGmCm63e9xepoBW0aYlgWxUl1soV6P0EvDtM3BpYHWk4zDEHoKbOq4dY18m8t/QJdYHN4mmjmEygHSKqBlBt6WBVobSFsczri3a2uXG06G9i67uJX9qLa2Ri6MewWXCP8A0iDvpO3wnZ4Ts8J2eE7PCdvhLCKRRQgqlRxS+rJmre50jV1GredBqr13LxMoNPtD7Tr9EAgoWDygHjVLk7x3mQq2wvS40Nd4XG85GgO+Z7ih7xCgoSdZbzAiyJQq7li5dTcU1L67nDxzqukMYvpux3hSehUqhFL00mEolXVS5kCN3g980HqxNAa0TTwY0vI0jisELVyox1co43l7aMxKH4xJoDp0xHtoOFwg0Cg7hvSoB4xWdYBlUypsuy+8ymQsL0gPyS/qgdqHVWmNYn4QKORa+1S9Bm5AXnLpArH84utYjABGTbprrcs3p2qiYlRGhLra9D+EOqomTBWZitRvK1gltoB8Qtg4jEuWYNYGRSORSLzmV28zZA077o0VNasFcaQfyyrThzAw0FeCjNZjdrrOJVldqjZQlOnMJ0KraY2PExsRjYjGxGNiMbHiOTR4gA7Uo8DCGZyzFg0gXT9egOYyUfd0sVxKr6jpXpKDP5mS9CM6nQh+DedaEvvAIJkYiVjWDbXWbzAXWCzbLU1WYkLY6QQB8ZKbRQ71qIBUa7wmIm5N1wcarbVUqhVrKqi2+7xwl7ahByZhXA5uAuuuuIb7IDb5TL0l1S9Vs6xluk6RoKFFesKfY3YsXGVw6Cly0aGtahEu8utGyVjbDd8TM4dspmQNSK2HMsOQhsK8Wh/3CMQEJAXt1iAdQD4juQorUBqs4jO2BTpZibBMxvEpsXPLKxWm8GXNM4aKlSGw4YTElLVLV2EBUB1GkpUcLWDE3gEqz5jUrt7PXvB6WMRIOGLGmY1X+Zal2C3Z+IwFRTE9oQXmLkPtj2u3ii2uMesKkkYj6pXsKlEwizJ5HWCrib2Uhpumm6abppumkNOvWxuvW5zUcbMCsVmwSDoemQVGB1IHVgZJmhXANwGzXNS/MoYpbq23lSEoZdpVS222tLjarBYYHPaAjaaVrEdCeu90K+XnZ2mHI7W/KatzBQLwRDT7r1/UC3a5NK1I7GGljMTI0gxhh03RagzBuYhgqsC2ZingKWXo9IFiYv0qFRedhPyGDotRw6XmVDEK1zKBiF6Ev1gMFrvNLMRTPXPEaWlszKKFzrnSFq6WqRLqoigRKVtDjdD6DK6bXf2llWu0W3ePfs8L/wCy/SDFtR/7C42QBt8RYlSQgWAe3WO4BZqFLY3sdWp3YlPWXdIhx7m8tb6BtX4g/Gim7esr4YIF3ZjMJn1EdhnrctB1AdokV5NYhl9lwZI9q4xQU1AX1qAmpCIqSweYOpael7xXjBS6q+ZWTretzGqUALrTmKi32JmsQigx1O8SWKtifpJw+E4fCcPhOHwnD4S5L6sIRMHiDpE7S00LsgDgPxFhKLCuYUIjT7S1Ab3RNWu5iFCKTvgwtm9LzXc4SNoA4sl4OYyjn3Rc8rGcCWBGhcQO+NM5lPHS8wOmovB45sjymVx2Q6b/AM5YxdzMkFy+mkTqsScPEv5Y9Mr21I0Sks+i+JonmwvJfnAowBoZHQqahzMb3TIuXQg6Uy45X1Jkug9QTXkB4hxTHDn7/P32BzhqHXFjVLtouDAuwoiV80yJpdWJpqumAoFcVmhUGbTdFb3lta+CmUnoZYqY3cVWRXHTWGEUdQCnGiBSnb30mYwKsl6jjDI5qpIGKnDifVe+NZS6hwoCPqgVldRC0hoQ4S18asFhXRuFhKHvy+knHWj3HMum4vWdAvBU6nugjyxPjJ8ZPjJ8ZPjJ8ZPjJ8ZPjJ8ZPjJ8ZEQv7JWJ0fafhW0B/lKf5Sn+UoYeKKF1R0n9CfKbwmdNldtppi4NSy4acIxGLYldSTWlkbXJXSKABdYdAD8TYf8ABKLTZYirkv2QLqVTNFmZQrU0ejVvpLFb4BaOI2w10piLffjETa0muCKxGi9GoTAvGqb4hq6yjQd+ZlQiZv8AdykDTbhEhL24jMA0MTDA1QjZf2I1jf2RQBVodUrlhSBu4olimF0R/ptCOjLOxFMaHEwpUqjveKlTgaOnPEGdgnSxlBLZUDRvLli9Ff2RjOpZXPy63Cf9DE6sqikMJC9MRqbgjP4mW3J0qIsJOkICinhNFmdk+ETYX8Ecjq6NE0Lj1agZGbUqYolbqUSgg44IhezWNYjop20RKC9tERko74Sy1SYwZmnoMnmVHVDMo2lG0o2lG0o2lG0o2lG0o2lG0o2lG0sj1X3TQStPtMniqFF+hP1E/URQmjtE0aCdOYFnaQ+X3Qv640vquNyOl9JriC48odyPOnaDRekaiBlnA/JOjhgKOSFyu8rvKxWyS1pZxGMGC0xc9qghQzCj8JWA3UQmr0xEBnVx3iBkphgqs2g+mG2OrSt4VJSWw1dWDnXwpy8S4Bmq1aRO+EiuoxGBtCPvd4u6Bg307zYoL2nWnAvdqOJbF00XNaMkYMXELGdhBXYsRrGjUqgFX5gQUGltY0hZ0okOPYYlkgrtaIaFbS2iNlkZDVNtmuqotsFpzpMgSUsHKtOsGFTi3ve8EaSrHVBgRwyu8rFYrFYrFYrFYrFYrCaeE+c3no38qqnNe5KxA2U8RBOltNB6U/RT9FEn0nRrG4tMJfM0dhPjN4qoqrYvPrGVApjR1zGd7F1xyhoJhViQqrDeETWBBgw0TqBMTExUtKNQ0geYtB395mmBG0XrEqKh0ZvInW5hcY3E6w0oKOkoJdA4uUZeBN7wRVeDDtOkbKem0lAw7ztvKj1qy947TyqehtUuczXV8yn0uwbmBEmtqlYommBhm5Hg3jrFhnlqfuQWADJTdXrACloyy2ONygkftRkXeusYIQ3u+uIkyBpbIIAM3OkGT1AjBhuVF1uUfNuz+sCGnrA3si54Kt0SwMw1BgA0JcolEolEolEolEolEojVPaF7nuTPmH8pseqnvBXNJ+PaNV6VE7J3TUZl2Le6XpDWXFniaOwilcmh+ZeVagh1tNL74eukN5aHTTSNKqoWFkERRtl0gmwtu3LHT7aLlxW0Zx0ihRqOtdeJhgG3f4jjdxlOV9K1lOBV1WjJAby3smkmqXXeEA+9KtoD1pQuznPWX+hL/GqliC/s1KXSI4FETDOa2Wne4OmJBOxUeRtWWH5OkWvZYf4qKbUC6ZG3SobrR1M9O8XtFoW7txA9SBk2lzhU1WfTHSo2TbG9ukPU1AdYoqRvBr73BGew+s6Q0gB7XRtMgu1ku/zLORyuh2ldE2qx1vpHDFdU/GKijKpj5xBQOofyuj2np3vPRfy4K7nvNkCBHtFvr/QEjQm82NiN4b98HEhcK5zZVlXjSVmtQG6BzF+BIulEpRZKWM1cLoURQ6zp9iGDWtNN6us1H1RwdutwYAbC1VGsAIupbD8Jq9DBlEKtVsxFxRSF9do6hOXcgze1R5UdlatKhnJjUM9O9zXoOrW9Yh3BJTrUbQ7YZpnpGbDjMrsguOrEjGlmA1FzHFjaLKby8dTTq1vAageOaZ6VFJLbLS8xC6xqy5jplreCKl+RVVBsOdGaQxFHq6kV0lupvWBV+xrWVlst6KqHKmnrhgnSNrv8xq6hrzG6d9efvr73R7T073nov5Vrb+6LRZCLV7Q0lSpbT5TFzRYYB4IBGq18x6K86XWcSu9jsU1xM2qAWXZEWYwGbl2pvErTf/sdMaB7H2riPKCkJYknTU5+IDO0rqbxZQIdVpprDWBSKraFATybQbGoX+kUrGWIDto63xC12NIMA6sxlOpWrrfaO4ClWq9IGgrbdiOvIN/QgIaNsZviEyOiBUyNx6yAlaa1WWneB+OoVdFzP5I2KgAzYR0qFt3LrO5dF1nX6sGkzCHRzda56S3SKp1dO8G3oIwXXtDNAaW6yVfrQNriEg2ZKQu+r94bmCVxK4jD7Do9p6d7z0X8vr/dPQM0+0NJcv6s3X2J6/3wg7/IF5Tkwai3zK+NqsMu8eSZoXeOJQoFYtM3BYMADpp9uCIaanEwoC0NN8ve4leBS7+IEkoVNxecO8fIJQ2tOsEasO4jchVYwU+umUb33ji0rRqz0lNxYVowHS6MHaNJ6avWECDajDMXm6B7M6EY2uByS3VGWVyNT3iElFAZPzl2OuXgMrabisQXVamXkjNMVpKSZcN3UtSK7tV/mWHDJ1Ik1dCnISqTShZL3lF4u61yjRKl164OYqq/1BcZu8EQLnpf2XmoE64xr2kDV+yCF6IKXohSbxB2qXAOjHA9p6d7z0X8vr/dPQM0+0NPtZtnBMqOjfzFH0gO8gr6tOjUpRPfPaPoww9B1uWXMhqMRLc1L3faaIKPH0hhBsDUq+bgbhY552mHpF9P9FRLY9B1HEqfdabuJBdGGIx4/oJjqM21c56xKWEq7vz0qVNuTsawXSI7xp2qIJ1ry5b6y2tWi6uv1poU+m9oydub16HiCO1qdVkxF5gtp0zvKno40a0YSuIKLB6VLZea4dI3EM4FMdEnooA0JofCOgriA7Mp1hmNNdrTrcbNDqUD+uN5JfgPU/PHWJAhH/wdKmAOofR0mCzEc6rGI7FlcqkWSld4l6pM8GYMsODFei9Tiene89F/L6n3T0DNPt93Vt2J6/3wFEG8E5zGiNwmoWU0NpbNtup2i7t06NKjEb6D7TRVQ/JEurG64q5yNHaalW7gDTuEsFKNOkqg6pAcstdIK0XtlYi8DaAxTp13jQNFdLjRRsNGBZDQ1+pu7Mbm8wcq/ua0pTAWAvqblSosNHaUuDXpAwmCChNeZRMY6lwWu7Nt4KimNtoWDOEpUvUjKW8xanR1N5pt8fXY6xBug1nd+8zBhKej8wpsfmYYsa5hjz0G1IrTiYA6StXiene89F/L6n3T0DNPt93Vt2IfP756v3Z1/wCX1J6shKOiKIYd4o4ndH00bILe0hqDug68wRG7VxoI6Paene89F/L6n3T0DNPt93UdOxPW++fE5x1/5fUnqSG/lraJpadkz9X4liu+do4bdQqDKhGvwuOQt62gNHaOj2np3vPRfy+p909AzT7fd1HTsT1vvnqvdjr/APTX/wAb2MpN3/Ea9WIsBqGg1uJQaxKa5RYc4RNv1IGDtHV2np3vPRfy+p909AzT7fd1HTsT1vvnqvdjr/8AOfQCX0ieaLIZ/n2hMWtTNPRS1s7Eipcp1NZtU0IXa9sztIJHqRVNbtPTveei/l9T7p6Bmn2+7qEx2J633z1Xux1/+lr0S/LtUVQmrdXaIyDsd45PH89/RfpEHBKxJyxBAuX4lkCyi4yF65mp6woLfSfObz0X8vqfdPQM0+33dR07E9b74H5Ov6KmYoWdPoNlkca/WpUqVKlSpUqVKlSpX0smmNY2hezULjjp1PSoqgBsXSZV50m/EEtNp1rrKlSpUqVKlSpUqAwmmkQdSWQ5Q4FQbTLzBbCyEONIVmH0jvGwDADM9O956L+X1PunoGafb7uo0HoBMLOrXzLkM31c5YLAd4Aon5Rw9C4YBStW9JSCi9cwHWvMvQTzL7eZfbzL7eZfbzL7eZfbzL7eZfbzL7eZfbzL7eZfbzL7eZfbzL7eZ+HmXZVPylrblzGiX2VCNq2lQCEEDS5kMgd40IGzWNxBugAwsILM8y+3mX28y+3mX28y+3mX28y+3mX28y+3mX28y+3mX28y+3mX28y3c8y3jzDpTuwqg2Z1lmq3CRPbkt0qKgmCsxXqBjM9A956b+X1PunoGafb7qrr7E9b74rxrBNwt1RNmzmUxCCrcYlxI7RMNYHoNeIWShMFCFwhSgISzV6RSkdq9SJBbp0zErMu873md7zO95ne8zveZ3vM73md7zO95ne8zveZ3vM+RnyMEEgLN6suj12NB2iuXUq4/MxIUG2qPqWuhtGS7ha9VaSwHr4agbGunFR7pEq1GncSkotl5bzueZ3PM73md7zO95ne8zveZ3vM73md7zO95ne8zveZ3vM73mV58xaGbcy6prtuvSK5ZBxk0RGxVaqrLJiBAcxYjoWlxobAX+ZgDqn8vqfdPQM0+32Mq3g/igHDqhEdx90Mojl1QkgaweW7iiqoFbIrl9Vv1l51gs0tPzBA0crZ+0TYG8Nd3MAKrqERZPKWoRxrPiZ8TPiZ8TPiZ8TPiZ8TPiZ8TPiZ8DD9uX/7l4ISLH68pUVst4Mbh/FEAK8DGvKt0MSkq4mybH44X9YoQMNj4mfEy/3S/wB0v90v90v90v8AdL/dL/dPjZ8bPkZ8jPkZ8jBE5Z6yjro26cwQ1QK6MhAgl0LusQw1TBSaEkazcEx1vrDhxT+X1PunoGafb7Mvk0mEGrtJ673SzEnEvLM6pK6DH4g7MmuMCo0aCkJ1r645mCwHrXEcwL0aQNglnGI0sbdoAbrY7zueM7njO54TueE7nhO54TueE7nhO54TueE7nhO54w5fCJLHXZBYZOMRrjjQh1l4EM4vvWLqn1FYuCpsZhM8cYEF061l9021aQNVw1YcrxnK8ZyPGcjxnI8ZyPGcjxnI8ZyPGcjxnJ8ZyfGczxnM8ZzPGczxiw2saYxAKqcZgmrrSQUWh1pjB3ODAFjYVJZQGpVTQYH8vqfdPQM0+32ajZGXY/VVTV2k9d7o0E0+5MMMcGcGcGcWXmmDWOkUtdXtEYn+04c4c4c4c4c4c4c4c4c4c4c4c2GdJw2sdrOJOJOJOJOJOJOJOJOJOJOJOJOJOJOJOJOJOJOJOJOJOJOJOJOJOLOPOPOLOJHcQUn8vqfdPQM0+32A3gT2TMRlDXsJ673S9G77kqZ8v2tvWarpTBiXNvaN3Pf/AJbaj0QWKzO8zvM7zO8zvM7zO8zvM7zO8zvM7zO8zvM7zO8zvM7zO8zvM7zO8zvM7zO8zvPzPzM7zO811JW38vqfdPQM0+32DNdWeyW1TKGvYT13unqvc+5NWegnyOJ8rv8Ayv8A0PqfdPQM0+32fK4+gau0nrvdPVe59yas9BPkcT5ff+V/6H1PunoGafb7PlcfQNXaT13unqvc+5NWegnyOJ8vv/K/9D6n3T0DNPt9nyuPoGrtJ673T1XufcmrPQT5HE+X3/lf+h9T7p6Bmn2+z5XH0DV2k9d7p6r3PuTVnoJ8jifL7/yv/Q+p909AzT7fZ8rj6Bq7Seu909V7n3Jqz0E+RxPl9/5X/ofU+6egZp9vs+Vx9A1dpPXe6eq9z7k1Z6CfI4ny+/8AK/8AQ+p909AzT7fZ8rj6Bq7Seu909V7n3Jqz0E+RxPl9/wCV/wCh9T7p6Bmn2+z5XH0DV2k9d7p6r3PuTVnoJ8jifL7/AMr/AND6n3T0DNPt9nyuPoGrtJ673T1XufcmrPQT5HE+X3/lf+h9T7p6Bmn2+z5XH0DV2k9d7p6r3PuTVnoJ8jifL7/yv/Q+p909AzT7fZ8rj6Bq7Seu909V7n3Jqz0EwDr/AOJrfX3ZcuXLly5cuX9ai5men/DMxQ1lwz/CVr3908kZp9vs+Vx9A1dpPXe6eq9z7k1Z6CEraq9o7YBLfMptlNvmU2+ZTb5lNvmU2+ZTb5lNvmU2+ZTbLNss2xbMMaZxZxZxZxZxZxZxZxZxZxZxZxZxZxZxZxZxZxZxZxZxZxZxZxZxZxZxZxZxZxZxZxZxZxZb1D8ymyUamUdDODODOLOLOLOLOLOLAGC7p5msZKa8TT7fZ8rj6Bq7Seu909V7n3JqPSaLiGoYAr0hioJKcw1OXwg/aA3HwSawKAmhG4ncHpTcFCmtTnxHR9A1E1FY1xE+qCaKciciW3TgpYqnOlHVORORP0E/QT9BP0H1gOROdOROROROROROROROROROROROROROROROROROROROROVOVFGlXaoEsHlSrg4YC4a1rMvn06aax0GbsyaNdYKNlpzDn20dGuYF1teqpyJyJyJyIaUaSj3jqg1BNPtBvT6vL0/8TEHWNXYT1Xunqvc+5KxDn2iMsPRXENGAmD1lGa8FGXtU1eG2qXHATQW6kFXSalCxDWTRiHGi0UfxDSmkWFv4RovP8S3BZz/E5/iLioPEuF9eIh1+Idd+JyPE5HicnxOT4nJ8Tk+JyfE5PiWdfBlHXwZ8wz5hnzDPmGfMM+YZ8wz5hnzDPmGfMM+YZ8wz5hnzDPmGfMM+YZ8wz5hnzE+YlD4hgToCKYGIaEOG8PKuMHKszOIisoe0oU2CluZwpu+O6MMCQOK7z5hnzDPgGfAMcBFaQUyqW8Q0L2mh9QCXkQ06JD0J6r3T1XufchpmWRql2d8qKALzZMIKHJDtzS7yRwAXqwxHAnnIrAS8WQTfBWwjUmTRQJBqA9LECBJ0UEJir0MplTWcy36PJLXwOcxsmoXG7RmyLAZaMk+FnwM+VJ8iT5EnyJNT+xCsa3TJL7HGuSNmmjXJOF5JwvJOF5JwvJOF5JwvJOF5JwvJOF5JwvJOF5JwvJOF5JwvJOF5JwvJOB5JwPJBRqOmSYNNOmScDyTgeSClL2sgzAXUpM6u1YYl+mJuJlHfgSwJadKZmXGXTEVbW6FmJwPJOB5JxfJOL5I4DnWjEf10cqg2isIAvrNyJBUlWtCFZQLOV8zV2E9V7p6r3P4EHTGN6ZwJwJwJwJVh6wUTdzT6lZVh1w8RgpqLr6nshEtMgNCVxFCsquUlhaF4mI8F0lX1BeKxOiBFfO0qRiI7YjaQajacOcOcOcOcOcOU8ENOdYDoplriY5TBmulU3Zby3lvLeW8t5by3lvLeW8t5by3ltLaVDbRWGsAqycFf5ylrWta1rWta1ehDppPA8ZwPGZ8WtlBI0NYahahHRzZC+UjhWb4mqmxPVe6eG+7POhtOR4nI8TleJyvE5XicrxFuvxAurxOb4nN8Tm+JzfEtlFrai4Zkd6g4hDqg1BHqJTuEXexMRL6Apf4gy0YUcXpCthBp4xasKmxdC6QspF7dJhHq0xMQ3zpAnRxzYSavcZKvFNtZhF5RrFbZWCLa9Y7W0Q3hcxNa1N5Xp5pjvF3mes3eZ3pczT63M/bRPXzQdAueZo9bmfvp++nUE6Zg7Rd3mP8AumO8XeFd4u8sa9aWtIKvlMg8ULesF080T180F080/bQcx5voWj1uZjHE/Qx//aCNZu8sLxd4MWeSC6eaBf8AtP3U/bT9tGrLe7WPwsDWzRuOgQGyZHBR9Zq7CDz+6Wxb+7ASV4lePE/GfjPxn4yvHiV48SvHiV48SvHiV48SholHRPHiZ48S34S3jxPw8T8PEQqCINB4ifT4ifR4iwa5wCR05hGl+IG9R2nWl7TMGntHDlXEEcFcSxvRC8yxk/IX9IQCDfxLtCjDIwSthbqg01gwixpiGIYcQHWB1GCgCzTEEQYrpHoHibb4iNUoaRcDUFYNMeRyekwex4mlNdoEw8QAzbtK7NO0ELHwlhS7ViDi61Y2mfDwlmofiZGniZlB4iAA8RJAFvEFo9iW/wCEp2eJTs8QDQHiWvQlPEp4+gR+X3SsQUC+uUdfkTQzzpDpuc6c6cqcqc6c6c6c6c6c6UaX4lmt+JzZzZz5zZws4WNauKqvMA6PrADXHnROsNCt6xIgI65sXFC5bDBbYY5Q4aYw7TLhfEC2PzFz/wAQA1IIvEhbfVpiIBo4+gN1hgt22uYNVudfpVpUHvQuCrRoxLg3uDsBdSoCwB1aljW+kWD0aRVu/lial+Zfq/M1J+WG5j8wJwq7yjF0cvWA31o/MsNkei/WF63UL2dwzFVDKVHOnInInInMlOjnEziZiklCnX3QC2pbU1dYQJQBA2RHQjCkVCqluPEtx4l8HiXweJfbxL7eIdjxPweJ+DxHseJfB4l8HiY2JjYmNiY2JfB4l8HiXweJfB4mNiY2JjYmNiY2JjYmNiY2JjYmNiX28S+DxL7S+08TxLceJbjx9fE8fb4niX28S+3iX28S+3iX28S+3iX28S+3iW48S3HiW48S3HiX28S+3iX28S+3iXweJfB4l9pfaW+Et8JfjxL8eJTYlNiAmiOQpW3mf//Z</sv:value>
- </sv:property>
- <sv:property sv:name="jcr:lastModified" sv:type="Date">
- <sv:value>2010-04-30T16:07:28.962+02:00</sv:value>
- </sv:property>
- <sv:property sv:name="jcr:mimeType" sv:type="String">
- <sv:value>image/jpeg</sv:value>
- </sv:property>
- <sv:property sv:name="resolution" sv:type="String">
- <sv:value>res-640x460</sv:value>
- </sv:property>
- <sv:property sv:name="width" sv:type="String">
- <sv:value>640</sv:value>
- </sv:property>
- </sv:node>
- </sv:node>
</sv:node>
<sv:node sv:name="swiss-cow">
<sv:property sv:name="jcr:primaryType" sv:type="Name">
@@ -338,345 +223,6 @@
<sv:value>800</sv:value>
</sv:property>
</sv:node>
- <sv:node sv:name="resolutions">
- <sv:property sv:name="jcr:primaryType" sv:type="Name">
- <sv:value>mgnl:resolutions</sv:value>
- </sv:property>
- <sv:property sv:name="jcr:mixinTypes" sv:type="Name">
- <sv:value>mix:lockable</sv:value>
- </sv:property>
- <sv:property sv:name="jcr:uuid" sv:type="String">
- <sv:value>0728f2b1-7fc2-47cb-b116-94e07960f6f4</sv:value>
- </sv:property>
- <sv:node sv:name="MetaData">
- <sv:property sv:name="jcr:primaryType" sv:type="Name">
- <sv:value>mgnl:metaData</sv:value>
- </sv:property>
- <sv:property sv:name="mgnl:creationdate" sv:type="Date">
- <sv:value>2010-04-30T15:58:51.454+02:00</sv:value>
- </sv:property>
- </sv:node>
- <sv:node sv:name="thumbnail">
- <sv:property sv:name="jcr:primaryType" sv:type="Name">
- <sv:value>mgnl:resource</sv:value>
- </sv:property>
- <sv:property sv:name="jcr:uuid" sv:type="String">
- <sv:value>6e906690-e15b-4f04-9d9e-f89951667bb8</sv:value>
- </sv:property>
- <sv:property sv:name="extension" sv:type="String">
- <sv:value>jpg</sv:value>
- </sv:property>
- <sv:property sv:name="fileName" sv:type="String">
- <sv:value>swiss-cow</sv:value>
- </sv:property>
- <sv:property sv:name="height" sv:type="String">
- <sv:value>75</sv:value>
- </sv:property>
- <sv:property sv:name="jcr:data" sv:type="Binary">
- <sv:value>/9j/4AAQSkZJRgABAgAAAQABAAD/2wBDAAYEBQYFBAYGBQYHBwYIChAKCgkJChQODwwQFxQYGBcUFhYaHSUfGhsjHBYWICwgIyYnKSopGR8tMC0oMCUoKSj/2wBDAQcHBwoIChMKChMoGhYaKCgoKCgoKCgoKCgoKCgoKCgoKCgoKCgoKCgoKCgoKCgoKCgoKCgoKCgoKCgoKCgoKCj/wgARCABLAGQDASIAAhEBAxEB/8QAGgAAAgMBAQAAAAAAAAAAAAAAAAUDBAYBAv/EABkBAAIDAQAAAAAAAAAAAAAAAAAEAQMFAv/aAAwDAQACEAMQAAABRcm5tZURKBFybgREoEXZAI+yARkgExPw5ht2tWg7jo3LFdjFGwpsr5kbr3FISY65hJgLJaKLS8oz+Rra2VC6rskaJbBFehY9bWPVLRdTWLIF1RpMdmaM6R8mRe8Nkjzvl/dXyWFK5f8AT+UuGJ1C4YkxkfaG7maWiqw56q676vvmKc61gsWS59ZjWWq0xvISrGZE/wD/xAAjEAABBQEAAgICAwAAAAAAAAABAAIDBBESEyEFEBQiMDEy/9oACAEBAAEFAsWLFixYsWLFiz7z7z+LFixMiJDKUzg6s7tzS0luHFixYsWLFSeI7P5BEkzubAa2Rpj8qb8f0rVQwLFixYsWLxtYK9yORSuD7VeqysBM4L/Sty+V2LFixYh6Vh+MB/aqfYkK9ud8lO/4935AsO5XK5XKxNk0zezI7JvJzJFOXqrK2N9kmyyKv438LhcrlcojxTFumRn7vCrQNFh9PzOg3eFyuVyuU35PHS8zy4MeGNhqxFyZG9qaZ4lVlZ15NWldItmJAmy16d8cSY7RIrNcdjJZFL/Uh9PaNBMclUl8IA1w9r//xAAhEQABAwQDAQEBAAAAAAAAAAABAAIDEBESIQQTMSIzwf/aAAgBAwEBPwG9Lq6ur14sPZtDhx22pOI5vm04FpsaxR9jrKOJsY+aEqcEP+q8MbNHOx9Un5iSPf8AE4l5u5YLFBmDkDuykO02RzWFjT6sF1rBf//EACERAAEEAgICAwAAAAAAAAAAAAABAgMRBBITITEyECIw/9oACAECAQE/AfwzMjipBc6S+iPNa726GuRyWnzNNxtskkdL7HgRLIHJp9SyzMVaQQRm3gbF3q5aG0xKabm46RZGGvVkKdWKiXaiuNzY/8QAKhAAAgEDAgQFBQEAAAAAAAAAAQIAAxESITEgQVFxEDAyQmETIjNA4fH/2gAIAQEABj8C/dwYEHcXl8bd5ipDSzaES3kKzf5GR9VjKt/iZHHIe4QrWAZhs0Jq1gvYQHIMp58ZNTUj2wCoQCIcTktoXp1HcnkYOszOglh6BxfMt4ESxll9RlFUQEc2bnPxBCNyPIAEv4GqwXa28GbKOkJvvxMp5HwLQCFc8VG0VQ28NOp6159eIZoVgZTLxu0+o3tN7TJ6ZtNL4npMnN2mk3MsJ/Zyg7SoTuI1owvpKJXQkwGL8zYT7CRAW1PB/8QAJhABAAIBAwQCAQUAAAAAAAAAAQARITFBURAgYXGBkTChscHR8P/aAAgBAQABPyH8YAKldFSuipUqVKlSpUrsDZC01RnQTnUBZPjD+sQA6gZd8H8AAtStLd3MpR7op2hTdwjKwjQy17ljM1XTM7ZcZf5Jmw1Ax9ncEuw8KocfLAEA0d4sUmohrT1cR1ZpMVbBaOKil4Q5ee7uZQ4niYtH9oZuJrCGXi1VFCYsF248SwD3g/HaDUWWBGUEqDvLZtYlBjJnExtOZJTOeGBrKDTSsy3DLcdeiR+FEJpkGzGSjK1MQjbO+ZiONC5yZlaQ4dnQt/iHUoS25iGrdXUAeFbs0KQTfMpVv5SLKldyZhVUy2ibG3eFP9JYNfRB+e+YpbS9iDZCl666plQ0GKCrT95mlcFPmOzQ3DRMN7YjYcWzWItX9Xuaonhin2bxhsIBgQn/2gAMAwEAAgADAAAAEFrFv7pjpisFun/+JMM8/TXLxjs4sBUOMZ4Qf//EACERAAMAAgEDBQAAAAAAAAAAAAABESExQRBRYSCRobHR/9oACAEDAQE/EBX6QpRKO/DQhDOmA3P4IpjKUejiSCQapBTkbKrZCCEl7wISreg0RZqtZws+9/g5uyRwyxWHfQHOETkLbv7+eRK3COWR3P/EAB8RAQACAQQDAQAAAAAAAAAAAAEAETEQIUHwMFFhof/aAAgBAgEBPxDwKqfSPe7xNgVGbwH78h57NbPnxHbVwcJa+RpBQa7qcbxVGqZTtxhHil+dG4JuiFlEAMSguZbEv6n/xAAnEAEAAgIBAwQBBQEAAAAAAAABABEhMUFRYXEQgZGhsSAwwdHw4f/aAAgBAQABPxD9wAHxj6u1DTTp/Z//ABj6nItRULVJnhx8EDO7VPda314/JaAcUq1gXql9quO5CgUjGWyoX17/AKgPpthZkLswezrxcTUQs2EcVnEsGoyUBjwNntDAabVmnuhcCYr2acnbUDIDHJHrdHj7g5oxahM1krGcLz+nWFADLDcQcK3QPwfMpYo4flD5gFmh4K/2ojkohF0ujZ/cSrzyr+OkLMK2cptb4ikJw1eB9H/fR4er4xh42tc9z5iMuW5UFJkQnNXaPfH1UYIQea1Kg+BXOf47zRt3UuR0awUzZH7EE9eE8J4TwnhMaaLnNmbhLIHUna0NNS4JLstHT+pVAOQ7V45PEWjKihE0PPbcorxUSnlv+IQO4Y4sX7JRv4p3PxPCeEUBqnETdzBemz6ZWQq3xzK7hBLrkmYffF/7iU...
[truncated message content] |
|
From: <fg...@us...> - 2010-06-07 21:56:18
|
Revision: 2631
http://openutils.svn.sourceforge.net/openutils/?rev=2631&view=rev
Author: fgiust
Date: 2010-06-07 21:56:11 +0000 (Mon, 07 Jun 2010)
Log Message:
-----------
MEDIA-149 Add support for ico image format
Modified Paths:
--------------
trunk/openutils-mgnlmedia/pom.xml
trunk/openutils-mgnlmedia/src/main/assembly/assembly-bundle.xml
trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/setup/MediaModuleVersionHandler.java
trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/types/impl/ImageTypeHandler.java
trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/utils/ImageUtils.java
trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap/media-nooverwrite/config.modules.media.dialogs.mediaImageDlg.xml
trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap/media-nooverwrite/config.modules.media.mediatypes.image.xml
trunk/openutils-mgnlmedia/src/test/java/net/sourceforge/openutils/mgnlmedia/media/utils/ImageUtilsTest.java
Added Paths:
-----------
trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/utils/IcoUtils.java
trunk/openutils-mgnlmedia/src/test/resources/images/openmind.ico
Modified: trunk/openutils-mgnlmedia/pom.xml
===================================================================
--- trunk/openutils-mgnlmedia/pom.xml 2010-06-07 21:05:31 UTC (rev 2630)
+++ trunk/openutils-mgnlmedia/pom.xml 2010-06-07 21:56:11 UTC (rev 2631)
@@ -1,8 +1,9 @@
-<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>
- <version>1.3</version>
+ <version>1.5</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<packaging>jar</packaging>
@@ -191,6 +192,11 @@
</exclusion>
</exclusions>
</dependency>
+ <dependency>
+ <groupId>nl.ikarus.nxt.priv.imageio.icoreader</groupId>
+ <artifactId>ICOReader</artifactId>
+ <version>1.04</version>
+ </dependency>
</dependencies>
<repositories>
<repository>
Modified: trunk/openutils-mgnlmedia/src/main/assembly/assembly-bundle.xml
===================================================================
--- trunk/openutils-mgnlmedia/src/main/assembly/assembly-bundle.xml 2010-06-07 21:05:31 UTC (rev 2630)
+++ trunk/openutils-mgnlmedia/src/main/assembly/assembly-bundle.xml 2010-06-07 21:56:11 UTC (rev 2631)
@@ -34,6 +34,7 @@
<include>com.flazr:flazr:*</include>
<include>commons-cli:commons-cli:*</include>
<include>org.jboss.netty:netty:*</include>
+ <include>nl.ikarus.nxt.priv.imageio.icoreader:*</include>
</includes>
</dependencySet>
</dependencySets>
Modified: trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/setup/MediaModuleVersionHandler.java
===================================================================
--- trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/setup/MediaModuleVersionHandler.java 2010-06-07 21:05:31 UTC (rev 2630)
+++ trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/setup/MediaModuleVersionHandler.java 2010-06-07 21:56:11 UTC (rev 2631)
@@ -171,21 +171,35 @@
"parseremotefiles",
Boolean.TRUE));
+ // add "jpeg"
tasks.add(new ChangeExistingPropertyTask(
ContentRepository.CONFIG,
"/modules/media/dialogs/mediaImageDlg/tabImage/original",
"extensions",
"jpg,gif,png",
"jpg,jpeg,gif,png"));
-
tasks.add(new ChangeExistingPropertyTask(
ContentRepository.CONFIG,
"/modules/media/mediatypes/image",
"extensions",
"jpg,gif,png",
"jpg,jpeg,gif,png"));
-
+ // add "ico"
+ tasks.add(new ChangeExistingPropertyTask(
+ ContentRepository.CONFIG,
+ "/modules/media/dialogs/mediaImageDlg/tabImage/original",
+ "extensions",
+ "jpg,jpeg,gif,png",
+ "jpg,jpeg,gif,png,ico"));
+
+ tasks.add(new ChangeExistingPropertyTask(
+ ContentRepository.CONFIG,
+ "/modules/media/mediatypes/image",
+ "extensions",
+ "jpg,jpeg,gif,png",
+ "jpg,jpeg,gif,png,ico"));
+
// install stk support
if (isModuleInstalled("standard-templating-kit"))
{
Modified: trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/types/impl/ImageTypeHandler.java
===================================================================
--- trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/types/impl/ImageTypeHandler.java 2010-06-07 21:05:31 UTC (rev 2630)
+++ trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/types/impl/ImageTypeHandler.java 2010-06-07 21:56:11 UTC (rev 2631)
@@ -19,15 +19,20 @@
package net.sourceforge.openutils.mgnlmedia.media.types.impl;
+import info.magnolia.cms.beans.runtime.FileProperties;
import info.magnolia.cms.core.Content;
+import info.magnolia.cms.core.NodeData;
import info.magnolia.cms.util.NodeDataUtil;
+import java.awt.image.BufferedImage;
import java.io.InputStream;
import net.sourceforge.openutils.mgnlmedia.media.configuration.MediaConfigurationManager;
+import net.sourceforge.openutils.mgnlmedia.media.utils.IcoUtils;
import net.sourceforge.openutils.mgnlmedia.media.utils.ImageUtils;
import org.apache.commons.io.IOUtils;
+import org.apache.commons.lang.ArrayUtils;
import org.apache.commons.lang.StringUtils;
import org.devlib.schmidt.imageinfo.ImageInfo;
import org.slf4j.Logger;
@@ -88,6 +93,7 @@
InputStream stream = null;
try
{
+ NodeData nodeData = getOriginalFileNodeData(media);
stream = getOriginalFileNodeData(media).getStream();
ImageInfo ii = new ImageInfo();
ii.setInput(stream);
@@ -98,6 +104,19 @@
NodeDataUtil.getOrCreateAndSet(media, METADATA_HEIGHT, ii.getHeight());
media.save();
}
+ else if (StringUtils.equals(nodeData.getAttribute(FileProperties.EXTENSION), "ico"))
+ {
+ BufferedImage bi = IcoUtils.createBufferedImage(nodeData);
+ if (bi != null)
+ {
+
+ NodeDataUtil.getOrCreateAndSet(media, METADATA_BITDEPTH, bi.getColorModel().getPixelSize());
+ NodeDataUtil.getOrCreateAndSet(media, METADATA_WIDTH, bi.getWidth());
+ NodeDataUtil.getOrCreateAndSet(media, METADATA_HEIGHT, bi.getHeight());
+ media.save();
+ }
+ bi.flush();
+ }
}
catch (Throwable e)
{
Added: trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/utils/IcoUtils.java
===================================================================
--- trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/utils/IcoUtils.java (rev 0)
+++ trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/utils/IcoUtils.java 2010-06-07 21:56:11 UTC (rev 2631)
@@ -0,0 +1,83 @@
+/**
+ *
+ * Magnolia SimpleMedia Module (http://www.openmindlab.com/lab/products/media.html)
+ * Copyright (C)2008 - 2010, Openmind S.r.l. http://www.openmindonline.it
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package net.sourceforge.openutils.mgnlmedia.media.utils;
+
+import info.magnolia.cms.core.NodeData;
+
+import java.awt.image.BufferedImage;
+import java.io.IOException;
+import java.io.InputStream;
+import java.util.Iterator;
+
+import javax.imageio.ImageIO;
+import javax.imageio.ImageReader;
+import javax.imageio.stream.ImageInputStream;
+
+import org.apache.commons.io.IOUtils;
+
+
+/**
+ * @author fgiust
+ * @version $Id$
+ */
+public class IcoUtils
+{
+
+ public static BufferedImage createBufferedImage(NodeData image) throws IOException
+ {
+ // this should work for any image type, but better don't change the ImageIO.read() that worked till
+ // now...
+ InputStream is = image.getStream();
+ try
+ {
+ nl.ikarus.nxt.priv.imageio.icoreader.lib.ICOReaderSpi.registerIcoReader();
+ ImageInputStream in = ImageIO.createImageInputStream(is);
+ Iterator<ImageReader> it = ImageIO.getImageReaders(in);
+ ImageReader r = null;
+ while (it.hasNext())
+ {
+
+ try
+ {
+ r = it.next();
+ r.setInput(in);
+
+ BufferedImage read = r.read(-1);
+
+ return read;
+
+ }
+ catch (Throwable ex)
+ {
+ IOUtils.closeQuietly(is);
+ is = image.getStream();
+ in = ImageIO.createImageInputStream(image.getStream());
+ }
+ }
+ }
+ finally
+ {
+ IOUtils.closeQuietly(is);
+ }
+
+ return null;
+ }
+
+}
Property changes on: trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/utils/IcoUtils.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: svn:keywords
+ Author Date Id Revision
Added: svn:eol-style
+ native
Modified: trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/utils/ImageUtils.java
===================================================================
--- trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/utils/ImageUtils.java 2010-06-07 21:05:31 UTC (rev 2630)
+++ trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/utils/ImageUtils.java 2010-06-07 21:56:11 UTC (rev 2631)
@@ -96,7 +96,7 @@
*/
public static String RESOLUTION_PROPERTY = "resolution";
- private static final String[] extensions = new String[]{"jpg", "jpeg", "gif", "png" };
+ private static final String[] extensions = new String[]{"jpg", "gif", "png" };
static
{
@@ -351,16 +351,16 @@
* Save a resolution for an image to a node (in resolutions/res-[width]x[height]/data.jpg)
* @param image image to save
* @param saveTo node to save to
- * @param extension extension
+ * @param outputformat extension
* @param quality image quality
* @param forceProgressive true to force progressive mode
* @throws RepositoryException exception in jcr operations
* @throws IOException exception converting image to jpg
*/
- public static void saveResolution(BufferedImage image, Content saveTo, String extension, float quality,
+ public static void saveResolution(BufferedImage image, Content saveTo, String outputformat, float quality,
boolean forceProgressive) throws RepositoryException, IOException
{
- saveResolution(image, saveTo, null, extension, quality, forceProgressive);
+ saveResolution(image, saveTo, null, outputformat, quality, forceProgressive);
}
/**
@@ -368,13 +368,13 @@
* @param image image to save
* @param saveTo node to save to
* @param name name for this resolution
- * @param extension extension
+ * @param outputformat extension
* @param quality image quality
* @param forceProgressive true to force progressive mode
* @throws RepositoryException exception in jcr operations
* @throws IOException exception converting image to jpg
*/
- public static void saveResolution(BufferedImage image, Content saveTo, String name, String extension,
+ public static void saveResolution(BufferedImage image, Content saveTo, String name, String outputformat,
float quality, boolean forceProgressive) throws RepositoryException, IOException
{
@@ -382,7 +382,7 @@
try
{
- stream = getStream(image, extension, quality, forceProgressive);
+ stream = getStream(image, outputformat, quality, forceProgressive);
if (stream == null)
{
@@ -419,13 +419,13 @@
log.info("setting value to {}", nd.getHandle());
nd.setValue(stream);
- String mimetype = "image/" + extension;
- if ("jpg".equals(extension))
+ String mimetype = "image/" + outputformat;
+ if ("jpg".equals(outputformat))
{
mimetype = "image/jpeg";
}
nd.setAttribute(ImageUtils.RESOLUTION_PROPERTY, originalRes);
- nd.setAttribute(FileProperties.PROPERTY_EXTENSION, extension);
+ nd.setAttribute(FileProperties.PROPERTY_EXTENSION, outputformat);
nd.setAttribute(FileProperties.PROPERTY_FILENAME, saveTo.getName());
nd.setAttribute(FileProperties.PROPERTY_CONTENTTYPE, mimetype);
nd.setAttribute(FileProperties.PROPERTY_LASTMODIFIED, GregorianCalendar.getInstance(TimeZone
@@ -470,6 +470,12 @@
throws IOException
{
+ // don't write ico file, use png
+ if (StringUtils.equalsIgnoreCase(extension, "ico"))
+ {
+ extension = "png";
+ }
+
final File tempFile = File.createTempFile("image-", "." + extension);
FileOutputStream fos = new FileOutputStream(tempFile);
@@ -591,7 +597,7 @@
/**
* Check if the resolution for a media is already present. Otherwise create it
- * @param media media to check the resolutoin on
+ * @param media media to check the resolution on
* @param resolutionTarget target resolution
* @return false if resolution doesn't exist and there is a problem in generate it; true otherwise
*/
@@ -709,18 +715,10 @@
+ image.getContentLength());
}
- String extension = image.getAttribute(FileProperties.PROPERTY_EXTENSION);
- if (!Arrays.asList(extensions).contains(extension))
+ String outputextension = image.getAttribute(FileProperties.PROPERTY_EXTENSION);
+ if (!Arrays.asList(extensions).contains(outputextension))
{
- try
- {
- image.setAttribute(FileProperties.PROPERTY_EXTENSION, "jpg");
- }
- catch (RepositoryException e)
- {
- throw new RuntimeException(e);
- }
- extension = "jpg";
+ outputextension = "png";
}
BufferedImage original = createBufferedImage(image);
@@ -764,12 +762,23 @@
}
if ("thumbnail".equals(resolutionTarget) || "preview".equals(resolutionTarget))
{
- ImageUtils
- .saveResolution(img, node, resolutionTarget, extension, quality, forceProgressive);
+ ImageUtils.saveResolution(
+ img,
+ node,
+ resolutionTarget,
+ outputextension,
+ quality,
+ forceProgressive);
}
else
{
- ImageUtils.saveResolution(img, node, resolutionName, extension, quality, forceProgressive);
+ ImageUtils.saveResolution(
+ img,
+ node,
+ resolutionName,
+ outputextension,
+ quality,
+ forceProgressive);
}
}
catch (RepositoryException e)
@@ -944,7 +953,7 @@
try
{
- String ext = image.getAttribute("extension");
+ String ext = image.getAttribute(FileProperties.EXTENSION);
if (StringUtils.equalsIgnoreCase(ext, "jpg") || StringUtils.equalsIgnoreCase(ext, "jpeg"))
{
@@ -961,6 +970,14 @@
e);
}
}
+ else if (StringUtils.equalsIgnoreCase(ext, "ico") || StringUtils.equalsIgnoreCase(ext, "bmp"))
+ {
+ BufferedImage buffered = IcoUtils.createBufferedImage(image);
+ if (buffered != null)
+ {
+ return buffered;
+ }
+ }
return ImageIO.read(is);
}
Modified: trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap/media-nooverwrite/config.modules.media.dialogs.mediaImageDlg.xml
===================================================================
--- trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap/media-nooverwrite/config.modules.media.dialogs.mediaImageDlg.xml 2010-06-07 21:05:31 UTC (rev 2630)
+++ trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap/media-nooverwrite/config.modules.media.dialogs.mediaImageDlg.xml 2010-06-07 21:56:11 UTC (rev 2631)
@@ -100,7 +100,7 @@
<sv:value>mediaFile</sv:value>
</sv:property>
<sv:property sv:name="extensions" sv:type="String">
- <sv:value>jpg,jpeg,gif,png</sv:value>
+ <sv:value>jpg,jpeg,gif,png,ico</sv:value>
</sv:property>
<sv:property sv:name="label" sv:type="String">
<sv:value>media.dialogs.tabImage.image.label</sv:value>
Modified: trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap/media-nooverwrite/config.modules.media.mediatypes.image.xml
===================================================================
--- trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap/media-nooverwrite/config.modules.media.mediatypes.image.xml 2010-06-07 21:05:31 UTC (rev 2630)
+++ trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap/media-nooverwrite/config.modules.media.mediatypes.image.xml 2010-06-07 21:56:11 UTC (rev 2631)
@@ -16,7 +16,7 @@
<sv:value>true</sv:value>
</sv:property>
<sv:property sv:name="extensions" sv:type="String">
- <sv:value>jpg,jpeg,gif,png</sv:value>
+ <sv:value>jpg,jpeg,gif,png,ico</sv:value>
</sv:property>
<sv:property sv:name="i18nBasename" sv:type="String">
<sv:value>net.sourceforge.openutils.mgnlmedia.media.lang.messages</sv:value>
Modified: trunk/openutils-mgnlmedia/src/test/java/net/sourceforge/openutils/mgnlmedia/media/utils/ImageUtilsTest.java
===================================================================
--- trunk/openutils-mgnlmedia/src/test/java/net/sourceforge/openutils/mgnlmedia/media/utils/ImageUtilsTest.java 2010-06-07 21:05:31 UTC (rev 2630)
+++ trunk/openutils-mgnlmedia/src/test/java/net/sourceforge/openutils/mgnlmedia/media/utils/ImageUtilsTest.java 2010-06-07 21:56:11 UTC (rev 2631)
@@ -147,6 +147,18 @@
* @throws Exception
*/
@Test
+ public void testIco() throws Exception
+ {
+
+ NodeData ico = new FileNodeData("/images/openmind.ico");
+ BufferedImage bufferedImage = ImageUtils.createBufferedImage(ico);
+ Assert.assertNotNull(bufferedImage);
+ }
+
+ /**
+ * @throws Exception
+ */
+ @Test
public void testBadImageTxt() throws Exception
{
Added: trunk/openutils-mgnlmedia/src/test/resources/images/openmind.ico
===================================================================
(Binary files differ)
Property changes on: trunk/openutils-mgnlmedia/src/test/resources/images/openmind.ico
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <mol...@us...> - 2010-06-18 15:41:45
|
Revision: 2686
http://openutils.svn.sourceforge.net/openutils/?rev=2686&view=rev
Author: molaschi
Date: 2010-06-18 15:41:38 +0000 (Fri, 18 Jun 2010)
Log Message:
-----------
MEDIA-156 updated mgnltasks to 4.1.2 and removed SamplesExtractionTask
Modified Paths:
--------------
trunk/openutils-mgnlmedia/pom.xml
trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/setup/MediaModuleVersionHandler.java
Removed Paths:
-------------
trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/setup/SamplesExtractionTask.java
Modified: trunk/openutils-mgnlmedia/pom.xml
===================================================================
--- trunk/openutils-mgnlmedia/pom.xml 2010-06-18 15:27:40 UTC (rev 2685)
+++ trunk/openutils-mgnlmedia/pom.xml 2010-06-18 15:41:38 UTC (rev 2686)
@@ -102,7 +102,7 @@
<dependency>
<groupId>net.sourceforge.openutils</groupId>
<artifactId>openutils-mgnltasks</artifactId>
- <version>4.0.5</version>
+ <version>4.1.2</version>
</dependency>
<dependency>
<groupId>net.sourceforge.openutils</groupId>
Modified: trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/setup/MediaModuleVersionHandler.java
===================================================================
--- trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/setup/MediaModuleVersionHandler.java 2010-06-18 15:27:40 UTC (rev 2685)
+++ trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/setup/MediaModuleVersionHandler.java 2010-06-18 15:41:38 UTC (rev 2686)
@@ -29,6 +29,7 @@
import it.openutils.mgnltasks.ChangeExistingPropertyTask;
import it.openutils.mgnltasks.CreateMissingPropertyTask;
import it.openutils.mgnltasks.NodeSortTask;
+import it.openutils.mgnltasks.SamplesExtractionTask;
import it.openutils.mgnltasks.SimpleModuleVersionHandler;
import java.util.ArrayList;
Deleted: trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/setup/SamplesExtractionTask.java
===================================================================
--- trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/setup/SamplesExtractionTask.java 2010-06-18 15:27:40 UTC (rev 2685)
+++ trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/setup/SamplesExtractionTask.java 2010-06-18 15:41:38 UTC (rev 2686)
@@ -1,91 +0,0 @@
-/**
- *
- * Magnolia SimpleMedia Module (http://www.openmindlab.com/lab/products/media.html)
- * Copyright (C)2008 - 2010, Openmind S.r.l. http://www.openmindonline.it
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-
-package net.sourceforge.openutils.mgnlmedia.media.setup;
-
-import info.magnolia.cms.core.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 samples files to webapp root.
- * @author fgiust
- * @version $Id$
- */
-public class SamplesExtractionTask extends AbstractTask
-{
-
- public SamplesExtractionTask()
- {
- super("Samples extraction", "Extracts jsp files for samples.");
- }
-
- /**
- * {@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)
- {
- final boolean thisIsAFileWeWant = resourcePath.startsWith("/mgnl-files/")
- && StringUtils.contains(resourcePath, "/samples-media/");
- if (!thisIsAFileWeWant)
- {
- 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);
- }
- }
-
-}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <die...@us...> - 2010-06-30 06:17:51
|
Revision: 2733
http://openutils.svn.sourceforge.net/openutils/?rev=2733&view=rev
Author: diego_schivo
Date: 2010-06-30 06:17:44 +0000 (Wed, 30 Jun 2010)
Log Message:
-----------
MEDIA-145 sorting
Modified Paths:
--------------
trunk/openutils-mgnlmedia/pom.xml
trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/pages/MediaFolderViewPage.java
trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/media/pages/MediaFolderViewPage.html
Modified: trunk/openutils-mgnlmedia/pom.xml
===================================================================
--- trunk/openutils-mgnlmedia/pom.xml 2010-06-29 17:15:45 UTC (rev 2732)
+++ trunk/openutils-mgnlmedia/pom.xml 2010-06-30 06:17:44 UTC (rev 2733)
@@ -118,6 +118,11 @@
</dependency>
<dependency>
<groupId>net.sourceforge.openutils</groupId>
+ <artifactId>openutils-mgnlutils</artifactId>
+ <version>1.0.5</version>
+ </dependency>
+ <dependency>
+ <groupId>net.sourceforge.openutils</groupId>
<artifactId>openutils-elfunctions</artifactId>
<version>1.1.1</version>
</dependency>
Modified: trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/pages/MediaFolderViewPage.java
===================================================================
--- trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/pages/MediaFolderViewPage.java 2010-06-29 17:15:45 UTC (rev 2732)
+++ trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/pages/MediaFolderViewPage.java 2010-06-30 06:17:44 UTC (rev 2733)
@@ -28,6 +28,7 @@
import info.magnolia.cms.exchange.ExchangeException;
import info.magnolia.cms.security.Permission;
import info.magnolia.cms.util.AlertUtil;
+import info.magnolia.cms.util.ContentUtil;
import info.magnolia.cms.util.ExclusiveWrite;
import info.magnolia.commands.CommandsManager;
import info.magnolia.context.Context;
@@ -75,6 +76,11 @@
{
/**
+ *
+ */
+ public static final String SORT_BY_CREATIONDATE = "creationdate";
+
+ /**
*
*/
public static final String SORT_BY_FILENAME = "filename";
@@ -85,6 +91,11 @@
public static final String SORT_BY_MODIFICATIONDATE = "modificationdate";
/**
+ *
+ */
+ public static final String SORT_BY_TITLE = "title";
+
+ /**
*
*/
public static final String SORT_BY_USAGE = "usage";
@@ -182,7 +193,7 @@
}
}
bgSelector = StringUtils.defaultIfEmpty(bgSelector, "white");
- sorting = StringUtils.defaultString(sorting);
+ sorting = StringUtils.defaultIfEmpty(sorting, SORT_BY_CREATIONDATE);
if (page <= 0)
{
@@ -226,10 +237,9 @@
if (!StringUtils.isBlank(path))
{
- try
+ Content folder = ContentUtil.getContent(MediaModule.REPO, path);
+ if (folder != null)
{
- Content folder = hm.getContent(this.getPath());
-
writable = folder.isGranted(Permission.WRITE);
canPublish = writable && ActivationManagerFactory.getActivationManager().hasAnyActiveSubscriber();
@@ -243,10 +253,6 @@
5);
pages = MgnlPagingElFunctions.pageList(typeResult.getNumberOfPages(), 5, "page");
}
- catch (RepositoryException ex)
- {
- log.error("Exception caught", ex);
- }
}
else if (!StringUtils.isBlank(search))
{
Modified: trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/media/pages/MediaFolderViewPage.html
===================================================================
--- trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/media/pages/MediaFolderViewPage.html 2010-06-29 17:15:45 UTC (rev 2732)
+++ trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/media/pages/MediaFolderViewPage.html 2010-06-30 06:17:44 UTC (rev 2733)
@@ -148,7 +148,7 @@
<div id="sortingblock">
<div class="voice right" style="padding-top: 3px;">
<select id="sorting" name="sorting">
- <option value=""[#if this.sorting == ''] selected="selected"[/#if]>- order by -</option>
+ <option value=""[#if this.sorting == 'creationdate'] selected="selected"[/#if]>Creation date</option>
<option value="title"[#if this.sorting == 'title'] selected="selected"[/#if]>Title</option>
</select>
</div>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fg...@us...> - 2011-06-16 11:21:00
|
Revision: 3540
http://openutils.svn.sourceforge.net/openutils/?rev=3540&view=rev
Author: fgiust
Date: 2011-06-16 11:20:53 +0000 (Thu, 16 Jun 2011)
Log Message:
-----------
test infrastructure
Modified Paths:
--------------
trunk/openutils-mgnlmedia/pom.xml
trunk/openutils-mgnlmedia/src/main/resources/META-INF/magnolia/media.xml
Added Paths:
-----------
trunk/openutils-mgnlmedia/src/test/java/net/sourceforge/openutils/mgnlmedia/media/repotests/
trunk/openutils-mgnlmedia/src/test/java/net/sourceforge/openutils/mgnlmedia/media/repotests/MediaTests.java
trunk/openutils-mgnlmedia/src/test/resources/log4j.dtd
trunk/openutils-mgnlmedia/src/test/resources/test-magnolia.properties
trunk/openutils-mgnlmedia/src/test/resources/test-repository/
trunk/openutils-mgnlmedia/src/test/resources/test-repository/jackrabbit-test-configuration.xml
trunk/openutils-mgnlmedia/src/test/resources/test-repository/test-repositories.xml
trunk/openutils-mgnlmedia/src/test/resources/test_dir.txt
Modified: trunk/openutils-mgnlmedia/pom.xml
===================================================================
--- trunk/openutils-mgnlmedia/pom.xml 2011-06-16 10:59:48 UTC (rev 3539)
+++ trunk/openutils-mgnlmedia/pom.xml 2011-06-16 11:20:53 UTC (rev 3540)
@@ -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>
@@ -100,6 +101,34 @@
</dependency>
<dependency>
<groupId>info.magnolia</groupId>
+ <artifactId>magnolia-module-fckEditor</artifactId>
+ <version>${magnolia.version}</version>
+ <optional>true</optional>
+ <exclusions>
+ <exclusion>
+ <groupId>javax.mail</groupId>
+ <artifactId>mail</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>javax.jms</groupId>
+ <artifactId>jms</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>com.sun.jdmk</groupId>
+ <artifactId>jmxtools</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>com.sun.jmx</groupId>
+ <artifactId>jmxri</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>pdfbox</groupId>
+ <artifactId>pdfbox</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>info.magnolia</groupId>
<artifactId>magnolia-module-admininterface</artifactId>
<version>${magnolia.version}</version>
<exclusions>
Modified: trunk/openutils-mgnlmedia/src/main/resources/META-INF/magnolia/media.xml
===================================================================
--- trunk/openutils-mgnlmedia/src/main/resources/META-INF/magnolia/media.xml 2011-06-16 10:59:48 UTC (rev 3539)
+++ trunk/openutils-mgnlmedia/src/main/resources/META-INF/magnolia/media.xml 2011-06-16 11:20:53 UTC (rev 3540)
@@ -11,12 +11,9 @@
<dependency>
<name>adminInterface</name>
<version>4.0/*</version>
+ <optional>true</optional>
</dependency>
<dependency>
- <name>fckEditor</name>
- <version>4.0/*</version>
- </dependency>
- <dependency>
<name>standard-templating-kit</name>
<version>1.2/*</version>
<optional>true</optional>
Added: trunk/openutils-mgnlmedia/src/test/java/net/sourceforge/openutils/mgnlmedia/media/repotests/MediaTests.java
===================================================================
--- trunk/openutils-mgnlmedia/src/test/java/net/sourceforge/openutils/mgnlmedia/media/repotests/MediaTests.java (rev 0)
+++ trunk/openutils-mgnlmedia/src/test/java/net/sourceforge/openutils/mgnlmedia/media/repotests/MediaTests.java 2011-06-16 11:20:53 UTC (rev 3540)
@@ -0,0 +1,63 @@
+/**
+ *
+ * SimpleMedia Module for Magnolia CMS (http://www.openmindlab.com/lab/products/media.html)
+ * Copyright(C) 2008-2011, Openmind S.r.l. http://www.openmindonline.it
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sourceforge.openutils.mgnlmedia.media.repotests;
+
+import info.magnolia.cms.core.Content;
+import it.openutils.mgnlutils.test.RepositoryTestConfiguration;
+import it.openutils.mgnlutils.test.TestNgRepositoryTestcase;
+
+import java.io.InputStream;
+
+import net.sourceforge.openutils.mgnlmedia.media.utils.MediaLoadUtils;
+
+import org.apache.commons.io.IOUtils;
+import org.testng.Assert;
+import org.testng.annotations.BeforeClass;
+import org.testng.annotations.Test;
+
+
+/**
+ * @author fgiust
+ * @version $Id$
+ */
+@RepositoryTestConfiguration(jackrabbitRepositoryConfig = "/test-repository/jackrabbit-test-configuration.xml", repositoryConfig = "/test-repository/test-repositories.xml")
+// , bootstrapFiles = "/test-bootstrap/media.x.xml"
+public class MediaTests extends TestNgRepositoryTestcase
+{
+
+ @Override
+ @BeforeClass
+ public void setUp() throws Exception
+ {
+ super.setUp();
+ // MgnlContext.getHierarchyManager("media").save();
+ }
+
+ @Test(enabled = false)
+ public void uploadIco() throws Exception
+ {
+ InputStream is = getClass().getResourceAsStream("/images/openmind.ico");
+ Content entry = MediaLoadUtils.loadEntry(is, "/test/folder", "openmind.ico", true);
+
+ IOUtils.closeQuietly(is);
+
+ Assert.assertNotNull(entry);
+ }
+
+}
Property changes on: trunk/openutils-mgnlmedia/src/test/java/net/sourceforge/openutils/mgnlmedia/media/repotests/MediaTests.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: svn:keywords
+ Author Date Id Revision
Added: svn:eol-style
+ native
Added: trunk/openutils-mgnlmedia/src/test/resources/log4j.dtd
===================================================================
--- trunk/openutils-mgnlmedia/src/test/resources/log4j.dtd (rev 0)
+++ trunk/openutils-mgnlmedia/src/test/resources/log4j.dtd 2011-06-16 11:20:53 UTC (rev 3540)
@@ -0,0 +1,166 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+
+<!-- Authors: Chris Taylor, Ceki Gulcu. -->
+
+<!-- Version: 1.2 -->
+
+<!-- A configuration element consists of optional renderer
+elements,appender elements, categories and an optional root
+element. -->
+
+<!ELEMENT log4j:configuration (renderer*, appender*,(category|logger)*,root?,
+ categoryFactory?)>
+
+<!-- The "threshold" attribute takes a level value such that all -->
+<!-- logging statements with a level equal or below this value are -->
+<!-- disabled. -->
+
+<!-- Setting the "debug" enable the printing of internal log4j logging -->
+<!-- statements. -->
+
+<!-- By default, debug attribute is "null", meaning that we not do touch -->
+<!-- internal log4j logging settings. The "null" value for the threshold -->
+<!-- attribute can be misleading. The threshold field of a repository -->
+<!-- cannot be set to null. The "null" value for the threshold attribute -->
+<!-- simply means don't touch the threshold field, the threshold field -->
+<!-- keeps its old value. -->
+
+<!ATTLIST log4j:configuration
+ xmlns:log4j CDATA #FIXED "http://jakarta.apache.org/log4j/"
+ threshold (all|debug|info|warn|error|fatal|off|null) "null"
+ debug (true|false|null) "null"
+>
+
+<!-- renderer elements allow the user to customize the conversion of -->
+<!-- message objects to String. -->
+
+<!ELEMENT renderer EMPTY>
+<!ATTLIST renderer
+ renderedClass CDATA #REQUIRED
+ renderingClass CDATA #REQUIRED
+>
+
+<!-- Appenders must have a name and a class. -->
+<!-- Appenders may contain an error handler, a layout, optional parameters -->
+<!-- and filters. They may also reference (or include) other appenders. -->
+<!ELEMENT appender (errorHandler?, param*, layout?, filter*, appender-ref*)>
+<!ATTLIST appender
+ name ID #REQUIRED
+ class CDATA #REQUIRED
+>
+
+<!ELEMENT layout (param*)>
+<!ATTLIST layout
+ class CDATA #REQUIRED
+>
+
+<!ELEMENT filter (param*)>
+<!ATTLIST filter
+ class CDATA #REQUIRED
+>
+
+<!-- ErrorHandlers can be of any class. They can admit any number of -->
+<!-- parameters. -->
+
+<!ELEMENT errorHandler (param*, root-ref?, logger-ref*, appender-ref?)>
+<!ATTLIST errorHandler
+ class CDATA #REQUIRED
+>
+
+<!ELEMENT root-ref EMPTY>
+
+<!ELEMENT logger-ref EMPTY>
+<!ATTLIST logger-ref
+ ref IDREF #REQUIRED
+>
+
+<!ELEMENT param EMPTY>
+<!ATTLIST param
+ name CDATA #REQUIRED
+ value CDATA #REQUIRED
+>
+
+
+<!-- The priority class is org.apache.log4j.Level by default -->
+<!ELEMENT priority (param*)>
+<!ATTLIST priority
+ class CDATA #IMPLIED
+ value CDATA #REQUIRED
+>
+
+<!-- The level class is org.apache.log4j.Level by default -->
+<!ELEMENT level (param*)>
+<!ATTLIST level
+ class CDATA #IMPLIED
+ value CDATA #REQUIRED
+>
+
+
+<!-- If no level element is specified, then the configurator MUST not -->
+<!-- touch the level of the named category. -->
+<!ELEMENT category (param*,(priority|level)?,appender-ref*)>
+<!ATTLIST category
+ class CDATA #IMPLIED
+ name CDATA #REQUIRED
+ additivity (true|false) "true"
+>
+
+<!-- If no level element is specified, then the configurator MUST not -->
+<!-- touch the level of the named logger. -->
+<!ELEMENT logger (level?,appender-ref*)>
+<!ATTLIST logger
+ name ID #REQUIRED
+ additivity (true|false) "true"
+>
+
+
+<!ELEMENT categoryFactory (param*)>
+<!ATTLIST categoryFactory
+ class CDATA #REQUIRED>
+
+<!ELEMENT appender-ref EMPTY>
+<!ATTLIST appender-ref
+ ref IDREF #REQUIRED
+>
+
+<!-- If no priority element is specified, then the configurator MUST not -->
+<!-- touch the priority of root. -->
+<!-- The root category always exists and cannot be subclassed. -->
+<!ELEMENT root (param*, (priority|level)?, appender-ref*)>
+
+
+<!-- ==================================================================== -->
+<!-- A logging event -->
+<!-- ==================================================================== -->
+<!ELEMENT log4j:eventSet (log4j:event*)>
+<!ATTLIST log4j:eventSet
+ xmlns:log4j CDATA #FIXED "http://jakarta.apache.org/log4j/"
+ version (1.1|1.2) "1.2"
+ includesLocationInfo (true|false) "true"
+>
+
+
+
+<!ELEMENT log4j:event (log4j:message, log4j:NDC?, log4j:throwable?,
+ log4j:locationInfo?) >
+
+<!-- The timestamp format is application dependent. -->
+<!ATTLIST log4j:event
+ logger CDATA #REQUIRED
+ level CDATA #REQUIRED
+ thread CDATA #REQUIRED
+ timestamp CDATA #REQUIRED
+>
+
+<!ELEMENT log4j:message (#PCDATA)>
+<!ELEMENT log4j:NDC (#PCDATA)>
+
+<!ELEMENT log4j:throwable (#PCDATA)>
+
+<!ELEMENT log4j:locationInfo EMPTY>
+<!ATTLIST log4j:locationInfo
+ class CDATA #REQUIRED
+ method CDATA #REQUIRED
+ file CDATA #REQUIRED
+ line CDATA #REQUIRED
+>
Property changes on: trunk/openutils-mgnlmedia/src/test/resources/log4j.dtd
___________________________________________________________________
Added: svn:mime-type
+ text/xml
Added: svn:eol-style
+ native
Added: trunk/openutils-mgnlmedia/src/test/resources/test-magnolia.properties
===================================================================
--- trunk/openutils-mgnlmedia/src/test/resources/test-magnolia.properties (rev 0)
+++ trunk/openutils-mgnlmedia/src/test/resources/test-magnolia.properties 2011-06-16 11:20:53 UTC (rev 3540)
@@ -0,0 +1,39 @@
+magnolia.basedir=target/magnolia-test-data
+magnolia.cache.startdir=${magnolia.basedir}/cache
+magnolia.upload.tmpdir=${magnolia.basedir}/tmp
+magnolia.exchange.history=${magnolia.basedir}/history
+
+magnolia.app.rootdir=.
+
+magnolia.repositories.home=target/test-repositories
+# points to the classpath resources, but will be extracted and the property reset
+
+magnolia.repositories.config=/test-repositories.xml
+magnolia.repositories.jackrabbit.config=/jackrabbit-test-configuration.xml
+
+log4j.config=WEB-INF/config/default/log4j.xml
+magnolia.logs.dir=${magnolia.base}/logs
+
+# The directories in which the bootstrap files are searched
+magnolia.bootstrap.dir=WEB-INF/bootstrap/author WEB-INF/bootstrap/common
+
+
+magnolia.bootstrap.authorInstance=true
+magnolia.bootstrap.samples=false
+magnolia.develop=true
+
+magnolia.connection.jcr.userId = admin
+magnolia.connection.jcr.password = admin
+
+magnolia.update.auto=true
+
+magnolia.defaultpage = /sapere.html
+
+####### solo per test #####
+info.magnolia.logging.AuditLoggingManager=info.magnolia.logging.AuditLoggingManager
+info.magnolia.link.LinkTransformerManager=info.magnolia.link.LinkTransformerManager
+#######
+
+info.magnolia.cms.i18n.I18nContentSupport=info.magnolia.cms.i18n.DefaultI18nContentSupport
+
+info.magnolia.cms.core.search.SearchFactory=info.magnolia.cms.core.search.DefaultSearchFactory
Property changes on: trunk/openutils-mgnlmedia/src/test/resources/test-magnolia.properties
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: svn:keywords
+ Author Date Id Revision
Added: svn:eol-style
+ native
Added: trunk/openutils-mgnlmedia/src/test/resources/test-repository/jackrabbit-test-configuration.xml
===================================================================
--- trunk/openutils-mgnlmedia/src/test/resources/test-repository/jackrabbit-test-configuration.xml (rev 0)
+++ trunk/openutils-mgnlmedia/src/test/resources/test-repository/jackrabbit-test-configuration.xml 2011-06-16 11:20:53 UTC (rev 3540)
@@ -0,0 +1,52 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE Repository PUBLIC "-//The Apache Software Foundation//DTD Jackrabbit 1.6//EN" "http://jackrabbit.apache.org/dtd/repository-1.6.dtd">
+<!-- TESTING-ONLY configuration! repositories are in memory only and any change is lost upon restart -->
+<Repository>
+ <FileSystem class="org.apache.jackrabbit.core.fs.mem.MemoryFileSystem">
+ </FileSystem>
+ <Security appName="Jackrabbit">
+ <AccessManager class="org.apache.jackrabbit.core.security.SimpleAccessManager"></AccessManager>
+ <LoginModule class="org.apache.jackrabbit.core.security.SimpleLoginModule">
+ <param name="anonymousId" value="anonymous" />
+ </LoginModule>
+ </Security>
+ <Workspaces rootPath="${rep.home}/workspaces" defaultWorkspace="default" />
+ <Workspace name="default">
+ <FileSystem class="org.apache.jackrabbit.core.fs.mem.MemoryFileSystem">
+ </FileSystem>
+ <PersistenceManager class="org.apache.jackrabbit.core.persistence.bundle.BundleFsPersistenceManager">
+ <param name="blobFSBlockSize" value="1" /><!-- store in memory -->
+ </PersistenceManager>
+ <SearchIndex class="org.apache.jackrabbit.core.query.lucene.SearchIndex">
+ <param name="path" value="${wsp.home}/index" />
+ <param name="useCompoundFile" value="false" /><!-- lasciare a false solo per i tests -->
+ <param name="minMergeDocs" value="100" />
+ <param name="volatileIdleTime" value="3" />
+ <param name="maxMergeDocs" value="100000" />
+ <param name="mergeFactor" value="10" />
+ <param name="maxFieldLength" value="10000" />
+ <param name="bufferSize" value="10" />
+ <param name="cacheSize" value="1000" />
+ <param name="autoRepair" value="true" />
+ <param name="queryClass" value="org.apache.jackrabbit.core.query.QueryImpl" />
+ <param name="respectDocumentOrder" value="true" />
+ <param name="resultFetchSize" value="2147483647" />
+ <param name="extractorPoolSize" value="3" />
+ <param name="extractorTimeout" value="100" />
+ <param name="extractorBackLogSize" value="100" />
+ <param name="enableConsistencyCheck" value="true" />
+ <param name="autoRepair" value="true" />
+ <param name="forceConsistencyCheck" value="false" />
+ <param name="directoryManagerClass" value="org.apache.jackrabbit.core.query.lucene.directory.RAMDirectoryManager" />
+ <param name="supportHighlighting" value="true" />
+ <param name="analyzer" value="net.sourceforge.openutils.mgnlcriteria.utils.ASCIIFoldingAnalyzer" />
+ </SearchIndex>
+ </Workspace>
+ <Versioning rootPath="${rep.home}/version">
+ <FileSystem class="org.apache.jackrabbit.core.fs.mem.MemoryFileSystem">
+ </FileSystem>
+ <PersistenceManager class="org.apache.jackrabbit.core.persistence.bundle.BundleFsPersistenceManager">
+ <param name="blobFSBlockSize" value="1" /><!-- store in memory -->
+ </PersistenceManager>
+ </Versioning>
+</Repository>
\ No newline at end of file
Property changes on: trunk/openutils-mgnlmedia/src/test/resources/test-repository/jackrabbit-test-configuration.xml
___________________________________________________________________
Added: svn:mime-type
+ text/xml
Added: svn:keywords
+ Author Date Id Revision
Added: svn:eol-style
+ native
Added: trunk/openutils-mgnlmedia/src/test/resources/test-repository/test-repositories.xml
===================================================================
--- trunk/openutils-mgnlmedia/src/test/resources/test-repository/test-repositories.xml (rev 0)
+++ trunk/openutils-mgnlmedia/src/test/resources/test-repository/test-repositories.xml 2011-06-16 11:20:53 UTC (rev 3540)
@@ -0,0 +1,52 @@
+<!--
+ $Id$
+-->
+<!DOCTYPE JCR [
+<!ELEMENT Map (#PCDATA)>
+<!ATTLIST Map
+ name CDATA #REQUIRED
+ repositoryName CDATA #REQUIRED
+ workspaceName CDATA #REQUIRED>
+<!ELEMENT JCR (RepositoryMapping|Repository)*>
+<!ELEMENT param (#PCDATA)>
+<!ATTLIST param
+ name CDATA #REQUIRED
+ value CDATA #REQUIRED>
+<!ELEMENT Repository (param|workspace)*>
+<!ATTLIST Repository
+ loadOnStartup CDATA #REQUIRED
+ name CDATA #REQUIRED
+ provider CDATA #REQUIRED>
+<!ELEMENT workspace (#PCDATA)>
+<!ATTLIST workspace
+ name CDATA #REQUIRED>
+<!ELEMENT RepositoryMapping (Map)*>
+]><JCR>
+ <RepositoryMapping>
+ <Map name="website" repositoryName="magnolia" workspaceName="website" />
+ <Map name="config" repositoryName="magnolia" workspaceName="config" />
+ <Map name="users" repositoryName="magnolia" workspaceName="users" />
+ <Map name="userroles" repositoryName="magnolia" workspaceName="userroles" />
+ <Map name="usergroups" repositoryName="magnolia" workspaceName="usergroups" />
+ <Map name="mgnlSystem" repositoryName="magnolia" workspaceName="mgnlSystem" /> <!-- System internal data -->
+ <Map name="mgnlVersion" repositoryName="magnolia" workspaceName="mgnlVersion" /> <!-- magnolia version workspace -->
+ <Map name="media" repositoryName="magnolia" workspaceName="media" />
+ </RepositoryMapping>
+
+ <!-- magnolia default repository -->
+ <Repository name="magnolia" provider="info.magnolia.jackrabbit.ProviderImpl" loadOnStartup="true">
+ <param name="configFile" value="${magnolia.repositories.jackrabbit.config}" />
+ <param name="repositoryHome" value="${magnolia.repositories.home}/magnolia" />
+ <param name="contextFactoryClass" value="org.apache.jackrabbit.core.jndi.provider.DummyInitialContextFactory" />
+ <param name="providerURL" value="localhost" />
+ <param name="bindName" value="${magnolia.webapp}" />
+ <workspace name="website" />
+ <workspace name="config" />
+ <workspace name="users" />
+ <workspace name="userroles" />
+ <workspace name="usergroups" />
+ <workspace name="mgnlSystem" />
+ <workspace name="mgnlVersion" />
+ <workspace name="media" />
+ </Repository>
+</JCR>
\ No newline at end of file
Property changes on: trunk/openutils-mgnlmedia/src/test/resources/test-repository/test-repositories.xml
___________________________________________________________________
Added: svn:mime-type
+ text/xml
Added: svn:keywords
+ Author Date Id Revision
Added: svn:eol-style
+ native
Added: trunk/openutils-mgnlmedia/src/test/resources/test_dir.txt
===================================================================
--- trunk/openutils-mgnlmedia/src/test/resources/test_dir.txt (rev 0)
+++ trunk/openutils-mgnlmedia/src/test/resources/test_dir.txt 2011-06-16 11:20:53 UTC (rev 3540)
@@ -0,0 +1 @@
+// file used in unit test to find the test resource root
\ No newline at end of file
Property changes on: trunk/openutils-mgnlmedia/src/test/resources/test_dir.txt
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: svn:keywords
+ Author Date Id Revision
Added: svn:eol-style
+ native
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fg...@us...> - 2011-06-16 16:58:10
|
Revision: 3542
http://openutils.svn.sourceforge.net/openutils/?rev=3542&view=rev
Author: fgiust
Date: 2011-06-16 16:58:03 +0000 (Thu, 16 Jun 2011)
Log Message:
-----------
tests draft
Modified Paths:
--------------
trunk/openutils-mgnlmedia/pom.xml
trunk/openutils-mgnlmedia/src/test/java/net/sourceforge/openutils/mgnlmedia/media/repotests/MediaTests.java
Added Paths:
-----------
trunk/openutils-mgnlmedia/src/test/resources/META-INF/
trunk/openutils-mgnlmedia/src/test/resources/META-INF/magnolia/
trunk/openutils-mgnlmedia/src/test/resources/META-INF/magnolia/standard-templating-kit.xml
trunk/openutils-mgnlmedia/src/test/resources/log4j.xml
Modified: trunk/openutils-mgnlmedia/pom.xml
===================================================================
--- trunk/openutils-mgnlmedia/pom.xml 2011-06-16 13:31:03 UTC (rev 3541)
+++ trunk/openutils-mgnlmedia/pom.xml 2011-06-16 16:58:03 UTC (rev 3542)
@@ -101,34 +101,6 @@
</dependency>
<dependency>
<groupId>info.magnolia</groupId>
- <artifactId>magnolia-module-fckEditor</artifactId>
- <version>${magnolia.version}</version>
- <optional>true</optional>
- <exclusions>
- <exclusion>
- <groupId>javax.mail</groupId>
- <artifactId>mail</artifactId>
- </exclusion>
- <exclusion>
- <groupId>javax.jms</groupId>
- <artifactId>jms</artifactId>
- </exclusion>
- <exclusion>
- <groupId>com.sun.jdmk</groupId>
- <artifactId>jmxtools</artifactId>
- </exclusion>
- <exclusion>
- <groupId>com.sun.jmx</groupId>
- <artifactId>jmxri</artifactId>
- </exclusion>
- <exclusion>
- <groupId>pdfbox</groupId>
- <artifactId>pdfbox</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>info.magnolia</groupId>
<artifactId>magnolia-module-admininterface</artifactId>
<version>${magnolia.version}</version>
<exclusions>
@@ -173,8 +145,25 @@
<artifactId>magnolia-module-standard-templating-kit</artifactId>
<version>1.4</version>
<optional>true</optional>
+ <exclusions>
+ <exclusion>
+ <groupId>info.magnolia</groupId>
+ <artifactId>magnolia-module-resources</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>info.magnolia</groupId>
+ <artifactId>magnolia-module-public-user-registration</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
+ <groupId>info.magnolia</groupId>
+ <artifactId>magnolia-core</artifactId>
+ <classifier>tests</classifier>
+ <version>${magnolia.version}</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
<groupId>com.drewnoakes</groupId>
<artifactId>metadata-extractor</artifactId>
<version>2.4.0-beta-1</version>
@@ -241,6 +230,6 @@
</dependency>
</dependencies>
<properties>
- <magnolia.version>4.4.1</magnolia.version>
+ <magnolia.version>4.4.4</magnolia.version>
</properties>
</project>
\ No newline at end of file
Modified: trunk/openutils-mgnlmedia/src/test/java/net/sourceforge/openutils/mgnlmedia/media/repotests/MediaTests.java
===================================================================
--- trunk/openutils-mgnlmedia/src/test/java/net/sourceforge/openutils/mgnlmedia/media/repotests/MediaTests.java 2011-06-16 13:31:03 UTC (rev 3541)
+++ trunk/openutils-mgnlmedia/src/test/java/net/sourceforge/openutils/mgnlmedia/media/repotests/MediaTests.java 2011-06-16 16:58:03 UTC (rev 3542)
@@ -19,6 +19,9 @@
package net.sourceforge.openutils.mgnlmedia.media.repotests;
import info.magnolia.cms.core.Content;
+import info.magnolia.cms.core.HierarchyManager;
+import info.magnolia.cms.util.ContentUtil;
+import info.magnolia.context.MgnlContext;
import it.openutils.mgnlutils.test.RepositoryTestConfiguration;
import it.openutils.mgnlutils.test.TestNgRepositoryTestcase;
@@ -27,7 +30,6 @@
import net.sourceforge.openutils.mgnlmedia.media.utils.MediaLoadUtils;
import org.apache.commons.io.IOUtils;
-import org.testng.Assert;
import org.testng.annotations.BeforeClass;
import org.testng.annotations.Test;
@@ -36,7 +38,8 @@
* @author fgiust
* @version $Id$
*/
-@RepositoryTestConfiguration(jackrabbitRepositoryConfig = "/test-repository/jackrabbit-test-configuration.xml", repositoryConfig = "/test-repository/test-repositories.xml")
+@RepositoryTestConfiguration(jackrabbitRepositoryConfig = "/test-repository/jackrabbit-test-configuration.xml", repositoryConfig = "/test-repository/test-repositories.xml", autostart = true)
+// , startModules = @ModuleConfiguration(name = "media", moduleclass = MediaModule.class)
// , bootstrapFiles = "/test-bootstrap/media.x.xml"
public class MediaTests extends TestNgRepositoryTestcase
{
@@ -49,15 +52,20 @@
// MgnlContext.getHierarchyManager("media").save();
}
- @Test(enabled = false)
+ @Test(enabled = true)
public void uploadIco() throws Exception
{
+
+ HierarchyManager hm = MgnlContext.getHierarchyManager("media");
+ ContentUtil.createPath(hm, "/test/folder");
+ hm.save();
+
InputStream is = getClass().getResourceAsStream("/images/openmind.ico");
Content entry = MediaLoadUtils.loadEntry(is, "/test/folder", "openmind.ico", true);
IOUtils.closeQuietly(is);
- Assert.assertNotNull(entry);
+ // Assert.assertNotNull(entry);
}
}
Added: trunk/openutils-mgnlmedia/src/test/resources/META-INF/magnolia/standard-templating-kit.xml
===================================================================
--- trunk/openutils-mgnlmedia/src/test/resources/META-INF/magnolia/standard-templating-kit.xml (rev 0)
+++ trunk/openutils-mgnlmedia/src/test/resources/META-INF/magnolia/standard-templating-kit.xml 2011-06-16 16:58:03 UTC (rev 3542)
@@ -0,0 +1,78 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE module SYSTEM "module.dtd">
+<module>
+<!-- overwrite the real description during tests to avoid the long list of dependencies -->
+ <name>standard-templating-kit</name>
+ <displayName>Magnolia Standard Templating Kit</displayName>
+ <description></description>
+ <class>info.magnolia.module.templatingkit.STKModule</class>
+ <versionHandler>info.magnolia.module.templatingkit.setup.STKModuleVersionHandler</versionHandler>
+ <version>1.4</version>
+ <properties>
+ <property>
+ <name>info.magnolia.module.templatingkit.style.Theme</name>
+ <value>info.magnolia.module.templatingkit.style.ThemeImpl</value>
+ </property>
+ <property>
+ <name>info.magnolia.module.templatingkit.sites.SiteManager</name>
+ <value>info.magnolia.module.templatingkit.sites.STKSiteManager</value>
+ </property>
+ <property>
+ <name>info.magnolia.module.templatingkit.beanmerger.BeanMerger</name>
+ <value>info.magnolia.module.templatingkit.beanmerger.STKBeanMerger</value>
+ </property>
+ <property>
+ <name>info.magnolia.module.templatingkit.categorization.CategorizationSupport</name>
+ <value>info.magnolia.module.templatingkit.categorization.STKCategorizationSupport</value>
+ </property>
+ <property>
+ <name>info.magnolia.cms.core.AggregationState</name>
+ <value>info.magnolia.module.templatingkit.ExtendedAggregationState</value>
+ </property>
+ </properties>
+ <dependencies>
+ <dependency>
+ <name>core</name>
+ <version>4.4/*</version>
+ </dependency>
+ <!--
+ <dependency>
+ <name>adminInterface</name>
+ <version>4.4/*</version>
+ </dependency>
+ <dependency>
+ <name>cache</name>
+ <version>4.4/*</version>
+ </dependency>
+ <dependency>
+ <name>fckEditor</name>
+ <version>4.4/*</version>
+ </dependency>
+ <dependency>
+ <name>resources</name>
+ <version>1.3/*</version>
+ </dependency>
+ <dependency>
+ <name>inplace-templating</name>
+ <version>1.2/*</version>
+ </dependency>
+ <dependency>
+ <name>dms</name>
+ <version>1.5/*</version>
+ </dependency>
+ <dependency>
+ <name>data</name>
+ <version>1.6/*</version>
+ </dependency>
+ <dependency>
+ <name>rssaggregator</name>
+ <version>1.1/*</version>
+ </dependency>
+ <dependency>
+ <name>public-user-registration</name>
+ <version>1.2/*</version>
+ <optional>true</optional>
+ </dependency>
+ -->
+ </dependencies>
+</module>
Property changes on: trunk/openutils-mgnlmedia/src/test/resources/META-INF/magnolia/standard-templating-kit.xml
___________________________________________________________________
Added: svn:mime-type
+ text/xml
Added: svn:keywords
+ Author Date Id Revision
Added: svn:eol-style
+ native
Property changes on: trunk/openutils-mgnlmedia/src/test/resources/log4j.xml
___________________________________________________________________
Added: svn:mime-type
+ text/xml
Added: svn:keywords
+ Author Date Id Revision
Added: svn:eol-style
+ native
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fg...@us...> - 2011-11-20 20:20:59
|
Revision: 3703
http://openutils.svn.sourceforge.net/openutils/?rev=3703&view=rev
Author: fgiust
Date: 2011-11-20 20:20:50 +0000 (Sun, 20 Nov 2011)
Log Message:
-----------
MEDIA-274 parsing of swf metadata
Modified Paths:
--------------
trunk/openutils-mgnlmedia/pom.xml
trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/types/impl/MediaWithPreviewImageTypeHandler.java
trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/types/impl/SwfTypeHandler.java
trunk/openutils-mgnlmedia/src/main/resources/META-INF/tags/media/media.tag
trunk/openutils-mgnlmedia/src/main/resources/META-INF/tags/media/swfobject.tag
trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap-samples/media/media.samples.xml
trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/media/lang/messages.properties
trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/media/lang/messages_it.properties
Modified: trunk/openutils-mgnlmedia/pom.xml
===================================================================
--- trunk/openutils-mgnlmedia/pom.xml 2011-11-20 17:59:29 UTC (rev 3702)
+++ trunk/openutils-mgnlmedia/pom.xml 2011-11-20 20:20:50 UTC (rev 3703)
@@ -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>
@@ -227,6 +228,26 @@
<artifactId>isoparser</artifactId>
<version>1.0-beta-3</version>
</dependency>
+ <dependency>
+ <groupId>org.devlib.schmidt</groupId>
+ <artifactId>imageinfo</artifactId>
+ <version>1.9</version>
+ </dependency>
+ <dependency>
+ <groupId>org.freehep</groupId>
+ <artifactId>freehep-graphicsio-swf</artifactId>
+ <version>2.1.3</version>
+ <exclusions>
+ <exclusion>
+ <groupId>org.freehep</groupId>
+ <artifactId>freehep-graphics2d</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.freehep</groupId>
+ <artifactId>freehep-graphicsio-tests</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
</dependencies>
<properties>
<magnolia.version>4.4.4</magnolia.version>
Modified: trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/types/impl/MediaWithPreviewImageTypeHandler.java
===================================================================
--- trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/types/impl/MediaWithPreviewImageTypeHandler.java 2011-11-20 17:59:29 UTC (rev 3702)
+++ trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/types/impl/MediaWithPreviewImageTypeHandler.java 2011-11-20 20:20:50 UTC (rev 3703)
@@ -45,19 +45,9 @@
*/
public String getThumbnailUrl(Content media)
{
- boolean hasPreview = false;
- try
+ if (hasPreview(media))
{
- hasPreview = media.hasNodeData(PREVIEW_NODEDATA_NAME);
- }
- catch (RepositoryException e)
- {
- // ignore
- }
-
- if (hasPreview)
- {
if (!ImageUtils.checkOrCreateResolution(media, "thumbnail", PREVIEW_NODEDATA_NAME))
{
return "";
@@ -76,6 +66,24 @@
public abstract String getReplacementThumbnail();
+ protected boolean hasPreview(Content media)
+ {
+
+ if (media != null)
+ {
+ try
+ {
+ return media.hasNodeData(PREVIEW_NODEDATA_NAME);
+ }
+ catch (RepositoryException e)
+ {
+ // ignore
+ }
+ }
+
+ return false;
+ }
+
@Override
public String getPreviewImageNodeDataName()
{
Modified: trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/types/impl/SwfTypeHandler.java
===================================================================
--- trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/types/impl/SwfTypeHandler.java 2011-11-20 17:59:29 UTC (rev 3702)
+++ trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/types/impl/SwfTypeHandler.java 2011-11-20 20:20:50 UTC (rev 3703)
@@ -22,10 +22,13 @@
import info.magnolia.cms.core.Content;
import info.magnolia.cms.util.NodeDataUtil;
+import java.awt.Dimension;
import java.io.InputStream;
import org.apache.commons.io.IOUtils;
import org.devlib.schmidt.imageinfo.ImageInfo;
+import org.freehep.graphicsio.swf.SWFHeader;
+import org.freehep.graphicsio.swf.SWFInputStream;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -50,15 +53,43 @@
try
{
stream = getOriginalFileNodeData(media).getStream();
- ImageInfo ii = new ImageInfo();
- ii.setInput(stream);
- if (ii.check())
+
+ Dimension dimension = null;
+ Integer flashversion = null;
+ try
{
- NodeDataUtil.getOrCreateAndSet(media, METADATA_WIDTH, ii.getWidth());
- NodeDataUtil.getOrCreateAndSet(media, METADATA_HEIGHT, ii.getHeight());
+ SWFInputStream swfinput = new SWFInputStream(stream);
+ SWFHeader header = new SWFHeader(swfinput);
+ dimension = header.getSize();
+ flashversion = header.getVersion();
+ }
+ catch (Throwable e)
+ {
+ log.warn("Unable to parse swf header: " + e.getClass().getName() + " " + e.getMessage());
+ }
+
+ if (dimension != null)
+ {
+ NodeDataUtil.getOrCreateAndSet(media, METADATA_WIDTH, dimension.getWidth());
+ NodeDataUtil.getOrCreateAndSet(media, METADATA_HEIGHT, dimension.getHeight());
+ NodeDataUtil.getOrCreateAndSet(media, "media_flashversion", flashversion);
media.save();
}
+ else if (hasPreview(media))
+ {
+ IOUtils.closeQuietly(stream);
+ stream = media.getNodeData(getPreviewImageNodeDataName()).getStream();
+ ImageInfo ii = new ImageInfo();
+ ii.setInput(stream);
+ if (ii.check())
+ {
+ NodeDataUtil.getOrCreateAndSet(media, METADATA_WIDTH, ii.getWidth());
+ NodeDataUtil.getOrCreateAndSet(media, METADATA_HEIGHT, ii.getHeight());
+ media.save();
+ }
+ }
+
}
catch (Throwable e)
{
Modified: trunk/openutils-mgnlmedia/src/main/resources/META-INF/tags/media/media.tag
===================================================================
--- trunk/openutils-mgnlmedia/src/main/resources/META-INF/tags/media/media.tag 2011-11-20 17:59:29 UTC (rev 3702)
+++ trunk/openutils-mgnlmedia/src/main/resources/META-INF/tags/media/media.tag 2011-11-20 20:20:50 UTC (rev 3703)
@@ -177,6 +177,18 @@
</c:when>
+ <c:when test="${media.type eq 'swf' }">
+
+ <c:if test="${!(width gt 0)}">
+ <c:set var="width" value="${media:width(mediaNode)}" />
+ </c:if>
+ <c:if test="${!(height gt 0)}">
+ <c:set var="height" value="${media:height(mediaNode)}" />
+ </c:if>
+
+ <media:swfobject player="${pageContext.request.contextPath}${media:url(mediaNode)}" width="${width gt 0 ? width : ''}" height="${height gt 0? height : ''}" image="${thumbnail}"/>
+ </c:when>
+
</c:choose>
</c:when>
<c:when test="${!empty property and fn:startsWith(item, '/')}">
Modified: trunk/openutils-mgnlmedia/src/main/resources/META-INF/tags/media/swfobject.tag
===================================================================
--- trunk/openutils-mgnlmedia/src/main/resources/META-INF/tags/media/swfobject.tag 2011-11-20 17:59:29 UTC (rev 3702)
+++ trunk/openutils-mgnlmedia/src/main/resources/META-INF/tags/media/swfobject.tag 2011-11-20 20:20:50 UTC (rev 3703)
@@ -6,6 +6,7 @@
<jsp:directive.attribute name="player" required="true" rtexprvalue="true" type="java.lang.String" description="the swf file of the player (examples: player.swf (default), jwplayer4, jwplayer5, jwplayer5/player.swf, /.resources/media/players/jwplayer5/player.swf)" />
<jsp:directive.attribute name="width" required="false" rtexprvalue="true" type="java.lang.Integer" description="flash content width" />
<jsp:directive.attribute name="height" required="false" rtexprvalue="true" type="java.lang.Integer" description="flash content height" />
+ <jsp:directive.attribute name="image" required="false" rtexprvalue="true" description="replacement image" />
<jsp:directive.tag dynamic-attributes="attrs" />
<!-- end attributes -->
Modified: trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap-samples/media/media.samples.xml
===================================================================
--- trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap-samples/media/media.samples.xml 2011-11-20 17:59:29 UTC (rev 3702)
+++ trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap-samples/media/media.samples.xml 2011-11-20 20:20:50 UTC (rev 3703)
@@ -151,6 +151,72 @@
<sv:value>320</sv:value>
</sv:property>
</sv:node>
+ <sv:node sv:name="resolutions">
+ <sv:property sv:name="jcr:primaryType" sv:type="Name">
+ <sv:value>mgnl:resolutions</sv:value>
+ </sv:property>
+ <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
+ <sv:value>mix:lockable</sv:value>
+ </sv:property>
+ <sv:property sv:name="jcr:uuid" sv:type="String">
+ <sv:value>ec963fa4-00f5-4efd-8aa2-bdbf8e609bc9</sv:value>
+ </sv:property>
+ <sv:property sv:name="jcr:createdBy" sv:type="String">
+ <sv:value>admin</sv:value>
+ </sv:property>
+ <sv:node sv:name="MetaData">
+ <sv:property sv:name="jcr:primaryType" sv:type="Name">
+ <sv:value>mgnl:metaData</sv:value>
+ </sv:property>
+ <sv:property sv:name="jcr:createdBy" sv:type="String">
+ <sv:value>admin</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:creationdate" sv:type="Date">
+ <sv:value>2011-11-20T21:13:52.626+01:00</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:lastmodified" sv:type="Date">
+ <sv:value>2011-11-20T21:13:52.627+01:00</sv:value>
+ </sv:property>
+ </sv:node>
+ <sv:node sv:name="thumbnail">
+ <sv:property sv:name="jcr:primaryType" sv:type="Name">
+ <sv:value>mgnl:resource</sv:value>
+ </sv:property>
+ <sv:property sv:name="jcr:uuid" sv:type="String">
+ <sv:value>90544e4e-942d-475b-a636-b361a138d6a5</sv:value>
+ </sv:property>
+ <sv:property sv:name="extension" sv:type="String">
+ <sv:value>jpg</sv:value>
+ </sv:property>
+ <sv:property sv:name="fileName" sv:type="String">
+ <sv:value>bliptv</sv:value>
+ </sv:property>
+ <sv:property sv:name="height" sv:type="String">
+ <sv:value>75</sv:value>
+ </sv:property>
+ <sv:property sv:name="jcr:data" sv:type="Binary">
+ <sv:value>/9j/4AAQSkZJRgABAQAAAQABAAD/2wBDAAYEBQYFBAYGBQYHBwYIChAKCgkJChQODwwQFxQYGBcUFhYaHSUfGhsjHBYWICwgIyYnKSopGR8tMC0oMCUoKSj/2wBDAQcHBwoIChMKChMoGhYaKCgoKCgoKCgoKCgoKCgoKCgoKCgoKCgoKCgoKCgoKCgoKCgoKCgoKCgoKCgoKCgoKCj/wAARCABLAGQDASIAAhEBAxEB/8QAHwAAAQUBAQEBAQEAAAAAAAAAAAECAwQFBgcICQoL/8QAtRAAAgEDAwIEAwUFBAQAAAF9AQIDAAQRBRIhMUEGE1FhByJxFDKBkaEII0KxwRVS0fAkM2JyggkKFhcYGRolJicoKSo0NTY3ODk6Q0RFRkdISUpTVFVWV1hZWmNkZWZnaGlqc3R1dnd4eXqDhIWGh4iJipKTlJWWl5iZmqKjpKWmp6ipqrKztLW2t7i5usLDxMXGx8jJytLT1NXW19jZ2uHi4+Tl5ufo6erx8vP09fb3+Pn6/8QAHwEAAwEBAQEBAQEBAQAAAAAAAAECAwQFBgcICQoL/8QAtREAAgECBAQDBAcFBAQAAQJ3AAECAxEEBSExBhJBUQdhcRMiMoEIFEKRobHBCSMzUvAVYnLRChYkNOEl8RcYGRomJygpKjU2Nzg5OkNERUZHSElKU1RVVldYWVpjZGVmZ2hpanN0dXZ3eHl6goOEhYaHiImKkpOUlZaXmJmaoqOkpaanqKmqsrO0tba3uLm6wsPExcbHyMnK0tPU1dbX2Nna4uPk5ebn6Onq8vP09fb3+Pn6/9oADAMBAAIRAxEAPwD0DwnpHhO90uCKKxuC8MSrIXiHJx2OOec+9bx8KeGHJX7Mo+Yr9xeo6/w9KfpukTXGkWMyTSqPs6LiNwq/dH+x1z3q9HobxySmVpHErknJDY6dPl4FCulZiV3uZ/8Awh/hhoS5t49mOyKfb+77/wBag/4QbwoC2YG4HOF/+x9q3o9HUEiRGzjHynPP/fP0p66BCykgSE+hcf4UIZzX/CGeEOD5Ev8A37P/AMRSnwV4QUkmCTj/AGD/APE10/8Awj9rg7vNAB4+cf4U5fD9qpDgy/iykfyp3Yjmj4P8JdDbOe3+rP8A8TUsfw28LSxh1txtYZGXUH8iK6b+yIM428/7kf8A8TTJ9HTbiEIG/wBqNDx+VF2Bzh+F/hYn/UD/AL+p/hTX+HXhWENmDO0ZOGU/0rTbS7uEtcPLYvapyVFuMkY9c+tbX2OwK4MMPP8AsCldlNJHK2XgbwtNDG0Vv8rjcofAI+uV4q/H4D0BMFbSM/8AAl/wq9f6bF5DHT47b7QSuPOHy4BGenOcZpljayEMI7GNohIwDkjpuPQf/qp3ZJ5j8Q9H0uy1qGG1tYlj8gHG0Hnew9PairfxLtzH4gjDQeT+4GBuByN7AH2z6UUXCx2WgRu/hq3tY2AkMcZfcxUFsAeoz07Va1rTbm4tLSKbhYioUkbiTx+nFN8IWaPY2BeHIIVt3lntk9c46gdv5102sqzxw7VLYfJ4Y4H4EVPLFlxbi7rcxrqOaK7jvJUYKBj5cnn6D/P6UljBdJcyzLtIlyygNg847E1bkRv7HiRYmJRzlfLcevYHP6mnWELedB+7IIOeUcY/M07Ikx4rGezsLm2zI7PJ5zMV3Z5A7D2/yKJ7O8m0uOxllnaSP5mlwSSvOQTjHQ4raiV1kud6OFMbD7jnPP1/lQVcXMw8t8NFgEK+Pu+mcH9KI+67oXKrWM26sby9ubeeL5Vj2naTgnBzz+n+SakGnah/bL3pdzHsKrCXG0HjnHrxWzpMUMaZjV1kKjduVgP1/wAaty3EcRwxJ9cDOKLdh6HK2+n3tjbTqyxiJ0AOAM5B4/DmulFs+PvL/wB8j/CmahKkunzbDn5QcfjV0dKb8wMufSVmk3tJID/svtH6VlaZJOtpMiz3GS7hSAny/Meny/zzXVVjaRZwNYmQqd3mO2cnruNRK/QR5d8UnL63YsWL5sk+Y4y3zvzwAP0oqj8VpXXW7AAn/jyXv/00koqgse06B/yAtN/69o//AEEVfrk9Bi1dtEsdp4+zxgfvx/dHP3Ktw3eqGeaD7NETDgFjcH5sjOfu0DOhorE8/VP+faH/AMCD/wDE0qyaq+VFvCOOv2g//E0AaNpe214ZhbTJIYXMcgU/dYdQasVz8NlqcO/yUjTeSzbZlG5j1Y4j5NWkGqqoBhhYgYybg5P5LQN26GvVG6yhy24DntkVB/xNf+eEH/gQf/iaQjVCCDbwEH/p4P8A8TTTsIW4cNZXeARnB5GO9ag6VgR2OpszLMsGxzgt5mSoyf8AZHbA/Ct+hu4kLWdo3/IM/wCBv/6Ea0aztG/5Bh/3n/8AQjSGeK/Fj/kOWH/Xkv8A6MkopnxaJ/tzTuCM2K8Ht+8koprYD2zw7/yA7D/r3j/9AWmQf8hPUP8AeT/0Gn+Hf+QHYf8AXvH/AOgLUcH/ACE9Q/3k/wDQaQFupIfv/hUeafD9+gCxRRRQAUUUUAFFFJmgBaztG/5Bv/A3/wDQjWhWfo3/ACDf+Bv/AOhGgDxP4uf8h6w/68V/9GSUUfFz/kPWH/Xiv/oySimthHtXh5gNDsM55t4+3+wKhvdNNxcySpOEDkEgo+c4x2YV4dovjHXrfS7ZI9QbbsXAaNGx8o6ZHA9q0F8b+ISf+Qh/5Aj/APiakD1KfTtTgLfYJLaTOOZlfj82NJJFq8bxEtp6oR85aPGD7c8/pXl//Cb+If8AoIf+QI//AImkPjbxB/z/AI/78R//ABNFmwPV/Lvhj/SLLkZGYO3/AH1SN9sRMl7WQ5/hiAx/4/XlP/CbeIP+f8f9+I//AImj/hN/EOP+Qh/5Aj/+Jp8oz1PzLz+7Bn/rmP8A4ul8y9/uwf8Afsf/ABdeV/8ACb+If+gh/wCQI/8A4mj/AITfxDj/AJCH/kCP/wCJp2A9TMl6BkpBj18sf/F1AyXEjscoGc9FJHp6SewrzI+NvEH/AD/j/vxH/wDE0h8b+If+ggP+/Ef/AMTSswPUo2ukQIvkn6qCfzL1q6c00FusDW0g6kuSMZJz0z714yPG3iDP/H+P+/Ef/wATUg8a+IMf8f4/78R//E0WYDfjLH5PiSyj/u2Kf+jJKK8/+IniHVL7WoJbq53uLdVB8tBxub0HvRRZgf/Z</sv:value>
+ </sv:property>
+ <sv:property sv:name="jcr:lastModified" sv:type="Date">
+ <sv:value>2011-11-20T21:13:52.668+01:00</sv:value>
+ </sv:property>
+ <sv:property sv:name="jcr:lastModifiedBy" sv:type="String">
+ <sv:value>admin</sv:value>
+ </sv:property>
+ <sv:property sv:name="jcr:mimeType" sv:type="String">
+ <sv:value>image/jpeg</sv:value>
+ </sv:property>
+ <sv:property sv:name="resolution" sv:type="String">
+ <sv:value>thumbnail</sv:value>
+ </sv:property>
+ <sv:property sv:name="size" sv:type="String">
+ <sv:value>2394</sv:value>
+ </sv:property>
+ <sv:property sv:name="width" sv:type="String">
+ <sv:value>100</sv:value>
+ </sv:property>
+ </sv:node>
+ </sv:node>
</sv:node>
<sv:node sv:name="swiss-cow">
<sv:property sv:name="jcr:primaryType" sv:type="Name">
@@ -253,6 +319,110 @@
<sv:value>800</sv:value>
</sv:property>
</sv:node>
+ <sv:node sv:name="resolutions">
+ <sv:property sv:name="jcr:primaryType" sv:type="Name">
+ <sv:value>mgnl:resolutions</sv:value>
+ </sv:property>
+ <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
+ <sv:value>mix:lockable</sv:value>
+ </sv:property>
+ <sv:property sv:name="jcr:uuid" sv:type="String">
+ <sv:value>7d4e22de-0831-465d-b11e-028494a6f3b4</sv:value>
+ </sv:property>
+ <sv:property sv:name="jcr:createdBy" sv:type="String">
+ <sv:value>admin</sv:value>
+ </sv:property>
+ <sv:node sv:name="MetaData">
+ <sv:property sv:name="jcr:primaryType" sv:type="Name">
+ <sv:value>mgnl:metaData</sv:value>
+ </sv:property>
+ <sv:property sv:name="jcr:createdBy" sv:type="String">
+ <sv:value>admin</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:creationdate" sv:type="Date">
+ <sv:value>2011-11-20T21:13:53.269+01:00</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:lastmodified" sv:type="Date">
+ <sv:value>2011-11-20T21:13:53.270+01:00</sv:value>
+ </sv:property>
+ </sv:node>
+ <sv:node sv:name="thumbnail">
+ <sv:property sv:name="jcr:primaryType" sv:type="Name">
+ <sv:value>mgnl:resource</sv:value>
+ </sv:property>
+ <sv:property sv:name="jcr:uuid" sv:type="String">
+ <sv:value>c978ccb7-d81c-4ba5-af70-f12b53cc4902</sv:value>
+ </sv:property>
+ <sv:property sv:name="extension" sv:type="String">
+ <sv:value>jpg</sv:value>
+ </sv:property>
+ <sv:property sv:name="fileName" sv:type="String">
+ <sv:value>swiss-cow</sv:value>
+ </sv:property>
+ <sv:property sv:name="height" sv:type="String">
+ <sv:value>75</sv:value>
+ </sv:property>
+ <sv:property sv:name="jcr:data" sv:type="Binary">
+ <sv:value>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</sv:value>
+ </sv:property>
+ <sv:property sv:name="jcr:lastModified" sv:type="Date">
+ <sv:value>2011-11-20T21:13:53.276+01:00</sv:value>
+ </sv:property>
+ <sv:property sv:name="jcr:lastModifiedBy" sv:type="String">
+ <sv:value>admin</sv:value>
+ </sv:property>
+ <sv:property sv:name="jcr:mimeType" sv:type="String">
+ <sv:value>image/jpeg</sv:value>
+ </sv:property>
+ <sv:property sv:name="resolution" sv:type="String">
+ <sv:value>thumbnail</sv:value>
+ </sv:property>
+ <sv:property sv:name="size" sv:type="String">
+ <sv:value>2407</sv:value>
+ </sv:property>
+ <sv:property sv:name="width" sv:type="String">
+ <sv:value>100</sv:value>
+ </sv:property>
+ </sv:node>
+ <sv:node sv:name="preview">
+ <sv:property sv:name="jcr:primaryType" sv:type="Name">
+ <sv:value>mgnl:resource</sv:value>
+ </sv:property>
+ <sv:property sv:name="jcr:uuid" sv:type="String">
+ <sv:value>8f965773-e489-45da-b15b-10f31f4fbce9</sv:value>
+ </sv:property>
+ <sv:property sv:name="extension" sv:type="String">
+ <sv:value>jpg</sv:value>
+ </sv:property>
+ <sv:property sv:name="fileName" sv:type="String">
+ <sv:value>swiss-cow</sv:value>
+ </sv:property>
+ <sv:property sv:name="height" sv:type="String">
+ <sv:value>338</sv:value>
+ </sv:property>
+ <sv:property sv:name="jcr:data" sv:type="Binary">
+ <sv:value>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</sv:value>
+ </sv:property>
+ <sv:property sv:name="jcr:lastModified" sv:type="Date">
+ <sv:value>2011-11-20T21:13:53.318+01:00</sv:value>
+ </sv:property>
+ <sv:property sv:name="jcr:lastModifiedBy" sv:type="String">
+ <sv:value>admin</sv:value>
+ </sv:property>
+ <sv:property sv:name="jcr:mimeType" sv:type="String">
+ <sv:value>image/jpeg</sv:value>
+ </sv:property>
+ <sv:property sv:name="resolution" sv:type="String">
+ <sv:value>preview</sv:value>
+ </sv:property>
+ <sv:property sv:name="size" sv:type="String">
+ <sv:value>21735</sv:value>
+ </sv:property>
+ <sv:property sv:name="width" sv:type="String">
+ <sv:value>450</sv:value>
+ </sv:property>
+ </sv:node>
+ </sv:node>
</sv:node>
<sv:node sv:name="music0">
<sv:property sv:name="jcr:primaryType" sv:type="Name">
@@ -480,6 +650,72 @@
<sv:value>100</sv:value>
</sv:property>
</sv:node>
+ <sv:node sv:name="resolutions">
+ <sv:property sv:name="jcr:primaryType" sv:type="Name">
+ <sv:value>mgnl:resolutions</sv:value>
+ </sv:property>
+ <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
+ <sv:value>mix:lockable</sv:value>
+ </sv:property>
+ <sv:property sv:name="jcr:uuid" sv:type="String">
+ <sv:value>b2b4fd2f-b101-4469-a591-4ed71fe8555c</sv:value>
+ </sv:property>
+ <sv:property sv:name="jcr:createdBy" sv:type="String">
+ <sv:value>admin</sv:value>
+ </sv:property>
+ <sv:node sv:name="MetaData">
+ <sv:property sv:name="jcr:primaryType" sv:type="Name">
+ <sv:value>mgnl:metaData</sv:value>
+ </sv:property>
+ <sv:property sv:name="jcr:createdBy" sv:type="String">
+ <sv:value>admin</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:creationdate" sv:type="Date">
+ <sv:value>2011-11-20T21:13:53.097+01:00</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:lastmodified" sv:type="Date">
+ <sv:value>2011-11-20T21:13:53.098+01:00</sv:value>
+ </sv:property>
+ </sv:node>
+ <sv:node sv:name="thumbnail">
+ <sv:property sv:name="jcr:primaryType" sv:type="Name">
+ <sv:value>mgnl:resource</sv:value>
+ </sv:property>
+ <sv:property sv:name="jcr:uuid" sv:type="String">
+ <sv:value>a66bb295-1a71-4a68-96af-b6b80c34b0cf</sv:value>
+ </sv:property>
+ <sv:property sv:name="extension" sv:type="String">
+ <sv:value>png</sv:value>
+ </sv:property>
+ <sv:property sv:name="fileName" sv:type="String">
+ <sv:value>sampleflv</sv:value>
+ </sv:property>
+ <sv:property sv:name="height" sv:type="String">
+ <sv:value>80</sv:value>
+ </sv:property>
+ <sv:property sv:name="jcr:data" sv:type="Binary">
+ <sv:value>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...
[truncated message content] |
|
From: <mol...@us...> - 2009-08-26 13:37:10
|
Revision: 1318
http://openutils.svn.sourceforge.net/openutils/?rev=1318&view=rev
Author: molaschi
Date: 2009-08-26 13:36:56 +0000 (Wed, 26 Aug 2009)
Log Message:
-----------
MEDIA-9 add media tag for media rendering
Modified Paths:
--------------
trunk/openutils-mgnlmedia/pom.xml
trunk/openutils-mgnlmedia/src/main/resources/META-INF/media.tld
Added Paths:
-----------
trunk/openutils-mgnlmedia/src/main/resources/META-INF/tags/media.tag
Modified: trunk/openutils-mgnlmedia/pom.xml
===================================================================
--- trunk/openutils-mgnlmedia/pom.xml 2009-08-26 12:55:45 UTC (rev 1317)
+++ trunk/openutils-mgnlmedia/pom.xml 2009-08-26 13:36:56 UTC (rev 1318)
@@ -91,6 +91,11 @@
<version>2.1</version>
</dependency>
<dependency>
+ <groupId>net.sourceforge.openutils</groupId>
+ <artifactId>openutils-elfunctions</artifactId>
+ <version>1.0</version>
+ </dependency>
+ <dependency>
<groupId>com.drewnoakes</groupId>
<artifactId>metadata-extractor</artifactId>
<version>2.4.0-beta-1</version>
Modified: trunk/openutils-mgnlmedia/src/main/resources/META-INF/media.tld
===================================================================
--- trunk/openutils-mgnlmedia/src/main/resources/META-INF/media.tld 2009-08-26 12:55:45 UTC (rev 1317)
+++ trunk/openutils-mgnlmedia/src/main/resources/META-INF/media.tld 2009-08-26 13:36:56 UTC (rev 1318)
@@ -7,6 +7,169 @@
<tlib-version>1.1</tlib-version>
<short-name>media</short-name>
<uri>http://net.sourceforge.openutils/mgnlMedia</uri>
+ <tag-file>
+ <name>media</name>
+ <path>/META-INF/tags/media.tag</path>
+ <display-name>Media Tag</display-name>
+ <description>
+ <![CDATA[
+ Media tag that renders according to media type. <br/>
+
+ The following properties are supported:
+ <table>
+ <tr>
+ <th>Property</th>
+ <th>Required</th>
+ <th>Description</th>
+ </tr>
+ <tr>
+ <td>
+ id
+ </td>
+ <td>
+ false
+ </td>
+ <td>
+ html element id
+ </td>
+ </tr>
+ <tr>
+ <td>
+ item
+ </td>
+ <td>
+ true
+ </td>
+ <td>
+ media uuid or media content node
+ </td>
+ </tr>
+ <tr>
+ <td>
+ width
+ </td>
+ <td>
+ false for images, true for videos or mp3
+ </td>
+ <td>
+ image or player width
+ </td>
+ </tr>
+ <tr>
+ <td>
+ height
+ </td>
+ <td>
+ false for images, true for videos or mp3
+ </td>
+ <td>
+ image or player height
+ </td>
+ </tr>
+ <tr>
+ <td>
+ alt
+ </td>
+ <td>
+ false
+ </td>
+ <td>
+ alt / title on images. If not specified, the title of the media (if present) will be used
+ </td>
+ </tr>
+ <tr>
+ <td>
+ cssClass
+ </td>
+ <td>
+ false
+ </td>
+ <td>
+ cssClass to be applied on html element
+ </td>
+ </tr>
+ <tr>
+ <td>
+ style
+ </td>
+ <td>
+ false
+ </td>
+ <td>
+ style to be applied on html element
+ </td>
+ </tr>
+ <tr>
+ <td>
+ resize
+ </td>
+ <td>
+ false
+ </td>
+ <td>
+ valid values are 'fit', 'nocrop', 'crop'
+ </td>
+ </tr>
+ <tr>
+ <td>
+ autoPlay
+ </td>
+ <td>
+ false
+ </td>
+ <td>
+ auto starts the player without waiting for user play command
+ </td>
+ </tr>
+ <tr>
+ <td>
+ loop
+ </td>
+ <td>
+ false
+ </td>
+ <td>
+ loop video or audio
+ </td>
+ </tr>
+ <tr>
+ <td>
+ noPlayIcon
+ </td>
+ <td>
+ false
+ </td>
+ <td>
+ hide player icons
+ </td>
+ </tr>
+ <tr>
+ <td>
+ skin
+ </td>
+ <td>
+ false
+ </td>
+ <td>
+ set player skin
+ </td>
+ </tr>
+ </table>
+
+ For videos or mp3s it needs the following scripts loaded in page:
+ <ul>
+ <li>.resources/media/js/mootools-1.2-core.js</li>
+ <li>.resources/media/js/mootools-1.2-more.js</li>
+ <li>.resources/media/js/mootools-1.2-swfobject.js</li>
+ </ul>
+ ]]>
+ </description>
+ <example>
+ <![CDATA[
+ <media:media id="myMedia" item="${content.image}" />
+ ]]>
+ </example>
+ </tag-file>
<function>
<name>node</name>
<description>Load a node from the media repository, given the UUID of the media node.</description>
Added: trunk/openutils-mgnlmedia/src/main/resources/META-INF/tags/media.tag
===================================================================
--- trunk/openutils-mgnlmedia/src/main/resources/META-INF/tags/media.tag (rev 0)
+++ trunk/openutils-mgnlmedia/src/main/resources/META-INF/tags/media.tag 2009-08-26 13:36:56 UTC (rev 1318)
@@ -0,0 +1,150 @@
+<jsp:root version="2.0" xmlns:jsp="http://java.sun.com/JSP/Page" xmlns:c="http://java.sun.com/jsp/jstl/core"
+ xmlns:cms="cms-taglib" xmlns:cmsu="cms-util-taglib" xmlns:fmt="http://java.sun.com/jsp/jstl/fmt" xmlns:fn="http://java.sun.com/jsp/jstl/functions"
+ xmlns:media="http://net.sourceforge.openutils/mgnlMedia" xmlns:su="http://openutils.sf.net/openutils-stringutils">
+ <jsp:directive.attribute name="id" required="false" rtexprvalue="true" />
+ <jsp:directive.attribute name="item" required="true" rtexprvalue="true" type="java.lang.Object" />
+ <jsp:directive.attribute name="width" required="false" rtexprvalue="true" type="java.lang.Integer" />
+ <jsp:directive.attribute name="height" required="false" rtexprvalue="true" type="java.lang.Integer" />
+ <jsp:directive.attribute name="alt" required="false" rtexprvalue="true" />
+ <jsp:directive.attribute name="cssClass" required="false" rtexprvalue="true" />
+ <jsp:directive.attribute name="style" required="false" rtexprvalue="true" />
+ <jsp:directive.attribute name="resize" required="false" rtexprvalue="true" />
+ <jsp:directive.attribute name="autoPlay" required="false" rtexprvalue="true" type="java.lang.Boolean" />
+ <jsp:directive.attribute name="loop" required="false" rtexprvalue="true" type="java.lang.Boolean" />
+ <jsp:directive.attribute name="noPlayIcon" required="false" rtexprvalue="true" type="java.lang.Boolean" />
+ <jsp:directive.attribute name="skin" required="false" rtexprvalue="true" />
+ <c:set value="${media:node(item)}" var="mediaNode" />
+ <c:choose>
+ <c:when test="${!empty mediaNode}">
+ <cms:setNode var="media" content="${mediaNode}" />
+ <c:choose>
+ <c:when test="${media.type eq 'image' or media.type eq 'wallpaper'}">
+ <c:set var="controlChar" value="" />
+ <c:choose>
+ <c:when test="${resize eq 'nocrop'}">
+ <c:set var="controlChar" value="o" />
+ </c:when>
+ <c:when test="${resize eq 'fit'}">
+ <c:set var="controlChar" value="l" />
+ </c:when>
+ </c:choose>
+ <c:set var="resolution">${controlChar}${width}x${height}</c:set>
+ <c:set var="url" value="${media:urlres(mediaNode, resolution)}" />
+ <c:if test="${!empty(url)}">
+ <c:if test="${empty alt}">
+ <c:set var="alt" value="${media:title(mediaNode)}" />
+ </c:if>
+ <![CDATA[<img src="${pageContext.request.contextPath}${url}" alt="${alt}" title="${alt}"]]>
+ <c:if test="${not empty id}">
+ <![CDATA[ id="${id}"]]>
+ </c:if>
+ <c:if test="${not empty width">
+ <![CDATA[ width="${width}"]]>
+ </c:if>
+ <c:if test="${not empty height">
+ <![CDATA[ height="${height}"]]>
+ </c:if>
+ <c:if test="${not empty cssClass}">
+ <![CDATA[ class="${cssClass}"]]>
+ </c:if>
+ <c:if test="${not empty style}">
+ <![CDATA[ style="${style}"]]>
+ </c:if>
+ <![CDATA[ />]]>
+ </c:if>
+ </c:when>
+ <c:when test="${media.type eq 'video'}">
+ <c:set var="url" value="${media:url(mediaNode)}" />
+ <c:if test="${!empty(url)}">
+ <c:set var="previewId" value="preview-${su:randomAlphanumeric(6)}" />
+ <div id="${previewId}" class="preview">
+ <div id="no-player">
+ </div>
+ </div>
+ <c:if test="${fn:endsWith(fn:toLowerCase(media:url(mediaNode)), 'flv')}">
+ <c:set var="flashvars">
+ <![CDATA[file=${pageContext.request.contextPath}${media:url(mediaNode)}&controlbar=over]]>
+ <c:if test="${autoPlay}">
+ <![CDATA[&autostart=true]]>
+ </c:if>
+ <c:if test="${loop}">
+ <![CDATA[&repeat=always]]>
+ </c:if>
+ <c:if test="${noPlayIcon}">
+ <![CDATA[&icons=false]]>
+ </c:if>
+ <c:if test="${not empty skin}">
+ <![CDATA[&skin=${skin}]]>
+ </c:if>
+ </c:set>
+ <script type='text/javascript'>
+ <![CDATA[
+ window.addEvent('domready', function(){
+ var swfobject = new SWFObject('${pageContext.request.contextPath}/.resources/media/players/player.swf','player','${width}','${height}','9','#ffffff');
+ swfobject.addParam('allowfullscreen','true');
+ swfobject.addParam('allowscriptaccess','always');
+ swfobject.addParam('wmode','opaque');
+ swfobject.addParam('flashvars', '${flashvars}');
+
+ var version = deconcept.SWFObjectUtil.getPlayerVersion();
+ if (version["major"] == 0 || version["major"] < 9) {
+ $('no-player').setStyle('display','block');
+ } else {
+ swfobject.write('${previewId}');
+ }
+ });]]>
+ </script>
+ </c:if>
+ <c:if test="${fn:endsWith(fn:toLowerCase(media:url(mediaNode)), 'swf')}">
+ <script type='text/javascript'>
+ <![CDATA[
+ window.addEvent('domready', function(){
+ var swfobject = new SWFObject('${pageContext.request.contextPath}${media:url(mediaNode)}', '${previewId}', "${width}", "${height}", "9.0.0");
+ var version = deconcept.SWFObjectUtil.getPlayerVersion();
+ if (version["major"] == 0 || version["major"] < 9) {
+ $('no-player').setStyle('display','block');
+ } else {
+ swfobject.write('${previewId}');
+ }
+ });]]>
+ </script>
+ </c:if>
+ </c:if>
+ </c:when>
+ <c:when test="${media.type eq 'youtube'}">
+ <c:set var="url" value="${media:url(mediaNode)}" />
+ <c:set var="previewImage" value="${su:substringAfterLast(url, 'v=')}" />
+ <c:if test="${!empty(url)}">
+ <c:set var="previewId" value="preview-${su:randomAlphanumeric(6)}" />
+ <div id="${previewId}" class="preview">
+ <div id="no-player">
+ <!--
+ <ma:message key="media.noFlashPlayerDetected" /> -->
+ </div>
+ </div>
+ <script type='text/javascript'>
+ <![CDATA[
+
+ window.addEvent('domready', function(){
+ var swfobject = new SWFObject('${pageContext.request.contextPath}/.resources/media/players/player.swf','player','${width}','${height}','9','#ffffff');
+ swfobject.addParam('allowfullscreen','true');
+ swfobject.addParam('allowscriptaccess','always');
+ swfobject.addParam('wmode','opaque');
+ swfobject.addParam('flashvars','file=${media:url(mediaNode)}&controlbar=over&type=youtube&image=http://img.youtube.com/vi/${previewImage}/0.jpg');
+ var version = deconcept.SWFObjectUtil.getPlayerVersion();
+ if (version["major"] == 0 || version["major"] < 9) {
+ $('no-player').setStyle('display','block');
+ } else {
+ swfobject.write('${previewId}');
+ }
+ });
+ ]]></script>
+ </c:if>
+ </c:when>
+ </c:choose>
+ </c:when>
+ <c:otherwise>
+ <![CDATA[<!-- missing media: ${item} -->]]>
+ </c:otherwise>
+ </c:choose>
+</jsp:root>
\ No newline at end of file
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fg...@us...> - 2009-12-31 09:55:50
|
Revision: 1574
http://openutils.svn.sourceforge.net/openutils/?rev=1574&view=rev
Author: fgiust
Date: 2009-12-31 09:55:35 +0000 (Thu, 31 Dec 2009)
Log Message:
-----------
update license headers
Modified Paths:
--------------
trunk/openutils-mgnlmedia/pom.xml
trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/commands/MediaActivationCommand.java
trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/configuration/ImageProcessorsManager.java
trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/configuration/MediaConfigurationManager.java
trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/configuration/MediaTypeConfiguration.java
trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/dialog/DialogCustomSaveHandler.java
trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/dialog/DialogFileAudio.java
trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/dialog/DialogFileImage.java
trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/dialog/DialogFileNoPreview.java
trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/dialog/DialogFileVideo.java
trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/dialog/DialogMetadata.java
trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/dialog/DialogSelectMedia.java
trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/dialog/LayerDialog.java
trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/dialog/LayerDialogMVC.java
trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/lifecycle/MediaModule.java
trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/pages/MediaBean.java
trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/pages/MediaBrowserPage.java
trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/pages/MediaFolderSelectionPage.java
trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/pages/MediaFolderViewPage.java
trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/pages/MediaSearchPage.java
trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/pages/MessagesTemplatedMVCHandler.java
trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/processors/BaseImageResolutionProcessor.java
trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/processors/BlackAndWhitePostProcessor.java
trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/processors/FitInAndFillWithBandsImageResolutionProcessor.java
trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/processors/FitInImageResolutionProcessor.java
trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/processors/ImagePostProcessor.java
trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/processors/ImageResolutionProcessor.java
trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/processors/LogSizePostProcessor.java
trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/processors/ResizeCropCenteredImageResolutionProcessor.java
trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/processors/ResizeNoCropImageResolutionProcessor.java
trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/processors/RoundedCornersProcessor.java
trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/save/MediaCustomSaveHandler.java
trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/setup/MediaModuleVersionHandler.java
trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/setup/RemoveResolutionsNodeTask.java
trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/setup/RenameThumbToImageTask.java
trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/setup/SamplesExtractionTask.java
trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/tags/el/MediaEl.java
trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/tree/JcrBrowserWithNodeTypeTreeConfiguration.java
trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/tree/MediaBrowserConfiguration.java
trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/tree/MediaModuleTree.java
trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/tree/MediaModuleTreeConfiguration.java
trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/tree/MediaModuleTreeMVCHandler.java
trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/types/MediaTypeHandler.java
trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/types/impl/AudioTypeHandler.java
trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/types/impl/BaseTypeHandler.java
trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/types/impl/ImageTypeHandler.java
trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/types/impl/MediaWithPreviewImageTypeHandler.java
trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/types/impl/VideoTypeHandler.java
trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/types/impl/YouTubeVideoTypeHandler.java
trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/uri/MediaURI2RepositoryMapping.java
trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/utils/BadImageFormatException.java
trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/utils/ImageUtils.java
trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/utils/JpegUtils.java
trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/utils/MediaLoadUtils.java
trunk/openutils-mgnlmedia/src/main/resources/META-INF/magnolia/media.xml
trunk/openutils-mgnlmedia/src/main/resources/mgnl-resources/media/css/branding.css
trunk/openutils-mgnlmedia/src/main/resources/mgnl-resources/media/css/folderView.css
trunk/openutils-mgnlmedia/src/main/resources/mgnl-resources/media/css/upload.css
trunk/openutils-mgnlmedia/src/main/resources/mgnl-resources/media/js/media.js
trunk/openutils-mgnlmedia/src/main/resources/mgnl-resources/media/js/upload/FancyUpload2.js
trunk/openutils-mgnlmedia/src/main/resources/mgnl-resources/media/js/upload/Fx.ProgressBar.js
trunk/openutils-mgnlmedia/src/main/resources/mgnl-resources/media/js/upload/Swiff.Uploader.js
trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/media/lang/messages_en.properties
trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/media/lang/messages_it.properties
trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/media/pages/MediaBrowserPage.html
trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/media/pages/MediaFolderSelectionPage.html
trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/media/pages/MediaFolderViewPage.html
trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/media/pages/MediaSearchPage.html
trunk/openutils-mgnlmedia/src/test/java/net/sourceforge/openutils/mgnlmedia/media/utils/FileNodeData.java
trunk/openutils-mgnlmedia/src/test/java/net/sourceforge/openutils/mgnlmedia/media/utils/ImageProcessorsManagerMock.java
trunk/openutils-mgnlmedia/src/test/java/net/sourceforge/openutils/mgnlmedia/media/utils/ImageUtilsTest.java
trunk/openutils-mgnlmedia/src/test/resources/images/badimage.txt
Modified: trunk/openutils-mgnlmedia/pom.xml
===================================================================
--- trunk/openutils-mgnlmedia/pom.xml 2009-12-31 09:35:50 UTC (rev 1573)
+++ trunk/openutils-mgnlmedia/pom.xml 2009-12-31 09:55:35 UTC (rev 1574)
@@ -59,9 +59,9 @@
</configuration>
</plugin>
<plugin>
- <groupId>com.google.code.maven-license-plugin</groupId>
+ <groupId>com.mycila.maven-license-plugin</groupId>
<artifactId>maven-license-plugin</artifactId>
- <version>1.4.0</version>
+ <version>1.5.0</version>
<configuration>
<header>src/main/etc/header.txt</header>
<includes>
@@ -74,6 +74,8 @@
<exclude>src/main/resources/**/*.ftl</exclude>
<exclude>src/main/assembly/**</exclude>
<exclude>src/main/resources/mgnl-bootstrap/**</exclude>
+ <exclude>src/main/resources/mgnl-bootstrap-samples/**</exclude>
+ <exclude>src/main/resources/mgnl-files/**</exclude>
<exclude>src/main/resources/mgnl-nodetypes/**</exclude>
<exclude>src/main/resources/mgnl-resources/media/css/multibox.css</exclude>
<exclude>src/main/resources/mgnl-resources/media/js/multibox/**</exclude>
@@ -82,7 +84,7 @@
<exclude>src/main/resources/mgnl-resources/media/js/swfobject.js</exclude>
</excludes>
<properties>
- <year>${project.inceptionYear} - 2009</year>
+ <year>${project.inceptionYear} - 2010</year>
<name>${project.name}</name>
<description>${project.description}</description>
<url>${project.url}</url>
Modified: trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/commands/MediaActivationCommand.java
===================================================================
--- trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/commands/MediaActivationCommand.java 2009-12-31 09:35:50 UTC (rev 1573)
+++ trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/commands/MediaActivationCommand.java 2009-12-31 09:55:35 UTC (rev 1574)
@@ -1,9 +1,7 @@
/**
*
* Magnolia SimpleMedia Module (http://lab.openmindonline.it/lab/products/media.html)
- * Magnolia SimpleMedia Module: a module for Magnolia CMS for easier management of images and videos with
- * several features.
- * Copyright (C)2008 - 2009, Openmind S.r.l. http://www.openmindonline.it
+ * Copyright (C)2008 - 2010, Openmind S.r.l. http://www.openmindonline.it
*
*
* This library is free software; you can redistribute it and/or
@@ -23,6 +21,7 @@
* License along with this library; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
+
package net.sourceforge.openutils.mgnlmedia.media.commands;
import info.magnolia.cms.core.Content;
Modified: trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/configuration/ImageProcessorsManager.java
===================================================================
--- trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/configuration/ImageProcessorsManager.java 2009-12-31 09:35:50 UTC (rev 1573)
+++ trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/configuration/ImageProcessorsManager.java 2009-12-31 09:55:35 UTC (rev 1574)
@@ -1,9 +1,7 @@
/**
*
* Magnolia SimpleMedia Module (http://lab.openmindonline.it/lab/products/media.html)
- * Magnolia SimpleMedia Module: a module for Magnolia CMS for easier management of images and videos with
- * several features.
- * Copyright (C)2008 - 2009, Openmind S.r.l. http://www.openmindonline.it
+ * Copyright (C)2008 - 2010, Openmind S.r.l. http://www.openmindonline.it
*
*
* This library is free software; you can redistribute it and/or
@@ -23,6 +21,7 @@
* License along with this library; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
+
package net.sourceforge.openutils.mgnlmedia.media.configuration;
import info.magnolia.cms.beans.config.ObservedManager;
Modified: trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/configuration/MediaConfigurationManager.java
===================================================================
--- trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/configuration/MediaConfigurationManager.java 2009-12-31 09:35:50 UTC (rev 1573)
+++ trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/configuration/MediaConfigurationManager.java 2009-12-31 09:55:35 UTC (rev 1574)
@@ -1,9 +1,7 @@
/**
*
* Magnolia SimpleMedia Module (http://lab.openmindonline.it/lab/products/media.html)
- * Magnolia SimpleMedia Module: a module for Magnolia CMS for easier management of images and videos with
- * several features.
- * Copyright (C)2008 - 2009, Openmind S.r.l. http://www.openmindonline.it
+ * Copyright (C)2008 - 2010, Openmind S.r.l. http://www.openmindonline.it
*
*
* This library is free software; you can redistribute it and/or
@@ -23,6 +21,7 @@
* License along with this library; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
+
package net.sourceforge.openutils.mgnlmedia.media.configuration;
import info.magnolia.cms.beans.config.ContentRepository;
Modified: trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/configuration/MediaTypeConfiguration.java
===================================================================
--- trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/configuration/MediaTypeConfiguration.java 2009-12-31 09:35:50 UTC (rev 1573)
+++ trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/configuration/MediaTypeConfiguration.java 2009-12-31 09:55:35 UTC (rev 1574)
@@ -1,9 +1,7 @@
/**
*
* Magnolia SimpleMedia Module (http://lab.openmindonline.it/lab/products/media.html)
- * Magnolia SimpleMedia Module: a module for Magnolia CMS for easier management of images and videos with
- * several features.
- * Copyright (C)2008 - 2009, Openmind S.r.l. http://www.openmindonline.it
+ * Copyright (C)2008 - 2010, Openmind S.r.l. http://www.openmindonline.it
*
*
* This library is free software; you can redistribute it and/or
@@ -23,6 +21,7 @@
* License along with this library; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
+
package net.sourceforge.openutils.mgnlmedia.media.configuration;
import java.util.List;
Modified: trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/dialog/DialogCustomSaveHandler.java
===================================================================
--- trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/dialog/DialogCustomSaveHandler.java 2009-12-31 09:35:50 UTC (rev 1573)
+++ trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/dialog/DialogCustomSaveHandler.java 2009-12-31 09:55:35 UTC (rev 1574)
@@ -1,9 +1,7 @@
/**
*
* Magnolia SimpleMedia Module (http://lab.openmindonline.it/lab/products/media.html)
- * Magnolia SimpleMedia Module: a module for Magnolia CMS for easier management of images and videos with
- * several features.
- * Copyright (C)2008 - 2009, Openmind S.r.l. http://www.openmindonline.it
+ * Copyright (C)2008 - 2010, Openmind S.r.l. http://www.openmindonline.it
*
*
* This library is free software; you can redistribute it and/or
@@ -23,6 +21,7 @@
* License along with this library; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
+
package net.sourceforge.openutils.mgnlmedia.media.dialog;
import info.magnolia.cms.core.Content;
Modified: trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/dialog/DialogFileAudio.java
===================================================================
--- trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/dialog/DialogFileAudio.java 2009-12-31 09:35:50 UTC (rev 1573)
+++ trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/dialog/DialogFileAudio.java 2009-12-31 09:55:35 UTC (rev 1574)
@@ -1,9 +1,7 @@
/**
*
* Magnolia SimpleMedia Module (http://lab.openmindonline.it/lab/products/media.html)
- * Magnolia SimpleMedia Module: a module for Magnolia CMS for easier management of images and videos with
- * several features.
- * Copyright (C)2008 - 2009, Openmind S.r.l. http://www.openmindonline.it
+ * Copyright (C)2008 - 2010, Openmind S.r.l. http://www.openmindonline.it
*
*
* This library is free software; you can redistribute it and/or
@@ -23,6 +21,7 @@
* License along with this library; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
+
package net.sourceforge.openutils.mgnlmedia.media.dialog;
import info.magnolia.cms.beans.config.MIMEMapping;
Modified: trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/dialog/DialogFileImage.java
===================================================================
--- trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/dialog/DialogFileImage.java 2009-12-31 09:35:50 UTC (rev 1573)
+++ trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/dialog/DialogFileImage.java 2009-12-31 09:55:35 UTC (rev 1574)
@@ -1,9 +1,7 @@
/**
*
* Magnolia SimpleMedia Module (http://lab.openmindonline.it/lab/products/media.html)
- * Magnolia SimpleMedia Module: a module for Magnolia CMS for easier management of images and videos with
- * several features.
- * Copyright (C)2008 - 2009, Openmind S.r.l. http://www.openmindonline.it
+ * Copyright (C)2008 - 2010, Openmind S.r.l. http://www.openmindonline.it
*
*
* This library is free software; you can redistribute it and/or
@@ -23,6 +21,7 @@
* License along with this library; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
+
package net.sourceforge.openutils.mgnlmedia.media.dialog;
import info.magnolia.cms.beans.config.MIMEMapping;
Modified: trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/dialog/DialogFileNoPreview.java
===================================================================
--- trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/dialog/DialogFileNoPreview.java 2009-12-31 09:35:50 UTC (rev 1573)
+++ trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/dialog/DialogFileNoPreview.java 2009-12-31 09:55:35 UTC (rev 1574)
@@ -1,9 +1,7 @@
/**
*
* Magnolia SimpleMedia Module (http://lab.openmindonline.it/lab/products/media.html)
- * Magnolia SimpleMedia Module: a module for Magnolia CMS for easier management of images and videos with
- * several features.
- * Copyright (C)2008 - 2009, Openmind S.r.l. http://www.openmindonline.it
+ * Copyright (C)2008 - 2010, Openmind S.r.l. http://www.openmindonline.it
*
*
* This library is free software; you can redistribute it and/or
@@ -23,6 +21,7 @@
* License along with this library; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
+
package net.sourceforge.openutils.mgnlmedia.media.dialog;
import info.magnolia.cms.beans.runtime.Document;
Modified: trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/dialog/DialogFileVideo.java
===================================================================
--- trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/dialog/DialogFileVideo.java 2009-12-31 09:35:50 UTC (rev 1573)
+++ trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/dialog/DialogFileVideo.java 2009-12-31 09:55:35 UTC (rev 1574)
@@ -1,9 +1,7 @@
/**
*
* Magnolia SimpleMedia Module (http://lab.openmindonline.it/lab/products/media.html)
- * Magnolia SimpleMedia Module: a module for Magnolia CMS for easier management of images and videos with
- * several features.
- * Copyright (C)2008 - 2009, Openmind S.r.l. http://www.openmindonline.it
+ * Copyright (C)2008 - 2010, Openmind S.r.l. http://www.openmindonline.it
*
*
* This library is free software; you can redistribute it and/or
@@ -23,6 +21,7 @@
* License along with this library; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
+
package net.sourceforge.openutils.mgnlmedia.media.dialog;
import info.magnolia.cms.beans.config.MIMEMapping;
Modified: trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/dialog/DialogMetadata.java
===================================================================
--- trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/dialog/DialogMetadata.java 2009-12-31 09:35:50 UTC (rev 1573)
+++ trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/dialog/DialogMetadata.java 2009-12-31 09:55:35 UTC (rev 1574)
@@ -1,9 +1,7 @@
/**
*
* Magnolia SimpleMedia Module (http://lab.openmindonline.it/lab/products/media.html)
- * Magnolia SimpleMedia Module: a module for Magnolia CMS for easier management of images and videos with
- * several features.
- * Copyright (C)2008 - 2009, Openmind S.r.l. http://www.openmindonline.it
+ * Copyright (C)2008 - 2010, Openmind S.r.l. http://www.openmindonline.it
*
*
* This library is free software; you can redistribute it and/or
@@ -23,6 +21,7 @@
* License along with this library; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
+
package net.sourceforge.openutils.mgnlmedia.media.dialog;
import info.magnolia.cms.gui.dialog.DialogStatic;
Modified: trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/dialog/DialogSelectMedia.java
===================================================================
--- trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/dialog/DialogSelectMedia.java 2009-12-31 09:35:50 UTC (rev 1573)
+++ trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/dialog/DialogSelectMedia.java 2009-12-31 09:55:35 UTC (rev 1574)
@@ -1,9 +1,7 @@
/**
*
* Magnolia SimpleMedia Module (http://lab.openmindonline.it/lab/products/media.html)
- * Magnolia SimpleMedia Module: a module for Magnolia CMS for easier management of images and videos with
- * several features.
- * Copyright (C)2008 - 2009, Openmind S.r.l. http://www.openmindonline.it
+ * Copyright (C)2008 - 2010, Openmind S.r.l. http://www.openmindonline.it
*
*
* This library is free software; you can redistribute it and/or
@@ -23,6 +21,7 @@
* License along with this library; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
+
package net.sourceforge.openutils.mgnlmedia.media.dialog;
import freemarker.template.TemplateException;
Modified: trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/dialog/LayerDialog.java
===================================================================
--- trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/dialog/LayerDialog.java 2009-12-31 09:35:50 UTC (rev 1573)
+++ trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/dialog/LayerDialog.java 2009-12-31 09:55:35 UTC (rev 1574)
@@ -1,9 +1,7 @@
/**
*
* Magnolia SimpleMedia Module (http://lab.openmindonline.it/lab/products/media.html)
- * Magnolia SimpleMedia Module: a module for Magnolia CMS for easier management of images and videos with
- * several features.
- * Copyright (C)2008 - 2009, Openmind S.r.l. http://www.openmindonline.it
+ * Copyright (C)2008 - 2010, Openmind S.r.l. http://www.openmindonline.it
*
*
* This library is free software; you can redistribute it and/or
@@ -23,6 +21,7 @@
* License along with this library; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
+
package net.sourceforge.openutils.mgnlmedia.media.dialog;
import info.magnolia.cms.gui.control.Button;
Modified: trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/dialog/LayerDialogMVC.java
===================================================================
--- trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/dialog/LayerDialogMVC.java 2009-12-31 09:35:50 UTC (rev 1573)
+++ trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/dialog/LayerDialogMVC.java 2009-12-31 09:55:35 UTC (rev 1574)
@@ -1,9 +1,7 @@
/**
*
* Magnolia SimpleMedia Module (http://lab.openmindonline.it/lab/products/media.html)
- * Magnolia SimpleMedia Module: a module for Magnolia CMS for easier management of images and videos with
- * several features.
- * Copyright (C)2008 - 2009, Openmind S.r.l. http://www.openmindonline.it
+ * Copyright (C)2008 - 2010, Openmind S.r.l. http://www.openmindonline.it
*
*
* This library is free software; you can redistribute it and/or
@@ -23,6 +21,7 @@
* License along with this library; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
+
package net.sourceforge.openutils.mgnlmedia.media.dialog;
import info.magnolia.cms.core.Content;
Modified: trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/lifecycle/MediaModule.java
===================================================================
--- trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/lifecycle/MediaModule.java 2009-12-31 09:35:50 UTC (rev 1573)
+++ trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/lifecycle/MediaModule.java 2009-12-31 09:55:35 UTC (rev 1574)
@@ -1,9 +1,7 @@
/**
*
* Magnolia SimpleMedia Module (http://lab.openmindonline.it/lab/products/media.html)
- * Magnolia SimpleMedia Module: a module for Magnolia CMS for easier management of images and videos with
- * several features.
- * Copyright (C)2008 - 2009, Openmind S.r.l. http://www.openmindonline.it
+ * Copyright (C)2008 - 2010, Openmind S.r.l. http://www.openmindonline.it
*
*
* This library is free software; you can redistribute it and/or
@@ -23,6 +21,7 @@
* License along with this library; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
+
package net.sourceforge.openutils.mgnlmedia.media.lifecycle;
import info.magnolia.module.ModuleLifecycle;
Modified: trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/pages/MediaBean.java
===================================================================
--- trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/pages/MediaBean.java 2009-12-31 09:35:50 UTC (rev 1573)
+++ trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/pages/MediaBean.java 2009-12-31 09:55:35 UTC (rev 1574)
@@ -1,9 +1,7 @@
/**
*
* Magnolia SimpleMedia Module (http://lab.openmindonline.it/lab/products/media.html)
- * Magnolia SimpleMedia Module: a module for Magnolia CMS for easier management of images and videos with
- * several features.
- * Copyright (C)2008 - 2009, Openmind S.r.l. http://www.openmindonline.it
+ * Copyright (C)2008 - 2010, Openmind S.r.l. http://www.openmindonline.it
*
*
* This library is free software; you can redistribute it and/or
@@ -23,6 +21,7 @@
* License along with this library; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
+
package net.sourceforge.openutils.mgnlmedia.media.pages;
import info.magnolia.cms.core.Content;
Modified: trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/pages/MediaBrowserPage.java
===================================================================
--- trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/pages/MediaBrowserPage.java 2009-12-31 09:35:50 UTC (rev 1573)
+++ trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/pages/MediaBrowserPage.java 2009-12-31 09:55:35 UTC (rev 1574)
@@ -1,9 +1,7 @@
/**
*
* Magnolia SimpleMedia Module (http://lab.openmindonline.it/lab/products/media.html)
- * Magnolia SimpleMedia Module: a module for Magnolia CMS for easier management of images and videos with
- * several features.
- * Copyright (C)2008 - 2009, Openmind S.r.l. http://www.openmindonline.it
+ * Copyright (C)2008 - 2010, Openmind S.r.l. http://www.openmindonline.it
*
*
* This library is free software; you can redistribute it and/or
@@ -23,6 +21,7 @@
* License along with this library; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
+
package net.sourceforge.openutils.mgnlmedia.media.pages;
import info.magnolia.cms.beans.runtime.Document;
Modified: trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/pages/MediaFolderSelectionPage.java
===================================================================
--- trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/pages/MediaFolderSelectionPage.java 2009-12-31 09:35:50 UTC (rev 1573)
+++ trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/pages/MediaFolderSelectionPage.java 2009-12-31 09:55:35 UTC (rev 1574)
@@ -1,9 +1,7 @@
/**
*
* Magnolia SimpleMedia Module (http://lab.openmindonline.it/lab/products/media.html)
- * Magnolia SimpleMedia Module: a module for Magnolia CMS for easier management of images and videos with
- * several features.
- * Copyright (C)2008 - 2009, Openmind S.r.l. http://www.openmindonline.it
+ * Copyright (C)2008 - 2010, Openmind S.r.l. http://www.openmindonline.it
*
*
* This library is free software; you can redistribute it and/or
@@ -23,6 +21,7 @@
* License along with this library; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
+
package net.sourceforge.openutils.mgnlmedia.media.pages;
import java.util.Date;
Modified: trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/pages/MediaFolderViewPage.java
===================================================================
--- trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/pages/MediaFolderViewPage.java 2009-12-31 09:35:50 UTC (rev 1573)
+++ trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/pages/MediaFolderViewPage.java 2009-12-31 09:55:35 UTC (rev 1574)
@@ -1,9 +1,7 @@
/**
*
* Magnolia SimpleMedia Module (http://lab.openmindonline.it/lab/products/media.html)
- * Magnolia SimpleMedia Module: a module for Magnolia CMS for easier management of images and videos with
- * several features.
- * Copyright (C)2008 - 2009, Openmind S.r.l. http://www.openmindonline.it
+ * Copyright (C)2008 - 2010, Openmind S.r.l. http://www.openmindonline.it
*
*
* This library is free software; you can redistribute it and/or
@@ -23,6 +21,7 @@
* License along with this library; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
+
package net.sourceforge.openutils.mgnlmedia.media.pages;
import info.magnolia.cms.core.Content;
Modified: trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/pages/MediaSearchPage.java
===================================================================
--- trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/pages/MediaSearchPage.java 2009-12-31 09:35:50 UTC (rev 1573)
+++ trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/pages/MediaSearchPage.java 2009-12-31 09:55:35 UTC (rev 1574)
@@ -1,9 +1,7 @@
/**
*
* Magnolia SimpleMedia Module (http://lab.openmindonline.it/lab/products/media.html)
- * Magnolia SimpleMedia Module: a module for Magnolia CMS for easier management of images and videos with
- * several features.
- * Copyright (C)2008 - 2009, Openmind S.r.l. http://www.openmindonline.it
+ * Copyright (C)2008 - 2010, Openmind S.r.l. http://www.openmindonline.it
*
*
* This library is free software; you can redistribute it and/or
@@ -23,6 +21,7 @@
* License along with this library; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
+
package net.sourceforge.openutils.mgnlmedia.media.pages;
import info.magnolia.cms.core.Content;
Modified: trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/pages/MessagesTemplatedMVCHandler.java
===================================================================
--- trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/pages/MessagesTemplatedMVCHandler.java 2009-12-31 09:35:50 UTC (rev 1573)
+++ trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/pages/MessagesTemplatedMVCHandler.java 2009-12-31 09:55:35 UTC (rev 1574)
@@ -1,9 +1,7 @@
/**
*
* Magnolia SimpleMedia Module (http://lab.openmindonline.it/lab/products/media.html)
- * Magnolia SimpleMedia Module: a module for Magnolia CMS for easier management of images and videos with
- * several features.
- * Copyright (C)2008 - 2009, Openmind S.r.l. http://www.openmindonline.it
+ * Copyright (C)2008 - 2010, Openmind S.r.l. http://www.openmindonline.it
*
*
* This library is free software; you can redistribute it and/or
@@ -23,6 +21,7 @@
* License along with this library; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
+
package net.sourceforge.openutils.mgnlmedia.media.pages;
import javax.servlet.http.HttpServletRequest;
Modified: trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/processors/BaseImageResolutionProcessor.java
===================================================================
--- trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/processors/BaseImageResolutionProcessor.java 2009-12-31 09:35:50 UTC (rev 1573)
+++ trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/processors/BaseImageResolutionProcessor.java 2009-12-31 09:55:35 UTC (rev 1574)
@@ -1,9 +1,7 @@
/**
*
* Magnolia SimpleMedia Module (http://lab.openmindonline.it/lab/products/media.html)
- * Magnolia SimpleMedia Module: a module for Magnolia CMS for easier management of images and videos with
- * several features.
- * Copyright (C)2008 - 2009, Openmind S.r.l. http://www.openmindonline.it
+ * Copyright (C)2008 - 2010, Openmind S.r.l. http://www.openmindonline.it
*
*
* This library is free software; you can redistribute it and/or
@@ -23,6 +21,7 @@
* License along with this library; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
+
package net.sourceforge.openutils.mgnlmedia.media.processors;
import java.awt.Color;
Modified: trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/processors/BlackAndWhitePostProcessor.java
===================================================================
--- trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/processors/BlackAndWhitePostProcessor.java 2009-12-31 09:35:50 UTC (rev 1573)
+++ trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/processors/BlackAndWhitePostProcessor.java 2009-12-31 09:55:35 UTC (rev 1574)
@@ -1,9 +1,7 @@
/**
*
* Magnolia SimpleMedia Module (http://lab.openmindonline.it/lab/products/media.html)
- * Magnolia SimpleMedia Module: a module for Magnolia CMS for easier management of images and videos with
- * several features.
- * Copyright (C)2008 - 2009, Openmind S.r.l. http://www.openmindonline.it
+ * Copyright (C)2008 - 2010, Openmind S.r.l. http://www.openmindonline.it
*
*
* This library is free software; you can redistribute it and/or
@@ -23,6 +21,7 @@
* License along with this library; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
+
package net.sourceforge.openutils.mgnlmedia.media.processors;
import java.awt.Graphics;
Modified: trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/processors/FitInAndFillWithBandsImageResolutionProcessor.java
===================================================================
--- trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/processors/FitInAndFillWithBandsImageResolutionProcessor.java 2009-12-31 09:35:50 UTC (rev 1573)
+++ trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/processors/FitInAndFillWithBandsImageResolutionProcessor.java 2009-12-31 09:55:35 UTC (rev 1574)
@@ -1,9 +1,7 @@
/**
*
* Magnolia SimpleMedia Module (http://lab.openmindonline.it/lab/products/media.html)
- * Magnolia SimpleMedia Module: a module for Magnolia CMS for easier management of images and videos with
- * several features.
- * Copyright (C)2008 - 2009, Openmind S.r.l. http://www.openmindonline.it
+ * Copyright (C)2008 - 2010, Openmind S.r.l. http://www.openmindonline.it
*
*
* This library is free software; you can redistribute it and/or
@@ -23,6 +21,7 @@
* License along with this library; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
+
package net.sourceforge.openutils.mgnlmedia.media.processors;
import java.awt.Color;
Modified: trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/processors/FitInImageResolutionProcessor.java
===================================================================
--- trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/processors/FitInImageResolutionProcessor.java 2009-12-31 09:35:50 UTC (rev 1573)
+++ trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/processors/FitInImageResolutionProcessor.java 2009-12-31 09:55:35 UTC (rev 1574)
@@ -1,9 +1,7 @@
/**
*
* Magnolia SimpleMedia Module (http://lab.openmindonline.it/lab/products/media.html)
- * Magnolia SimpleMedia Module: a module for Magnolia CMS for easier management of images and videos with
- * several features.
- * Copyright (C)2008 - 2009, Openmind S.r.l. http://www.openmindonline.it
+ * Copyright (C)2008 - 2010, Openmind S.r.l. http://www.openmindonline.it
*
*
* This library is free software; you can redistribute it and/or
@@ -23,6 +21,7 @@
* License along with this library; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
+
package net.sourceforge.openutils.mgnlmedia.media.processors;
import java.awt.image.BufferedImage;
Modified: trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/processors/ImagePostProcessor.java
===================================================================
--- trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/processors/ImagePostProcessor.java 2009-12-31 09:35:50 UTC (rev 1573)
+++ trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/processors/ImagePostProcessor.java 2009-12-31 09:55:35 UTC (rev 1574)
@@ -1,9 +1,7 @@
/**
*
* Magnolia SimpleMedia Module (http://lab.openmindonline.it/lab/products/media.html)
- * Magnolia SimpleMedia Module: a module for Magnolia CMS for easier management of images and videos with
- * several features.
- * Copyright (C)2008 - 2009, Openmind S.r.l. http://www.openmindonline.it
+ * Copyright (C)2008 - 2010, Openmind S.r.l. http://www.openmindonline.it
*
*
* This library is free software; you can redistribute it and/or
@@ -23,6 +21,7 @@
* License along with this library; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
+
package net.sourceforge.openutils.mgnlmedia.media.processors;
import java.awt.image.BufferedImage;
Modified: trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/processors/ImageResolutionProcessor.java
===================================================================
--- trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/processors/ImageResolutionProcessor.java 2009-12-31 09:35:50 UTC (rev 1573)
+++ trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/processors/ImageResolutionProcessor.java 2009-12-31 09:55:35 UTC (rev 1574)
@@ -1,9 +1,7 @@
/**
*
* Magnolia SimpleMedia Module (http://lab.openmindonline.it/lab/products/media.html)
- * Magnolia SimpleMedia Module: a module for Magnolia CMS for easier management of images and videos with
- * several features.
- * Copyright (C)2008 - 2009, Openmind S.r.l. http://www.openmindonline.it
+ * Copyright (C)2008 - 2010, Openmind S.r.l. http://www.openmindonline.it
*
*
* This library is free software; you can redistribute it and/or
@@ -23,6 +21,7 @@
* License along with this library; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
+
package net.sourceforge.openutils.mgnlmedia.media.processors;
import java.awt.image.BufferedImage;
Modified: trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/processors/LogSizePostProcessor.java
===================================================================
--- trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/processors/LogSizePostProcessor.java 2009-12-31 09:35:50 UTC (rev 1573)
+++ trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/processors/LogSizePostProcessor.java 2009-12-31 09:55:35 UTC (rev 1574)
@@ -1,9 +1,7 @@
/**
*
* Magnolia SimpleMedia Module (http://lab.openmindonline.it/lab/products/media.html)
- * Magnolia SimpleMedia Module: a module for Magnolia CMS for easier management of images and videos with
- * several features.
- * Copyright (C)2008 - 2009, Openmind S.r.l. http://www.openmindonline.it
+ * Copyright (C)2008 - 2010, Openmind S.r.l. http://www.openmindonline.it
*
*
* This library is free software; you can redistribute it and/or
@@ -23,6 +21,7 @@
* License along with this library; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
+
package net.sourceforge.openutils.mgnlmedia.media.processors;
import java.awt.image.BufferedImage;
Modified: trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/processors/ResizeCropCenteredImageResolutionProcessor.java
===================================================================
--- trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/processors/ResizeCropCenteredImageResolutionProcessor.java 2009-12-31 09:35:50 UTC (rev 1573)
+++ trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/processors/ResizeCropCenteredImageResolutionProcessor.java 2009-12-31 09:55:35 UTC (rev 1574)
@@ -1,9 +1,7 @@
/**
*
* Magnolia SimpleMedia Module (http://lab.openmindonline.it/lab/products/media.html)
- * Magnolia SimpleMedia Module: a module for Magnolia CMS for easier management of images and videos with
- * several features.
- * Copyright (C)2008 - 2009, Openmind S.r.l. http://www.openmindonline.it
+ * Copyright (C)2008 - 2010, Openmind S.r.l. http://www.openmindonline.it
*
*
* This library is free software; you can redistribute it and/or
@@ -23,6 +21,7 @@
* License along with this library; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
+
package net.sourceforge.openutils.mgnlmedia.media.processors;
import java.awt.image.BufferedImage;
Modified: trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/processors/ResizeNoCropImageResolutionProcessor.java
===================================================================
--- trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/processors/ResizeNoCropImageResolutionProcessor.java 2009-12-31 09:35:50 UTC (rev 1573)
+++ trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/processors/ResizeNoCropImageResolutionProcessor.java 2009-12-31 09:55:35 UTC (rev 1574)
@@ -1,9 +1,7 @@
/**
*
* Magnolia SimpleMedia Module (http://lab.openmindonline.it/lab/products/media.html)
- * Magnolia SimpleMedia Module: a module for Magnolia CMS for easier management of images and videos with
- * several features.
- * Copyright (C)2008 - 2009, Openmind S.r.l. http://www.openmindonline.it
+ * Copyright (C)2008 - 2010, Openmind S.r.l. http://www.openmindonline.it
*
*
* This library is free software; you can redistribute it and/or
@@ -23,6 +21,7 @@
* License along with this library; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
+
package net.sourceforge.openutils.mgnlmedia.media.processors;
import java.awt.image.BufferedImage;
Modified: trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/processors/RoundedCornersProcessor.java
===================================================================
--- trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/processors/RoundedCornersProcessor.java 2009-12-31 09:35:50 UTC (rev 1573)
+++ trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/processors/RoundedCornersProcessor.java 2009-12-31 09:55:35 UTC (rev 1574)
@@ -1,9 +1,7 @@
/**
*
* Magnolia SimpleMedia Module (http://lab.openmindonline.it/lab/products/media.html)
- * Magnolia SimpleMedia Module: a module for Magnolia CMS for easier management of images and videos with
- * several features.
- * Copyright (C)2008 - 2009, Openmind S.r.l. http://www.openmindonline.it
+ * Copyright (C)2008 - 2010, Openmind S.r.l. http://www.openmindonline.it
*
*
* This library is free software; you can redistribute it and/or
@@ -23,6 +21,7 @@
* License along with this library; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
+
package net.sourceforge.openutils.mgnlmedia.media.processors;
import java.awt.Color;
Modified: trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/save/MediaCustomSaveHandler.java
===================================================================
--- trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/save/MediaCustomSaveHandler.java 2009-12-31 09:35:50 UTC (rev 1573)
+++ trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/save/MediaCustomSaveHandler.java 2009-12-31 09:55:35 UTC (rev 1574)
@@ -1,9 +1,7 @@
/**
*
* Magnolia SimpleMedia Module (http://lab.openmindonline.it/lab/products/media.html)
- * Magnolia SimpleMedia Module: a module for Magnolia CMS for easier management of images and videos with
- * several features.
- * Copyright (C)2008 - 2009, Openmind S.r.l. http://www.openmindonline.it
+ * Copyright (C)2008 - 2010, Openmind S.r.l. http://www.openmindonline.it
*
*
* This library is free software; you can redistribute it and/or
@@ -23,6 +21,7 @@
* License along with this library; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
+
package net.sourceforge.openutils.mgnlmedia.media.save;
import info.magnolia.cms.beans.runtime.MultipartForm;
Modified: trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/setup/MediaModuleVersionHandler.java
===================================================================
--- trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/setup/MediaModuleVersionHandler.java 2009-12-31 09:35:50 UTC (rev 1573)
+++ trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/setup/MediaModuleVersionHandler.java 2009-12-31 09:55:35 UTC (rev 1574)
@@ -1,9 +1,7 @@
/**
*
* Magnolia SimpleMedia Module (http://lab.openmindonline.it/lab/products/media.html)
- * Magnolia SimpleMedia Module: a module for Magnolia CMS for easier management of images and videos with
- * several features.
- * Copyright (C)2008 - 2009, Openmind S.r.l. http://www.openmindonline.it
+ * Copyright (C)2008 - 2010, Openmind S.r.l. http://www.openmindonline.it
*
*
* This library is free software; you can redistribute it and/or
@@ -23,6 +21,7 @@
* License along with this library; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
+
package net.sourceforge.openutils.mgnlmedia.media.setup;
import info.magnolia.cms.core.Content;
Modified: trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/setup/RemoveResolutionsNodeTask.java
===================================================================
--- trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/setup/RemoveResolutionsNodeTask.java 2009-12-31 09:35:50 UTC (rev 1573)
+++ trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/setup/RemoveResolutionsNodeTask.java 2009-12-31 09:55:35 UTC (rev 1574)
@@ -1,9 +1,7 @@
/**
*
* Magnolia SimpleMedia Module (http://lab.openmindonline.it/lab/products/media.html)
- * Magnolia SimpleMedia Module: a module for Magnolia CMS for easier management of images and videos with
- * several features.
- * Copyright (C)2008 - 2009, Openmind S.r.l. http://www.openmindonline.it
+ * Copyright (C)2008 - 2010, Openmind S.r.l. http://www.openmindonline.it
*
*
* This library is free software; you can redistribute it and/or
@@ -23,6 +21,7 @@
* License along with this library; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
+
package net.sourceforge.openutils.mgnlmedia.media.setup;
import java.util.Collection;
Modified: trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/setup/RenameThumbToImageTask.java
===================================================================
--- trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/setup/RenameThumbToImageTask.java 2009-12-31 09:35:50 UTC (rev 1573)
+++ trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/setup/RenameThumbToImageTask.java 2009-12-31 09:55:35 UTC (rev 1574)
@@ -1,9 +1,7 @@
/**
*
* Magnolia SimpleMedia Module (http://lab.openmindonline.it/lab/products/media.html)
- * Magnolia SimpleMedia Module: a module for Magnolia CMS for easier management of images and videos with
- * several features.
- * Copyright (C)2008 - 2009, Openmind S.r.l. http://www.openmindonline.it
+ * Copyright (C)2008 - 2010, Openmind S.r.l. http://www.openmindonline.it
*
*
* This library is free software; you can redistribute it and/or
@@ -23,6 +21,7 @@
* License along with this library; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
+
package net.sourceforge.openutils.mgnlmedia.media.setup;
import info.magnolia.cms.beans.runtime.FileProperties;
Modified: trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/setup/SamplesExtractionTask.java
===================================================================
--- trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/setup/SamplesExtractionTask.java 2009-12-31 09:35:50 UTC (rev 1573)
+++ trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/setup/SamplesExtractionTask.java 2009-12-31 09:55:35 UTC (rev 1574)
@@ -1,9 +1,7 @@
/**
*
* Magnolia SimpleMedia Module (http://lab.openmindonline.it/lab/products/media.html)
- * Magnolia SimpleMedia Module: a module for Magnolia CMS for easier management of images and videos with
- * several features.
- * Copyright (C)2008 - 2009, Openmind S.r.l. http://www.openmindonline.it
+ * Copyright (C)2008 - 2010, Openmind S.r.l. http://www.openmindonline.it
*
*
* This library is free software; you can redistribute it and/or
@@ -23,6 +21,7 @@
* License along with this library; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
+
package net.sourceforge.openutils.mgnlmedia.media.setup;
import info.magnolia.cms.core.HierarchyManager;
Modified: trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/tags/el/MediaEl.java
===================================================================
--- trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/tags/el/MediaEl.java 2009-12-31 09:35:50 UTC (rev 1573)
+++ trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/tags/el/MediaEl.java 2009-12-31 09:55:35 UTC (rev 1574)
@@ -1,9 +1,7 @@
/**
*
* Magnolia SimpleMedia Module (http://lab.openmindonline.it/lab/products/media.html)
- * Magnolia SimpleMedia Module: a module for Magnolia CMS for easier management of images and videos with
- * several features.
- * Copyright (C)2008 - 2009, Openmind S.r.l. http://www.openmindonline.it
+ * Copyright (C)2008 - 2010, Openmind S.r.l. http://www.openmindonline.it
*
*
* This library is free software; you can redistribute it and/or
@@ -23,6 +21,7 @@
* License along with this library; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
+
package net.sourceforge.openutils.mgnlmedia.media.tags.el;
import info.magnolia.cms.beans.runtime.FileProperties;
Modified: trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/tree/JcrBrowserWithNodeTypeTreeConfiguration.java
===================================================================
--- trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/tree/JcrBrowserWithNodeTypeTreeConfiguration.java 2009-12-31 09:35:50 UTC (rev 1573)
+++ trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/tree/JcrBrowserWithNodeTypeTreeConfiguration.java 2009-12-31 09:55:35 UTC (rev 1574)
@@ -1,9 +1,7 @@
/**
*
* Magnolia SimpleMedia Module (http://lab.openmindonline.it/lab/products/media.html)
- * Magnolia SimpleMedia Module: a module for Magnolia CMS for easier management of images and videos with
- * several features.
- * Copyright (C)2008 - 2009, Openmind S.r.l. http://www.openmindonline.it
+ * Copyright (C)2008 - 2010, Openmind S.r.l. http://www.openmindonline.it
*
*
* This library is free software; you can redistribute it and/or
@@ -23,6 +21,7 @@
* License along with this library; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
+
package net.sourceforge.openutils.mgnlmedia.media.tree;
import info.magnolia.cms.core.Content;
Modified: trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/tree/MediaBrowserConfiguration.java
===================================================================
--- trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/tree/MediaBrowserConfiguration.java 2009-12-31 09:35:50 UTC (rev 1573)
+++ trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/tree/MediaBrowserConfiguration.java 2009-12-31 09:55:35 UTC (rev 1574)
@@ -1,9 +1,7 @@
/**
*
* Magnolia SimpleMedia Module (http://lab.openmindonline.it/lab/products/media.html)
- * Magnolia SimpleMedia Module: a module for Magnolia CMS for easier management of images and videos with
- * several features.
- * Copyright (C)2008 - 2009, Openmind S.r.l. http://www.openmindonline.it
+ * Copyright (C)2008 - 2010, Openmind S.r.l. http://www.openmindonline.it
*
*
* This library is free software; you can redistribute it and/or
@@ -23,6 +21,7 @@
* License along with this library; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
+
package net.sourceforge.openutils.mgnlmedia.media.tree;
import info.magnolia.cms.core.Content;
Modified: trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/tree/MediaModuleTree.java
===================================================================
--- trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/tree/MediaModuleTree.java 2009-12-31 09:35:50 UTC (rev 1573)
+++ trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/tree/MediaModuleTree.java 2009-12-31 09:55:35 UTC (rev 1574)
@@ -1,9 +1,7 @@
/**
*
* Magnolia SimpleMedia Module (http://lab.openmindonline.it/lab/products/media.html)
- * Magnolia SimpleMedia Module: a module for Magnolia CMS for easier management of images and videos with
- * several features.
- * Copyright (C)2008 - 2009, Openmind S.r.l. http://www.openmindonline.it
+ * Copyright (C)2008 - 2010, Openmind S.r.l. http://www.openmindonline.it
*
*
* This library is free software; you can redistribute it and/or
@@ -23,6 +21,7 @@
* License along with this library; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
+
package net.sourceforge.openutils.mgnlmedia.media.tree;
import info.magnolia.cms.core.Content;
Modified: trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/tree/MediaModuleTreeConfiguration.java
===================================================================
--- trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/tree/MediaModuleTreeConfiguration.java 2009-12-31 09:35:50 UTC (rev 1573)
+++ trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/tree/MediaModuleTreeConfiguration.java 2009-12-31 09:55:35 UTC (rev 1574)
@@ -1,9 +1,7 @@
/**
*
* Magnolia SimpleMedia Module (http://lab.openmindonline.it/lab/products/media.html)
- * Magnolia SimpleMedia Module: a module for Magnolia CMS for easier management of images and videos with
- * several features.
- * Copyright (C)2008 - 2009, Openmind S.r.l. http://www.openmindonline.it
+ * Copyright (C)2008 - 2010, Openmind S.r.l. http://www.openmindonline.it
*
*
* This library is free software; you can redistribute it and/or
@@ -23,6 +21,7 @@
* License along with this library; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
+
package net.sourc...
[truncated message content] |
|
From: <fg...@us...> - 2010-02-07 19:54:33
|
Revision: 1852
http://openutils.svn.sourceforge.net/openutils/?rev=1852&view=rev
Author: fgiust
Date: 2010-02-07 19:54:27 +0000 (Sun, 07 Feb 2010)
Log Message:
-----------
MEDIA-83 speed up page loading - new google collections dependency
Modified Paths:
--------------
trunk/openutils-mgnlmedia/pom.xml
trunk/openutils-mgnlmedia/src/main/assembly/assembly-bundle.xml
trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/pages/MediaFolderViewPage.java
Modified: trunk/openutils-mgnlmedia/pom.xml
===================================================================
--- trunk/openutils-mgnlmedia/pom.xml 2010-02-07 18:57:21 UTC (rev 1851)
+++ trunk/openutils-mgnlmedia/pom.xml 2010-02-07 19:54:27 UTC (rev 1852)
@@ -92,6 +92,11 @@
<version>1.1</version>
</dependency>
<dependency>
+ <groupId>com.google.collections</groupId>
+ <artifactId>google-collections</artifactId>
+ <version>1.0</version>
+ </dependency>
+ <dependency>
<groupId>info.magnolia</groupId>
<artifactId>magnolia-module-standard-templating-kit</artifactId>
<version>1.2</version>
Modified: trunk/openutils-mgnlmedia/src/main/assembly/assembly-bundle.xml
===================================================================
--- trunk/openutils-mgnlmedia/src/main/assembly/assembly-bundle.xml 2010-02-07 18:57:21 UTC (rev 1851)
+++ trunk/openutils-mgnlmedia/src/main/assembly/assembly-bundle.xml 2010-02-07 19:54:27 UTC (rev 1852)
@@ -29,6 +29,7 @@
<includes>
<include>com.drewnoakes:metadata-extractor</include>
<include>net.sourceforge.openutils:*</include>
+ <include>com.google.collections:*</include>
</includes>
</dependencySet>
</dependencySets>
Modified: trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/pages/MediaFolderViewPage.java
===================================================================
--- trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/pages/MediaFolderViewPage.java 2010-02-07 18:57:21 UTC (rev 1851)
+++ trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/pages/MediaFolderViewPage.java 2010-02-07 19:54:27 UTC (rev 1852)
@@ -54,13 +54,16 @@
import net.sourceforge.openutils.mgnlmedia.media.lifecycle.MediaModule;
import org.apache.commons.chain.Command;
+import org.apache.commons.collections.CollectionUtils;
import org.apache.commons.lang.StringUtils;
-import org.apache.commons.lang.time.StopWatch;
import org.apache.jackrabbit.util.ISO9075;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import com.google.common.base.Function;
+import com.google.common.collect.Collections2;
+
/**
* Page that renders the folder view
* @author molaschi
@@ -196,14 +199,14 @@
/**
* {@inheritDoc}
*/
+ @SuppressWarnings("unchecked")
@Override
public String show()
{
HierarchyManager hm = MgnlContext.getInstance().getHierarchyManager(MediaModule.REPO);
- MediaTypeConfiguration mtc = MediaConfigurationManager.getInstance().getTypes().get(type);
+ final MediaTypeConfiguration mtc = MediaConfigurationManager.getInstance().getTypes().get(type);
Collection<Content> mediasOfType = null;
- medias = new ArrayList<MediaBean>();
develop = SystemProperty.getBooleanProperty("magnolia.develop");
@@ -242,44 +245,47 @@
if (mediasOfType != null)
{
-
- StopWatch watch = new StopWatch();
- watch.start();
- for (Content media : mediasOfType)
+ medias = Collections2.transform(mediasOfType, new Function<Content, MediaBean>()
{
- MediaBean mb = new MediaBean();
- mb.setContent(media);
- mb.setMetaData(media.getMetaData());
- mb.setHandle(media.getHandle());
- mb.setFilename(mtc.getHandler().getFilename(media));
- mb.setDescription(mtc.getHandler().getDescription(media));
- mb.setThumbnailUrl(mtc.getHandler().getThumbnailUrl(media));
- mb.setPreviewUrl(mtc.getHandler().getPreviewUrl(media));
- mb.setDescription(mtc.getHandler().getDescription(media));
- mb.setUuid(media.getUUID());
- try
+ public MediaBean apply(Content media)
{
- mb.setWritable(media.getParent().isGranted(Permission.WRITE));
- mb.setCanPublish(!MediaModule.getInstance().isSingleinstance()
- && mb.isWritable()
- && ActivationManagerFactory.getActivationManager().hasAnyActiveSubscriber());
+ MediaBean mb = new MediaBean();
+ mb.setContent(media);
+ mb.setMetaData(media.getMetaData());
+ mb.setHandle(media.getHandle());
+ mb.setFilename(mtc.getHandler().getFilename(media));
+ mb.setDescription(mtc.getHandler().getDescription(media));
+ mb.setThumbnailUrl(mtc.getHandler().getThumbnailUrl(media));
+ mb.setPreviewUrl(mtc.getHandler().getPreviewUrl(media));
+ mb.setDescription(mtc.getHandler().getDescription(media));
+ mb.setUuid(media.getUUID());
- mb.getUsedInWebPages().addAll(
- MediaConfigurationManager.getInstance().getUsedInWebPages(media.getUUID()));
- }
- catch (RepositoryException ex)
- {
- log.error("Exception caught", ex);
- }
+ try
+ {
+ mb.setWritable(media.getParent().isGranted(Permission.WRITE));
+ mb.setCanPublish(!MediaModule.getInstance().isSingleinstance()
+ && mb.isWritable()
+ && ActivationManagerFactory.getActivationManager().hasAnyActiveSubscriber());
- mb.setMediaInfo(mtc.getHandler().getMediaInfo(media));
+ mb.getUsedInWebPages().addAll(
+ MediaConfigurationManager.getInstance().getUsedInWebPages(media.getUUID()));
+ }
+ catch (RepositoryException ex)
+ {
+ log.error("Exception caught", ex);
+ }
- medias.add(mb);
- }
+ mb.setMediaInfo(mtc.getHandler().getMediaInfo(media));
- log.warn("Took {} to display {} files", watch.toSplitString(), mediasOfType.size());
+ return mb;
+ }
+ });
}
+ else
+ {
+ medias = CollectionUtils.EMPTY_COLLECTION;
+ }
return super.show();
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fg...@us...> - 2011-01-18 09:13:59
|
Revision: 3252
http://openutils.svn.sourceforge.net/openutils/?rev=3252&view=rev
Author: fgiust
Date: 2011-01-18 09:13:47 +0000 (Tue, 18 Jan 2011)
Log Message:
-----------
update module name according to new standards
Modified Paths:
--------------
trunk/openutils-mgnlmedia/pom.xml
trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/dam/SimpleMediaAsset.java
trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/dam/SimpleMediaContentHandler.java
trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/freemarker/SktSimpleMediaParagraphRenderer.java
trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/freemarker/SktSimpleMediaTemplateRenderer.java
trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/grid/MediaGridColumnType.java
trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/advancedsearch/Option.java
trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/advancedsearch/SearchFilter.java
trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/advancedsearch/SearchFilterAbstract.java
trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/advancedsearch/SearchFilterBeetweenCreationDate.java
trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/advancedsearch/SearchFilterEmpty.java
trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/advancedsearch/SearchFilterInMultivalue.java
trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/advancedsearch/SearchFilterMultiplevalue.java
trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/advancedsearch/SearchFilterOptionProvider.java
trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/advancedsearch/SearchFilterPath.java
trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/advancedsearch/SearchFilterSorting.java
trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/advancedsearch/SearchFilterSpecFieldMedia.java
trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/advancedsearch/SearchFilterStatus.java
trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/advancedsearch/SearchFilterStatusModified.java
trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/advancedsearch/SearchFilterText.java
trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/advancedsearch/SearchFilterUUID.java
trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/advancedsearch/configuration/SearchMediaQueryConfiguration.java
trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/commands/MediaActivationCommand.java
trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/commands/MediaDeactivationCommand.java
trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/configuration/ImageProcessorsManager.java
trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/configuration/MediaConfigurationManager.java
trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/configuration/MediaTypeConfiguration.java
trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/configuration/MediaUsedInManager.java
trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/configuration/UsedInWorkspace.java
trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/dialog/DialogFileAudio.java
trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/dialog/DialogFileDocument.java
trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/dialog/DialogFileImage.java
trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/dialog/DialogFileNoPreview.java
trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/dialog/DialogFileVideo.java
trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/dialog/DialogMetadata.java
trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/dialog/DialogSelectMedia.java
trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/dialog/DisplayUUID.java
trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/dialog/LayerDialog.java
trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/dialog/LayerDialogMVC.java
trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/lifecycle/MediaModule.java
trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/pages/MediaAdvancedSearchFormPage.java
trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/pages/MediaAdvancedSearchPage.java
trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/pages/MediaBean.java
trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/pages/MediaBeanBuilder.java
trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/pages/MediaBrowserPage.java
trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/pages/MediaFolderSelectionPage.java
trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/pages/MediaFolderViewPage.java
trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/pages/MediaSearchPage.java
trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/pages/MessagesTemplatedMVCHandler.java
trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/pages/SortMode.java
trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/processors/BaseImageResolutionProcessor.java
trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/processors/BlackAndWhitePostProcessor.java
trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/processors/FitInAndFillWithBandsImageResolutionProcessor.java
trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/processors/FitInImageResolutionProcessor.java
trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/processors/ImagePostProcessor.java
trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/processors/ImageResolutionProcessor.java
trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/processors/LogSizePostProcessor.java
trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/processors/ResizeCropCenteredImageResolutionProcessor.java
trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/processors/ResizeNoCropImageResolutionProcessor.java
trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/processors/RoundedCornersProcessor.java
trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/save/MediaCustomSaveHandler.java
trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/setup/ConditionallySubscribeMediaRepositoriesTask.java
trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/setup/MediaModuleVersionHandler.java
trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/setup/MoveHandlerNodedataToNode.java
trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/setup/MoveOriginalNodeTask.java
trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/setup/RemoveResolutionsNodeTask.java
trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/setup/RenameThumbToImageTask.java
trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/setup/SetupModuleRepositoriesWithoutSubscriberTask.java
trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/tags/el/MediaEl.java
trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/tree/JcrBrowserWithNodeTypeTreeConfiguration.java
trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/tree/MediaBrowserConfiguration.java
trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/tree/MediaModuleTree.java
trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/tree/MediaModuleTreeConfiguration.java
trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/tree/MediaModuleTreeMVCHandler.java
trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/types/MediaTypeHandler.java
trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/types/externals/ExternalVideoSupport.java
trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/types/externals/YoutubeSupport.java
trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/types/impl/AudioTypeHandler.java
trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/types/impl/BaseTypeHandler.java
trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/types/impl/BaseVideoTypeHandler.java
trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/types/impl/DocumentTypeHandler.java
trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/types/impl/ExternalVideoTypeHandler.java
trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/types/impl/ImageTypeHandler.java
trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/types/impl/MediaWithPreviewImageTypeHandler.java
trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/types/impl/VideoTypeHandler.java
trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/types/impl/YouTubeVideoTypeHandler.java
trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/uri/MediaURI2RepositoryMapping.java
trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/utils/BadImageFormatException.java
trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/utils/FLVMedataUtils.java
trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/utils/IcoUtils.java
trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/utils/ImageUtils.java
trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/utils/JpegUtils.java
trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/utils/MediaLoadUtils.java
trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/utils/MediaMetadataFormatUtils.java
trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/utils/RtmpMedatadaFetcher.java
trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/virtualurimapping/MediaThumbnailVirtualUriMapping.java
trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/zip/DefaultZipImporter.java
trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/zip/ZipImporter.java
trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/zip/ZipImporterException.java
trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/playlist/PlaylistConstants.java
trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/playlist/dialog/PlaylistEntryDialogMVC.java
trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/playlist/pages/AbstractPlaylistLink.java
trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/playlist/pages/DefaultPlaylistTrackExtensionContributor.java
trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/playlist/pages/MessageFormatPlaylistLink.java
trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/playlist/pages/PlaylistBean.java
trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/playlist/pages/PlaylistEntryBean.java
trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/playlist/pages/PlaylistLink.java
trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/playlist/pages/PlaylistTrackExtensionContributor.java
trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/playlist/pages/PlaylistView.java
trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/playlist/pages/PlaylistsBrowserPage.java
trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/playlist/tree/PlaylistsJcrBrowserTreeConfiguration.java
trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/playlist/tree/PlaylistsTree.java
trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/playlist/tree/PlaylistsTreeConfiguration.java
trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/playlist/tree/PlaylistsTreeMVCHandler.java
trunk/openutils-mgnlmedia/src/test/java/net/sourceforge/openutils/mgnlmedia/media/utils/FileNodeData.java
trunk/openutils-mgnlmedia/src/test/java/net/sourceforge/openutils/mgnlmedia/media/utils/ImageProcessorsManagerMock.java
trunk/openutils-mgnlmedia/src/test/java/net/sourceforge/openutils/mgnlmedia/media/utils/ImageUtilsTest.java
Modified: trunk/openutils-mgnlmedia/pom.xml
===================================================================
--- trunk/openutils-mgnlmedia/pom.xml 2011-01-18 09:10:06 UTC (rev 3251)
+++ trunk/openutils-mgnlmedia/pom.xml 2011-01-18 09:13:47 UTC (rev 3252)
@@ -8,8 +8,8 @@
<modelVersion>4.0.0</modelVersion>
<packaging>jar</packaging>
<artifactId>openutils-mgnlmedia</artifactId>
- <name>Magnolia SimpleMedia Module</name>
- <description>Magnolia SimpleMedia Module: a module for Magnolia CMS for easier management multimedia assets.</description>
+ <name>SimpleMedia Module for Magnolia CMS</name>
+ <description>SimpleMedia Module for Magnolia CMS: a module for Magnolia CMS for easier management of multimedia assets.</description>
<version>4.3.1-SNAPSHOT</version>
<inceptionYear>2008</inceptionYear>
<licenses>
@@ -143,7 +143,7 @@
<dependency>
<groupId>net.sourceforge.openutils</groupId>
<artifactId>openutils-mgnlcriteria</artifactId>
- <version>3.0.2</version>
+ <version>3.2.1</version>
</dependency>
<dependency>
<groupId>javax.servlet</groupId>
@@ -196,30 +196,6 @@
<version>1.04</version>
</dependency>
</dependencies>
- <repositories>
- <repository>
- <id>repository.magnolia.info</id>
- <name>magnolia repository</name>
- <url>http://nexus.magnolia-cms.com/content/groups/public/</url>
- <releases>
- <enabled>true</enabled>
- </releases>
- <snapshots>
- <enabled>false</enabled>
- </snapshots>
- </repository>
- <repository>
- <id>repository.openmindonline.it</id>
- <name>openmindonline repository</name>
- <url>http://repository.openmindonline.it</url>
- <releases>
- <enabled>true</enabled>
- </releases>
- <snapshots>
- <enabled>false</enabled>
- </snapshots>
- </repository>
- </repositories>
<properties>
<magnolia.version>4.4.1</magnolia.version>
</properties>
Modified: trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/dam/SimpleMediaAsset.java
===================================================================
--- trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/dam/SimpleMediaAsset.java 2011-01-18 09:10:06 UTC (rev 3251)
+++ trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/dam/SimpleMediaAsset.java 2011-01-18 09:13:47 UTC (rev 3252)
@@ -1,7 +1,7 @@
/**
*
- * Magnolia SimpleMedia Module (http://www.openmindlab.com/lab/products/media.html)
- * Copyright (C)2008 - 2010, Openmind S.r.l. http://www.openmindonline.it
+ * SimpleMedia Module for Magnolia CMS (http://www.openmindlab.com/lab/products/media.html)
+ * Copyright(C) 2008-2010, Openmind S.r.l. http://www.openmindonline.it
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@ -16,6 +16,7 @@
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
+
package net.sourceforge.openutils.mgnlmedia.dam;
import info.magnolia.cms.core.Content;
Modified: trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/dam/SimpleMediaContentHandler.java
===================================================================
--- trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/dam/SimpleMediaContentHandler.java 2011-01-18 09:10:06 UTC (rev 3251)
+++ trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/dam/SimpleMediaContentHandler.java 2011-01-18 09:13:47 UTC (rev 3252)
@@ -1,7 +1,7 @@
/**
*
- * Magnolia SimpleMedia Module (http://www.openmindlab.com/lab/products/media.html)
- * Copyright (C)2008 - 2010, Openmind S.r.l. http://www.openmindonline.it
+ * SimpleMedia Module for Magnolia CMS (http://www.openmindlab.com/lab/products/media.html)
+ * Copyright(C) 2008-2010, Openmind S.r.l. http://www.openmindonline.it
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@ -16,6 +16,7 @@
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
+
package net.sourceforge.openutils.mgnlmedia.dam;
import info.magnolia.cms.core.Content;
Modified: trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/freemarker/SktSimpleMediaParagraphRenderer.java
===================================================================
--- trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/freemarker/SktSimpleMediaParagraphRenderer.java 2011-01-18 09:10:06 UTC (rev 3251)
+++ trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/freemarker/SktSimpleMediaParagraphRenderer.java 2011-01-18 09:13:47 UTC (rev 3252)
@@ -1,7 +1,7 @@
/**
*
- * Magnolia SimpleMedia Module (http://www.openmindlab.com/lab/products/media.html)
- * Copyright (C)2008 - 2010, Openmind S.r.l. http://www.openmindonline.it
+ * SimpleMedia Module for Magnolia CMS (http://www.openmindlab.com/lab/products/media.html)
+ * Copyright(C) 2008-2010, Openmind S.r.l. http://www.openmindonline.it
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@ -16,6 +16,7 @@
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
+
package net.sourceforge.openutils.mgnlmedia.freemarker;
import freemarker.ext.beans.BeansWrapper;
Modified: trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/freemarker/SktSimpleMediaTemplateRenderer.java
===================================================================
--- trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/freemarker/SktSimpleMediaTemplateRenderer.java 2011-01-18 09:10:06 UTC (rev 3251)
+++ trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/freemarker/SktSimpleMediaTemplateRenderer.java 2011-01-18 09:13:47 UTC (rev 3252)
@@ -1,7 +1,7 @@
/**
*
- * Magnolia SimpleMedia Module (http://www.openmindlab.com/lab/products/media.html)
- * Copyright (C)2008 - 2010, Openmind S.r.l. http://www.openmindonline.it
+ * SimpleMedia Module for Magnolia CMS (http://www.openmindlab.com/lab/products/media.html)
+ * Copyright(C) 2008-2010, Openmind S.r.l. http://www.openmindonline.it
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@ -16,6 +16,7 @@
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
+
package net.sourceforge.openutils.mgnlmedia.freemarker;
import freemarker.ext.beans.BeansWrapper;
Modified: trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/grid/MediaGridColumnType.java
===================================================================
--- trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/grid/MediaGridColumnType.java 2011-01-18 09:10:06 UTC (rev 3251)
+++ trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/grid/MediaGridColumnType.java 2011-01-18 09:13:47 UTC (rev 3252)
@@ -1,7 +1,7 @@
/**
*
- * Magnolia SimpleMedia Module (http://www.openmindlab.com/lab/products/media.html)
- * Copyright (C)2008 - 2010, Openmind S.r.l. http://www.openmindonline.it
+ * SimpleMedia Module for Magnolia CMS (http://www.openmindlab.com/lab/products/media.html)
+ * Copyright(C) 2008-2010, Openmind S.r.l. http://www.openmindonline.it
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
Modified: trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/advancedsearch/Option.java
===================================================================
--- trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/advancedsearch/Option.java 2011-01-18 09:10:06 UTC (rev 3251)
+++ trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/advancedsearch/Option.java 2011-01-18 09:13:47 UTC (rev 3252)
@@ -1,6 +1,6 @@
/**
*
- * Magnolia SimpleMedia Module (http://www.openmindlab.com/lab/products/media.html)
+ * SimpleMedia Module for Magnolia CMS (http://www.openmindlab.com/lab/products/media.html)
* Copyright(C) 2008-2010, Openmind S.r.l. http://www.openmindonline.it
*
* This program is free software: you can redistribute it and/or modify
Modified: trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/advancedsearch/SearchFilter.java
===================================================================
--- trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/advancedsearch/SearchFilter.java 2011-01-18 09:10:06 UTC (rev 3251)
+++ trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/advancedsearch/SearchFilter.java 2011-01-18 09:13:47 UTC (rev 3252)
@@ -1,7 +1,7 @@
/**
*
- * Magnolia SimpleMedia Module (http://www.openmindlab.com/lab/products/media.html)
- * Copyright (C)2008 - 2010, Openmind S.r.l. http://www.openmindonline.it
+ * SimpleMedia Module for Magnolia CMS (http://www.openmindlab.com/lab/products/media.html)
+ * Copyright(C) 2008-2010, Openmind S.r.l. http://www.openmindonline.it
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
Modified: trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/advancedsearch/SearchFilterAbstract.java
===================================================================
--- trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/advancedsearch/SearchFilterAbstract.java 2011-01-18 09:10:06 UTC (rev 3251)
+++ trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/advancedsearch/SearchFilterAbstract.java 2011-01-18 09:13:47 UTC (rev 3252)
@@ -1,7 +1,7 @@
/**
*
- * Magnolia SimpleMedia Module (http://www.openmindlab.com/lab/products/media.html)
- * Copyright (C)2008 - 2010, Openmind S.r.l. http://www.openmindonline.it
+ * SimpleMedia Module for Magnolia CMS (http://www.openmindlab.com/lab/products/media.html)
+ * Copyright(C) 2008-2010, Openmind S.r.l. http://www.openmindonline.it
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
Modified: trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/advancedsearch/SearchFilterBeetweenCreationDate.java
===================================================================
--- trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/advancedsearch/SearchFilterBeetweenCreationDate.java 2011-01-18 09:10:06 UTC (rev 3251)
+++ trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/advancedsearch/SearchFilterBeetweenCreationDate.java 2011-01-18 09:13:47 UTC (rev 3252)
@@ -1,7 +1,7 @@
/**
*
- * Magnolia SimpleMedia Module (http://www.openmindlab.com/lab/products/media.html)
- * Copyright (C)2008 - 2010, Openmind S.r.l. http://www.openmindonline.it
+ * SimpleMedia Module for Magnolia CMS (http://www.openmindlab.com/lab/products/media.html)
+ * Copyright(C) 2008-2010, Openmind S.r.l. http://www.openmindonline.it
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
Modified: trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/advancedsearch/SearchFilterEmpty.java
===================================================================
--- trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/advancedsearch/SearchFilterEmpty.java 2011-01-18 09:10:06 UTC (rev 3251)
+++ trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/advancedsearch/SearchFilterEmpty.java 2011-01-18 09:13:47 UTC (rev 3252)
@@ -1,7 +1,7 @@
/**
*
- * Magnolia SimpleMedia Module (http://www.openmindlab.com/lab/products/media.html)
- * Copyright (C)2008 - 2010, Openmind S.r.l. http://www.openmindonline.it
+ * SimpleMedia Module for Magnolia CMS (http://www.openmindlab.com/lab/products/media.html)
+ * Copyright(C) 2008-2010, Openmind S.r.l. http://www.openmindonline.it
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
Modified: trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/advancedsearch/SearchFilterInMultivalue.java
===================================================================
--- trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/advancedsearch/SearchFilterInMultivalue.java 2011-01-18 09:10:06 UTC (rev 3251)
+++ trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/advancedsearch/SearchFilterInMultivalue.java 2011-01-18 09:13:47 UTC (rev 3252)
@@ -1,7 +1,7 @@
/**
*
- * Magnolia SimpleMedia Module (http://www.openmindlab.com/lab/products/media.html)
- * Copyright (C)2008 - 2010, Openmind S.r.l. http://www.openmindonline.it
+ * SimpleMedia Module for Magnolia CMS (http://www.openmindlab.com/lab/products/media.html)
+ * Copyright(C) 2008-2010, Openmind S.r.l. http://www.openmindonline.it
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
Modified: trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/advancedsearch/SearchFilterMultiplevalue.java
===================================================================
--- trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/advancedsearch/SearchFilterMultiplevalue.java 2011-01-18 09:10:06 UTC (rev 3251)
+++ trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/advancedsearch/SearchFilterMultiplevalue.java 2011-01-18 09:13:47 UTC (rev 3252)
@@ -1,7 +1,7 @@
/**
*
- * Magnolia SimpleMedia Module (http://www.openmindlab.com/lab/products/media.html)
- * Copyright (C)2008 - 2010, Openmind S.r.l. http://www.openmindonline.it
+ * SimpleMedia Module for Magnolia CMS (http://www.openmindlab.com/lab/products/media.html)
+ * Copyright(C) 2008-2010, Openmind S.r.l. http://www.openmindonline.it
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
Modified: trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/advancedsearch/SearchFilterOptionProvider.java
===================================================================
--- trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/advancedsearch/SearchFilterOptionProvider.java 2011-01-18 09:10:06 UTC (rev 3251)
+++ trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/advancedsearch/SearchFilterOptionProvider.java 2011-01-18 09:13:47 UTC (rev 3252)
@@ -1,7 +1,7 @@
/**
*
- * Magnolia SimpleMedia Module (http://www.openmindlab.com/lab/products/media.html)
- * Copyright (C)2008 - 2010, Openmind S.r.l. http://www.openmindonline.it
+ * SimpleMedia Module for Magnolia CMS (http://www.openmindlab.com/lab/products/media.html)
+ * Copyright(C) 2008-2010, Openmind S.r.l. http://www.openmindonline.it
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
Modified: trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/advancedsearch/SearchFilterPath.java
===================================================================
--- trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/advancedsearch/SearchFilterPath.java 2011-01-18 09:10:06 UTC (rev 3251)
+++ trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/advancedsearch/SearchFilterPath.java 2011-01-18 09:13:47 UTC (rev 3252)
@@ -1,7 +1,7 @@
/**
*
- * Magnolia SimpleMedia Module (http://www.openmindlab.com/lab/products/media.html)
- * Copyright (C)2008 - 2010, Openmind S.r.l. http://www.openmindonline.it
+ * SimpleMedia Module for Magnolia CMS (http://www.openmindlab.com/lab/products/media.html)
+ * Copyright(C) 2008-2010, Openmind S.r.l. http://www.openmindonline.it
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
Modified: trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/advancedsearch/SearchFilterSorting.java
===================================================================
--- trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/advancedsearch/SearchFilterSorting.java 2011-01-18 09:10:06 UTC (rev 3251)
+++ trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/advancedsearch/SearchFilterSorting.java 2011-01-18 09:13:47 UTC (rev 3252)
@@ -1,3 +1,22 @@
+/**
+ *
+ * SimpleMedia Module for Magnolia CMS (http://www.openmindlab.com/lab/products/media.html)
+ * Copyright(C) 2008-2010, Openmind S.r.l. http://www.openmindonline.it
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
package net.sourceforge.openutils.mgnlmedia.media.advancedsearch;
import javax.servlet.http.HttpServletRequest;
Modified: trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/advancedsearch/SearchFilterSpecFieldMedia.java
===================================================================
--- trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/advancedsearch/SearchFilterSpecFieldMedia.java 2011-01-18 09:10:06 UTC (rev 3251)
+++ trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/advancedsearch/SearchFilterSpecFieldMedia.java 2011-01-18 09:13:47 UTC (rev 3252)
@@ -1,7 +1,7 @@
/**
*
- * Magnolia SimpleMedia Module (http://www.openmindlab.com/lab/products/media.html)
- * Copyright (C)2008 - 2010, Openmind S.r.l. http://www.openmindonline.it
+ * SimpleMedia Module for Magnolia CMS (http://www.openmindlab.com/lab/products/media.html)
+ * Copyright(C) 2008-2010, Openmind S.r.l. http://www.openmindonline.it
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
Modified: trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/advancedsearch/SearchFilterStatus.java
===================================================================
--- trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/advancedsearch/SearchFilterStatus.java 2011-01-18 09:10:06 UTC (rev 3251)
+++ trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/advancedsearch/SearchFilterStatus.java 2011-01-18 09:13:47 UTC (rev 3252)
@@ -1,7 +1,7 @@
/**
*
- * Magnolia SimpleMedia Module (http://www.openmindlab.com/lab/products/media.html)
- * Copyright (C)2008 - 2010, Openmind S.r.l. http://www.openmindonline.it
+ * SimpleMedia Module for Magnolia CMS (http://www.openmindlab.com/lab/products/media.html)
+ * Copyright(C) 2008-2010, Openmind S.r.l. http://www.openmindonline.it
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
Modified: trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/advancedsearch/SearchFilterStatusModified.java
===================================================================
--- trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/advancedsearch/SearchFilterStatusModified.java 2011-01-18 09:10:06 UTC (rev 3251)
+++ trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/advancedsearch/SearchFilterStatusModified.java 2011-01-18 09:13:47 UTC (rev 3252)
@@ -1,7 +1,7 @@
/**
*
- * Magnolia SimpleMedia Module (http://www.openmindlab.com/lab/products/media.html)
- * Copyright (C)2008 - 2010, Openmind S.r.l. http://www.openmindonline.it
+ * SimpleMedia Module for Magnolia CMS (http://www.openmindlab.com/lab/products/media.html)
+ * Copyright(C) 2008-2010, Openmind S.r.l. http://www.openmindonline.it
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
Modified: trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/advancedsearch/SearchFilterText.java
===================================================================
--- trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/advancedsearch/SearchFilterText.java 2011-01-18 09:10:06 UTC (rev 3251)
+++ trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/advancedsearch/SearchFilterText.java 2011-01-18 09:13:47 UTC (rev 3252)
@@ -1,7 +1,7 @@
/**
*
- * Magnolia SimpleMedia Module (http://www.openmindlab.com/lab/products/media.html)
- * Copyright (C)2008 - 2010, Openmind S.r.l. http://www.openmindonline.it
+ * SimpleMedia Module for Magnolia CMS (http://www.openmindlab.com/lab/products/media.html)
+ * Copyright(C) 2008-2010, Openmind S.r.l. http://www.openmindonline.it
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
Modified: trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/advancedsearch/SearchFilterUUID.java
===================================================================
--- trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/advancedsearch/SearchFilterUUID.java 2011-01-18 09:10:06 UTC (rev 3251)
+++ trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/advancedsearch/SearchFilterUUID.java 2011-01-18 09:13:47 UTC (rev 3252)
@@ -1,7 +1,7 @@
/**
*
- * Magnolia SimpleMedia Module (http://www.openmindlab.com/lab/products/media.html)
- * Copyright (C)2008 - 2010, Openmind S.r.l. http://www.openmindonline.it
+ * SimpleMedia Module for Magnolia CMS (http://www.openmindlab.com/lab/products/media.html)
+ * Copyright(C) 2008-2010, Openmind S.r.l. http://www.openmindonline.it
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
Modified: trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/advancedsearch/configuration/SearchMediaQueryConfiguration.java
===================================================================
--- trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/advancedsearch/configuration/SearchMediaQueryConfiguration.java 2011-01-18 09:10:06 UTC (rev 3251)
+++ trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/advancedsearch/configuration/SearchMediaQueryConfiguration.java 2011-01-18 09:13:47 UTC (rev 3252)
@@ -1,7 +1,7 @@
/**
*
- * Magnolia SimpleMedia Module (http://www.openmindlab.com/lab/products/media.html)
- * Copyright (C)2008 - 2010, Openmind S.r.l. http://www.openmindonline.it
+ * SimpleMedia Module for Magnolia CMS (http://www.openmindlab.com/lab/products/media.html)
+ * Copyright(C) 2008-2010, Openmind S.r.l. http://www.openmindonline.it
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
Modified: trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/commands/MediaActivationCommand.java
===================================================================
--- trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/commands/MediaActivationCommand.java 2011-01-18 09:10:06 UTC (rev 3251)
+++ trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/commands/MediaActivationCommand.java 2011-01-18 09:13:47 UTC (rev 3252)
@@ -1,7 +1,7 @@
/**
*
- * Magnolia SimpleMedia Module (http://www.openmindlab.com/lab/products/media.html)
- * Copyright (C)2008 - 2010, Openmind S.r.l. http://www.openmindonline.it
+ * SimpleMedia Module for Magnolia CMS (http://www.openmindlab.com/lab/products/media.html)
+ * Copyright(C) 2008-2010, Openmind S.r.l. http://www.openmindonline.it
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
Modified: trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/commands/MediaDeactivationCommand.java
===================================================================
--- trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/commands/MediaDeactivationCommand.java 2011-01-18 09:10:06 UTC (rev 3251)
+++ trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/commands/MediaDeactivationCommand.java 2011-01-18 09:13:47 UTC (rev 3252)
@@ -1,7 +1,7 @@
/**
*
- * Magnolia SimpleMedia Module (http://www.openmindlab.com/lab/products/media.html)
- * Copyright (C)2008 - 2010, Openmind S.r.l. http://www.openmindonline.it
+ * SimpleMedia Module for Magnolia CMS (http://www.openmindlab.com/lab/products/media.html)
+ * Copyright(C) 2008-2010, Openmind S.r.l. http://www.openmindonline.it
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
Modified: trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/configuration/ImageProcessorsManager.java
===================================================================
--- trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/configuration/ImageProcessorsManager.java 2011-01-18 09:10:06 UTC (rev 3251)
+++ trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/configuration/ImageProcessorsManager.java 2011-01-18 09:13:47 UTC (rev 3252)
@@ -1,7 +1,7 @@
/**
*
- * Magnolia SimpleMedia Module (http://www.openmindlab.com/lab/products/media.html)
- * Copyright (C)2008 - 2010, Openmind S.r.l. http://www.openmindonline.it
+ * SimpleMedia Module for Magnolia CMS (http://www.openmindlab.com/lab/products/media.html)
+ * Copyright(C) 2008-2010, Openmind S.r.l. http://www.openmindonline.it
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
Modified: trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/configuration/MediaConfigurationManager.java
===================================================================
--- trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/configuration/MediaConfigurationManager.java 2011-01-18 09:10:06 UTC (rev 3251)
+++ trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/configuration/MediaConfigurationManager.java 2011-01-18 09:13:47 UTC (rev 3252)
@@ -1,7 +1,7 @@
/**
*
- * Magnolia SimpleMedia Module (http://www.openmindlab.com/lab/products/media.html)
- * Copyright (C)2008 - 2010, Openmind S.r.l. http://www.openmindonline.it
+ * SimpleMedia Module for Magnolia CMS (http://www.openmindlab.com/lab/products/media.html)
+ * Copyright(C) 2008-2010, Openmind S.r.l. http://www.openmindonline.it
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
Modified: trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/configuration/MediaTypeConfiguration.java
===================================================================
--- trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/configuration/MediaTypeConfiguration.java 2011-01-18 09:10:06 UTC (rev 3251)
+++ trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/configuration/MediaTypeConfiguration.java 2011-01-18 09:13:47 UTC (rev 3252)
@@ -1,7 +1,7 @@
/**
*
- * Magnolia SimpleMedia Module (http://www.openmindlab.com/lab/products/media.html)
- * Copyright (C)2008 - 2010, Openmind S.r.l. http://www.openmindonline.it
+ * SimpleMedia Module for Magnolia CMS (http://www.openmindlab.com/lab/products/media.html)
+ * Copyright(C) 2008-2010, Openmind S.r.l. http://www.openmindonline.it
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
Modified: trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/configuration/MediaUsedInManager.java
===================================================================
--- trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/configuration/MediaUsedInManager.java 2011-01-18 09:10:06 UTC (rev 3251)
+++ trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/configuration/MediaUsedInManager.java 2011-01-18 09:13:47 UTC (rev 3252)
@@ -1,6 +1,6 @@
/**
*
- * Magnolia SimpleMedia Module (http://www.openmindlab.com/lab/products/media.html)
+ * SimpleMedia Module for Magnolia CMS (http://www.openmindlab.com/lab/products/media.html)
* Copyright(C) 2008-2010, Openmind S.r.l. http://www.openmindonline.it
*
* This program is free software: you can redistribute it and/or modify
Modified: trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/configuration/UsedInWorkspace.java
===================================================================
--- trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/configuration/UsedInWorkspace.java 2011-01-18 09:10:06 UTC (rev 3251)
+++ trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/configuration/UsedInWorkspace.java 2011-01-18 09:13:47 UTC (rev 3252)
@@ -1,6 +1,6 @@
/**
*
- * Magnolia SimpleMedia Module (http://www.openmindlab.com/lab/products/media.html)
+ * SimpleMedia Module for Magnolia CMS (http://www.openmindlab.com/lab/products/media.html)
* Copyright(C) 2008-2010, Openmind S.r.l. http://www.openmindonline.it
*
* This program is free software: you can redistribute it and/or modify
Modified: trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/dialog/DialogFileAudio.java
===================================================================
--- trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/dialog/DialogFileAudio.java 2011-01-18 09:10:06 UTC (rev 3251)
+++ trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/dialog/DialogFileAudio.java 2011-01-18 09:13:47 UTC (rev 3252)
@@ -1,7 +1,7 @@
/**
*
- * Magnolia SimpleMedia Module (http://www.openmindlab.com/lab/products/media.html)
- * Copyright (C)2008 - 2010, Openmind S.r.l. http://www.openmindonline.it
+ * SimpleMedia Module for Magnolia CMS (http://www.openmindlab.com/lab/products/media.html)
+ * Copyright(C) 2008-2010, Openmind S.r.l. http://www.openmindonline.it
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
Modified: trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/dialog/DialogFileDocument.java
===================================================================
--- trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/dialog/DialogFileDocument.java 2011-01-18 09:10:06 UTC (rev 3251)
+++ trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/dialog/DialogFileDocument.java 2011-01-18 09:13:47 UTC (rev 3252)
@@ -1,7 +1,7 @@
/**
*
- * Magnolia SimpleMedia Module (http://www.openmindlab.com/lab/products/media.html)
- * Copyright (C)2008 - 2010, Openmind S.r.l. http://www.openmindonline.it
+ * SimpleMedia Module for Magnolia CMS (http://www.openmindlab.com/lab/products/media.html)
+ * Copyright(C) 2008-2010, Openmind S.r.l. http://www.openmindonline.it
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@ -16,6 +16,7 @@
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
+
package net.sourceforge.openutils.mgnlmedia.media.dialog;
import info.magnolia.cms.gui.dialog.DialogFile;
Modified: trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/dialog/DialogFileImage.java
===================================================================
--- trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/dialog/DialogFileImage.java 2011-01-18 09:10:06 UTC (rev 3251)
+++ trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/dialog/DialogFileImage.java 2011-01-18 09:13:47 UTC (rev 3252)
@@ -1,7 +1,7 @@
/**
*
- * Magnolia SimpleMedia Module (http://www.openmindlab.com/lab/products/media.html)
- * Copyright (C)2008 - 2010, Openmind S.r.l. http://www.openmindonline.it
+ * SimpleMedia Module for Magnolia CMS (http://www.openmindlab.com/lab/products/media.html)
+ * Copyright(C) 2008-2010, Openmind S.r.l. http://www.openmindonline.it
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
Modified: trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/dialog/DialogFileNoPreview.java
===================================================================
--- trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/dialog/DialogFileNoPreview.java 2011-01-18 09:10:06 UTC (rev 3251)
+++ trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/dialog/DialogFileNoPreview.java 2011-01-18 09:13:47 UTC (rev 3252)
@@ -1,7 +1,7 @@
/**
*
- * Magnolia SimpleMedia Module (http://www.openmindlab.com/lab/products/media.html)
- * Copyright (C)2008 - 2010, Openmind S.r.l. http://www.openmindonline.it
+ * SimpleMedia Module for Magnolia CMS (http://www.openmindlab.com/lab/products/media.html)
+ * Copyright(C) 2008-2010, Openmind S.r.l. http://www.openmindonline.it
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
Modified: trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/dialog/DialogFileVideo.java
===================================================================
--- trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/dialog/DialogFileVideo.java 2011-01-18 09:10:06 UTC (rev 3251)
+++ trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/dialog/DialogFileVideo.java 2011-01-18 09:13:47 UTC (rev 3252)
@@ -1,7 +1,7 @@
/**
*
- * Magnolia SimpleMedia Module (http://www.openmindlab.com/lab/products/media.html)
- * Copyright (C)2008 - 2010, Openmind S.r.l. http://www.openmindonline.it
+ * SimpleMedia Module for Magnolia CMS (http://www.openmindlab.com/lab/products/media.html)
+ * Copyright(C) 2008-2010, Openmind S.r.l. http://www.openmindonline.it
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
Modified: trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/dialog/DialogMetadata.java
===================================================================
--- trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/dialog/DialogMetadata.java 2011-01-18 09:10:06 UTC (rev 3251)
+++ trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/dialog/DialogMetadata.java 2011-01-18 09:13:47 UTC (rev 3252)
@@ -1,7 +1,7 @@
/**
*
- * Magnolia SimpleMedia Module (http://www.openmindlab.com/lab/products/media.html)
- * Copyright (C)2008 - 2010, Openmind S.r.l. http://www.openmindonline.it
+ * SimpleMedia Module for Magnolia CMS (http://www.openmindlab.com/lab/products/media.html)
+ * Copyright(C) 2008-2010, Openmind S.r.l. http://www.openmindonline.it
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
Modified: trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/dialog/DialogSelectMedia.java
===================================================================
--- trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/dialog/DialogSelectMedia.java 2011-01-18 09:10:06 UTC (rev 3251)
+++ trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/dialog/DialogSelectMedia.java 2011-01-18 09:13:47 UTC (rev 3252)
@@ -1,7 +1,7 @@
/**
*
- * Magnolia SimpleMedia Module (http://www.openmindlab.com/lab/products/media.html)
- * Copyright (C)2008 - 2010, Openmind S.r.l. http://www.openmindonline.it
+ * SimpleMedia Module for Magnolia CMS (http://www.openmindlab.com/lab/products/media.html)
+ * Copyright(C) 2008-2010, Openmind S.r.l. http://www.openmindonline.it
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
Modified: trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/dialog/DisplayUUID.java
===================================================================
--- trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/dialog/DisplayUUID.java 2011-01-18 09:10:06 UTC (rev 3251)
+++ trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/dialog/DisplayUUID.java 2011-01-18 09:13:47 UTC (rev 3252)
@@ -1,7 +1,7 @@
/**
*
- * Magnolia SimpleMedia Module (http://www.openmindlab.com/lab/products/media.html)
- * Copyright (C)2008 - 2010, Openmind S.r.l. http://www.openmindonline.it
+ * SimpleMedia Module for Magnolia CMS (http://www.openmindlab.com/lab/products/media.html)
+ * Copyright(C) 2008-2010, Openmind S.r.l. http://www.openmindonline.it
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
Modified: trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/dialog/LayerDialog.java
===================================================================
--- trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/dialog/LayerDialog.java 2011-01-18 09:10:06 UTC (rev 3251)
+++ trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/dialog/LayerDialog.java 2011-01-18 09:13:47 UTC (rev 3252)
@@ -1,7 +1,7 @@
/**
*
- * Magnolia SimpleMedia Module (http://www.openmindlab.com/lab/products/media.html)
- * Copyright (C)2008 - 2010, Openmind S.r.l. http://www.openmindonline.it
+ * SimpleMedia Module for Magnolia CMS (http://www.openmindlab.com/lab/products/media.html)
+ * Copyright(C) 2008-2010, Openmind S.r.l. http://www.openmindonline.it
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
Modified: trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/dialog/LayerDialogMVC.java
===================================================================
--- trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/dialog/LayerDialogMVC.java 2011-01-18 09:10:06 UTC (rev 3251)
+++ trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/dialog/LayerDialogMVC.java 2011-01-18 09:13:47 UTC (rev 3252)
@@ -1,7 +1,7 @@
/**
*
- * Magnolia SimpleMedia Module (http://www.openmindlab.com/lab/products/media.html)
- * Copyright (C)2008 - 2010, Openmind S.r.l. http://www.openmindonline.it
+ * SimpleMedia Module for Magnolia CMS (http://www.openmindlab.com/lab/products/media.html)
+ * Copyright(C) 2008-2010, Openmind S.r.l. http://www.openmindonline.it
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
Modified: trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/lifecycle/MediaModule.java
===================================================================
--- trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/lifecycle/MediaModule.java 2011-01-18 09:10:06 UTC (rev 3251)
+++ trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/lifecycle/MediaModule.java 2011-01-18 09:13:47 UTC (rev 3252)
@@ -1,7 +1,7 @@
/**
*
- * Magnolia SimpleMedia Module (http://www.openmindlab.com/lab/products/media.html)
- * Copyright (C)2008 - 2010, Openmind S.r.l. http://www.openmindonline.it
+ * SimpleMedia Module for Magnolia CMS (http://www.openmindlab.com/lab/products/media.html)
+ * Copyright(C) 2008-2010, Openmind S.r.l. http://www.openmindonline.it
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
Modified: trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/pages/MediaAdvancedSearchFormPage.java
===================================================================
--- trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/pages/MediaAdvancedSearchFormPage.java 2011-01-18 09:10:06 UTC (rev 3251)
+++ trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/pages/MediaAdvancedSearchFormPage.java 2011-01-18 09:13:47 UTC (rev 3252)
@@ -1,7 +1,7 @@
/**
*
- * Magnolia SimpleMedia Module (http://www.openmindlab.com/lab/products/media.html)
- * Copyright (C)2008 - 2010, Openmind S.r.l. http://www.openmindonline.it
+ * SimpleMedia Module for Magnolia CMS (http://www.openmindlab.com/lab/products/media.html)
+ * Copyright(C) 2008-2010, Openmind S.r.l. http://www.openmindonline.it
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
Modified: trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/pages/MediaAdvancedSearchPage.java
===================================================================
--- trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/pages/MediaAdvancedSearchPage.java 2011-01-18 09:10:06 UTC (rev 3251)
+++ trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/pages/MediaAdvancedSearchPage.java 2011-01-18 09:13:47 UTC (rev 3252)
@@ -1,7 +1,7 @@
/**
*
- * Magnolia SimpleMedia Module (http://www.openmindlab.com/lab/products/media.html)
- * Copyright (C)2008 - 2010, Openmind S.r.l. http://www.openmindonline.it
+ * SimpleMedia Module for Magnolia CMS (http://www.openmindlab.com/lab/products/media.html)
+ * Copyright(C) 2008-2010, Openmind S.r.l. http://www.openmindonline.it
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
Modified: trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/pages/MediaBean.java
===================================================================
--- trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/pages/MediaBean.java 2011-01-18 09:10:06 UTC (rev 3251)
+++ trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/pages/MediaBean.java 2011-01-18 09:13:47 UTC (rev 3252)
@@ -1,7 +1,7 @@
/**
*
- * Magnolia SimpleMedia Module (http://www.openmindlab.com/lab/products/media.html)
- * Copyright (C)2008 - 2010, Openmind S.r.l. http://www.openmindonline.it
+ * SimpleMedia Module for Magnolia CMS (http://www.openmindlab.com/lab/products/media.html)
+ * Copyright(C) 2008-2010, Openmind S.r.l. http://www.openmindonline.it
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
Modified: trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/pages/MediaBeanBuilder.java
===================================================================
--- trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/pages/MediaBeanBuilde...
[truncated message content] |
×
Want the latest updates on software, tech news, and AI?
Get latest updates about software, tech news, and AI from SourceForge directly in your inbox once a month.
Thanks for helping keep SourceForge clean.
X