|
From: <fg...@us...> - 2013-10-20 15:00:33
|
Revision: 4400
http://openutils.svn.sourceforge.net/openutils/?rev=4400&view=rev
Author: fgiust
Date: 2013-10-20 15:00:28 +0000 (Sun, 20 Oct 2013)
Log Message:
-----------
API updates
Modified Paths:
--------------
magnoliamodules/trunk/openutils-mgnlrepoutils/pom.xml
magnoliamodules/trunk/openutils-mgnlrepoutils/src/main/java/net/sourceforge/openutils/mgnlrepoutils/Linkfix.java
magnoliamodules/trunk/openutils-mgnlrepoutils/src/main/java/net/sourceforge/openutils/mgnlrepoutils/LinkfixPage.java
magnoliamodules/trunk/openutils-mgnlrepoutils/src/main/java/net/sourceforge/openutils/mgnlrepoutils/RepositoryUtilsPage.java
magnoliamodules/trunk/openutils-mgnltagcloud/src/main/java/net/sourceforge/openutils/mgnltagcloud/util/JackrabbitUtil.java
magnoliamodules/trunk/openutils-mgnlutils/src/main/java/it/openutils/mgnlutils/el/MgnlUtilsDeprecatedAdapters.java
magnoliamodules/trunk/openutils-mgnlutils/src/main/java/it/openutils/mgnlutils/el/MgnlUtilsElFunctions.java
magnoliamodules/trunk/openutils-mgnlutils/src/main/java/it/openutils/mgnlutils/util/NodeUtilsExt.java
magnoliamodules/trunk/openutils-mgnlutils/src/test/java/it/openutils/mgnlutils/el/MgnlUtilsElFunctionsTest.java
Modified: magnoliamodules/trunk/openutils-mgnlrepoutils/pom.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnlrepoutils/pom.xml 2013-10-20 14:20:48 UTC (rev 4399)
+++ magnoliamodules/trunk/openutils-mgnlrepoutils/pom.xml 2013-10-20 15:00:28 UTC (rev 4400)
@@ -79,6 +79,11 @@
<version>5.0.1</version>
</dependency>
<dependency>
+ <groupId>net.sourceforge.openutils</groupId>
+ <artifactId>openutils-mgnlutils</artifactId>
+ <version>5.0.2-SNAPSHOT</version>
+ </dependency>
+ <dependency>
<groupId>javax.servlet</groupId>
<artifactId>servlet-api</artifactId>
<version>2.5</version>
Modified: magnoliamodules/trunk/openutils-mgnlrepoutils/src/main/java/net/sourceforge/openutils/mgnlrepoutils/Linkfix.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlrepoutils/src/main/java/net/sourceforge/openutils/mgnlrepoutils/Linkfix.java 2013-10-20 14:20:48 UTC (rev 4399)
+++ magnoliamodules/trunk/openutils-mgnlrepoutils/src/main/java/net/sourceforge/openutils/mgnlrepoutils/Linkfix.java 2013-10-20 15:00:28 UTC (rev 4400)
@@ -19,11 +19,10 @@
package net.sourceforge.openutils.mgnlrepoutils;
-import info.magnolia.cms.core.Content;
-import info.magnolia.cms.core.Content.ContentFilter;
-import info.magnolia.cms.core.ItemType;
-import info.magnolia.cms.core.NodeData;
import info.magnolia.context.MgnlContext;
+import info.magnolia.jcr.util.MetaDataUtil;
+import info.magnolia.jcr.util.NodeUtil;
+import it.openutils.mgnlutils.util.NodeUtilsExt;
import java.io.StringWriter;
import java.util.Collection;
@@ -31,6 +30,9 @@
import java.util.regex.Matcher;
import java.util.regex.Pattern;
+import javax.jcr.Node;
+import javax.jcr.Property;
+import javax.jcr.PropertyIterator;
import javax.jcr.PropertyType;
import javax.jcr.RepositoryException;
import javax.jcr.Value;
@@ -54,22 +56,6 @@
private static final Pattern UUID_PATTERN = Pattern
.compile("([a-f0-9]{8}-[a-f0-9]{4}-[a-f0-9]{4}-[a-f0-9]{4}-[a-f0-9]{12})");
- private static final ContentFilter ACCEPTALL_CONTENTFILTER = new ContentFilter()
- {
-
- public boolean accept(Content content)
- {
- try
- {
- return !ItemType.NT_METADATA.equals(content.getNodeTypeName());
- }
- catch (RepositoryException e)
- {
- return true;
- }
- }
- };
-
private Map<String, String> replacements;
private Collection<String> sourceRepositoriesAndPaths;
@@ -153,7 +139,7 @@
log.info("Processing {}", source);
- Content node = MgnlContext.getHierarchyManager(repo).getContent(path);
+ Node node = MgnlContext.getJCRSession(repo).getNode(path);
processNode(node);
}
@@ -165,26 +151,27 @@
* @param node
* @throws RepositoryException
*/
- private void processNode(Content node) throws RepositoryException
+ private void processNode(Node node) throws RepositoryException
{
- log.debug("Processing {}", node.getHandle());
+ log.debug("Processing {}", NodeUtil.getPathIfPossible(node));
nodesCount++;
- Collection<NodeData> nodedatas = node.getNodeDataCollection();
+ PropertyIterator properties = node.getProperties();
boolean nodeUpdated = false;
- for (NodeData nodedata : nodedatas)
+ while (properties.hasNext())
{
- nodeUpdated = processNodedata(nodedata) || nodeUpdated;
+ nodeUpdated = processProperty(properties.nextProperty()) || nodeUpdated;
}
if (nodeUpdated)
{
- node.updateMetaData();
+ MetaDataUtil.updateMetaData(node);
}
- Collection<Content> children = node.getChildren(ACCEPTALL_CONTENTFILTER);
- for (Content child : children)
+ Iterable<Node> children = NodeUtil.getNodes(node, NodeUtil.EXCLUDE_META_DATA_FILTER);
+
+ for (Node child : children)
{
processNode(child);
}
@@ -195,9 +182,9 @@
* @param nodedata
* @throws RepositoryException
*/
- private boolean processNodedata(NodeData data) throws RepositoryException
+ private boolean processProperty(Property data) throws RepositoryException
{
- if (data.isMultiValue() == NodeData.MULTIVALUE_TRUE)
+ if (data.isMultiple())
{
return processMultiValue(data);
}
@@ -214,7 +201,7 @@
* @param data
* @throws RepositoryException
*/
- private boolean processString(NodeData data) throws RepositoryException
+ private boolean processString(Property data) throws RepositoryException
{
String dataAsString = data.getString();
if (StringUtils.isEmpty(dataAsString))
@@ -236,10 +223,7 @@
{
log.debug("Replacing UUID {} with {}", uuid, newuuid);
- fullLog.append(String.format(
- "%s:%s\n",
- data.getHierarchyManager().getWorkspace().getName(),
- data.getHandle()));
+ fullLog.append(String.format("%s:%s\n", data.getSession().getWorkspace().getName(), data.getPath()));
gotMatches = true;
substitutionsCount++;
@@ -265,10 +249,7 @@
log.debug("Replacing text {} with {}", plainpath, repl.getValue());
- fullLog.append(String.format(
- "%s:%s\n",
- data.getHierarchyManager().getWorkspace().getName(),
- data.getHandle()));
+ fullLog.append(String.format("%s:%s\n", data.getSession().getWorkspace().getName(), data.getPath()));
gotMatches = true;
substitutionsCount++;
@@ -283,7 +264,7 @@
if (gotMatches)
{
data.setValue(newString);
- data.save();
+ data.getSession().save();
return true;
}
@@ -320,8 +301,12 @@
String newhandle = StringUtils.replace(handle, replacement.getKey(), replacement.getValue());
try
{
- Content newcontent = MgnlContext.getHierarchyManager(repo).getContent(newhandle);
- return newcontent.getUUID();
+ Node newcontent = NodeUtilsExt.getNodeIfExists(MgnlContext.getJCRSession(repo), newhandle);
+
+ if (newcontent != null)
+ {
+ return NodeUtil.getNodeIdentifierIfPossible(newcontent);
+ }
}
catch (RepositoryException e)
{
@@ -339,7 +324,7 @@
* @param data
* @throws RepositoryException
*/
- private boolean processMultiValue(NodeData data) throws RepositoryException
+ private boolean processMultiValue(Property data) throws RepositoryException
{
Value[] values = data.getValues();
@@ -378,12 +363,7 @@
String newString = sb.toString();
log.info("Creating value {}", newString);
- values[j] = data
- .getHierarchyManager()
- .getWorkspace()
- .getSession()
- .getValueFactory()
- .createValue(newString);
+ values[j] = data.getSession().getWorkspace().getSession().getValueFactory().createValue(newString);
}
}
@@ -394,7 +374,7 @@
log.debug("Setting value {} {}", values.length, values);
data.setValue(values);
- data.save();
+ data.getSession().save();
return true;
}
Modified: magnoliamodules/trunk/openutils-mgnlrepoutils/src/main/java/net/sourceforge/openutils/mgnlrepoutils/LinkfixPage.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlrepoutils/src/main/java/net/sourceforge/openutils/mgnlrepoutils/LinkfixPage.java 2013-10-20 14:20:48 UTC (rev 4399)
+++ magnoliamodules/trunk/openutils-mgnlrepoutils/src/main/java/net/sourceforge/openutils/mgnlrepoutils/LinkfixPage.java 2013-10-20 15:00:28 UTC (rev 4400)
@@ -155,7 +155,7 @@
// test it
try
{
- MgnlContext.getHierarchyManager(repo);
+ MgnlContext.getJCRSession(repo);
}
catch (IllegalArgumentException e)
{
Modified: magnoliamodules/trunk/openutils-mgnlrepoutils/src/main/java/net/sourceforge/openutils/mgnlrepoutils/RepositoryUtilsPage.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlrepoutils/src/main/java/net/sourceforge/openutils/mgnlrepoutils/RepositoryUtilsPage.java 2013-10-20 14:20:48 UTC (rev 4399)
+++ magnoliamodules/trunk/openutils-mgnlrepoutils/src/main/java/net/sourceforge/openutils/mgnlrepoutils/RepositoryUtilsPage.java 2013-10-20 15:00:28 UTC (rev 4400)
@@ -19,12 +19,13 @@
package net.sourceforge.openutils.mgnlrepoutils;
-import info.magnolia.cms.beans.config.ContentRepository;
import info.magnolia.cms.util.AlertUtil;
import info.magnolia.context.MgnlContext;
import info.magnolia.module.admininterface.TemplatedMVCHandler;
import info.magnolia.objectfactory.Components;
import info.magnolia.repository.RepositoryManager;
+import info.magnolia.repository.definition.WorkspaceMappingDefinition;
+import it.openutils.mgnlutils.util.NodeUtilsExt;
import java.lang.reflect.Field;
import java.lang.reflect.InvocationTargetException;
@@ -134,7 +135,7 @@
private SearchIndex getSearchIndex(String repo) throws RepositoryException, NoSuchMethodException,
IllegalAccessException, InvocationTargetException
{
- WorkspaceImpl workspace = (WorkspaceImpl) MgnlContext.getHierarchyManager(repo).getWorkspace();
+ WorkspaceImpl workspace = (WorkspaceImpl) NodeUtilsExt.unwrap(MgnlContext.getJCRSession(repo).getWorkspace());
QueryManagerImpl queryManager = (QueryManagerImpl) workspace.getQueryManager();
@@ -144,10 +145,13 @@
private PersistenceManager getPersistenceManager(String repo) throws Exception
{
- WorkspaceImpl workspace = (WorkspaceImpl) MgnlContext.getHierarchyManager(repo).getWorkspace();
+ WorkspaceImpl workspace = (WorkspaceImpl) NodeUtilsExt.unwrap(MgnlContext.getJCRSession(repo).getWorkspace());
Repository repository = workspace.getSession().getRepository();
- String workspaceName = ContentRepository.getMappedWorkspaceName(repo);
+ WorkspaceMappingDefinition mapping = Components.getComponent(RepositoryManager.class).getWorkspaceMapping(repo);
+
+ String workspaceName = mapping != null ? mapping.getPhysicalWorkspaceName() : repo;
+
return getPM(repository, workspaceName);
}
Modified: magnoliamodules/trunk/openutils-mgnltagcloud/src/main/java/net/sourceforge/openutils/mgnltagcloud/util/JackrabbitUtil.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnltagcloud/src/main/java/net/sourceforge/openutils/mgnltagcloud/util/JackrabbitUtil.java 2013-10-20 14:20:48 UTC (rev 4399)
+++ magnoliamodules/trunk/openutils-mgnltagcloud/src/main/java/net/sourceforge/openutils/mgnltagcloud/util/JackrabbitUtil.java 2013-10-20 15:00:28 UTC (rev 4400)
@@ -21,8 +21,8 @@
import info.magnolia.context.SystemContext;
import info.magnolia.jcr.RuntimeRepositoryException;
-import info.magnolia.jcr.wrapper.DelegateSessionWrapper;
import info.magnolia.objectfactory.Components;
+import it.openutils.mgnlutils.util.NodeUtilsExt;
import java.lang.reflect.InvocationTargetException;
import java.lang.reflect.Method;
@@ -98,15 +98,8 @@
Session session;
try
{
- session = Components.getComponent(SystemContext.class).getJCRSession(repository);
-
// TAGCLOUD-21
- while (session instanceof DelegateSessionWrapper)
- {
- session = ((DelegateSessionWrapper) session).getWrappedSession();
- }
-
- return session;
+ return NodeUtilsExt.unwrap(Components.getComponent(SystemContext.class).getJCRSession(repository));
}
catch (RepositoryException e)
{
Modified: magnoliamodules/trunk/openutils-mgnlutils/src/main/java/it/openutils/mgnlutils/el/MgnlUtilsDeprecatedAdapters.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlutils/src/main/java/it/openutils/mgnlutils/el/MgnlUtilsDeprecatedAdapters.java 2013-10-20 14:20:48 UTC (rev 4399)
+++ magnoliamodules/trunk/openutils-mgnlutils/src/main/java/it/openutils/mgnlutils/el/MgnlUtilsDeprecatedAdapters.java 2013-10-20 15:00:28 UTC (rev 4400)
@@ -27,6 +27,7 @@
import info.magnolia.context.MgnlContext;
import info.magnolia.context.WebContext;
import info.magnolia.jcr.util.ContentMap;
+import it.openutils.mgnlutils.util.NodeUtilsExt;
import java.util.Properties;
@@ -52,8 +53,7 @@
AggregationState aggregationState = getAggregationStateIfAvailable();
if (aggregationState != null)
{
- Content mainContent = aggregationState.getCurrentContent();
- return mainContent != null ? mainContent.getJCRNode() : null;
+ return toNode(aggregationState.getCurrentContent());
}
return null;
}
@@ -63,8 +63,7 @@
AggregationState aggregationState = getAggregationStateIfAvailable();
if (aggregationState != null)
{
- Content mainContent = aggregationState.getMainContent();
- return mainContent != null ? mainContent.getJCRNode() : null;
+ return toNode(aggregationState.getMainContent());
}
return null;
}
@@ -95,11 +94,11 @@
}
else if (nodeorcontent instanceof Content)
{
- return ((Content) nodeorcontent).getJCRNode();
+ return NodeUtilsExt.wrap(((Content) nodeorcontent).getJCRNode());
}
else if (nodeorcontent instanceof NodeMapWrapper)
{
- return ((NodeMapWrapper) nodeorcontent).getJCRNode();
+ return NodeUtilsExt.wrap(((NodeMapWrapper) nodeorcontent).getJCRNode());
}
else if (nodeorcontent instanceof String)
{
Modified: magnoliamodules/trunk/openutils-mgnlutils/src/main/java/it/openutils/mgnlutils/el/MgnlUtilsElFunctions.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlutils/src/main/java/it/openutils/mgnlutils/el/MgnlUtilsElFunctions.java 2013-10-20 14:20:48 UTC (rev 4399)
+++ magnoliamodules/trunk/openutils-mgnlutils/src/main/java/it/openutils/mgnlutils/el/MgnlUtilsElFunctions.java 2013-10-20 15:00:28 UTC (rev 4400)
@@ -142,22 +142,10 @@
{
return null;
}
- try
- {
- Node node = MgnlContext.getJCRSession(repository).getNode(path);
- return node;
+ Node node = NodeUtilsExt.getNodeByIdOrPath(repository, path);
- }
- catch (RepositoryException e)
- {
- log.debug("{} loading path {} from workspace {}:{}", new Object[]{
- e.getClass().getName(),
- path,
- repository,
- e.getMessage() });
- }
- return null;
+ return node;
}
/**
@@ -994,31 +982,8 @@
return null;
}
- try
- {
- Session session = MgnlContext.getJCRSession(StringUtils.isNotBlank(repo)
- ? repo
- : RepositoryConstants.WEBSITE);
- if (identifier.startsWith("/"))
- {
- if (session.nodeExists(identifier))
- {
- content = session.getNode(identifier);
- }
- }
- else
- {
- content = session.getNodeByIdentifier(StringUtils.trim(identifier));
- }
- }
- catch (ItemNotFoundException e)
- {
- log.debug("Node \"" + identifier + "\" not found");
- }
- catch (RepositoryException e)
- {
- log.error(e.getClass().getName() + " getting node \"" + identifier + "\"", e);
- }
+ content = NodeUtilsExt.getNodeByIdOrPath(repo, StringUtils.trim(identifier));
+
}
else
{
@@ -1162,21 +1127,7 @@
return null;
}
- Session session;
- try
- {
- session = MgnlContext.getJCRSession(repo);
- Node loaded = session.getNodeByIdentifier(uuid);
-
- return loaded;
-
- }
- catch (ItemNotFoundException e)
- {
- // ignore
- }
-
- return null;
+ return NodeUtilsExt.getNodeByIdOrPath(repo, uuid);
}
/**
Modified: magnoliamodules/trunk/openutils-mgnlutils/src/main/java/it/openutils/mgnlutils/util/NodeUtilsExt.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlutils/src/main/java/it/openutils/mgnlutils/util/NodeUtilsExt.java 2013-10-20 14:20:48 UTC (rev 4399)
+++ magnoliamodules/trunk/openutils-mgnlutils/src/main/java/it/openutils/mgnlutils/util/NodeUtilsExt.java 2013-10-20 15:00:28 UTC (rev 4400)
@@ -21,7 +21,6 @@
import info.magnolia.cms.core.AggregationState;
import info.magnolia.cms.core.Path;
-import info.magnolia.cms.util.ContentUtil;
import info.magnolia.content2bean.Content2BeanException;
import info.magnolia.content2bean.Content2BeanUtil;
import info.magnolia.context.MgnlContext;
@@ -30,12 +29,12 @@
import info.magnolia.jcr.util.NodeUtil;
import info.magnolia.jcr.util.PropertyUtil;
import info.magnolia.jcr.wrapper.ChannelVisibilityContentDecorator;
+import info.magnolia.jcr.wrapper.DelegateSessionWrapper;
+import info.magnolia.jcr.wrapper.DelegateWorkspaceWrapper;
import info.magnolia.jcr.wrapper.HTMLEscapingNodeWrapper;
import info.magnolia.jcr.wrapper.I18nNodeWrapper;
import info.magnolia.link.LinkFactory;
import info.magnolia.link.LinkTransformerManager;
-import info.magnolia.link.LinkUtil;
-import info.magnolia.objectfactory.Components;
import java.util.regex.Pattern;
@@ -43,10 +42,10 @@
import javax.jcr.Node;
import javax.jcr.RepositoryException;
import javax.jcr.Session;
+import javax.jcr.Workspace;
import org.apache.commons.lang.StringUtils;
-
/**
* @author fgiust
* @version $Id: NodeUtilsExt.java 4292 2013-09-12 15:54:10Z fgiust $
@@ -75,7 +74,7 @@
{
try
{
- return session.getNode(absolutepath);
+ return wrap(session.getNode(absolutepath));
}
catch (RepositoryException e)
{
@@ -153,7 +152,7 @@
{
try
{
- return NodeUtil.getNodeByIdentifier(workspace, uuidOrPath);
+ return wrap(NodeUtil.getNodeByIdentifier(workspace, uuidOrPath));
}
catch (ItemNotFoundException e)
{
@@ -168,7 +167,7 @@
{
try
{
- return getNodeIfExists(MgnlContext.getJCRSession(workspace), uuidOrPath);
+ return wrap(getNodeIfExists(MgnlContext.getJCRSession(workspace), uuidOrPath));
}
catch (RepositoryException e)
{
@@ -272,7 +271,35 @@
return LinkTransformerManager
.getInstance()
.getAbsolute(addcontextpath)
- .transform(LinkFactory.createLink(ContentUtil.asContent(node)));
+ .transform(LinkFactory.createLink(info.magnolia.cms.util.ContentUtil.asContent(node)));
}
+
+ public static Session unwrap(Session session)
+ {
+ if (session == null)
+ {
+ return null;
+ }
+ while (session instanceof DelegateSessionWrapper)
+ {
+ session = ((DelegateSessionWrapper) session).getWrappedSession();
+ }
+
+ return session;
+ }
+
+ public static Workspace unwrap(Workspace workspace)
+ {
+ if (workspace == null)
+ {
+ return null;
+ }
+ while (workspace instanceof DelegateWorkspaceWrapper)
+ {
+ workspace = ((DelegateWorkspaceWrapper) workspace).getWrappedWorkspace();
+ }
+
+ return workspace;
+ }
}
Modified: magnoliamodules/trunk/openutils-mgnlutils/src/test/java/it/openutils/mgnlutils/el/MgnlUtilsElFunctionsTest.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlutils/src/test/java/it/openutils/mgnlutils/el/MgnlUtilsElFunctionsTest.java 2013-10-20 14:20:48 UTC (rev 4399)
+++ magnoliamodules/trunk/openutils-mgnlutils/src/test/java/it/openutils/mgnlutils/el/MgnlUtilsElFunctionsTest.java 2013-10-20 15:00:28 UTC (rev 4400)
@@ -118,19 +118,12 @@
((MockWebContext) MgnlContext.getInstance()).setContextPath("/testcontextpath");
Components.getComponent(ServerConfiguration.class).setDefaultExtension("html");
- try
- {
- Class classI18nContentSupport = Class.forName("info.magnolia.cms.i18n.DefaultI18nContentSupport");
- Method i18nGetLocale = classI18nContentSupport.getMethod("getDefaultLocale");
- // Magnolia version >= 4.3.x
- i18nGetLocale.invoke(i18nSupport, en.getLocale());
- }
- catch (Throwable e)
- {
- // Magnolia version < 4.3.x
- MgnlContext.getInstance().setLocale(new Locale(""));
- }
+ Class classI18nContentSupport = Class.forName("info.magnolia.cms.i18n.DefaultI18nContentSupport");
+ Method i18nGetLocale = classI18nContentSupport.getMethod("getDefaultLocale");
+ // Magnolia version >= 4.3.x
+ i18nGetLocale.invoke(i18nSupport, en.getLocale());
+
// info.magnolia.link.BaseLinkTest.setUp()
// not configured in the repository
ComponentsTestUtil.setImplementation(URI2RepositoryManager.class, URI2RepositoryManager.class);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fg...@us...> - 2013-10-20 15:39:14
|
Revision: 4402
http://openutils.svn.sourceforge.net/openutils/?rev=4402&view=rev
Author: fgiust
Date: 2013-10-20 15:39:10 +0000 (Sun, 20 Oct 2013)
Log Message:
-----------
cleanup duplicate code
Modified Paths:
--------------
magnoliamodules/trunk/openutils-mgnlcontextmenu/pom.xml
magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/java/net/sourceforge/openutils/mgnlcontextmenu/dialog/EntrySaveHandler.java
magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/java/net/sourceforge/openutils/mgnlcontextmenu/el/ContextMenuElFunctions.java
magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/java/net/sourceforge/openutils/mgnlcontextmenu/setup/ContextMenuModuleVersionHandler.java
magnoliamodules/trunk/openutils-mgnlcontrols/pom.xml
magnoliamodules/trunk/openutils-mgnllms/pom.xml
magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/module/LMSModuleVersionHandler.java
magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/grid/MediaGridColumnType.java
magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/configuration/DefaultMediaUsedInManager.java
magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/configuration/UsedInWorkspace.java
magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/lifecycle/MediaModule.java
magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/pages/MediaBean.java
magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/pages/MediaBeanBuilder.java
magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/setup/MediaModuleVersionHandler.java
magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/types/impl/DocumentTypeHandler.java
magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/types/impl/ImageTypeHandler.java
magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/types/impl/VideoTypeHandler.java
magnoliamodules/trunk/openutils-mgnlrepoutils/src/main/resources/net/sourceforge/openutils/mgnlrepoutils/RepositoryUtilsPage.html
magnoliamodules/trunk/openutils-mgnlrules/pom.xml
magnoliamodules/trunk/openutils-mgnlrules/src/main/java/net/sourceforge/openutils/mgnlrules/setup/RuleModuleVersionHandler.java
magnoliamodules/trunk/openutils-mgnltagcloud/pom.xml
magnoliamodules/trunk/openutils-mgnltagcloud/src/main/java/net/sourceforge/openutils/mgnltagcloud/setup/TagCloudModuleVersionHandler.java
magnoliamodules/trunk/openutils-mgnltasks/src/main/java/it/openutils/mgnltasks/SetPropertyTask.java
magnoliamodules/trunk/openutils-mgnltasks/src/main/java/it/openutils/mgnltasks/SimpleModuleVersionHandler.java
magnoliamodules/trunk/openutils-mgnlutils/src/main/java/it/openutils/mgnlutils/el/MgnlUtilsElFunctions.java
magnoliamodules/trunk/openutils-mgnlutils/src/main/java/it/openutils/mgnlutils/util/ClassicRenderExceptionHandler.java
magnoliamodules/trunk/openutils-mgnlutils/src/test/java/it/openutils/mgnlutils/el/MgnlUtilsElFunctionsTest.java
Added Paths:
-----------
magnoliamodules/trunk/openutils-mgnltasks/src/main/java/it/openutils/mgnltasks/FilesExtractionTask.java
Removed Paths:
-------------
magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/java/net/sourceforge/openutils/mgnlcontextmenu/setup/FilesExtractionTask.java
magnoliamodules/trunk/openutils-mgnlrules/src/main/java/net/sourceforge/openutils/mgnlrules/setup/FilesExtractionTask.java
Modified: magnoliamodules/trunk/openutils-mgnlcontextmenu/pom.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnlcontextmenu/pom.xml 2013-10-20 15:17:25 UTC (rev 4401)
+++ magnoliamodules/trunk/openutils-mgnlcontextmenu/pom.xml 2013-10-20 15:39:10 UTC (rev 4402)
@@ -1,5 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<parent>
<groupId>net.sourceforge.openutils</groupId>
<artifactId>openutils-parent</artifactId>
@@ -96,15 +97,8 @@
</exclusion>
</exclusions>
</dependency>
- <!--
<dependency>
<groupId>info.magnolia</groupId>
- <artifactId>magnolia-taglib-cms</artifactId>
- <version>${magnolia.version}</version>
- </dependency>
- -->
- <dependency>
- <groupId>info.magnolia</groupId>
<artifactId>magnolia-module-fckeditor</artifactId>
<version>${magnolia.version}</version>
</dependency>
@@ -116,10 +110,15 @@
<dependency>
<groupId>net.sourceforge.openutils</groupId>
<artifactId>openutils-mgnlutils</artifactId>
- <version>5.0.1</version>
+ <version>5.0.2-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>net.sourceforge.openutils</groupId>
+ <artifactId>openutils-mgnltasks</artifactId>
+ <version>5.0.1-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>net.sourceforge.openutils</groupId>
<artifactId>openutils-elfunctions</artifactId>
<version>1.1.1</version>
</dependency>
@@ -171,4 +170,4 @@
<properties>
<magnolia.version>4.5.11</magnolia.version>
</properties>
-</project>
+</project>
\ No newline at end of file
Modified: magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/java/net/sourceforge/openutils/mgnlcontextmenu/dialog/EntrySaveHandler.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/java/net/sourceforge/openutils/mgnlcontextmenu/dialog/EntrySaveHandler.java 2013-10-20 15:17:25 UTC (rev 4401)
+++ magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/java/net/sourceforge/openutils/mgnlcontextmenu/dialog/EntrySaveHandler.java 2013-10-20 15:39:10 UTC (rev 4402)
@@ -23,7 +23,6 @@
import info.magnolia.cms.core.Content;
import info.magnolia.cms.security.AccessDeniedException;
import info.magnolia.cms.util.NodeDataUtil;
-import info.magnolia.module.ModuleRegistry;
import info.magnolia.module.admininterface.FieldSaveHandler;
import info.magnolia.objectfactory.Components;
Modified: magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/java/net/sourceforge/openutils/mgnlcontextmenu/el/ContextMenuElFunctions.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/java/net/sourceforge/openutils/mgnlcontextmenu/el/ContextMenuElFunctions.java 2013-10-20 15:17:25 UTC (rev 4401)
+++ magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/java/net/sourceforge/openutils/mgnlcontextmenu/el/ContextMenuElFunctions.java 2013-10-20 15:39:10 UTC (rev 4402)
@@ -20,11 +20,9 @@
package net.sourceforge.openutils.mgnlcontextmenu.el;
import info.magnolia.cms.security.Permission;
-import info.magnolia.cms.util.DeprecationUtil;
import info.magnolia.context.MgnlContext;
import info.magnolia.context.WebContext;
import info.magnolia.jcr.util.NodeUtil;
-import info.magnolia.jcr.util.PropertyUtil;
import info.magnolia.jcr.wrapper.HTMLEscapingNodeWrapper;
import info.magnolia.objectfactory.Components;
import it.openutils.mgnlutils.el.MgnlUtilsDeprecatedAdapters;
Modified: magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/java/net/sourceforge/openutils/mgnlcontextmenu/setup/ContextMenuModuleVersionHandler.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/java/net/sourceforge/openutils/mgnlcontextmenu/setup/ContextMenuModuleVersionHandler.java 2013-10-20 15:17:25 UTC (rev 4401)
+++ magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/java/net/sourceforge/openutils/mgnlcontextmenu/setup/ContextMenuModuleVersionHandler.java 2013-10-20 15:39:10 UTC (rev 4402)
@@ -25,6 +25,7 @@
import info.magnolia.objectfactory.Components;
import info.magnolia.repository.RepositoryConstants;
import it.openutils.mgnltasks.CreateMissingPropertyTask;
+import it.openutils.mgnltasks.FilesExtractionTask;
import it.openutils.mgnltasks.SimpleModuleVersionHandler;
import java.util.ArrayList;
@@ -33,9 +34,7 @@
import net.sourceforge.openutils.mgnlcontextmenu.configuration.DefaultGetGlobalEntriesNodeStrategy;
import net.sourceforge.openutils.mgnlcontextmenu.configuration.DefaultPersistenceStrategy;
-import org.apache.commons.lang.StringUtils;
-
/**
* @author dschivo
*/
@@ -50,20 +49,9 @@
{
List<Task> tasks = new ArrayList<Task>();
- if (Components.getComponent(MagnoliaConfigurationProperties.class).getBooleanProperty("magnolia.bootstrap.samples"))
+ if (samplesEnabled())
{
- tasks.add(new FilesExtractionTask("Samples extraction", "Extracts jsp files for samples.")
- {
-
- /**
- * {@inheritDoc}
- */
- @Override
- protected boolean accept(String resource)
- {
- return super.accept(resource) && StringUtils.contains(resource, "/samples-contextmenu/");
- }
- });
+ tasks.add(new FilesExtractionTask("/samples-contextmenu/"));
}
tasks.add(new CreateMissingPropertyTask(
Deleted: magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/java/net/sourceforge/openutils/mgnlcontextmenu/setup/FilesExtractionTask.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/java/net/sourceforge/openutils/mgnlcontextmenu/setup/FilesExtractionTask.java 2013-10-20 15:17:25 UTC (rev 4401)
+++ magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/java/net/sourceforge/openutils/mgnlcontextmenu/setup/FilesExtractionTask.java 2013-10-20 15:39:10 UTC (rev 4402)
@@ -1,99 +0,0 @@
-/**
- *
- * ContextMenu Module for Magnolia CMS (http://www.openmindlab.com/lab/products/mgnlcontextmenu.html)
- * Copyright(C) 2010-2013, Openmind S.r.l. http://www.openmindonline.it
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-
-package net.sourceforge.openutils.mgnlcontextmenu.setup;
-
-import info.magnolia.cms.core.HierarchyManager;
-import info.magnolia.cms.core.Path;
-import info.magnolia.module.InstallContext;
-import info.magnolia.module.delta.AbstractTask;
-import info.magnolia.module.delta.TaskExecutionException;
-import info.magnolia.module.files.FileExtractionLogger;
-import info.magnolia.module.files.FileExtractor;
-import info.magnolia.module.files.MD5CheckingFileExtractor;
-
-import java.io.IOException;
-
-import org.apache.commons.lang.StringUtils;
-
-
-/**
- * Extract files to webapp root.
- * @author fgiust
- * @author dschivo
- */
-@SuppressWarnings("deprecation")
-public class FilesExtractionTask extends AbstractTask
-{
-
- public FilesExtractionTask(String taskName, String taskDescription)
- {
- super(taskName, taskDescription);
- }
-
- public FilesExtractionTask()
- {
- this("Files extraction", "Extracts files to webapp root.");
- }
-
- /**
- * {@inheritDoc}
- */
- public void execute(final InstallContext ctx) throws TaskExecutionException
- {
- final HierarchyManager hm = ctx.getConfigHierarchyManager();
- final MD5CheckingFileExtractor extractor = new MD5CheckingFileExtractor(new FileExtractionLogger()
- {
-
- public void error(String message)
- {
- ctx.warn(message);
- }
- }, hm);
- try
- {
- extractor.extractFiles(new FileExtractor.Transformer()
- {
-
- public String accept(String resourcePath)
- {
- if (!FilesExtractionTask.this.accept(resourcePath))
- {
- return null;
- }
- final String relTargetPath = StringUtils.removeStart(resourcePath, "/mgnl-files/");
- return Path.getAbsoluteFileSystemPath(relTargetPath);
- }
-
- });
- }
- catch (IOException e)
- {
- throw new TaskExecutionException("Could not extract files for module "
- + ctx.getCurrentModuleDefinition()
- + ": "
- + e.getMessage(), e);
- }
- }
-
- protected boolean accept(String resource)
- {
- return resource.startsWith("/mgnl-files/");
- }
-}
Modified: magnoliamodules/trunk/openutils-mgnlcontrols/pom.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnlcontrols/pom.xml 2013-10-20 15:17:25 UTC (rev 4401)
+++ magnoliamodules/trunk/openutils-mgnlcontrols/pom.xml 2013-10-20 15:39:10 UTC (rev 4402)
@@ -1,4 +1,5 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<parent>
<groupId>net.sourceforge.openutils</groupId>
<artifactId>openutils-parent</artifactId>
@@ -99,6 +100,11 @@
<version>2.2</version>
</dependency>
<dependency>
+ <groupId>net.sourceforge.openutils</groupId>
+ <artifactId>openutils-mgnlutils</artifactId>
+ <version>5.0.2-SNAPSHOT</version>
+ </dependency>
+ <dependency>
<groupId>javax.servlet</groupId>
<artifactId>servlet-api</artifactId>
<version>2.5</version>
Modified: magnoliamodules/trunk/openutils-mgnllms/pom.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnllms/pom.xml 2013-10-20 15:17:25 UTC (rev 4401)
+++ magnoliamodules/trunk/openutils-mgnllms/pom.xml 2013-10-20 15:39:10 UTC (rev 4402)
@@ -108,7 +108,7 @@
<dependency>
<groupId>net.sourceforge.openutils</groupId>
<artifactId>openutils-mgnltasks</artifactId>
- <version>5.0.0</version>
+ <version>5.0.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>net.sourceforge.openutils</groupId>
Modified: magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/module/LMSModuleVersionHandler.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/module/LMSModuleVersionHandler.java 2013-10-20 15:17:25 UTC (rev 4401)
+++ magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/module/LMSModuleVersionHandler.java 2013-10-20 15:39:10 UTC (rev 4402)
@@ -19,13 +19,12 @@
package net.sourceforge.openutils.mgnllms.module;
-import info.magnolia.cms.core.SystemProperty;
import info.magnolia.cms.security.Permission;
import info.magnolia.module.InstallContext;
import info.magnolia.module.delta.SetPropertyTask;
import info.magnolia.module.delta.Task;
import it.openutils.mgnltasks.AddPermissionTask;
-import it.openutils.mgnltasks.SamplesExtractionTask;
+import it.openutils.mgnltasks.FilesExtractionTask;
import it.openutils.mgnltasks.SimpleModuleVersionHandler;
import java.util.ArrayList;
@@ -58,9 +57,10 @@
{
List<Task> tasks = new ArrayList<Task>();
- if (SystemProperty.getBooleanProperty(SystemProperty.MAGNOLIA_BOOTSTRAP_SAMPLES))
+ if (samplesEnabled())
{
- tasks.add(new SamplesExtractionTask());
+ tasks.add(new FilesExtractionTask("/samples-lms/"));
+
tasks.add(new AddPermissionTask("anonymous", "website", "/sample-lms", Permission.READ));
tasks.add(new AddPermissionTask("anonymous", "website", "/sample-lms/*", Permission.NONE));
tasks.add(new AddPermissionTask("anonymous", "uri", "/sample-lms.html", Permission.READ));
Modified: magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/grid/MediaGridColumnType.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/grid/MediaGridColumnType.java 2013-10-20 15:17:25 UTC (rev 4401)
+++ magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/grid/MediaGridColumnType.java 2013-10-20 15:39:10 UTC (rev 4402)
@@ -22,7 +22,6 @@
import info.magnolia.cms.core.Content;
import info.magnolia.cms.i18n.Messages;
import info.magnolia.cms.security.AccessDeniedException;
-import info.magnolia.cms.util.ContentUtil;
import info.magnolia.cms.util.NodeDataUtil;
import info.magnolia.context.MgnlContext;
import info.magnolia.jcr.util.NodeUtil;
Modified: magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/configuration/DefaultMediaUsedInManager.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/configuration/DefaultMediaUsedInManager.java 2013-10-20 15:17:25 UTC (rev 4401)
+++ magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/configuration/DefaultMediaUsedInManager.java 2013-10-20 15:39:10 UTC (rev 4402)
@@ -19,13 +19,6 @@
package net.sourceforge.openutils.mgnlmedia.media.configuration;
-import info.magnolia.cms.core.MgnlNodeType;
-import info.magnolia.content2bean.Content2BeanException;
-import info.magnolia.jcr.RuntimeRepositoryException;
-import info.magnolia.jcr.util.NodeUtil;
-import info.magnolia.objectfactory.Components;
-import it.openutils.mgnlutils.util.NodeUtilsExt;
-
import java.util.ArrayList;
import java.util.HashMap;
import java.util.HashSet;
@@ -35,7 +28,6 @@
import javax.inject.Singleton;
import javax.jcr.Node;
-import javax.jcr.RepositoryException;
import net.sourceforge.openutils.mgnlcriteria.jcr.query.AdvancedResult;
import net.sourceforge.openutils.mgnlcriteria.jcr.query.Criteria;
Modified: magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/configuration/UsedInWorkspace.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/configuration/UsedInWorkspace.java 2013-10-20 15:17:25 UTC (rev 4401)
+++ magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/configuration/UsedInWorkspace.java 2013-10-20 15:39:10 UTC (rev 4402)
@@ -26,8 +26,6 @@
import org.apache.commons.lang.builder.ToStringBuilder;
import org.apache.commons.lang.builder.ToStringStyle;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
/**
Modified: magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/lifecycle/MediaModule.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/lifecycle/MediaModule.java 2013-10-20 15:17:25 UTC (rev 4401)
+++ magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/lifecycle/MediaModule.java 2013-10-20 15:39:10 UTC (rev 4402)
@@ -22,7 +22,6 @@
import info.magnolia.cms.beans.config.ObservedManager;
import info.magnolia.module.ModuleLifecycle;
import info.magnolia.module.ModuleLifecycleContext;
-import info.magnolia.objectfactory.Components;
import java.util.ArrayList;
import java.util.Collection;
@@ -33,10 +32,8 @@
import javax.inject.Inject;
import net.sourceforge.openutils.mgnlmedia.media.advancedsearch.configuration.SearchMediaQueryConfiguration;
-import net.sourceforge.openutils.mgnlmedia.media.configuration.ImageProcessorsManager;
import net.sourceforge.openutils.mgnlmedia.media.configuration.MediaConfigurationManager;
import net.sourceforge.openutils.mgnlmedia.media.configuration.MediaTypeConfiguration;
-import net.sourceforge.openutils.mgnlmedia.media.configuration.MediaUsedInManager;
import net.sourceforge.openutils.mgnlmedia.media.utils.LockUtils;
import net.sourceforge.openutils.mgnlmedia.media.zip.ZipImporter;
import net.sourceforge.openutils.mgnlmedia.playlist.pages.PlaylistLink;
Modified: magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/pages/MediaBean.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/pages/MediaBean.java 2013-10-20 15:17:25 UTC (rev 4401)
+++ magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/pages/MediaBean.java 2013-10-20 15:39:10 UTC (rev 4402)
@@ -22,7 +22,6 @@
import info.magnolia.cms.core.MetaData;
import java.util.HashMap;
-import java.util.List;
import java.util.Map;
import javax.jcr.Node;
Modified: magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/pages/MediaBeanBuilder.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/pages/MediaBeanBuilder.java 2013-10-20 15:17:25 UTC (rev 4401)
+++ magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/pages/MediaBeanBuilder.java 2013-10-20 15:39:10 UTC (rev 4402)
@@ -19,7 +19,6 @@
package net.sourceforge.openutils.mgnlmedia.media.pages;
-import info.magnolia.cms.beans.config.URI2RepositoryManager;
import info.magnolia.cms.exchange.ActivationManagerFactory;
import info.magnolia.cms.security.Permission;
import info.magnolia.jcr.util.MetaDataUtil;
@@ -28,7 +27,6 @@
import info.magnolia.objectfactory.Components;
import info.magnolia.repository.RepositoryConstants;
-import java.util.List;
import java.util.Map;
import javax.jcr.Node;
Modified: magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/setup/MediaModuleVersionHandler.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/setup/MediaModuleVersionHandler.java 2013-10-20 15:17:25 UTC (rev 4401)
+++ magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/setup/MediaModuleVersionHandler.java 2013-10-20 15:39:10 UTC (rev 4402)
@@ -19,7 +19,6 @@
package net.sourceforge.openutils.mgnlmedia.media.setup;
-import info.magnolia.init.MagnoliaConfigurationProperties;
import info.magnolia.module.InstallContext;
import info.magnolia.module.ModuleRegistry;
import info.magnolia.module.delta.SetupModuleRepositoriesTask;
@@ -84,8 +83,7 @@
{
List<Task> tasks = new ArrayList<Task>();
- if (Components.getComponent(MagnoliaConfigurationProperties.class).getBooleanProperty(
- "magnolia.bootstrap.samples"))
+ if (samplesEnabled())
{
tasks.add(new SamplesExtractionTask());
}
@@ -243,8 +241,6 @@
"wildcards",
Boolean.TRUE));
-
-
// empty placeholder
tasks.add(new CreateMissingPropertyTask(RepositoryConstants.CONFIG, "/modules/media/config", "baseurl", ""));
Modified: magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/types/impl/DocumentTypeHandler.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/types/impl/DocumentTypeHandler.java 2013-10-20 15:17:25 UTC (rev 4401)
+++ magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/types/impl/DocumentTypeHandler.java 2013-10-20 15:39:10 UTC (rev 4402)
@@ -25,7 +25,6 @@
import info.magnolia.jcr.util.NodeUtil;
import info.magnolia.jcr.util.PropertyUtil;
import info.magnolia.module.admininterface.SaveHandlerImpl;
-import it.openutils.mgnlutils.util.NodeUtilsExt;
import java.awt.image.BufferedImage;
import java.io.File;
@@ -36,10 +35,7 @@
import javax.imageio.ImageIO;
import javax.jcr.Node;
-import javax.jcr.Property;
-import javax.jcr.PropertyType;
import javax.jcr.RepositoryException;
-import javax.jcr.nodetype.NodeType;
import org.apache.commons.io.IOUtils;
import org.apache.commons.lang.StringUtils;
Modified: magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/types/impl/ImageTypeHandler.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/types/impl/ImageTypeHandler.java 2013-10-20 15:17:25 UTC (rev 4401)
+++ magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/types/impl/ImageTypeHandler.java 2013-10-20 15:39:10 UTC (rev 4402)
@@ -24,7 +24,6 @@
import info.magnolia.jcr.util.NodeUtil;
import info.magnolia.jcr.util.PropertyUtil;
import info.magnolia.objectfactory.Components;
-import it.openutils.mgnlutils.util.NodeUtilsExt;
import java.awt.image.BufferedImage;
import java.io.InputStream;
Modified: magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/types/impl/VideoTypeHandler.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/types/impl/VideoTypeHandler.java 2013-10-20 15:17:25 UTC (rev 4401)
+++ magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/types/impl/VideoTypeHandler.java 2013-10-20 15:39:10 UTC (rev 4402)
@@ -22,7 +22,6 @@
import info.magnolia.cms.beans.runtime.FileProperties;
import info.magnolia.cms.core.MgnlNodeType;
import info.magnolia.jcr.util.PropertyUtil;
-import it.openutils.mgnlutils.util.NodeUtilsExt;
import java.io.InputStream;
Modified: magnoliamodules/trunk/openutils-mgnlrepoutils/src/main/resources/net/sourceforge/openutils/mgnlrepoutils/RepositoryUtilsPage.html
===================================================================
--- magnoliamodules/trunk/openutils-mgnlrepoutils/src/main/resources/net/sourceforge/openutils/mgnlrepoutils/RepositoryUtilsPage.html 2013-10-20 15:17:25 UTC (rev 4401)
+++ magnoliamodules/trunk/openutils-mgnlrepoutils/src/main/resources/net/sourceforge/openutils/mgnlrepoutils/RepositoryUtilsPage.html 2013-10-20 15:39:10 UTC (rev 4402)
@@ -21,8 +21,7 @@
<p>
<strong>Warning:</strong>
this only works with Jackrabbit, and it works by using private APIs that are not guaranted to work in
- future versions (this is actually tested with versions from 1.5 to 2.2). The Persistence Manager check
- only works with "bundle" PMs.
+ future versions. The Persistence Manager check only works with "bundle" PMs.
<strong>Use it at your own risk.</strong>
</p>
</div>
Modified: magnoliamodules/trunk/openutils-mgnlrules/pom.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnlrules/pom.xml 2013-10-20 15:17:25 UTC (rev 4401)
+++ magnoliamodules/trunk/openutils-mgnlrules/pom.xml 2013-10-20 15:39:10 UTC (rev 4402)
@@ -1,5 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<parent>
<groupId>net.sourceforge.openutils</groupId>
<artifactId>openutils-parent</artifactId>
@@ -102,6 +103,11 @@
<version>5.0.0</version>
</dependency>
<dependency>
+ <groupId>net.sourceforge.openutils</groupId>
+ <artifactId>openutils-mgnltasks</artifactId>
+ <version>5.0.1-SNAPSHOT</version>
+ </dependency>
+ <dependency>
<groupId>info.magnolia</groupId>
<artifactId>magnolia-module-fckeditor</artifactId>
<version>${magnolia.version}</version>
Deleted: magnoliamodules/trunk/openutils-mgnlrules/src/main/java/net/sourceforge/openutils/mgnlrules/setup/FilesExtractionTask.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlrules/src/main/java/net/sourceforge/openutils/mgnlrules/setup/FilesExtractionTask.java 2013-10-20 15:17:2...
[truncated message content] |
|
From: <fg...@us...> - 2013-10-20 16:00:41
|
Revision: 4403
http://openutils.svn.sourceforge.net/openutils/?rev=4403&view=rev
Author: fgiust
Date: 2013-10-20 16:00:37 +0000 (Sun, 20 Oct 2013)
Log Message:
-----------
bump module versions and align dependencies
Modified Paths:
--------------
magnoliamodules/trunk/magnolia-test-webapp/pom.xml
magnoliamodules/trunk/magnolia5-test-webapp/pom.xml
magnoliamodules/trunk/openutils-mgnlbootstrapsync/pom.xml
magnoliamodules/trunk/openutils-mgnlbootstrapsync/src/main/resources/META-INF/magnolia/bootstrapsync.xml
magnoliamodules/trunk/openutils-mgnlcache/pom.xml
magnoliamodules/trunk/openutils-mgnlcache/src/main/resources/META-INF/magnolia/simplecache.xml
magnoliamodules/trunk/openutils-mgnlcas/pom.xml
magnoliamodules/trunk/openutils-mgnlcas/src/main/resources/META-INF/magnolia/cas.xml
magnoliamodules/trunk/openutils-mgnlcontextmenu/pom.xml
magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/resources/META-INF/magnolia/contextmenu.xml
magnoliamodules/trunk/openutils-mgnlcontrols/pom.xml
magnoliamodules/trunk/openutils-mgnlcontrols/src/main/resources/META-INF/magnolia/controls.xml
magnoliamodules/trunk/openutils-mgnlcriteria/pom.xml
magnoliamodules/trunk/openutils-mgnlcriteria/src/main/resources/META-INF/magnolia/criteria.xml
magnoliamodules/trunk/openutils-mgnlext/pom.xml
magnoliamodules/trunk/openutils-mgnlext/src/main/resources/META-INF/magnolia/ext.xml
magnoliamodules/trunk/openutils-mgnlgroovy/pom.xml
magnoliamodules/trunk/openutils-mgnlgroovy/src/main/resources/META-INF/magnolia/groovyshell.xml
magnoliamodules/trunk/openutils-mgnllms/pom.xml
magnoliamodules/trunk/openutils-mgnllms/src/main/resources/META-INF/magnolia/mgnllms.xml
magnoliamodules/trunk/openutils-mgnlmail/pom.xml
magnoliamodules/trunk/openutils-mgnlmail/src/main/resources/META-INF/magnolia/simplemail.xml
magnoliamodules/trunk/openutils-mgnlmedia/pom.xml
magnoliamodules/trunk/openutils-mgnlmedia/src/main/resources/META-INF/magnolia/media.xml
magnoliamodules/trunk/openutils-mgnlmessages/pom.xml
magnoliamodules/trunk/openutils-mgnlmessages/src/main/resources/META-INF/magnolia/messages.xml
magnoliamodules/trunk/openutils-mgnlrepoutils/pom.xml
magnoliamodules/trunk/openutils-mgnlrepoutils/src/main/resources/META-INF/magnolia/repoutils.xml
magnoliamodules/trunk/openutils-mgnlrules/pom.xml
magnoliamodules/trunk/openutils-mgnlrules/src/main/resources/META-INF/magnolia/rules.xml
magnoliamodules/trunk/openutils-mgnlstripes/pom.xml
magnoliamodules/trunk/openutils-mgnlstripes/src/main/resources/META-INF/magnolia/stripes.xml
magnoliamodules/trunk/openutils-mgnlstruts11/pom.xml
magnoliamodules/trunk/openutils-mgnlstruts11/src/main/resources/META-INF/magnolia/struts11.xml
magnoliamodules/trunk/openutils-mgnltagcloud/pom.xml
magnoliamodules/trunk/openutils-mgnltagcloud/src/main/resources/META-INF/magnolia/tagcloud.xml
magnoliamodules/trunk/openutils-mgnltasks/pom.xml
magnoliamodules/trunk/openutils-mgnltasks/src/main/resources/META-INF/magnolia/tasks.xml
magnoliamodules/trunk/openutils-mgnltests/pom.xml
magnoliamodules/trunk/openutils-mgnlutils/pom.xml
magnoliamodules/trunk/openutils-mgnlutils/src/main/resources/META-INF/magnolia/mgnlutils.xml
Modified: magnoliamodules/trunk/magnolia-test-webapp/pom.xml
===================================================================
--- magnoliamodules/trunk/magnolia-test-webapp/pom.xml 2013-10-20 15:39:10 UTC (rev 4402)
+++ magnoliamodules/trunk/magnolia-test-webapp/pom.xml 2013-10-20 16:00:37 UTC (rev 4403)
@@ -131,100 +131,93 @@
<dependency>
<groupId>net.sourceforge.openutils</groupId>
<artifactId>openutils-mgnlbootstrapsync</artifactId>
- <version>5.0.0-SNAPSHOT</version>
+ <version>5.0.10-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>net.sourceforge.openutils</groupId>
<artifactId>openutils-mgnlcas</artifactId>
- <version>5.0.0-SNAPSHOT</version>
+ <version>5.0.10-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>net.sourceforge.openutils</groupId>
<artifactId>openutils-mgnlcontrols</artifactId>
- <version>5.0.1-SNAPSHOT</version>
+ <version>5.0.10-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>net.sourceforge.openutils</groupId>
<artifactId>openutils-mgnlcriteria</artifactId>
- <version>5.0.2-SNAPSHOT</version>
+ <version>5.0.10-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>net.sourceforge.openutils</groupId>
<artifactId>openutils-mgnlcache</artifactId>
- <version>5.0.0-SNAPSHOT</version>
+ <version>5.0.10-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>net.sourceforge.openutils</groupId>
<artifactId>openutils-mgnlext</artifactId>
- <version>5.0.0-SNAPSHOT</version>
+ <version>5.0.10-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>net.sourceforge.openutils</groupId>
<artifactId>openutils-mgnlgroovy</artifactId>
- <version>5.0.1-SNAPSHOT</version>
+ <version>5.0.10-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>net.sourceforge.openutils</groupId>
<artifactId>openutils-mgnlmedia</artifactId>
- <version>5.0.3-SNAPSHOT</version>
+ <version>5.0.10-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>net.sourceforge.openutils</groupId>
<artifactId>openutils-mgnlmessages</artifactId>
- <version>5.0.2-SNAPSHOT</version>
+ <version>5.0.10-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>net.sourceforge.openutils</groupId>
<artifactId>openutils-mgnlrepoutils</artifactId>
- <version>5.0.0-SNAPSHOT</version>
+ <version>5.0.10-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>net.sourceforge.openutils</groupId>
<artifactId>openutils-mgnlstripes</artifactId>
- <version>5.0.1-SNAPSHOT</version>
+ <version>5.0.10-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>net.sourceforge.openutils</groupId>
<artifactId>openutils-mgnlstruts11</artifactId>
- <version>5.0.0-SNAPSHOT</version>
+ <version>5.0.10-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>net.sourceforge.openutils</groupId>
<artifactId>openutils-mgnltasks</artifactId>
- <version>5.0.1-SNAPSHOT</version>
+ <version>5.0.10-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>net.sourceforge.openutils</groupId>
<artifactId>openutils-mgnlutils</artifactId>
- <version>5.0.2-SNAPSHOT</version>
+ <version>5.0.10-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>net.sourceforge.openutils</groupId>
<artifactId>openutils-mgnltagcloud</artifactId>
- <version>5.0.2-SNAPSHOT</version>
+ <version>5.0.10-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>net.sourceforge.openutils</groupId>
<artifactId>openutils-mgnlrules</artifactId>
- <version>4.5.1-SNAPSHOT</version>
+ <version>5.0.10-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>net.sourceforge.openutils</groupId>
<artifactId>openutils-mgnlcontextmenu</artifactId>
- <version>4.5.5-SNAPSHOT</version>
+ <version>5.0.10-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>net.sourceforge.openutils</groupId>
<artifactId>openutils-mgnllms</artifactId>
- <version>5.0.0-SNAPSHOT</version>
+ <version>5.0.10-SNAPSHOT</version>
</dependency>
- <!--
- <dependency>
- <groupId>net.sourceforge.openutils</groupId>
- <artifactId>openutils-mgnlmobile</artifactId>
- <version>5.0.0-SNAPSHOT</version>
- </dependency>
- -->
</dependencies>
<dependencyManagement>
<dependencies>
Modified: magnoliamodules/trunk/magnolia5-test-webapp/pom.xml
===================================================================
--- magnoliamodules/trunk/magnolia5-test-webapp/pom.xml 2013-10-20 15:39:10 UTC (rev 4402)
+++ magnoliamodules/trunk/magnolia5-test-webapp/pom.xml 2013-10-20 16:00:37 UTC (rev 4403)
@@ -157,38 +157,13 @@
<dependency>
<groupId>net.sourceforge.openutils</groupId>
<artifactId>openutils-mgnlcriteria</artifactId>
- <version>5.0.2-SNAPSHOT</version>
+ <version>5.0.10-SNAPSHOT</version>
</dependency>
-<!-- <dependency> -->
-<!-- <groupId>net.sourceforge.openutils</groupId> -->
-<!-- <artifactId>openutils-mgnlmedia</artifactId> -->
-<!-- <version>5.0.3-SNAPSHOT</version> -->
-<!-- </dependency> -->
<dependency>
<groupId>net.sourceforge.openutils</groupId>
<artifactId>openutils-mgnltasks</artifactId>
- <version>5.0.1-SNAPSHOT</version>
+ <version>5.0.10-SNAPSHOT</version>
</dependency>
- <!-- <dependency> <groupId>net.sourceforge.openutils</groupId> <artifactId>openutils-mgnlbootstrapsync</artifactId> <version>5.0.0-SNAPSHOT</version>
- </dependency> <dependency> <groupId>net.sourceforge.openutils</groupId> <artifactId>openutils-mgnlcas</artifactId> <version>5.0.0-SNAPSHOT</version>
- </dependency> <dependency> <groupId>net.sourceforge.openutils</groupId> <artifactId>openutils-mgnlcontrols</artifactId> <version>5.0.1-SNAPSHOT</version>
- </dependency> <dependency> <groupId>net.sourceforge.openutils</groupId> <artifactId>openutils-mgnlcache</artifactId> <version>5.0.0-SNAPSHOT</version>
- </dependency> <dependency> <groupId>net.sourceforge.openutils</groupId> <artifactId>openutils-mgnlext</artifactId> <version>5.0.0-SNAPSHOT</version>
- </dependency> <dependency> <groupId>net.sourceforge.openutils</groupId> <artifactId>openutils-mgnlgroovy</artifactId> <version>5.0.1-SNAPSHOT</version>
- </dependency> <dependency> <groupId>net.sourceforge.openutils</groupId> <artifactId>openutils-mgnlmedia</artifactId> <version>5.0.3-SNAPSHOT</version>
- </dependency> <dependency> <groupId>net.sourceforge.openutils</groupId> <artifactId>openutils-mgnlmessages</artifactId> <version>5.0.2-SNAPSHOT</version>
- </dependency> <dependency> <groupId>net.sourceforge.openutils</groupId> <artifactId>openutils-mgnlrepoutils</artifactId>
- <version>5.0.0-SNAPSHOT</version> </dependency> <dependency> <groupId>net.sourceforge.openutils</groupId> <artifactId>openutils-mgnlstripes</artifactId>
- <version>5.0.1-SNAPSHOT</version> </dependency> <dependency> <groupId>net.sourceforge.openutils</groupId> <artifactId>openutils-mgnlstruts11</artifactId>
- <version>5.0.0-SNAPSHOT</version> </dependency> <dependency> <groupId>net.sourceforge.openutils</groupId> <artifactId>openutils-mgnltasks</artifactId>
- <version>5.0.1-SNAPSHOT</version> </dependency> <dependency> <groupId>net.sourceforge.openutils</groupId> <artifactId>openutils-mgnlutils</artifactId>
- <version>5.0.2-SNAPSHOT</version> </dependency> <dependency> <groupId>net.sourceforge.openutils</groupId> <artifactId>openutils-mgnltagcloud</artifactId>
- <version>5.0.2-SNAPSHOT</version> </dependency> <dependency> <groupId>net.sourceforge.openutils</groupId> <artifactId>openutils-mgnlrules</artifactId>
- <version>5.0.0-SNAPSHOT</version> </dependency> <dependency> <groupId>net.sourceforge.openutils</groupId> <artifactId>openutils-mgnlcontextmenu</artifactId>
- <version>5.0.0-SNAPSHOT</version> </dependency> <dependency> <groupId>net.sourceforge.openutils</groupId> <artifactId>openutils-mgnllms</artifactId>
- <version>5.0.0-SNAPSHOT</version> </dependency> -->
- <!-- <dependency> <groupId>net.sourceforge.openutils</groupId> <artifactId>openutils-mgnlmobile</artifactId> <version>5.0.0-SNAPSHOT</version>
- </dependency> -->
</dependencies>
<dependencyManagement>
<dependencies>
Modified: magnoliamodules/trunk/openutils-mgnlbootstrapsync/pom.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnlbootstrapsync/pom.xml 2013-10-20 15:39:10 UTC (rev 4402)
+++ magnoliamodules/trunk/openutils-mgnlbootstrapsync/pom.xml 2013-10-20 16:00:37 UTC (rev 4403)
@@ -12,7 +12,7 @@
<artifactId>openutils-mgnlbootstrapsync</artifactId>
<name>BootstrapSync for Magnolia CMS</name>
<description>Keep your magnolia bootstrap files in sync while developing</description>
- <version>5.0.0-SNAPSHOT</version>
+ <version>5.0.10-SNAPSHOT</version>
<licenses>
<license>
<name>GPLv3</name>
Modified: magnoliamodules/trunk/openutils-mgnlbootstrapsync/src/main/resources/META-INF/magnolia/bootstrapsync.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnlbootstrapsync/src/main/resources/META-INF/magnolia/bootstrapsync.xml 2013-10-20 15:39:10 UTC (rev 4402)
+++ magnoliamodules/trunk/openutils-mgnlbootstrapsync/src/main/resources/META-INF/magnolia/bootstrapsync.xml 2013-10-20 16:00:37 UTC (rev 4403)
@@ -6,4 +6,18 @@
<description>Bootstrap Synchronizer</description>
<class>it.openutils.mgnlbootstrapsync.lifecycle.BootstrapSyncModuleLifecycle</class>
<version>${project.version}</version>
-</module>
+ <dependencies>
+ <dependency>
+ <name>core</name>
+ <version>4.5.11/4.5.99</version>
+ </dependency>
+ <dependency>
+ <name>mgnlutils</name>
+ <version>5.0.10/*</version>
+ </dependency>
+ <dependency>
+ <name>adminInterface</name>
+ <version>*</version>
+ </dependency>
+ </dependencies>
+</module>
\ No newline at end of file
Modified: magnoliamodules/trunk/openutils-mgnlcache/pom.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnlcache/pom.xml 2013-10-20 15:39:10 UTC (rev 4402)
+++ magnoliamodules/trunk/openutils-mgnlcache/pom.xml 2013-10-20 16:00:37 UTC (rev 4403)
@@ -11,7 +11,7 @@
<artifactId>openutils-mgnlcache</artifactId>
<name>Simplecache module for Magnolia CMS</name>
<description>An alternative "simple is beautiful" cache module for Magnolia CMS</description>
- <version>5.0.0-SNAPSHOT</version>
+ <version>5.0.10-SNAPSHOT</version>
<inceptionYear>2010</inceptionYear>
<licenses>
<license>
@@ -61,7 +61,7 @@
<dependency>
<groupId>net.sourceforge.openutils</groupId>
<artifactId>openutils-mgnltasks</artifactId>
- <version>5.0.0</version>
+ <version>5.0.10-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>javax.servlet</groupId>
Modified: magnoliamodules/trunk/openutils-mgnlcache/src/main/resources/META-INF/magnolia/simplecache.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnlcache/src/main/resources/META-INF/magnolia/simplecache.xml 2013-10-20 15:39:10 UTC (rev 4402)
+++ magnoliamodules/trunk/openutils-mgnlcache/src/main/resources/META-INF/magnolia/simplecache.xml 2013-10-20 16:00:37 UTC (rev 4403)
@@ -8,8 +8,16 @@
<version>${project.version}</version>
<dependencies>
<dependency>
+ <name>core</name>
+ <version>4.5.11/4.5.99</version>
+ </dependency>
+ <dependency>
+ <name>mgnlutils</name>
+ <version>5.0.10/*</version>
+ </dependency>
+ <dependency>
<name>adminInterface</name>
- <version>4.5/*</version>
+ <version>*</version>
</dependency>
</dependencies>
</module>
\ No newline at end of file
Modified: magnoliamodules/trunk/openutils-mgnlcas/pom.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnlcas/pom.xml 2013-10-20 15:39:10 UTC (rev 4402)
+++ magnoliamodules/trunk/openutils-mgnlcas/pom.xml 2013-10-20 16:00:37 UTC (rev 4403)
@@ -10,7 +10,7 @@
<packaging>jar</packaging>
<artifactId>openutils-mgnlcas</artifactId>
<name>CAS integration module for Magnolia CMS</name>
- <version>5.0.0-SNAPSHOT</version>
+ <version>5.0.10-SNAPSHOT</version>
<inceptionYear>2007</inceptionYear>
<licenses>
<license>
Modified: magnoliamodules/trunk/openutils-mgnlcas/src/main/resources/META-INF/magnolia/cas.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnlcas/src/main/resources/META-INF/magnolia/cas.xml 2013-10-20 15:39:10 UTC (rev 4402)
+++ magnoliamodules/trunk/openutils-mgnlcas/src/main/resources/META-INF/magnolia/cas.xml 2013-10-20 16:00:37 UTC (rev 4403)
@@ -8,8 +8,16 @@
<version>${project.version}</version>
<dependencies>
<dependency>
+ <name>core</name>
+ <version>4.5.11/4.5.99</version>
+ </dependency>
+ <dependency>
+ <name>mgnlutils</name>
+ <version>5.0.10/*</version>
+ </dependency>
+ <dependency>
<name>adminInterface</name>
- <version>4.5/*</version>
+ <version>*</version>
</dependency>
</dependencies>
</module>
\ No newline at end of file
Modified: magnoliamodules/trunk/openutils-mgnlcontextmenu/pom.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnlcontextmenu/pom.xml 2013-10-20 15:39:10 UTC (rev 4402)
+++ magnoliamodules/trunk/openutils-mgnlcontextmenu/pom.xml 2013-10-20 16:00:37 UTC (rev 4403)
@@ -12,7 +12,7 @@
<artifactId>openutils-mgnlcontextmenu</artifactId>
<name>ContextMenu Module for Magnolia CMS</name>
<description>A magnolia module for editing content via context menu</description>
- <version>4.5.5-SNAPSHOT</version>
+ <version>5.0.10-SNAPSHOT</version>
<inceptionYear>2010</inceptionYear>
<licenses>
<license>
@@ -110,12 +110,12 @@
<dependency>
<groupId>net.sourceforge.openutils</groupId>
<artifactId>openutils-mgnlutils</artifactId>
- <version>5.0.2-SNAPSHOT</version>
+ <version>5.0.10-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>net.sourceforge.openutils</groupId>
<artifactId>openutils-mgnltasks</artifactId>
- <version>5.0.1-SNAPSHOT</version>
+ <version>5.0.10-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>net.sourceforge.openutils</groupId>
@@ -125,7 +125,7 @@
<dependency>
<groupId>net.sourceforge.openutils</groupId>
<artifactId>openutils-mgnlmedia</artifactId>
- <version>5.0.0</version>
+ <version>5.0.10-SNAPSHOT</version>
<optional>true</optional>
</dependency>
<dependency>
Modified: magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/resources/META-INF/magnolia/contextmenu.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/resources/META-INF/magnolia/contextmenu.xml 2013-10-20 15:39:10 UTC (rev 4402)
+++ magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/resources/META-INF/magnolia/contextmenu.xml 2013-10-20 16:00:37 UTC (rev 4403)
@@ -5,7 +5,7 @@
<displayName>contextmenu</displayName>
<description>Openutils - Magnolia Context Menu Library</description>
<class>net.sourceforge.openutils.mgnlcontextmenu.module.ContextMenuModule</class>
- <versionHandler>net.sourceforge.openutils.mgnlcontextmenu.setup.ContextMenuModuleVersionHandler</versionHandler>
+ <versionHandler>net.sourceforge.openutils.mgnlcontextmenu.setup.ContextMenuModuleVersionHandler</versionHandler>
<version>${project.version}</version>
<components>
<id>main</id>
@@ -14,4 +14,18 @@
<implementation>net.sourceforge.openutils.mgnlcontextmenu.configuration.ContextMenuManager</implementation>
</component>
</components>
+ <dependencies>
+ <dependency>
+ <name>core</name>
+ <version>4.5.11/4.5.99</version>
+ </dependency>
+ <dependency>
+ <name>mgnlutils</name>
+ <version>5.0.10/*</version>
+ </dependency>
+ <dependency>
+ <name>adminInterface</name>
+ <version>*</version>
+ </dependency>
+ </dependencies>
</module>
\ No newline at end of file
Modified: magnoliamodules/trunk/openutils-mgnlcontrols/pom.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnlcontrols/pom.xml 2013-10-20 15:39:10 UTC (rev 4402)
+++ magnoliamodules/trunk/openutils-mgnlcontrols/pom.xml 2013-10-20 16:00:37 UTC (rev 4403)
@@ -11,7 +11,7 @@
<artifactId>openutils-mgnlcontrols</artifactId>
<name>Controls module for Magnolia CMS</name>
<description>Additional controls that can be used in Magnolia dialogs</description>
- <version>5.0.1-SNAPSHOT</version>
+ <version>5.0.10-SNAPSHOT</version>
<inceptionYear>2008</inceptionYear>
<licenses>
<license>
@@ -92,17 +92,17 @@
<dependency>
<groupId>net.sourceforge.openutils</groupId>
<artifactId>openutils-mgnltasks</artifactId>
- <version>5.0.0</version>
+ <version>5.0.10-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>net.sourceforge.openutils</groupId>
<artifactId>openutils-mgnlext</artifactId>
- <version>2.2</version>
+ <version>5.0.10-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>net.sourceforge.openutils</groupId>
<artifactId>openutils-mgnlutils</artifactId>
- <version>5.0.2-SNAPSHOT</version>
+ <version>5.0.10-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>javax.servlet</groupId>
Modified: magnoliamodules/trunk/openutils-mgnlcontrols/src/main/resources/META-INF/magnolia/controls.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnlcontrols/src/main/resources/META-INF/magnolia/controls.xml 2013-10-20 15:39:10 UTC (rev 4402)
+++ magnoliamodules/trunk/openutils-mgnlcontrols/src/main/resources/META-INF/magnolia/controls.xml 2013-10-20 16:00:37 UTC (rev 4403)
@@ -16,8 +16,16 @@
</components>
<dependencies>
<dependency>
+ <name>core</name>
+ <version>4.5.11/4.5.99</version>
+ </dependency>
+ <dependency>
+ <name>mgnlutils</name>
+ <version>5.0.10/*</version>
+ </dependency>
+ <dependency>
<name>adminInterface</name>
- <version>4.5/*</version>
+ <version>*</version>
</dependency>
</dependencies>
-</module>
+</module>
\ No newline at end of file
Modified: magnoliamodules/trunk/openutils-mgnlcriteria/pom.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnlcriteria/pom.xml 2013-10-20 15:39:10 UTC (rev 4402)
+++ magnoliamodules/trunk/openutils-mgnlcriteria/pom.xml 2013-10-20 16:00:37 UTC (rev 4403)
@@ -8,7 +8,7 @@
</parent>
<artifactId>openutils-mgnlcriteria</artifactId>
<name>Criteria API for Magnolia CMS</name>
- <version>5.0.2-SNAPSHOT</version>
+ <version>5.0.10-SNAPSHOT</version>
<inceptionYear>2009</inceptionYear>
<description>A Hibernate's Criteria-like API to programmatically generate JCR queries with Magnolia</description>
<licenses>
@@ -154,7 +154,7 @@
<dependency>
<groupId>net.sourceforge.openutils</groupId>
<artifactId>openutils-mgnltests</artifactId>
- <version>5.0.0</version>
+ <version>5.0.10-SNAPSHOT</version>
<scope>test</scope>
</dependency>
<dependency>
Modified: magnoliamodules/trunk/openutils-mgnlcriteria/src/main/resources/META-INF/magnolia/criteria.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnlcriteria/src/main/resources/META-INF/magnolia/criteria.xml 2013-10-20 15:39:10 UTC (rev 4402)
+++ magnoliamodules/trunk/openutils-mgnlcriteria/src/main/resources/META-INF/magnolia/criteria.xml 2013-10-20 16:00:37 UTC (rev 4403)
@@ -8,7 +8,7 @@
<dependencies>
<dependency>
<name>core</name>
- <version>4.5/*</version>
+ <version>4.5.11/4.5.99</version>
</dependency>
</dependencies>
</module>
\ No newline at end of file
Modified: magnoliamodules/trunk/openutils-mgnlext/pom.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnlext/pom.xml 2013-10-20 15:39:10 UTC (rev 4402)
+++ magnoliamodules/trunk/openutils-mgnlext/pom.xml 2013-10-20 16:00:37 UTC (rev 4403)
@@ -10,7 +10,7 @@
<packaging>jar</packaging>
<artifactId>openutils-mgnlext</artifactId>
<name>openutils-mgnlext</name>
- <version>5.0.0-SNAPSHOT</version>
+ <version>5.0.10-SNAPSHOT</version>
<scm>
<connection>scm:svn:svn+ssh://svn.code.sf.net/p/openutils/code/magnoliamodules/trunk/openutils-mgnlext</connection>
<developerConnection>scm:svn:svn+ssh://svn.code.sf.net/p/openutils/code/magnoliamodules/trunk/openutils-mgnlext</developerConnection>
Modified: magnoliamodules/trunk/openutils-mgnlext/src/main/resources/META-INF/magnolia/ext.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnlext/src/main/resources/META-INF/magnolia/ext.xml 2013-10-20 15:39:10 UTC (rev 4402)
+++ magnoliamodules/trunk/openutils-mgnlext/src/main/resources/META-INF/magnolia/ext.xml 2013-10-20 16:00:37 UTC (rev 4403)
@@ -5,4 +5,10 @@
<displayName>openutils-mgnlext</displayName>
<description>A repackaging of ext-js for easier usage into Magnolia</description>
<version>${project.version}</version>
+ <dependencies>
+ <dependency>
+ <name>core</name>
+ <version>4.5.11/4.5.99</version>
+ </dependency>
+ </dependencies>
</module>
\ No newline at end of file
Modified: magnoliamodules/trunk/openutils-mgnlgroovy/pom.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnlgroovy/pom.xml 2013-10-20 15:39:10 UTC (rev 4402)
+++ magnoliamodules/trunk/openutils-mgnlgroovy/pom.xml 2013-10-20 16:00:37 UTC (rev 4403)
@@ -10,7 +10,7 @@
<artifactId>openutils-mgnlgroovy</artifactId>
<name>Groovy Shell for Magnolia CMS</name>
<description>Groovy Shell for Magnolia CMS is a module for running Groovy Scripts from the Magnolia admin interface. </description>
- <version>5.0.1-SNAPSHOT</version>
+ <version>5.0.10-SNAPSHOT</version>
<inceptionYear>2008</inceptionYear>
<licenses>
<license>
@@ -90,7 +90,7 @@
<dependency>
<groupId>net.sourceforge.openutils</groupId>
<artifactId>openutils-mgnltasks</artifactId>
- <version>5.0.0</version>
+ <version>5.0.10-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>javax.servlet</groupId>
Modified: magnoliamodules/trunk/openutils-mgnlgroovy/src/main/resources/META-INF/magnolia/groovyshell.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnlgroovy/src/main/resources/META-INF/magnolia/groovyshell.xml 2013-10-20 15:39:10 UTC (rev 4402)
+++ magnoliamodules/trunk/openutils-mgnlgroovy/src/main/resources/META-INF/magnolia/groovyshell.xml 2013-10-20 16:00:37 UTC (rev 4403)
@@ -9,8 +9,16 @@
<version>${project.version}</version>
<dependencies>
<dependency>
+ <name>core</name>
+ <version>4.5.11/4.5.99</version>
+ </dependency>
+ <dependency>
+ <name>mgnlutils</name>
+ <version>5.0.10/*</version>
+ </dependency>
+ <dependency>
<name>adminInterface</name>
- <version>4.5/*</version>
+ <version>*</version>
</dependency>
</dependencies>
</module>
\ No newline at end of file
Modified: magnoliamodules/trunk/openutils-mgnllms/pom.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnllms/pom.xml 2013-10-20 15:39:10 UTC (rev 4402)
+++ magnoliamodules/trunk/openutils-mgnllms/pom.xml 2013-10-20 16:00:37 UTC (rev 4403)
@@ -11,7 +11,7 @@
<artifactId>openutils-mgnllms</artifactId>
<name>E-learning Module for Magnolia CMS</name>
<description>A module for Magnolia CMS to build a simple Learning Management System.</description>
- <version>5.0.0-SNAPSHOT</version>
+ <version>5.0.10-SNAPSHOT</version>
<inceptionYear>2010</inceptionYear>
<licenses>
<license>
@@ -108,17 +108,17 @@
<dependency>
<groupId>net.sourceforge.openutils</groupId>
<artifactId>openutils-mgnltasks</artifactId>
- <version>5.0.1-SNAPSHOT</version>
+ <version>5.0.10-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>net.sourceforge.openutils</groupId>
<artifactId>openutils-mgnlcontrols</artifactId>
- <version>5.0.0</version>
+ <version>5.0.10-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>net.sourceforge.openutils</groupId>
<artifactId>openutils-mgnlext</artifactId>
- <version>2.1</version>
+ <version>5.0.10-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>net.sourceforge.openutils</groupId>
@@ -177,7 +177,7 @@
<dependency>
<groupId>net.sourceforge.openutils</groupId>
<artifactId>openutils-mgnlcriteria</artifactId>
- <version>5.0.1</version>
+ <version>5.0.10-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>javax.servlet</groupId>
Modified: magnoliamodules/trunk/openutils-mgnllms/src/main/resources/META-INF/magnolia/mgnllms.xml
===================================================================
(Binary files differ)
Modified: magnoliamodules/trunk/openutils-mgnlmail/pom.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnlmail/pom.xml 2013-10-20 15:39:10 UTC (rev 4402)
+++ magnoliamodules/trunk/openutils-mgnlmail/pom.xml 2013-10-20 16:00:37 UTC (rev 4403)
@@ -9,7 +9,7 @@
<packaging>jar</packaging>
<artifactId>openutils-mgnlmail</artifactId>
<name>simplemail module for Magnolia CMS</name>
- <version>5.0.1-SNAPSHOT</version>
+ <version>5.0.10-SNAPSHOT</version>
<inceptionYear>2011</inceptionYear>
<description>An extension to the mail module for Magnolia CMS</description>
<url>http://www.openmindlab.com/lab/products/mgnlmail.html</url>
@@ -98,7 +98,7 @@
<dependency>
<groupId>net.sourceforge.openutils</groupId>
<artifactId>openutils-mgnltasks</artifactId>
- <version>5.0.0</version>
+ <version>5.0.10-SNAPSHOT</version>
</dependency>
<dependency>
<grou...
[truncated message content] |
|
From: <fg...@us...> - 2013-10-20 16:08:26
|
Revision: 4405
http://openutils.svn.sourceforge.net/openutils/?rev=4405&view=rev
Author: fgiust
Date: 2013-10-20 16:08:22 +0000 (Sun, 20 Oct 2013)
Log Message:
-----------
shared copy of bootstrap 3.0 css
Modified Paths:
--------------
magnoliamodules/trunk/magnolia-test-webapp/src/main/webapp/template_magnoliautils/magnoliaUtils.jsp
magnoliamodules/trunk/magnolia5-test-webapp/src/main/webapp/template_magnoliautils/magnoliaUtils.jsp
magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/resources/mgnl-files/templates/samples-contextmenu/template-contextmenu.jsp
magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/resources/samples-contextmenu/template-contextmenu.ftl
magnoliamodules/trunk/openutils-mgnlcontrols/src/main/resources/samples-controls/template-controls.ftl
magnoliamodules/trunk/openutils-mgnlmedia/src/main/resources/samples-media/template.ftl
magnoliamodules/trunk/openutils-mgnlrules/src/main/resources/samples-rules/template-rules.ftl
magnoliamodules/trunk/openutils-mgnltagcloud/src/main/resources/mgnl-files/templates/samples-tagcloud/template.jsp
Removed Paths:
-------------
magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/resources/mgnl-resources/contextmenu/css/bootstrap.min.css
magnoliamodules/trunk/openutils-mgnlcontrols/src/main/resources/mgnl-resources/controls/samples/css/bootstrap.min.css
magnoliamodules/trunk/openutils-mgnlmedia/src/main/resources/mgnl-resources/media-samples/css/bootstrap.min.css
magnoliamodules/trunk/openutils-mgnlrules/src/main/resources/mgnl-resources/rules/css/bootstrap.min.css
magnoliamodules/trunk/openutils-mgnltagcloud/src/main/resources/mgnl-resources/tagcloud/samples/css/bootstrap.min.css
Modified: magnoliamodules/trunk/magnolia-test-webapp/src/main/webapp/template_magnoliautils/magnoliaUtils.jsp
===================================================================
--- magnoliamodules/trunk/magnolia-test-webapp/src/main/webapp/template_magnoliautils/magnoliaUtils.jsp 2013-10-20 16:01:48 UTC (rev 4404)
+++ magnoliamodules/trunk/magnolia-test-webapp/src/main/webapp/template_magnoliautils/magnoliaUtils.jsp 2013-10-20 16:08:22 UTC (rev 4405)
@@ -11,7 +11,7 @@
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
<title> ${content.title}
</title>
- <link rel="stylesheet" type="text/css" href="${pageContext.request.contextPath}/.resources/bootstrap/css/bootstrap.min.css" />
+ <link rel="stylesheet" type="text/css" href="${pageContext.request.contextPath}/.resources/bootstrap/3.0/css/bootstrap.min.css" />
<style>
<![CDATA[
code { display: block}
Modified: magnoliamodules/trunk/magnolia5-test-webapp/src/main/webapp/template_magnoliautils/magnoliaUtils.jsp
===================================================================
--- magnoliamodules/trunk/magnolia5-test-webapp/src/main/webapp/template_magnoliautils/magnoliaUtils.jsp 2013-10-20 16:01:48 UTC (rev 4404)
+++ magnoliamodules/trunk/magnolia5-test-webapp/src/main/webapp/template_magnoliautils/magnoliaUtils.jsp 2013-10-20 16:08:22 UTC (rev 4405)
@@ -11,7 +11,7 @@
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
<title> ${content.title}
</title>
- <link rel="stylesheet" type="text/css" href="${pageContext.request.contextPath}/.resources/bootstrap/css/bootstrap.min.css" />
+ <link rel="stylesheet" type="text/css" href="${pageContext.request.contextPath}/.resources/bootstrap/3.0/css/bootstrap.min.css" />
<style>
<![CDATA[
code { display: block}
Modified: magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/resources/mgnl-files/templates/samples-contextmenu/template-contextmenu.jsp
===================================================================
--- magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/resources/mgnl-files/templates/samples-contextmenu/template-contextmenu.jsp 2013-10-20 16:01:48 UTC (rev 4404)
+++ magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/resources/mgnl-files/templates/samples-contextmenu/template-contextmenu.jsp 2013-10-20 16:08:22 UTC (rev 4405)
@@ -14,7 +14,7 @@
${contextmenu:init()}
${contextmenu:links()}
<cms:init />
- <link rel="stylesheet" type="text/css" href="${pageContext.request.contextPath}/.resources/contextmenu/css/bootstrap.min.css" />
+ <link rel="stylesheet" type="text/css" href="${pageContext.request.contextPath}/.resources/bootstrap/3.0/css/bootstrap.min.css" />
<!-- samples css/js -->
<link rel="stylesheet" type="text/css"
href="${pageContext.request.contextPath}/.resources/contextmenu/css/contextmenu-samples.css" />
Deleted: magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/resources/mgnl-resources/contextmenu/css/bootstrap.min.css
===================================================================
--- magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/resources/mgnl-resources/contextmenu/css/bootstrap.min.css 2013-10-20 16:01:48 UTC (rev 4404)
+++ magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/resources/mgnl-resources/contextmenu/css/bootstrap.min.css 2013-10-20 16:08:22 UTC (rev 4405)
@@ -1,9 +0,0 @@
-/*!
- * Bootstrap v3.0.0
- *
- * Copyright 2013 Twitter, Inc
- * Licensed under the Apache License v2.0
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Designed and built with all the love in the world by @mdo and @fat.
@@ Diff output truncated at 100000 characters. @@
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fg...@us...> - 2013-10-20 16:10:18
|
Revision: 4406
http://openutils.svn.sourceforge.net/openutils/?rev=4406&view=rev
Author: fgiust
Date: 2013-10-20 16:10:14 +0000 (Sun, 20 Oct 2013)
Log Message:
-----------
update license headers
Modified Paths:
--------------
magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/filters/AggregatorServingZipFilter.java
magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/filters/RenderingServingZipFilter.java
magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/listeners/CourseEventListener.java
magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/listeners/EmptyCourseEventListener.java
magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/lms/configuration/LmsTypeConfiguration.java
magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/lms/dialog/DialogFileCourse.java
magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/lms/dialog/DialogMetadata.java
magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/lms/dialog/PreSaveDialogMVC.java
magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/lms/el/LmsElFunctions.java
magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/lms/exceptions/CourseException.java
magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/lms/gui/control/LmsDialogFile.java
magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/lms/tree/LmsBrowserConfiguration.java
magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/lms/tree/LmsJcrBrowserTreeConfiguration.java
magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/lms/tree/LmsModuleTree.java
magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/lms/tree/LmsModuleTreeConfiguration.java
magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/lms/tree/LmsModuleTreeMVCHandler.java
magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/lms/types/LmsTypeHandler.java
magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/lms/types/impl/BaseTypeHandler.java
magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/lms/types/impl/CourseTypeHandler.java
magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/lms/types/impl/ScormTypeHandler.java
magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/lms/uri/LmsURI2RepositoryMapping.java
magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/managers/LearnerActivitiesManager.java
magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/managers/LearnerManager.java
magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/managers/ScormCMIManager.java
magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/managers/impl/LearnerManagerWithMagnoliaUsers.java
magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/managers/impl/MagnoliaLearnerActivitiesManager.java
magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/managers/impl/MagnoliaScormCmiManager.java
magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/module/LMSConfigurationModuleManager.java
magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/module/LMSModule.java
magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/module/LMSModuleVersionHandler.java
magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/module/LmsTypesManager.java
magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/pages/lms/ScormCmiPage.java
magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/pages/lms/ScormPlayerPage.java
magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/pages/report/UserReportPage.java
magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/pages/report/UserReportPageAdmin.java
magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/report/Helper.java
magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/report/Objective.java
magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/report/TrackingModel.java
magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/report/UserReport.java
magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/samples/listeners/ExactContentFilter.java
magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/samples/listeners/StudentLevelListener.java
magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/scorm/model/CommonDataItemOrganization.java
magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/scorm/model/Dependency.java
magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/scorm/model/File.java
magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/scorm/model/Item.java
magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/scorm/model/Manifest.java
magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/scorm/model/Metadata.java
magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/scorm/model/ObjectFactory.java
magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/scorm/model/Organization.java
magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/scorm/model/Organizations.java
magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/scorm/model/Resource.java
magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/scorm/model/Resources.java
magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/scorm/model/cp/CompletionThreshold.java
magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/scorm/model/cp/Data.java
magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/scorm/model/cp/Map.java
magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/scorm/model/cp/ObjectFactory.java
magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/scorm/model/cp/TimeLimitAction.java
magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/scorm/model/cp/package-info.java
magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/scorm/model/imsss/AuxiliaryResource.java
magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/scorm/model/imsss/AuxiliaryResources.java
magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/scorm/model/imsss/ChildActivity.java
magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/scorm/model/imsss/ConditionCombination.java
magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/scorm/model/imsss/ConditionOperator.java
magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/scorm/model/imsss/ControlMode.java
magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/scorm/model/imsss/DeliveryControls.java
magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/scorm/model/imsss/ExitConditionRule.java
magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/scorm/model/imsss/ExitConditionRuleAction.java
magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/scorm/model/imsss/LimitConditions.java
magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/scorm/model/imsss/MapInfo.java
magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/scorm/model/imsss/ObjectFactory.java
magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/scorm/model/imsss/Objective.java
magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/scorm/model/imsss/ObjectiveBase.java
magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/scorm/model/imsss/ObjectiveMapping.java
magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/scorm/model/imsss/Objectives.java
magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/scorm/model/imsss/PostConditionRule.java
magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/scorm/model/imsss/PostConditionRuleAction.java
magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/scorm/model/imsss/PreConditionRule.java
magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/scorm/model/imsss/PreConditionRuleAction.java
magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/scorm/model/imsss/PrimaryObjective.java
magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/scorm/model/imsss/RandomTiming.java
magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/scorm/model/imsss/Randomization.java
magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/scorm/model/imsss/RollupAction.java
magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/scorm/model/imsss/RollupActionEnum.java
magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/scorm/model/imsss/RollupCondition.java
magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/scorm/model/imsss/RollupConditions.java
magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/scorm/model/imsss/RollupRule.java
magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/scorm/model/imsss/RollupRuleCondition.java
magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/scorm/model/imsss/RollupRules.java
magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/scorm/model/imsss/RuleActionExitCondition.java
magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/scorm/model/imsss/RuleActionPostCondition.java
magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/scorm/model/imsss/RuleActionPreCondition.java
magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/scorm/model/imsss/RuleCondition.java
magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/scorm/model/imsss/RuleConditions.java
magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/scorm/model/imsss/Sequencing.java
magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/scorm/model/imsss/SequencingCollection.java
magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/scorm/model/imsss/SequencingRule.java
magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/scorm/model/imsss/SequencingRuleCondition.java
magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/scorm/model/imsss/SequencingRules.java
magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/scorm/model/imsss/package-info.java
magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/scorm/model/nav/HideLMSUI.java
magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/scorm/model/nav/NavigationInterface.java
magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/scorm/model/nav/ObjectFactory.java
magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/scorm/model/nav/Presentation.java
magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/scorm/model/nav/package-info.java
magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/scorm/model/package-info.java
magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/scorm/model/seq/ConstrainChoiceConsiderations.java
magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/scorm/model/seq/MapInfo.java
magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/scorm/model/seq/ObjectFactory.java
magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/scorm/model/seq/Objective.java
magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/scorm/model/seq/Objectives.java
magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/scorm/model/seq/RollupConsideration.java
magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/scorm/model/seq/RollupConsiderations.java
magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/scorm/model/seq/SeqObjective.java
magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/scorm/model/seq/SeqObjectives.java
magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/scorm/model/seq/package-info.java
magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/scorm/utils/JaxbUtils.java
magnoliamodules/trunk/openutils-mgnllms/src/test/java/net/sourceforge/openutils/mgnllms/TestJaxb.java
magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/externalvideo/AsyncUploadExternalVideoProvider.java
magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/externalvideo/AsyncUploadThread.java
magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/externalvideo/BaseExternalVideoProvider.java
magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/externalvideo/BaseVideoTypeHandler.java
magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/externalvideo/ExternalVideoProvider.java
magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/externalvideo/ExternalVideoTypeHandler.java
magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/externalvideo/ExternalVideoUtil.java
magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/externalvideo/FtpAccount.java
magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/externalvideo/FtpAsyncUploadExternalVideoProvider.java
magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/externalvideo/FtpUtil.java
magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/externalvideo/TrascodingExternalVideoProvider.java
magnoliamodules/trunk/openutils-mgnltagcloud/src/main/java/net/sourceforge/openutils/mgnltagcloud/manager/TagCloudManager.java
magnoliamodules/trunk/pom.xml
Modified: magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/filters/AggregatorServingZipFilter.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/filters/AggregatorServingZipFilter.java 2013-10-20 16:08:22 UTC (rev 4405)
+++ magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/filters/AggregatorServingZipFilter.java 2013-10-20 16:10:14 UTC (rev 4406)
@@ -1,7 +1,7 @@
/**
*
* E-learning Module for Magnolia CMS (http://www.openmindlab.com/lab/products/lms.html)
- * Copyright(C) 2010-2011, Openmind S.r.l. http://www.openmindonline.it
+ * Copyright(C) 2010-2013, Openmind S.r.l. http://www.openmindonline.it
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@ -16,7 +16,6 @@
* 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.mgnllms.filters;
import info.magnolia.cms.beans.runtime.File;
Modified: magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/filters/RenderingServingZipFilter.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/filters/RenderingServingZipFilter.java 2013-10-20 16:08:22 UTC (rev 4405)
+++ magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/filters/RenderingServingZipFilter.java 2013-10-20 16:10:14 UTC (rev 4406)
@@ -1,7 +1,7 @@
/**
*
* E-learning Module for Magnolia CMS (http://www.openmindlab.com/lab/products/lms.html)
- * Copyright(C) 2010-2011, Openmind S.r.l. http://www.openmindonline.it
+ * Copyright(C) 2010-2013, Openmind S.r.l. http://www.openmindonline.it
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@ -16,7 +16,6 @@
* 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.mgnllms.filters;
import info.magnolia.cms.core.AggregationState;
Modified: magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/listeners/CourseEventListener.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/listeners/CourseEventListener.java 2013-10-20 16:08:22 UTC (rev 4405)
+++ magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/listeners/CourseEventListener.java 2013-10-20 16:10:14 UTC (rev 4406)
@@ -1,7 +1,7 @@
/**
*
* E-learning Module for Magnolia CMS (http://www.openmindlab.com/lab/products/lms.html)
- * Copyright(C) 2010-2011, Openmind S.r.l. http://www.openmindonline.it
+ * Copyright(C) 2010-2013, Openmind S.r.l. http://www.openmindonline.it
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@ -16,7 +16,6 @@
* 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.mgnllms.listeners;
/**
Modified: magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/listeners/EmptyCourseEventListener.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/listeners/EmptyCourseEventListener.java 2013-10-20 16:08:22 UTC (rev 4405)
+++ magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/listeners/EmptyCourseEventListener.java 2013-10-20 16:10:14 UTC (rev 4406)
@@ -1,7 +1,7 @@
/**
*
* E-learning Module for Magnolia CMS (http://www.openmindlab.com/lab/products/lms.html)
- * Copyright(C) 2010-2011, Openmind S.r.l. http://www.openmindonline.it
+ * Copyright(C) 2010-2013, Openmind S.r.l. http://www.openmindonline.it
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@ -16,7 +16,6 @@
* 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.mgnllms.listeners;
/**
Modified: magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/lms/configuration/LmsTypeConfiguration.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/lms/configuration/LmsTypeConfiguration.java 2013-10-20 16:08:22 UTC (rev 4405)
+++ magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/lms/configuration/LmsTypeConfiguration.java 2013-10-20 16:10:14 UTC (rev 4406)
@@ -1,7 +1,7 @@
/**
*
* E-learning Module for Magnolia CMS (http://www.openmindlab.com/lab/products/lms.html)
- * Copyright(C) 2010-2011, Openmind S.r.l. http://www.openmindonline.it
+ * Copyright(C) 2010-2013, Openmind S.r.l. http://www.openmindonline.it
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@ -16,7 +16,6 @@
* 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.mgnllms.lms.configuration;
import net.sourceforge.openutils.mgnllms.lms.types.LmsTypeHandler;
Modified: magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/lms/dialog/DialogFileCourse.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/lms/dialog/DialogFileCourse.java 2013-10-20 16:08:22 UTC (rev 4405)
+++ magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/lms/dialog/DialogFileCourse.java 2013-10-20 16:10:14 UTC (rev 4406)
@@ -1,7 +1,7 @@
/**
*
* E-learning Module for Magnolia CMS (http://www.openmindlab.com/lab/products/lms.html)
- * Copyright(C) 2010-2011, Openmind S.r.l. http://www.openmindonline.it
+ * Copyright(C) 2010-2013, Openmind S.r.l. http://www.openmindonline.it
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@ -16,7 +16,6 @@
* 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.mgnllms.lms.dialog;
import info.magnolia.cms.beans.config.MIMEMapping;
Modified: magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/lms/dialog/DialogMetadata.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/lms/dialog/DialogMetadata.java 2013-10-20 16:08:22 UTC (rev 4405)
+++ magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/lms/dialog/DialogMetadata.java 2013-10-20 16:10:14 UTC (rev 4406)
@@ -1,7 +1,7 @@
/**
*
* E-learning Module for Magnolia CMS (http://www.openmindlab.com/lab/products/lms.html)
- * Copyright(C) 2010-2011, Openmind S.r.l. http://www.openmindonline.it
+ * Copyright(C) 2010-2013, Openmind S.r.l. http://www.openmindonline.it
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@ -16,7 +16,6 @@
* 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.mgnllms.lms.dialog;
import info.magnolia.cms.gui.dialog.DialogStatic;
Modified: magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/lms/dialog/PreSaveDialogMVC.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/lms/dialog/PreSaveDialogMVC.java 2013-10-20 16:08:22 UTC (rev 4405)
+++ magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/lms/dialog/PreSaveDialogMVC.java 2013-10-20 16:10:14 UTC (rev 4406)
@@ -1,7 +1,7 @@
/**
*
* E-learning Module for Magnolia CMS (http://www.openmindlab.com/lab/products/lms.html)
- * Copyright(C) 2010-2011, Openmind S.r.l. http://www.openmindonline.it
+ * Copyright(C) 2010-2013, Openmind S.r.l. http://www.openmindonline.it
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@ -16,7 +16,6 @@
* 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.mgnllms.lms.dialog;
import info.magnolia.cms.core.Content;
Modified: magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/lms/el/LmsElFunctions.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/lms/el/LmsElFunctions.java 2013-10-20 16:08:22 UTC (rev 4405)
+++ magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/lms/el/LmsElFunctions.java 2013-10-20 16:10:14 UTC (rev 4406)
@@ -1,7 +1,7 @@
/**
*
* E-learning Module for Magnolia CMS (http://www.openmindlab.com/lab/products/lms.html)
- * Copyright(C) 2010-2011, Openmind S.r.l. http://www.openmindonline.it
+ * Copyright(C) 2010-2013, Openmind S.r.l. http://www.openmindonline.it
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@ -16,7 +16,6 @@
* 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.mgnllms.lms.el;
import info.magnolia.cms.core.Content;
Modified: magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/lms/exceptions/CourseException.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/lms/exceptions/CourseException.java 2013-10-20 16:08:22 UTC (rev 4405)
+++ magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/lms/exceptions/CourseException.java 2013-10-20 16:10:14 UTC (rev 4406)
@@ -1,7 +1,7 @@
/**
*
* E-learning Module for Magnolia CMS (http://www.openmindlab.com/lab/products/lms.html)
- * Copyright(C) 2010-2011, Openmind S.r.l. http://www.openmindonline.it
+ * Copyright(C) 2010-2013, Openmind S.r.l. http://www.openmindonline.it
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@ -16,7 +16,6 @@
* 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.mgnllms.lms.exceptions;
/**
Modified: magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/lms/gui/control/LmsDialogFile.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/lms/gui/control/LmsDialogFile.java 2013-10-20 16:08:22 UTC (rev 4405)
+++ magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/lms/gui/control/LmsDialogFile.java 2013-10-20 16:10:14 UTC (rev 4406)
@@ -1,7 +1,7 @@
/**
*
* E-learning Module for Magnolia CMS (http://www.openmindlab.com/lab/products/lms.html)
- * Copyright(C) 2010-2011, Openmind S.r.l. http://www.openmindonline.it
+ * Copyright(C) 2010-2013, Openmind S.r.l. http://www.openmindonline.it
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@ -16,7 +16,6 @@
* 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.mgnllms.lms.gui.control;
import info.magnolia.cms.gui.control.File;
Modified: magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/lms/tree/LmsBrowserConfiguration.java
===================================================================
--- magnoliamodul...
[truncated message content] |
|
From: <fg...@us...> - 2013-10-20 17:58:15
|
Revision: 4411
http://openutils.svn.sourceforge.net/openutils/?rev=4411&view=rev
Author: fgiust
Date: 2013-10-20 17:58:12 +0000 (Sun, 20 Oct 2013)
Log Message:
-----------
upgrade magnolia/jackrabbit versions
Modified Paths:
--------------
magnoliamodules/trunk/magnolia-test-webapp/pom.xml
magnoliamodules/trunk/magnolia5-test-webapp/pom.xml
magnoliamodules/trunk/openutils-mgnlcriteria/pom.xml
magnoliamodules/trunk/openutils-mgnltagcloud/pom.xml
Modified: magnoliamodules/trunk/magnolia-test-webapp/pom.xml
===================================================================
--- magnoliamodules/trunk/magnolia-test-webapp/pom.xml 2013-10-20 17:55:52 UTC (rev 4410)
+++ magnoliamodules/trunk/magnolia-test-webapp/pom.xml 2013-10-20 17:58:12 UTC (rev 4411)
@@ -275,7 +275,7 @@
<properties>
<magnolia.version>4.5.11</magnolia.version>
<stk.version>2.0.10</stk.version>
- <jackrabbit.version>2.4.1</jackrabbit.version>
+ <jackrabbit.version>2.6.4</jackrabbit.version>
</properties>
<build>
<plugins>
Modified: magnoliamodules/trunk/magnolia5-test-webapp/pom.xml
===================================================================
--- magnoliamodules/trunk/magnolia5-test-webapp/pom.xml 2013-10-20 17:55:52 UTC (rev 4410)
+++ magnoliamodules/trunk/magnolia5-test-webapp/pom.xml 2013-10-20 17:58:12 UTC (rev 4411)
@@ -221,7 +221,7 @@
<magnolia.version2>5.0-prev1-rc1</magnolia.version2>
<!-- <magnolia.version2>5.0.4</magnolia.version2> -->
<stk.version>2.5.3</stk.version>
- <jackrabbit.version>2.6.2</jackrabbit.version>
+ <jackrabbit.version>2.6.4</jackrabbit.version>
</properties>
<build>
<plugins>
Modified: magnoliamodules/trunk/openutils-mgnlcriteria/pom.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnlcriteria/pom.xml 2013-10-20 17:55:52 UTC (rev 4410)
+++ magnoliamodules/trunk/openutils-mgnlcriteria/pom.xml 2013-10-20 17:58:12 UTC (rev 4411)
@@ -177,8 +177,8 @@
</dependency>
</dependencies>
<properties>
- <magnolia.version>4.5.6</magnolia.version>
- <jackrabbit.version>2.4.1</jackrabbit.version>
+ <magnolia.version>4.5.11</magnolia.version>
+ <jackrabbit.version>2.6.4</jackrabbit.version>
<jcr.version>2.0</jcr.version>
</properties>
<!-- test running maven with -Djcr.version=2.0 -Djackrabbit.version=2.0.0 -Djcr.version=2.0 -Djackrabbit.version=2.1.0 -->
Modified: magnoliamodules/trunk/openutils-mgnltagcloud/pom.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnltagcloud/pom.xml 2013-10-20 17:55:52 UTC (rev 4410)
+++ magnoliamodules/trunk/openutils-mgnltagcloud/pom.xml 2013-10-20 17:58:12 UTC (rev 4411)
@@ -233,7 +233,7 @@
</dependency>
</dependencies>
<properties>
- <magnolia.version>4.5.6</magnolia.version>
- <jackrabbit.version>2.4.0</jackrabbit.version>
+ <magnolia.version>4.5.11</magnolia.version>
+ <jackrabbit.version>2.6.4</jackrabbit.version>
</properties>
</project>
\ 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...> - 2013-10-20 18:52:45
|
Revision: 4414
http://openutils.svn.sourceforge.net/openutils/?rev=4414&view=rev
Author: fgiust
Date: 2013-10-20 18:52:41 +0000 (Sun, 20 Oct 2013)
Log Message:
-----------
fix module definition
Modified Paths:
--------------
magnoliamodules/trunk/openutils-mgnlmessages/src/main/resources/META-INF/magnolia/messages.xml
Added Paths:
-----------
magnoliamodules/trunk/magnolia-test-webapp/src/main/resources/log4j.dtd
magnoliamodules/trunk/magnolia-test-webapp/src/main/resources/log4j.xml
Added: magnoliamodules/trunk/magnolia-test-webapp/src/main/resources/log4j.dtd
===================================================================
--- magnoliamodules/trunk/magnolia-test-webapp/src/main/resources/log4j.dtd (rev 0)
+++ magnoliamodules/trunk/magnolia-test-webapp/src/main/resources/log4j.dtd 2013-10-20 18:52:41 UTC (rev 4414)
@@ -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: magnoliamodules/trunk/magnolia-test-webapp/src/main/resources/log4j.dtd
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+text/xml
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: magnoliamodules/trunk/magnolia-test-webapp/src/main/resources/log4j.xml
===================================================================
--- magnoliamodules/trunk/magnolia-test-webapp/src/main/resources/log4j.xml (rev 0)
+++ magnoliamodules/trunk/magnolia-test-webapp/src/main/resources/log4j.xml 2013-10-20 18:52:41 UTC (rev 4414)
@@ -0,0 +1,41 @@
+ <?xml version="1.0" encoding="UTF-8"?>
+ <!DOCTYPE log4j:configuration SYSTEM "log4j.dtd">
+<log4j:configuration>
+ <!-- log4j test configuration -->
+ <appender name="test-appender" class="org.apache.log4j.ConsoleAppender">
+ <layout class="org.apache.log4j.PatternLayout">
+ <param name="ConversionPattern" value="%-5p %c.%M(%C{1}.java:%L) %m%n" />
+ </layout>
+ </appender>
+ <category name="jdbc">
+ <priority value="WARN" />
+ </category>
+ <category name="it">
+ <priority value="INFO" />
+ </category>
+ <category name="info">
+ <priority value="INFO" />
+ </category>
+ <category name="org">
+ <priority value="WARN" />
+ </category>
+ <category name="com">
+ <priority value="WARN" />
+ </category>
+ <category name="net">
+ <priority value="WARN" />
+ </category>
+ <category name="org.dbunit">
+ <priority value="WARN" />
+ </category>
+ <category name="score">
+ <priority value="INFO" />
+ </category>
+ <category name="info.magnolia.module.model.reader.BetwixtModuleDefinitionReader">
+ <priority value="INFO" />
+ </category>
+ <root>
+ <priority value="ALL" />
+ <appender-ref ref="test-appender" />
+ </root>
+</log4j:configuration>
\ No newline at end of file
Property changes on: magnoliamodules/trunk/magnolia-test-webapp/src/main/resources/log4j.xml
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+text/xml
\ No newline at end of property
Added: svn:keywords
## -0,0 +1 ##
+Author Date Id Revision
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Modified: magnoliamodules/trunk/openutils-mgnlmessages/src/main/resources/META-INF/magnolia/messages.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnlmessages/src/main/resources/META-INF/magnolia/messages.xml 2013-10-20 18:38:09 UTC (rev 4413)
+++ magnoliamodules/trunk/openutils-mgnlmessages/src/main/resources/META-INF/magnolia/messages.xml 2013-10-20 18:52:41 UTC (rev 4414)
@@ -45,7 +45,6 @@
<version>*</version>
</dependency>
</dependencies>
-</dependencies>
<repositories>
<repository>
<name>magnolia</name>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fg...@us...> - 2013-10-20 19:02:17
|
Revision: 4415
http://openutils.svn.sourceforge.net/openutils/?rev=4415&view=rev
Author: fgiust
Date: 2013-10-20 19:02:14 +0000 (Sun, 20 Oct 2013)
Log Message:
-----------
upgrade tagcloud to jackrabbit 2.&/lucene 3.6 and fix test configuration
Modified Paths:
--------------
magnoliamodules/trunk/magnolia-test-webapp/pom.xml
magnoliamodules/trunk/magnolia-test-webapp/src/main/resources/log4j.xml
magnoliamodules/trunk/openutils-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/utils/BaseAnalyzer.java
magnoliamodules/trunk/openutils-mgnlcriteria/src/test/resources/log4j.xml
magnoliamodules/trunk/openutils-mgnltagcloud/pom.xml
Added Paths:
-----------
magnoliamodules/trunk/magnolia-test-webapp/src/main/java/com/
magnoliamodules/trunk/magnolia-test-webapp/src/main/java/com/browseengine/
magnoliamodules/trunk/magnolia-test-webapp/src/main/java/com/browseengine/bobo/
magnoliamodules/trunk/magnolia-test-webapp/src/main/java/com/browseengine/bobo/api/
magnoliamodules/trunk/magnolia-test-webapp/src/main/java/com/browseengine/bobo/api/BoboIndexReader.java
magnoliamodules/trunk/magnolia-test-webapp/src/main/webapp/templates/samples-lms/
magnoliamodules/trunk/magnolia-test-webapp/src/main/webapp/templates/samples-lms/courses.jsp
magnoliamodules/trunk/magnolia-test-webapp/src/main/webapp/templates/samples-lms/index.jsp
magnoliamodules/trunk/openutils-mgnltagcloud/src/test/java/com/
magnoliamodules/trunk/openutils-mgnltagcloud/src/test/java/com/browseengine/
magnoliamodules/trunk/openutils-mgnltagcloud/src/test/java/com/browseengine/bobo/
magnoliamodules/trunk/openutils-mgnltagcloud/src/test/java/com/browseengine/bobo/api/
magnoliamodules/trunk/openutils-mgnltagcloud/src/test/java/com/browseengine/bobo/api/BoboIndexReader.java
Modified: magnoliamodules/trunk/magnolia-test-webapp/pom.xml
===================================================================
--- magnoliamodules/trunk/magnolia-test-webapp/pom.xml 2013-10-20 18:52:41 UTC (rev 4414)
+++ magnoliamodules/trunk/magnolia-test-webapp/pom.xml 2013-10-20 19:02:14 UTC (rev 4415)
@@ -218,6 +218,17 @@
<artifactId>openutils-mgnllms</artifactId>
<version>5.0.10-SNAPSHOT</version>
</dependency>
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-context</artifactId>
+ <version>2.5.5</version><!-- temporarily used for bobo-browse patch -->
+ <exclusions>
+ <exclusion>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
</dependencies>
<dependencyManagement>
<dependencies>
Added: magnoliamodules/trunk/magnolia-test-webapp/src/main/java/com/browseengine/bobo/api/BoboIndexReader.java
===================================================================
--- magnoliamodules/trunk/magnolia-test-webapp/src/main/java/com/browseengine/bobo/api/BoboIndexReader.java (rev 0)
+++ magnoliamodules/trunk/magnolia-test-webapp/src/main/java/com/browseengine/bobo/api/BoboIndexReader.java 2013-10-20 19:02:14 UTC (rev 4415)
@@ -0,0 +1,914 @@
+/**
+ *
+ * Tagcloud module for Magnolia CMS (http://www.openmindlab.com/lab/products/mgnltagcloud.html)
+ * Copyright(C) 2010-2013, Openmind S.r.l. http://www.openmindonline.it
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+// lucene 3.6 compatibility patch for bobo-browse 3.2.0, see https://github.com/senseidb/bobo/commit/e78d91ef8a00965d8d55c819f967cac172c23d17
+/**
+ * Bobo Browse Engine - High performance faceted/parametric search implementation
+ * that handles various types of semi-structured data. Written in Java.
+ *
+ * Copyright (C) 2005-2006 John Wang
+ *
+ * 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.
+ *
+ * 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
+ *
+ * To contact the project administrators for the bobo-browse project,
+ * please go to https://sourceforge.net/projects/bobo-browse/, or
+ * send mail to ow...@br....
+ */
+
+package com.browseengine.bobo.api;
+
+import java.io.File;
+import java.io.FileWriter;
+import java.io.IOException;
+import java.io.PrintWriter;
+import java.net.URLEncoder;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.Map.Entry;
+
+import org.apache.log4j.Logger;
+import org.apache.lucene.document.Document;
+import org.apache.lucene.document.Field;
+import org.apache.lucene.index.CorruptIndexException;
+import org.apache.lucene.index.FilterIndexReader;
+import org.apache.lucene.index.IndexReader;
+import org.apache.lucene.index.MultiReader;
+import org.apache.lucene.index.SegmentInfo;
+import org.apache.lucene.index.SegmentInfos;
+import org.apache.lucene.index.SegmentReader;
+import org.apache.lucene.index.Term;
+import org.apache.lucene.index.TermEnum;
+import org.apache.lucene.search.MatchAllDocsQuery;
+import org.apache.lucene.search.Query;
+import org.apache.lucene.store.Directory;
+import org.apache.lucene.store.FSDirectory;
+import org.apache.lucene.util.ReaderUtil;
+import org.springframework.context.support.FileSystemXmlApplicationContext;
+import org.springframework.context.support.GenericApplicationContext;
+
+import com.browseengine.bobo.facets.FacetHandler;
+import com.browseengine.bobo.facets.RuntimeFacetHandler;
+import com.browseengine.bobo.facets.RuntimeFacetHandlerFactory;
+
+
+/**
+ * bobo browse index reader
+ */
+public class BoboIndexReader extends FilterIndexReader
+{
+
+ private static final String SPRING_CONFIG = "bobo.spring";
+
+ private static Logger logger = Logger.getLogger(BoboIndexReader.class);
+
+ protected Map<String, FacetHandler< ? >> _facetHandlerMap;
+
+ protected Collection<FacetHandler< ? >> _facetHandlers;
+
+ protected Collection<RuntimeFacetHandlerFactory< ? , ? >> _runtimeFacetHandlerFactories;
+
+ protected Map<String, RuntimeFacetHandlerFactory< ? , ? >> _runtimeFacetHandlerFactoryMap;
+
+ protected WorkArea _workArea;
+
+ protected IndexReader _srcReader;
+
+ protected BoboIndexReader[] _subReaders = null;
+
+ protected int[] _starts = null;
+
+ private Directory _dir = null;
+
+ private final Map<String, Object> _facetDataMap = new HashMap<String, Object>();
+
+ private final ThreadLocal<Map<String, Object>> _runtimeFacetDataMap = new ThreadLocal<Map<String, Object>>()
+ {
+
+ protected Map<String, Object> initialValue()
+ {
+ return new HashMap<String, Object>();
+ }
+ };
+
+ private final ThreadLocal<Map<String, RuntimeFacetHandler< ? >>> _runtimeFacetHandlerMap = new ThreadLocal<Map<String, RuntimeFacetHandler< ? >>>()
+ {
+
+ protected Map<String, RuntimeFacetHandler< ? >> initialValue()
+ {
+ return new HashMap<String, RuntimeFacetHandler< ? >>();
+ }
+ };
+
+ /**
+ * Constructor
+ * @param reader Index reader
+ * @throws IOException
+ */
+ public static BoboIndexReader getInstance(IndexReader reader) throws IOException
+ {
+ return BoboIndexReader.getInstance(reader, null, null, new WorkArea());
+ }
+
+ public static BoboIndexReader getInstance(IndexReader reader, WorkArea workArea) throws IOException
+ {
+ return BoboIndexReader.getInstance(reader, null, null, workArea);
+ }
+
+ /**
+ * Constructor.
+ * @param reader index reader
+ * @param facetHandlers List of facet handlers
+ * @throws IOException
+ */
+ public static BoboIndexReader getInstance(IndexReader reader, Collection<FacetHandler< ? >> facetHandlers,
+ Collection<RuntimeFacetHandlerFactory< ? , ? >> facetHandlerFactories) throws IOException
+ {
+ return BoboIndexReader.getInstance(reader, facetHandlers, facetHandlerFactories, new WorkArea());
+ }
+
+ public static BoboIndexReader getInstance(IndexReader reader, Collection<FacetHandler< ? >> facetHandlers)
+ throws IOException
+ {
+ return BoboIndexReader.getInstance(reader, facetHandlers, Collections.EMPTY_LIST, new WorkArea());
+ }
+
+ public static BoboIndexReader getInstance(IndexReader reader, Collection<FacetHandler< ? >> facetHandlers,
+ Collection<RuntimeFacetHandlerFactory< ? , ? >> facetHandlerFactories, WorkArea workArea) throws IOException
+ {
+ BoboIndexReader boboReader = new BoboIndexReader(reader, facetHandlers, facetHandlerFactories, workArea);
+ boboReader.facetInit();
+ return boboReader;
+ }
+
+ public static BoboIndexReader getInstanceAsSubReader(IndexReader reader) throws IOException
+ {
+ return getInstanceAsSubReader(reader, null, null, new WorkArea());
+ }
+
+ public static BoboIndexReader getInstanceAsSubReader(IndexReader reader,
+ Collection<FacetHandler< ? >> facetHandlers,
+ Collection<RuntimeFacetHandlerFactory< ? , ? >> facetHandlerFactories) throws IOException
+ {
+ return getInstanceAsSubReader(reader, facetHandlers, facetHandlerFactories, new WorkArea());
+ }
+
+ public static BoboIndexReader getInstanceAsSubReader(IndexReader reader,
+ Collection<FacetHandler< ? >> facetHandlers,
+ Collection<RuntimeFacetHandlerFactory< ? , ? >> facetHandlerFactories, WorkArea workArea) throws IOException
+ {
+ BoboIndexReader boboReader = new BoboIndexReader(reader, facetHandlers, facetHandlerFactories, workArea, false);
+ boboReader.facetInit();
+ return boboReader;
+ }
+
+ @Override
+ public long getVersion()
+ {
+ try
+ {
+ SegmentInfos sinfos = new SegmentInfos();
+ sinfos.read(_dir);
+ return sinfos.getVersion();
+ }
+ catch (Exception e)
+ {
+ return 0L;
+ }
+ }
+
+ public IndexReader getInnerReader()
+ {
+ return in;
+ }
+
+ @Override
+ public synchronized IndexReader reopen() throws CorruptIndexException, IOException
+ {
+ IndexReader newInner = null;
+
+ SegmentInfos sinfos = new SegmentInfos();
+ sinfos.read(_dir);
+ int size = sinfos.size();
+
+ if (in instanceof MultiReader)
+ {
+ // setup current reader list
+ List<IndexReader> boboReaderList = new LinkedList<IndexReader>();
+ ReaderUtil.gatherSubReaders((List<IndexReader>) boboReaderList, in);
+ Map<String, BoboIndexReader> readerMap = new HashMap<String, BoboIndexReader>();
+ for (IndexReader reader : boboReaderList)
+ {
+ BoboIndexReader boboReader = (BoboIndexReader) reader;
+ SegmentReader sreader = (SegmentReader) (boboReader.in);
+ readerMap.put(sreader.getSegmentName(), boboReader);
+ }
+
+ ArrayList<BoboIndexReader> currentReaders = new ArrayList<BoboIndexReader>(size);
+ boolean isNewReader = false;
+ for (int i = 0; i < size; ++i)
+ {
+ SegmentInfo sinfo = (SegmentInfo) sinfos.info(i);
+ BoboIndexReader breader = readerMap.remove(sinfo.name);
+ if (breader != null)
+ {
+ // should use SegmentReader.reopen
+ // TODO: see LUCENE-2559
+ BoboIndexReader newReader = (BoboIndexReader) breader.reopen(true);
+ if (newReader != breader)
+ {
+ isNewReader = true;
+ }
+ if (newReader != null)
+ {
+ currentReaders.add(newReader);
+ }
+ }
+ else
+ {
+ isNewReader = true;
+ SegmentReader newSreader = SegmentReader.get(true, sinfo, 1);
+ breader = BoboIndexReader.getInstanceAsSubReader(
+ newSreader,
+ this._facetHandlers,
+ this._runtimeFacetHandlerFactories);
+ breader._dir = _dir;
+ currentReaders.add(breader);
+ }
+ }
+ isNewReader = isNewReader || (readerMap.size() != 0);
+ if (!isNewReader)
+ {
+ return this;
+ }
+ else
+ {
+ MultiReader newMreader = new MultiReader(currentReaders.toArray(new BoboIndexReader[currentReaders
+ .size()]), false);
+ BoboIndexReader newReader = BoboIndexReader.getInstanceAsSubReader(
+ newMreader,
+ this._facetHandlers,
+ this._runtimeFacetHandlerFactories);
+ newReader._dir = _dir;
+ return newReader;
+ }
+ }
+ else if (in instanceof SegmentReader)
+ {
+ // should use SegmentReader.reopen
+ // TODO: see LUCENE-2559
+
+ SegmentReader sreader = (SegmentReader) in;
+ int numDels = sreader.numDeletedDocs();
+
+ SegmentInfo sinfo = null;
+ boolean sameSeg = false;
+ // get SegmentInfo instance
+ for (int i = 0; i < size; ++i)
+ {
+ SegmentInfo sinfoTmp = (SegmentInfo) sinfos.info(i);
+ if (sinfoTmp.name.equals(sreader.getSegmentName()))
+ {
+ int numDels2 = sinfoTmp.getDelCount();
+ sameSeg = numDels == numDels2;
+ sinfo = sinfoTmp;
+ break;
+ }
+ }
+
+ if (sinfo == null)
+ {
+ // segment no longer exists
+ return null;
+ }
+ if (sameSeg)
+ {
+ return this;
+ }
+ else
+ {
+ SegmentReader newSreader = SegmentReader.get(true, sinfo, 1);
+ return BoboIndexReader.getInstanceAsSubReader(
+ newSreader,
+ this._facetHandlers,
+ this._runtimeFacetHandlerFactories);
+ }
+ }
+ else
+ {
+ // should not reach here, a catch-all default case
+ IndexReader reader = in.reopen(true);
+ if (in != reader)
+ {
+ return BoboIndexReader.getInstance(newInner, _facetHandlers, _runtimeFacetHandlerFactories, _workArea);
+ }
+ else
+ {
+ return this;
+ }
+ }
+ }
+
+ @Override
+ public synchronized IndexReader reopen(boolean openReadOnly) throws CorruptIndexException, IOException
+ {
+
+ // bobo readers are always readonly
+ return reopen();
+ }
+
+ public Object getFacetData(String name)
+ {
+ return _facetDataMap.get(name);
+ }
+
+ public Object putFacetData(String name, Object data)
+ {
+ return _facetDataMap.put(name, data);
+ }
+
+ public Object getRuntimeFacetData(String name)
+ {
+ Map<String, Object> map = _runtimeFacetDataMap.get();
+ if (map == null)
+ return null;
+
+ return map.get(name);
+ }
+
+ public Object putRuntimeFacetData(String name, Object data)
+ {
+ Map<String, Object> map = _runtimeFacetDataMap.get();
+ if (map == null)
+ {
+ map = new HashMap<String, Object>();
+ _runtimeFacetDataMap.set(map);
+ }
+ return map.put(name, data);
+ }
+
+ public void clearRuntimeFacetData()
+ {
+ _runtimeFacetDataMap.set(null);
+ }
+
+ public RuntimeFacetHandler< ? > getRuntimeFacetHandler(String name)
+ {
+ Map<String, RuntimeFacetHandler< ? >> map = _runtimeFacetHandlerMap.get();
+ if (map == null)
+ return null;
+
+ return map.get(name);
+ }
+
+ public void putRuntimeFacetHandler(String name, RuntimeFacetHandler< ? > data)
+ {
+ Map<String, RuntimeFacetHandler< ? >> map = _runtimeFacetHandlerMap.get();
+ if (map == null)
+ {
+ map = new HashMap<String, RuntimeFacetHandler< ? >>();
+ _runtimeFacetHandlerMap.set(map);
+ }
+ map.put(name, data);
+ }
+
+ public void clearRuntimeFacetHandler()
+ {
+ _runtimeFacetHandlerMap.set(null);
+ }
+
+ @Override
+ protected void doClose() throws IOException
+ {
+ _facetDataMap.clear();
+ if (_srcReader != null)
+ _srcReader.close();
+ super.doClose();
+ }
+
+ @Override
+ protected void doCommit(Map commitUserData) throws IOException
+ {
+ if (_srcReader != null)
+ _srcReader.flush(commitUserData);
+ }
+
+ @Override
+ protected void doDelete(int n) throws CorruptIndexException, IOException
+ {
+ if (_srcReader != null)
+ _srcReader.deleteDocument(n);
+ }
+
+ private void loadFacetHandler(String name, Set<String> loaded, Set<String> visited, WorkArea workArea)
+ throws IOException
+ {
+ FacetHandler< ? > facetHandler = _facetHandlerMap.get(name);
+ if (facetHandler != null && !loaded.contains(name))
+ {
+ visited.add(name);
+ Set<String> dependsOn = facetHandler.getDependsOn();
+ if (dependsOn.size() > 0)
+ {
+ Iterator<String> iter = dependsOn.iterator();
+ while (iter.hasNext())
+ {
+ String f = iter.next();
+ if (name.equals(f))
+ continue;
+ if (!loaded.contains(f))
+ {
+ if (visited.contains(f))
+ {
+ throw new IOException("Facet handler dependency cycle detected, facet handler: "
+ + name
+ + " not loaded");
+ }
+ loadFacetHandler(f, loaded, visited, workArea);
+ }
+ if (!loaded.contains(f))
+ {
+ throw new IOException("unable to load facet handler: " + f);
+ }
+ facetHandler.putDependedFacetHandler(_facetHandlerMap.get(f));
+ }
+ }
+
+ long start = System.currentTimeMillis();
+ facetHandler.loadFacetData(this, workArea);
+ long end = System.currentTimeMillis();
+ if (logger.isDebugEnabled())
+ {
+ StringBuffer buf = new StringBuffer();
+ buf.append("facetHandler loaded: ").append(name).append(", took: ").append(end - start).append(" ms");
+ logger.debug(buf.toString());
+ }
+ loaded.add(name);
+ }
+ }
+
+ private void loadFacetHandlers(WorkArea workArea, Set<String> toBeRemoved) throws IOException
+ {
+ Set<String> loaded = new HashSet<String>();
+ Set<String> visited = new HashSet<String>();
+
+ for (String name : _facetHandlerMap.keySet())
+ {
+ loadFacetHandler(name, loaded, visited, workArea);
+ }
+
+ for (String name : toBeRemoved)
+ {
+ _facetHandlerMap.remove(name);
+ }
+ }
+
+ /**
+ * Find all the leaf sub-readers and wrap each in BoboIndexReader.
+ * @param reader
+ * @param workArea
+ * @return
+ * @throws IOException
+ */
+ private static IndexReader[] createSubReaders(IndexReader reader, WorkArea workArea) throws IOException
+ {
+ List<IndexReader> readerList = new ArrayList<IndexReader>();
+ ReaderUtil.gatherSubReaders(readerList, reader);
+ IndexReader[] subReaders = (IndexReader[]) readerList.toArray(new IndexReader[readerList.size()]);
+ BoboIndexReader[] boboReaders;
+
+ if (subReaders != null && subReaders.length > 0)
+ {
+ boboReaders = new BoboIndexReader[subReaders.length];
+ for (int i = 0; i < subReaders.length; i++)
+ {
+ boboReaders[i] = new BoboIndexReader(subReaders[i], null, null, workArea, false);
+ }
+ }
+ else
+ {
+ boboReaders = new BoboIndexReader[]{new BoboIndexReader(reader, null, null, workArea, false) };
+ }
+ return boboReaders;
+ }
+
+ @Override
+ public Directory directory()
+ {
+ return (_subReaders != null ? _subReaders[0].directory() : super.directory());
+ }
+
+ private static Collection<FacetHandler< ? >> loadFromIndex(File file, WorkArea workArea) throws IOException
+ {
+ // File springFile = new File(file, SPRING_CONFIG);
+ // FileSystemXmlApplicationContext appCtx =
+ // new FileSystemXmlApplicationContext("file:" + springFile.getAbsolutePath());
+ // return (Collection<FacetHandler<?>>) appCtx.getBean("handlers");
+
+ Set<Entry<Class< ? >, Object>> entries = workArea.map.entrySet();
+ FileSystemXmlApplicationContext appCtx = new FileSystemXmlApplicationContext();
+ for (Entry<Class< ? >, Object> entry : entries)
+ {
+ Object obj = entry.getValue();
+ if (obj instanceof ClassLoader)
+ {
+ appCtx.setClassLoader((ClassLoader) obj);
+ break;
+ }
+ }
+
+ String absolutePath = file.getAbsolutePath();
+ String partOne = absolutePath.substring(0, absolutePath.lastIndexOf(File.separator));
+ String partTwo = URLEncoder.encode(
+ absolutePath.substring(absolutePath.lastIndexOf(File.separator) + 1),
+ "UTF-8");
+ absolutePath = partOne + File.separator + partTwo;
+
+ File springFile = new File(new File(absolutePath), SPRING_CONFIG);
+ appCtx.setConfigLocation("file:" + springFile.getAbsolutePath());
+ appCtx.refresh();
+
+ return (Collection<FacetHandler< ? >>) appCtx.getBean("handlers");
+
+ }
+
+ protected void initialize(Collection<FacetHandler< ? >> facetHandlers) throws IOException
+ {
+ if (facetHandlers == null) // try to load from index
+ {
+ Directory idxDir = directory();
+ if (idxDir != null && idxDir instanceof FSDirectory)
+ {
+ FSDirectory fsDir = (FSDirectory) idxDir;
+ File file = fsDir.getFile();
+
+ if (new File(file, SPRING_CONFIG).exists())
+ {
+ facetHandlers = loadFromIndex(file, _workArea);
+ }
+ else
+ {
+ facetHandlers = new ArrayList<FacetHandler< ? >>();
+ }
+ }
+ else
+ {
+ facetHandlers = new ArrayList<FacetHandler< ? >>();
+ }
+ }
+
+ _facetHandlers = facetHandlers;
+ _facetHandlerMap = new HashMap<String, FacetHandler< ? >>();
+ for (FacetHandler< ? > facetHandler : facetHandlers)
+ {
+ _facetHandlerMap.put(facetHandler.getName(), facetHandler);
+ }
+ }
+
+ /**
+ * @param reader
+ * @param facetHandlers
+ * @param facetHandlerFactories
+ * @param workArea
+ * @throws IOException
+ */
+ protected BoboIndexReader(
+ IndexReader reader,
+ Collection<FacetHandler< ? >> facetHandlers,
+ Collection<RuntimeFacetHandlerFactory< ? , ? >> facetHandlerFactories,
+ WorkArea workArea) throws IOException
+ {
+ this(reader, facetHandlers, facetHandlerFactories, workArea, true);
+ _srcReader = reader;
+ }
+
+ /**
+ * @param reader
+ * @param facetHandlers
+ * @param facetHandlerFactories
+ * @param workArea
+ * @param useSubReaders true => we create a MultiReader of all the leaf sub-readers as the inner reader. false => we
+ * use the given reader as the inner reader.
+ * @throws IOException
+ */
+ protected BoboIndexReader(
+ IndexReader reader,
+ Collection<FacetHandler< ? >> facetHandlers,
+ Collection<RuntimeFacetHandlerFactory< ? , ? >> facetHandlerFactories,
+ WorkArea workArea,
+ boolean useSubReaders) throws IOException
+ {
+ super(useSubReaders ? new MultiReader(createSubReaders(reader, workArea), false) : reader);
+ if (useSubReaders)
+ {
+ _dir = reader.directory();
+ BoboIndexReader[] subReaders = (BoboIndexReader[]) in.getSequentialSubReaders();
+ if (subReaders != null && subReaders.length > 0)
+ {
+ _subReaders = subReaders;
+
+ int maxDoc = 0;
+ _starts = new int[_subReaders.length + 1];
+ for (int i = 0; i < _subReaders.length; i++)
+ {
+ _subReaders[i]._dir = _dir;
+ if (facetHandlers != null)
+ _subReaders[i].setFacetHandlers(facetHandlers);
+ _starts[i] = maxDoc;
+ maxDoc += _subReaders[i].maxDoc();
+ }
+ _starts[_subReaders.length] = maxDoc;
+ }
+ }
+ _runtimeFacetHandlerFactories = facetHandlerFactories;
+ _runtimeFacetHandlerFactoryMap = new HashMap<String, RuntimeFacetHandlerFactory< ? , ? >>();
+ if (_runtimeFacetHandlerFactories != null)
+ {
+ for (RuntimeFacetHandlerFactory< ? , ? > factory : _runtimeFacetHandlerFactories)
+ {
+ _runtimeFacetHandlerFactoryMap.put(factory.getName(), factory);
+ }
+ }
+ _facetHandlers = facetHandlers;
+ _workArea = workArea;
+ }
+
+ protected void facetInit() throws IOException
+ {
+ facetInit(new HashSet<String>());
+ }
+
+ protected void facetInit(Set<String> toBeRemoved) throws IOException
+ {
+ initialize(_facetHandlers);
+ if (_subReaders == null)
+ {
+ loadFacetHandlers(_workArea, toBeRemoved);
+ }
+ else
+ {
+ for (BoboIndexReader r : _subReaders)
+ {
+ r.facetInit(toBeRemoved);
+ }
+
+ for (String name : toBeRemoved)
+ {
+ _facetHandlerMap.remove(name);
+ }
+ }
+ }
+
+ protected void setFacetHandlers(Collection<FacetHandler< ? >> facetHandlers)
+ {
+ _facetHandlers = facetHandlers;
+ }
+
+ /**
+ * @deprecated use {@link org.apache.lucene.search.MatchAllDocsQuery} instead.
+ * @return query that matches all docs in the index
+ */
+ public Query getFastMatchAllDocsQuery()
+ {
+ return new MatchAllDocsQuery();
+ }
+
+ /**
+ * Utility method to dump out all fields (name and terms) for a given index.
+ * @param outFile File to dump to.
+ * @throws IOException
+ */
+ public void dumpFields(File outFile) throws IOException
+ {
+ FileWriter writer = null;
+ try
+ {
+ writer = new FileWriter(outFile);
+ PrintWriter out = new PrintWriter(writer);
+ Set<String> fieldNames = getFacetNames();
+ for (String fieldName : fieldNames)
+ {
+ TermEnum te = terms(new Term(fieldName, ""));
+ out.write(fieldName + ":\n");
+ while (te.next())
+ {
+ Term term = te.term();
+ if (!fieldName.equals(term.field()))
+ {
+ break;
+ }
+ out.write(term.text() + "\n");
+ }
+ out.write("\n\n");
+ }
+ }
+ finally
+ {
+ if (writer != null)
+ {
+ writer.close();
+ }
+ }
+ }
+
+ /**
+ * Gets all the facet field names
+ * @return Set of facet field names
+ */
+ public Set<String> getFacetNames()
+ {
+ return _facetHandlerMap.keySet();
+ }
+
+ /**
+ * Gets a facet handler
+ * @param fieldname name
+ * @return facet handler
+ */
+ public FacetHandler< ? > getFacetHandler(String fieldname)
+ {
+ FacetHandler< ? > f = _facetHandlerMap.get(fieldname);
+ if (f == null)
+ f = getRuntimeFacetHandler(fieldname);
+ return f;
+ }
+
+ @Override
+ public IndexReader[] getSequentialSubReaders()
+ {
+ return _subReaders;
+ }
+
+ /**
+ * Gets the facet handler map
+ * @r...
[truncated message content] |
|
From: <fg...@us...> - 2013-10-21 08:10:08
|
Revision: 4420
http://openutils.svn.sourceforge.net/openutils/?rev=4420&view=rev
Author: fgiust
Date: 2013-10-21 08:10:04 +0000 (Mon, 21 Oct 2013)
Log Message:
-----------
make security work in unit test. Mostly
Modified Paths:
--------------
magnoliamodules/trunk/openutils-mgnlcriteria/pom.xml
magnoliamodules/trunk/openutils-mgnlcriteria/src/test/java/net/sourceforge/openutils/mgnlcriteria/advanced/FirstDigitEscapeTest.java
magnoliamodules/trunk/openutils-mgnlcriteria/src/test/java/net/sourceforge/openutils/mgnlcriteria/jcr/query/lucene/AclSearchIndexTest.java
magnoliamodules/trunk/openutils-mgnlcriteria/src/test/resources/crit-bootstrap/users.system.anonymous.xml
magnoliamodules/trunk/openutils-mgnlcriteria/src/test/resources/crit-repository/jackrabbit-acl-search-index-test-configuration.xml
magnoliamodules/trunk/openutils-mgnlcriteria/src/test/resources/crit-repository/jackrabbit-test-configuration.xml
magnoliamodules/trunk/openutils-mgnltests/src/main/java/it/openutils/mgnlutils/test/AbstractRepositoryTestcase.java
magnoliamodules/trunk/openutils-mgnltests/src/test/java/it/openutils/mgnlutils/test/testng/TestNgRepositoryTestcaseTest.java
Added Paths:
-----------
magnoliamodules/trunk/openutils-mgnltests/src/test/resources/log4j.dtd
magnoliamodules/trunk/openutils-mgnltests/src/test/resources/log4j.xml
magnoliamodules/trunk/openutils-mgnltests/src/test/resources/utils-bootstrap/userroles.anonymous.xml
magnoliamodules/trunk/openutils-mgnltests/src/test/resources/utils-bootstrap/users.system.anonymous.xml
Modified: magnoliamodules/trunk/openutils-mgnlcriteria/pom.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnlcriteria/pom.xml 2013-10-20 19:21:59 UTC (rev 4419)
+++ magnoliamodules/trunk/openutils-mgnlcriteria/pom.xml 2013-10-21 08:10:04 UTC (rev 4420)
@@ -178,7 +178,7 @@
</dependencies>
<properties>
<magnolia.version>4.5.11</magnolia.version>
- <jackrabbit.version>2.6.4</jackrabbit.version>
+ <jackrabbit.version>2.4.4</jackrabbit.version>
<jcr.version>2.0</jcr.version>
</properties>
<!-- test running maven with -Djcr.version=2.0 -Djackrabbit.version=2.0.0 -Djcr.version=2.0 -Djackrabbit.version=2.1.0 -->
Modified: magnoliamodules/trunk/openutils-mgnlcriteria/src/test/java/net/sourceforge/openutils/mgnlcriteria/advanced/FirstDigitEscapeTest.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlcriteria/src/test/java/net/sourceforge/openutils/mgnlcriteria/advanced/FirstDigitEscapeTest.java 2013-10-20 19:21:59 UTC (rev 4419)
+++ magnoliamodules/trunk/openutils-mgnlcriteria/src/test/java/net/sourceforge/openutils/mgnlcriteria/advanced/FirstDigitEscapeTest.java 2013-10-21 08:10:04 UTC (rev 4420)
@@ -19,6 +19,7 @@
package net.sourceforge.openutils.mgnlcriteria.advanced;
+import info.magnolia.cms.core.MgnlNodeType;
import info.magnolia.cms.security.MgnlRoleManager;
import info.magnolia.cms.security.Realm;
import info.magnolia.cms.security.SecuritySupport;
@@ -82,7 +83,7 @@
{
Criteria criteria = JCRCriteriaFactory.createCriteria().setWorkspace(RepositoryConstants.WEBSITE);
criteria.setBasePath("//myproject/Sport/F1/0a67369b-8cc6-43d8-b2d3-c07b12a2ed5f/versions/*");
- criteria.add(Restrictions.eq("@jcr:primaryType", "mgnl:contentNode"));
+ criteria.add(Restrictions.eq("@jcr:primaryType", MgnlNodeType.NT_COMPONENT));
criteria.addOrder(Order.desc("@jcr:created"));
AdvancedResult advResult = criteria.execute();
@@ -97,7 +98,7 @@
{
Criteria criteria = JCRCriteriaFactory.createCriteria().setWorkspace(RepositoryConstants.WEBSITE);
criteria.setBasePath("//myproject/Sport/F1/-0a67369b-8cc6-43d8-b2d3-c07b12a2ed5f/versions/*");
- criteria.add(Restrictions.eq("@jcr:primaryType", "mgnl:contentNode"));
+ criteria.add(Restrictions.eq("@jcr:primaryType", MgnlNodeType.NT_COMPONENT));
criteria.addOrder(Order.desc("@jcr:created"));
AdvancedResult advResult = criteria.execute();
@@ -111,7 +112,7 @@
{
Criteria criteria = JCRCriteriaFactory.createCriteria().setWorkspace(RepositoryConstants.WEBSITE);
criteria.setBasePath("/myproject/Sport/F1/0a67369b-8cc6-43d8-b2d3-(c07b12a2ed5f)");
- criteria.add(Restrictions.eq("@jcr:primaryType", "mgnl:contentNode"));
+ criteria.add(Restrictions.eq("@jcr:primaryType", MgnlNodeType.NT_COMPONENT));
criteria.addOrder(Order.desc("@jcr:created"));
AdvancedResult advResult = criteria.execute();
Modified: magnoliamodules/trunk/openutils-mgnlcriteria/src/test/java/net/sourceforge/openutils/mgnlcriteria/jcr/query/lucene/AclSearchIndexTest.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlcriteria/src/test/java/net/sourceforge/openutils/mgnlcriteria/jcr/query/lucene/AclSearchIndexTest.java 2013-10-20 19:21:59 UTC (rev 4419)
+++ magnoliamodules/trunk/openutils-mgnlcriteria/src/test/java/net/sourceforge/openutils/mgnlcriteria/jcr/query/lucene/AclSearchIndexTest.java 2013-10-21 08:10:04 UTC (rev 4420)
@@ -26,6 +26,7 @@
import info.magnolia.cms.security.SecuritySupport;
import info.magnolia.cms.security.SecuritySupportImpl;
import info.magnolia.cms.security.SystemUserManager;
+import info.magnolia.context.Context;
import info.magnolia.context.ContextDecorator;
import info.magnolia.context.MgnlContext;
import info.magnolia.repository.RepositoryConstants;
@@ -114,7 +115,8 @@
@Test
public void testDogsOnly() throws Exception
{
- final AccessManager wrappedAM = MgnlContext.getAccessManager(RepositoryConstants.WEBSITE);
+ Context ctx = MgnlContext.getInstance();
+ final AccessManager wrappedAM = ctx.getAccessManager(RepositoryConstants.WEBSITE);
Assert.assertNotNull(wrappedAM, "AccessManager is null");
Modified: magnoliamodules/trunk/openutils-mgnlcriteria/src/test/resources/crit-bootstrap/users.system.anonymous.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnlcriteria/src/test/resources/crit-bootstrap/users.system.anonymous.xml 2013-10-20 19:21:59 UTC (rev 4419)
+++ magnoliamodules/trunk/openutils-mgnlcriteria/src/test/resources/crit-bootstrap/users.system.anonymous.xml 2013-10-21 08:10:04 UTC (rev 4420)
@@ -79,15 +79,6 @@
<sv:property sv:name="0" sv:type="String">
<sv:value>d98728c7-b80f-444d-bfda-b54b28dc240c</sv:value>
</sv:property>
- <sv:property sv:name="00" sv:type="String">
- <sv:value>a106b4cf-d205-418c-acf3-27263612f5a4</sv:value>
- </sv:property>
- <sv:property sv:name="01" sv:type="String">
- <sv:value>0e008dcd-3412-47fe-ab91-a1a1b3c38baa</sv:value>
- </sv:property>
- <sv:property sv:name="02" sv:type="String">
- <sv:value>cf760801-f21e-4548-af47-e21cf9c4317a</sv:value>
- </sv:property>
<sv:property sv:name="jcr:createdBy" sv:type="String">
<sv:value>admin</sv:value>
</sv:property>
Modified: magnoliamodules/trunk/openutils-mgnlcriteria/src/test/resources/crit-repository/jackrabbit-acl-search-index-test-configuration.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnlcriteria/src/test/resources/crit-repository/jackrabbit-acl-search-index-test-configuration.xml 2013-10-20 19:21:59 UTC (rev 4419)
+++ magnoliamodules/trunk/openutils-mgnlcriteria/src/test/resources/crit-repository/jackrabbit-acl-search-index-test-configuration.xml 2013-10-21 08:10:04 UTC (rev 4420)
@@ -5,10 +5,11 @@
<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" />
+ <Security appName="magnolia">
+ <SecurityManager class="org.apache.jackrabbit.core.DefaultSecurityManager" />
+ <AccessManager class="org.apache.jackrabbit.core.security.DefaultAccessManager">
+ </AccessManager>
+ <LoginModule class="info.magnolia.jaas.sp.jcr.JackrabbitAuthenticationModule">
</LoginModule>
</Security>
<Workspaces rootPath="${rep.home}" defaultWorkspace="defaultworkspace" />
@@ -35,6 +36,9 @@
</FileSystem>
</SearchIndex>
<ISMLocking class="org.apache.jackrabbit.core.state.FineGrainedISMLocking" />
+ <WorkspaceSecurity>
+ <AccessControlProvider class="info.magnolia.cms.core.MagnoliaAccessProvider" />
+ </WorkspaceSecurity>
</Workspace>
<Versioning rootPath="${rep.home}/version">
<FileSystem class="org.apache.jackrabbit.core.fs.mem.MemoryFileSystem">
Modified: magnoliamodules/trunk/openutils-mgnlcriteria/src/test/resources/crit-repository/jackrabbit-test-configuration.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnlcriteria/src/test/resources/crit-repository/jackrabbit-test-configuration.xml 2013-10-20 19:21:59 UTC (rev 4419)
+++ magnoliamodules/trunk/openutils-mgnlcriteria/src/test/resources/crit-repository/jackrabbit-test-configuration.xml 2013-10-21 08:10:04 UTC (rev 4420)
@@ -5,10 +5,11 @@
<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" />
+ <Security appName="magnolia">
+ <SecurityManager class="org.apache.jackrabbit.core.DefaultSecurityManager" />
+ <AccessManager class="org.apache.jackrabbit.core.security.DefaultAccessManager">
+ </AccessManager>
+ <LoginModule class="info.magnolia.jaas.sp.jcr.JackrabbitAuthenticationModule">
</LoginModule>
</Security>
<Workspaces rootPath="${rep.home}" defaultWorkspace="defaultworkspace" />
@@ -35,6 +36,9 @@
</FileSystem>
</SearchIndex>
<ISMLocking class="org.apache.jackrabbit.core.state.FineGrainedISMLocking" />
+ <WorkspaceSecurity>
+ <AccessControlProvider class="info.magnolia.cms.core.MagnoliaAccessProvider" />
+ </WorkspaceSecurity>
</Workspace>
<Versioning rootPath="${rep.home}/version">
<FileSystem class="org.apache.jackrabbit.core.fs.mem.MemoryFileSystem">
Modified: magnoliamodules/trunk/openutils-mgnltests/src/main/java/it/openutils/mgnlutils/test/AbstractRepositoryTestcase.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnltests/src/main/java/it/openutils/mgnlutils/test/AbstractRepositoryTestcase.java 2013-10-20 19:21:59 UTC (rev 4419)
+++ magnoliamodules/trunk/openutils-mgnltests/src/main/java/it/openutils/mgnlutils/test/AbstractRepositoryTestcase.java 2013-10-21 08:10:04 UTC (rev 4420)
@@ -21,6 +21,14 @@
import info.magnolia.cms.core.Path;
import info.magnolia.cms.core.SystemProperty;
+import info.magnolia.cms.security.AccessManager;
+import info.magnolia.cms.security.MgnlGroupManager;
+import info.magnolia.cms.security.MgnlRoleManager;
+import info.magnolia.cms.security.PermissionUtil;
+import info.magnolia.cms.security.Realm;
+import info.magnolia.cms.security.SecuritySupport;
+import info.magnolia.cms.security.SecuritySupportImpl;
+import info.magnolia.cms.security.SystemUserManager;
import info.magnolia.cms.util.ClasspathResourcesUtil;
import info.magnolia.cms.util.ContentUtil;
import info.magnolia.content2bean.Content2BeanException;
@@ -37,6 +45,7 @@
import info.magnolia.init.properties.ClasspathPropertySource;
import info.magnolia.init.properties.InitPathsPropertySource;
import info.magnolia.init.properties.ModulePropertiesSource;
+import info.magnolia.jcr.wrapper.DelegateSessionWrapper;
import info.magnolia.module.ModuleLifecycle;
import info.magnolia.module.ModuleManagementException;
import info.magnolia.module.ModuleManager;
@@ -55,14 +64,13 @@
import info.magnolia.objectfactory.configuration.InstanceConfiguration;
import info.magnolia.objectfactory.configuration.ProviderConfiguration;
import info.magnolia.repository.DefaultRepositoryManager;
-import info.magnolia.repository.RepositoryConstants;
import info.magnolia.repository.RepositoryManager;
import info.magnolia.test.ComponentsTestUtil;
import info.magnolia.test.FixedModuleDefinitionReader;
import info.magnolia.test.TestMagnoliaConfigurationProperties;
import info.magnolia.test.TestMagnoliaInitPaths;
import info.magnolia.test.mock.MockContext;
-import info.magnolia.test.mock.MockUtil;
+import info.magnolia.test.mock.MockWebContext;
import java.io.File;
import java.io.FileOutputStream;
@@ -77,14 +85,18 @@
import javax.jcr.ImportUUIDBehavior;
import javax.jcr.Node;
+import javax.jcr.Repository;
import javax.jcr.RepositoryException;
+import javax.jcr.Session;
import javax.jcr.observation.EventListenerIterator;
import javax.jcr.observation.ObservationManager;
import org.apache.commons.io.FileUtils;
import org.apache.commons.io.IOUtils;
import org.apache.commons.lang.StringUtils;
-import org.apache.jackrabbit.core.jndi.BindableRepositoryFactory;
+import org.apache.jackrabbit.core.RepositoryImpl;
+import org.apache.jackrabbit.core.SessionImpl;
+import org.apache.jackrabbit.core.jndi.BindableRepository;
import org.apache.log4j.Level;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -132,9 +144,21 @@
initDefaultImplementations();
SystemProperty.getProperties().load(this.getClass().getResourceAsStream(magnoliaProperties));
- MockUtil.initMockContext();
- workaroundJCR1778();
+ // MockUtil.initMockContext();
+
+ final MockContext ctx = new MockWebContext()
+ {
+
+ @Override
+ public AccessManager getAccessManager(String workspace)
+ {
+ return PermissionUtil.getAccessManager(workspace, getSubject());
+ }
+ };
+ MgnlContext.setInstance(ctx);
+ ComponentsTestUtil.setImplementation(SystemContext.class, MockContext.class);
+
if (autoStart)
{
cleanUp();
@@ -159,6 +183,14 @@
}
+ final SecuritySupportImpl sec = new SecuritySupportImpl();
+ sec.setGroupManager(new MgnlGroupManager());
+ sec.setRoleManager(new MgnlRoleManager());
+ SystemUserManager systemUserManager = new SystemUserManager();
+ systemUserManager.setRealmName(Realm.REALM_SYSTEM.getName());
+ sec.addUserManager(Realm.REALM_SYSTEM.getName(), systemUserManager);
+ ComponentsTestUtil.setInstance(SecuritySupport.class, sec);
+
}
/**
@@ -189,26 +221,39 @@
MgnlContext.release();
SystemContext systemContext = Components.getComponent(SystemContext.class);
-
+
RepositoryManager repositoryManager = Components.getComponent(RepositoryManager.class);
-
+
Collection<String> workspaceNames = repositoryManager.getWorkspaceNames();
-
+
for (String workspace : workspaceNames)
{
- final ObservationManager observationManager = systemContext
- .getJCRSession(workspace)
- .getWorkspace()
- .getObservationManager();
+ Session session = systemContext.getJCRSession(workspace);
+
+ final ObservationManager observationManager = session.getWorkspace().getObservationManager();
final EventListenerIterator listeners = observationManager.getRegisteredEventListeners();
while (listeners.hasNext())
{
observationManager.removeEventListener(listeners.nextEventListener());
}
+
+ // BindableRepository br = ((BindableRepository) repositoryManager.getRepository(repositoryManager
+ // .getWorkspaceMapping(workspace)
+ // .getRepositoryName()));
+ //
+ // final Field repoField = BindableRepository.class.getDeclaredField("repository");
+ // repoField.setAccessible(true);
+ // Repository repository = (Repository) repoField.get(br);
+ //
+ // while (session instanceof DelegateSessionWrapper)
+ // {
+ // session = ((DelegateSessionWrapper) session).getWrappedSession();
+ // }
+ //
+ // ((RepositoryImpl) repository).loggedOut((SessionImpl) session);
+
}
-
-
systemContext.release();
repositoryManager.shutdown();
@@ -254,8 +299,7 @@
configuration.combine(configurationBuilder.getComponentsFromModules("main", mr.getModuleDefinitions()));
// Content2BeanProcessorImpl uses dependency injection and since we don't have that with MockComponentProvider
- // we
- // need to manually create this object and replace the component configuration read from core.xml
+ // we need to manually create this object and replace the component configuration read from core.xml
final TypeMappingImpl typeMapping = new TypeMappingImpl();
configuration.registerInstance(TypeMapping.class, typeMapping);
configuration.registerInstance(Content2BeanProcessor.class, new Content2BeanProcessorImpl(typeMapping));
@@ -306,45 +350,15 @@
return Collections.singletonList(core);
}
- /**
- * Workaround for JCR-1778.
- */
- @SuppressWarnings("unchecked")
- static void workaroundJCR1778()
- {
- try
- {
- Field cacheField = BindableRepositoryFactory.class.getDeclaredField("cache");
- cacheField.setAccessible(true);
- final Map<String, String> cache = (Map<String, String>) cacheField.get(null);
- cache.clear();
- }
- catch (SecurityException e)
- {
- // ignore
- }
- catch (NoSuchFieldException e)
- {
- // ignore
- }
- catch (IllegalArgumentException e)
- {
- // ignore
- }
- catch (IllegalAccessException e)
- {
- // ignore
- }
- }
-
protected void modifyContextesToUseRealRepository()
{
- SystemContext systemContext = Components.getComponent(SystemContext.class);
- RepositoryManager repositoryManager = Components.getComponent(RepositoryManager.class);
- SystemRepositoryStrategy repositoryStrategy = new SystemRepositoryStrategy(repositoryManager);
+ // create a mock web context with same repository acquiring strategy as the system context
+ MockContext systemContext = (MockContext) MgnlContext.getSystemContext();
+ SystemRepositoryStrategy repositoryStrategy = Components.newInstance(SystemRepositoryStrategy.class);
- ((MockContext) systemContext).setRepositoryStrategy(repositoryStrategy);
- ((MockContext) MgnlContext.getInstance()).setRepositoryStrategy(repositoryStrategy);
+ systemContext.setRepositoryStrategy(repositoryStrategy);
+ MockContext ctx = (MockContext) MgnlContext.getInstance();
+ ctx.setRepositoryStrategy(repositoryStrategy);
}
protected void startRepository(String repositoryConfigFileName, String jackrabbitRepositoryConfigFileName,
Modified: magnoliamodules/trunk/openutils-mgnltests/src/test/java/it/openutils/mgnlutils/test/testng/TestNgRepositoryTestcaseTest.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnltests/src/test/java/it/openutils/mgnlutils/test/testng/TestNgRepositoryTestcaseTest.java 2013-10-20 19:21:59 UTC (rev 4419)
+++ magnoliamodules/trunk/openutils-mgnltests/src/test/java/it/openutils/mgnlutils/test/testng/TestNgRepositoryTestcaseTest.java 2013-10-21 08:10:04 UTC (rev 4420)
@@ -19,6 +19,7 @@
package it.openutils.mgnlutils.test.testng;
+import info.magnolia.cms.security.AccessManager;
import info.magnolia.context.MgnlContext;
import info.magnolia.jcr.util.NodeUtil;
import info.magnolia.module.ModuleRegistry;
@@ -39,6 +40,8 @@
@RepositoryTestConfiguration(repositoryConfig = "/utils-repository/test-repositories.xml", jackrabbitRepositoryConfig = "/utils-repository/jackrabbit-test-configuration.xml", bootstrapFiles = {
"/utils-bootstrap/website.pets.xml",
+ "/utils-bootstrap/users.system.anonymous.xml",
+ "/utils-bootstrap/userroles.anonymous.xml",
"/utils-bootstrap/website.letters.xml",
"/utils-bootstrap/config.modules.testmodule.xml" }, magnoliaProperties = "/test-magnolia.properties", startModules = {@ModuleConfiguration(name = "testmodule", moduleclass = TestModule.class) })
public class TestNgRepositoryTestcaseTest extends TestNgRepositoryTestcase
@@ -50,6 +53,9 @@
Session session = MgnlContext.getJCRSession(RepositoryConstants.WEBSITE);
Assert.assertNotNull(session);
+ AccessManager accessManager = MgnlContext.getAccessManager(RepositoryConstants.WEBSITE);
+ Assert.assertNotNull(accessManager);
+
Node pets = session.getNode("/pets");
Assert.assertNotNull(pets);
Added: magnoliamodules/trunk/openutils-mgnltests/src/test/resources/log4j.dtd
===================================================================
--- magnoliamodules/trunk/openutils-mgnltests/src/test/resources/log4j.dtd (rev 0)
+++ magnoliamodules/trunk/openutils-mgnltests/src/test/resources/log4j.dtd 2013-10-21 08:10:04 UTC (rev 4420)
@@ -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: magnoliamodules/trunk/openutils-mgnltests/src/test/resources/log4j.dtd
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+text/xml
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: magnoliamodules/trunk/openutils-mgnltests/src/test/resources/log4j.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnltests/src/test/resources/log4j.xml (rev 0)
+++ magnoliamodules/trunk/openutils-mgnltests/src/test/resources/log4j.xml 2013-10-21 08:10:04 UTC (rev 4420)
@@ -0,0 +1,44 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE log4j:configuration SYSTEM "log4j.dtd">
+<log4j:configuration>
+ <!-- log4j test configuration -->
+ <appender name="test-appender" class="org.apache.log4j.ConsoleAppender">
+ <layout class="org.apache.log4j.PatternLayout">
+ <param name="ConversionPattern" value="%-5p %c.%M(%C{1}.java:%L) %m%n" />
+ </layout>
+ </appender>
+ <category name="jdbc">
+ <priority value="WARN" />
+ </category>
+ <category name="it">
+ <priority value="INFO" />
+ </category>
+ <category name="info">
+ <priority value="INFO" />
+ </category>
+ <category name="org">
+ <priority value="WARN" />
+ </category>
+ <category name="com">
+ <priority value="WARN" />
+ </category>
+ <category name="net">
+ <priority value="WARN" />
+ </category>
+ <category name="org.dbunit">
+ <priority value="WARN" />
+ </category>
+ <category name="score">
+ <priority value="INFO" />
+ </category>
+ <category name="it">
+ <priority value="INFO" />
+ </category>
+ <category name="info.magnolia.repository.DefaultRepositoryManager">
+ <priority value="INFO" />
+ </category>
+ <root>
+ <priority value="ALL" />
+ <appender-ref ref="test-appender" />
+ </root>
+</log4j:configuration>
\ No newline at end of file
Property changes on: magnoliamodules/trunk/openutils-mgnltests/src/test/resources/log4j.xml
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+text/xml
\ No newline at end of property
Added: svn:keywords
## -0,0 +1 ##
+Author Date Id Revision
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: magnoliamodules/trunk/openutils-mgnltests/src/test/resources/utils-bootstrap/userroles.anonymous.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnltests/src/test/resources/utils-bootstrap/userroles.anonymous.xml (rev 0)
+++ magnoliamodules/trunk/openutils-mgnltests/src/test/resources/utils-bootstrap/userroles.anonymous.xml 2013-10-21 08:10:04 UTC (rev 4420)
@@ -0,0 +1,721 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<sv:node sv:name="anonymous" xmlns:sv="http://www.jcp.org/jcr/sv/1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+ <sv:property sv:name="jcr:primaryType" sv:type="Name">
+ <sv:value>mgnl:role</sv:value>
+ </sv:property>
+ <sv:property sv:name="jcr:uuid" sv:type="String">
+ <sv:value>d98728c7-b80f-444d-bfda-b54b28dc240c</sv:value>
+ </sv:property>
+ <sv:property sv:na...
[truncated message content] |
|
From: <fg...@us...> - 2013-10-28 10:25:09
|
Revision: 4434
http://openutils.svn.sourceforge.net/openutils/?rev=4434&view=rev
Author: fgiust
Date: 2013-10-28 10:25:04 +0000 (Mon, 28 Oct 2013)
Log Message:
-----------
unit tests
Modified Paths:
--------------
magnoliamodules/trunk/openutils-mgnlcriteria/src/test/java/net/sourceforge/openutils/mgnlcriteria/advanced/BasePathTest.java
magnoliamodules/trunk/openutils-mgnlcriteria/src/test/java/net/sourceforge/openutils/mgnlcriteria/advanced/BasePathWithSpacesTest.java
magnoliamodules/trunk/openutils-mgnlcriteria/src/test/java/net/sourceforge/openutils/mgnlcriteria/advanced/Content2BeanTest.java
magnoliamodules/trunk/openutils-mgnlcriteria/src/test/java/net/sourceforge/openutils/mgnlcriteria/advanced/FirstDigitEscapeTest.java
magnoliamodules/trunk/openutils-mgnlcriteria/src/test/java/net/sourceforge/openutils/mgnlcriteria/advanced/JcrContainsCriteriaSearchTest.java
magnoliamodules/trunk/openutils-mgnlcriteria/src/test/java/net/sourceforge/openutils/mgnlcriteria/advanced/JcrContainsQuestionMarkTest.java
magnoliamodules/trunk/openutils-mgnlcriteria/src/test/java/net/sourceforge/openutils/mgnlcriteria/advanced/OrderingTest.java
magnoliamodules/trunk/openutils-mgnlcriteria/src/test/java/net/sourceforge/openutils/mgnlcriteria/advanced/PaginationTest.java
magnoliamodules/trunk/openutils-mgnlcriteria/src/test/java/net/sourceforge/openutils/mgnlcriteria/advanced/ScoreAnalizerAndSortTest.java
magnoliamodules/trunk/openutils-mgnlcriteria/src/test/java/net/sourceforge/openutils/mgnlcriteria/advanced/XpathEscapeTest.java
magnoliamodules/trunk/openutils-mgnlcriteria/src/test/java/net/sourceforge/openutils/mgnlcriteria/advanced/impl/AccessibleResultItemResultIteratorTest.java
magnoliamodules/trunk/openutils-mgnlcriteria/src/test/java/net/sourceforge/openutils/mgnlcriteria/advanced/impl/CorrectElementsWithoutMaxResults.java
magnoliamodules/trunk/openutils-mgnlcriteria/src/test/java/net/sourceforge/openutils/mgnlcriteria/jcr/query/CriteriaTest.java
magnoliamodules/trunk/openutils-mgnlcriteria/src/test/java/net/sourceforge/openutils/mgnlcriteria/jcr/query/EscapeSignTest.java
magnoliamodules/trunk/openutils-mgnlcriteria/src/test/java/net/sourceforge/openutils/mgnlcriteria/jcr/query/lucene/AclSearchIndexTest.java
magnoliamodules/trunk/openutils-mgnlcriteria/src/test/resources/crit-repository/indexing_configuration.xml
magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/lifecycle/MediaModule.java
magnoliamodules/trunk/openutils-mgnlmedia/src/test/java/net/sourceforge/openutils/mgnlmedia/media/repotests/MediaTests.java
magnoliamodules/trunk/openutils-mgnlmedia/src/test/java/net/sourceforge/openutils/mgnlmedia/media/utils/FileNode.java
magnoliamodules/trunk/openutils-mgnlmedia/src/test/java/net/sourceforge/openutils/mgnlmedia/media/utils/ImageUtilsTest.java
magnoliamodules/trunk/openutils-mgnlmedia/src/test/resources/log4j.xml
magnoliamodules/trunk/openutils-mgnltagcloud/pom.xml
magnoliamodules/trunk/openutils-mgnltests/src/main/java/it/openutils/mgnlutils/test/AbstractRepositoryTestcase.java
magnoliamodules/trunk/openutils-mgnltests/src/main/java/it/openutils/mgnlutils/test/RepositoryTestConfiguration.java
magnoliamodules/trunk/openutils-mgnltests/src/test/java/it/openutils/mgnlutils/test/testng/TestNgRepositoryTestcaseTest.java
magnoliamodules/trunk/openutils-mgnlutils/src/test/java/it/openutils/mgnlutils/el/MgnlUtilsElFunctionsTest.java
Removed Paths:
-------------
magnoliamodules/trunk/openutils-mgnlmedia/src/test/java/net/sourceforge/openutils/mgnlmedia/media/utils/FileNodeData.java
Modified: magnoliamodules/trunk/openutils-mgnlcriteria/src/test/java/net/sourceforge/openutils/mgnlcriteria/advanced/BasePathTest.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlcriteria/src/test/java/net/sourceforge/openutils/mgnlcriteria/advanced/BasePathTest.java 2013-10-22 20:13:36 UTC (rev 4433)
+++ magnoliamodules/trunk/openutils-mgnlcriteria/src/test/java/net/sourceforge/openutils/mgnlcriteria/advanced/BasePathTest.java 2013-10-28 10:25:04 UTC (rev 4434)
@@ -20,14 +20,8 @@
package net.sourceforge.openutils.mgnlcriteria.advanced;
import info.magnolia.cms.core.MgnlNodeType;
-import info.magnolia.cms.security.MgnlRoleManager;
-import info.magnolia.cms.security.Realm;
-import info.magnolia.cms.security.SecuritySupport;
-import info.magnolia.cms.security.SecuritySupportImpl;
-import info.magnolia.cms.security.SystemUserManager;
import info.magnolia.context.MgnlContext;
import info.magnolia.repository.RepositoryConstants;
-import info.magnolia.test.ComponentsTestUtil;
import it.openutils.mgnlutils.test.RepositoryTestConfiguration;
import it.openutils.mgnlutils.test.TestNgRepositoryTestcase;
@@ -61,7 +55,7 @@
"/crit-bootstrap/userroles.anonymous.xml",
"/crit-bootstrap/users.system.anonymous.xml",
"/crit-bootstrap/config.server.auditLogging.xml",
- "/crit-bootstrap/config.server.i18n.content.xml" })
+ "/crit-bootstrap/config.server.i18n.content.xml" }, security = true)
public class BasePathTest extends TestNgRepositoryTestcase
{
@@ -90,13 +84,6 @@
// ------- AdvancedCriteriaImpl
MgnlContext.getJCRSession(RepositoryConstants.WEBSITE).save();
- // info.magnolia.cms.security.SecurityTest.setUp()
- final SecuritySupportImpl sec = new SecuritySupportImpl();
- SystemUserManager systemUserManager = new SystemUserManager();
- systemUserManager.setRealmName(Realm.REALM_SYSTEM.getName());
- sec.addUserManager(Realm.REALM_SYSTEM.getName(), systemUserManager);
- sec.setRoleManager(new MgnlRoleManager());
- ComponentsTestUtil.setInstance(SecuritySupport.class, sec);
}
/**
Modified: magnoliamodules/trunk/openutils-mgnlcriteria/src/test/java/net/sourceforge/openutils/mgnlcriteria/advanced/BasePathWithSpacesTest.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlcriteria/src/test/java/net/sourceforge/openutils/mgnlcriteria/advanced/BasePathWithSpacesTest.java 2013-10-22 20:13:36 UTC (rev 4433)
+++ magnoliamodules/trunk/openutils-mgnlcriteria/src/test/java/net/sourceforge/openutils/mgnlcriteria/advanced/BasePathWithSpacesTest.java 2013-10-28 10:25:04 UTC (rev 4434)
@@ -20,14 +20,8 @@
package net.sourceforge.openutils.mgnlcriteria.advanced;
import info.magnolia.cms.core.MgnlNodeType;
-import info.magnolia.cms.security.MgnlRoleManager;
-import info.magnolia.cms.security.Realm;
-import info.magnolia.cms.security.SecuritySupport;
-import info.magnolia.cms.security.SecuritySupportImpl;
-import info.magnolia.cms.security.SystemUserManager;
import info.magnolia.context.MgnlContext;
import info.magnolia.repository.RepositoryConstants;
-import info.magnolia.test.ComponentsTestUtil;
import it.openutils.mgnlutils.test.RepositoryTestConfiguration;
import it.openutils.mgnlutils.test.TestNgRepositoryTestcase;
@@ -54,7 +48,7 @@
"/crit-bootstrap/userroles.anonymous.xml",
"/crit-bootstrap/users.system.anonymous.xml",
"/crit-bootstrap/config.server.auditLogging.xml",
- "/crit-bootstrap/config.server.i18n.content.xml" })
+ "/crit-bootstrap/config.server.i18n.content.xml" }, security = true)
public class BasePathWithSpacesTest extends TestNgRepositoryTestcase
{
@@ -72,13 +66,6 @@
// --- consectetur adipisici elit
MgnlContext.getJCRSession(RepositoryConstants.WEBSITE).save();
- // info.magnolia.cms.security.SecurityTest.setUp()
- final SecuritySupportImpl sec = new SecuritySupportImpl();
- SystemUserManager systemUserManager = new SystemUserManager();
- systemUserManager.setRealmName(Realm.REALM_SYSTEM.getName());
- sec.addUserManager(Realm.REALM_SYSTEM.getName(), systemUserManager);
- sec.setRoleManager(new MgnlRoleManager());
- ComponentsTestUtil.setInstance(SecuritySupport.class, sec);
}
/**
Modified: magnoliamodules/trunk/openutils-mgnlcriteria/src/test/java/net/sourceforge/openutils/mgnlcriteria/advanced/Content2BeanTest.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlcriteria/src/test/java/net/sourceforge/openutils/mgnlcriteria/advanced/Content2BeanTest.java 2013-10-22 20:13:36 UTC (rev 4433)
+++ magnoliamodules/trunk/openutils-mgnlcriteria/src/test/java/net/sourceforge/openutils/mgnlcriteria/advanced/Content2BeanTest.java 2013-10-28 10:25:04 UTC (rev 4434)
@@ -22,19 +22,12 @@
import info.magnolia.cms.core.MgnlNodeType;
import info.magnolia.cms.i18n.DefaultI18nContentSupport;
import info.magnolia.cms.i18n.I18nContentSupport;
-import info.magnolia.cms.security.MgnlRoleManager;
-import info.magnolia.cms.security.Realm;
-import info.magnolia.cms.security.SecuritySupport;
-import info.magnolia.cms.security.SecuritySupportImpl;
-import info.magnolia.cms.security.SystemUserManager;
import info.magnolia.context.MgnlContext;
import info.magnolia.repository.RepositoryConstants;
import info.magnolia.test.ComponentsTestUtil;
import it.openutils.mgnlutils.test.RepositoryTestConfiguration;
import it.openutils.mgnlutils.test.TestNgRepositoryTestcase;
-import java.util.Map;
-
import javax.jcr.Node;
import net.sourceforge.openutils.mgnlcriteria.jcr.query.AdvancedResult;
@@ -61,7 +54,7 @@
"/crit-bootstrap/userroles.anonymous.xml",
"/crit-bootstrap/users.system.anonymous.xml",
"/crit-bootstrap/config.server.auditLogging.xml",
- "/crit-bootstrap/config.server.i18n.content.xml" })
+ "/crit-bootstrap/config.server.i18n.content.xml" }, security = true)
public class Content2BeanTest extends TestNgRepositoryTestcase
{
@@ -79,13 +72,6 @@
ComponentsTestUtil.setInstance(I18nContentSupport.class, new DefaultI18nContentSupport());
- // info.magnolia.cms.security.SecurityTest.setUp()
- final SecuritySupportImpl sec = new SecuritySupportImpl();
- SystemUserManager systemUserManager = new SystemUserManager();
- systemUserManager.setRealmName(Realm.REALM_SYSTEM.getName());
- sec.addUserManager(Realm.REALM_SYSTEM.getName(), systemUserManager);
- sec.setRoleManager(new MgnlRoleManager());
- ComponentsTestUtil.setInstance(SecuritySupport.class, sec);
}
@SuppressWarnings("unchecked")
Modified: magnoliamodules/trunk/openutils-mgnlcriteria/src/test/java/net/sourceforge/openutils/mgnlcriteria/advanced/FirstDigitEscapeTest.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlcriteria/src/test/java/net/sourceforge/openutils/mgnlcriteria/advanced/FirstDigitEscapeTest.java 2013-10-22 20:13:36 UTC (rev 4433)
+++ magnoliamodules/trunk/openutils-mgnlcriteria/src/test/java/net/sourceforge/openutils/mgnlcriteria/advanced/FirstDigitEscapeTest.java 2013-10-28 10:25:04 UTC (rev 4434)
@@ -20,14 +20,8 @@
package net.sourceforge.openutils.mgnlcriteria.advanced;
import info.magnolia.cms.core.MgnlNodeType;
-import info.magnolia.cms.security.MgnlRoleManager;
-import info.magnolia.cms.security.Realm;
-import info.magnolia.cms.security.SecuritySupport;
-import info.magnolia.cms.security.SecuritySupportImpl;
-import info.magnolia.cms.security.SystemUserManager;
import info.magnolia.context.MgnlContext;
import info.magnolia.repository.RepositoryConstants;
-import info.magnolia.test.ComponentsTestUtil;
import it.openutils.mgnlutils.test.RepositoryTestConfiguration;
import it.openutils.mgnlutils.test.TestNgRepositoryTestcase;
@@ -55,7 +49,7 @@
"/crit-bootstrap/userroles.anonymous.xml",
"/crit-bootstrap/users.system.anonymous.xml",
"/crit-bootstrap/config.server.auditLogging.xml",
- "/crit-bootstrap/config.server.i18n.content.xml" })
+ "/crit-bootstrap/config.server.i18n.content.xml" }, security = true)
public class FirstDigitEscapeTest extends TestNgRepositoryTestcase
{
@@ -70,14 +64,6 @@
super.setUp();
MgnlContext.getJCRSession(RepositoryConstants.WEBSITE).save();
-
- // info.magnolia.cms.security.SecurityTest.setUp()
- final SecuritySupportImpl sec = new SecuritySupportImpl();
- SystemUserManager systemUserManager = new SystemUserManager();
- systemUserManager.setRealmName(Realm.REALM_SYSTEM.getName());
- sec.addUserManager(Realm.REALM_SYSTEM.getName(), systemUserManager);
- sec.setRoleManager(new MgnlRoleManager());
- ComponentsTestUtil.setInstance(SecuritySupport.class, sec);
}
@Test
Modified: magnoliamodules/trunk/openutils-mgnlcriteria/src/test/java/net/sourceforge/openutils/mgnlcriteria/advanced/JcrContainsCriteriaSearchTest.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlcriteria/src/test/java/net/sourceforge/openutils/mgnlcriteria/advanced/JcrContainsCriteriaSearchTest.java 2013-10-22 20:13:36 UTC (rev 4433)
+++ magnoliamodules/trunk/openutils-mgnlcriteria/src/test/java/net/sourceforge/openutils/mgnlcriteria/advanced/JcrContainsCriteriaSearchTest.java 2013-10-28 10:25:04 UTC (rev 4434)
@@ -22,11 +22,6 @@
import info.magnolia.cms.core.MgnlNodeType;
import info.magnolia.cms.i18n.DefaultI18nContentSupport;
import info.magnolia.cms.i18n.I18nContentSupport;
-import info.magnolia.cms.security.MgnlRoleManager;
-import info.magnolia.cms.security.Realm;
-import info.magnolia.cms.security.SecuritySupport;
-import info.magnolia.cms.security.SecuritySupportImpl;
-import info.magnolia.cms.security.SystemUserManager;
import info.magnolia.context.MgnlContext;
import info.magnolia.repository.RepositoryConstants;
import info.magnolia.test.ComponentsTestUtil;
@@ -63,7 +58,7 @@
"/crit-bootstrap/userroles.anonymous.xml",
"/crit-bootstrap/users.system.anonymous.xml",
"/crit-bootstrap/config.server.auditLogging.xml",
- "/crit-bootstrap/config.server.i18n.content.xml" })
+ "/crit-bootstrap/config.server.i18n.content.xml" }, security = true)
public class JcrContainsCriteriaSearchTest extends TestNgRepositoryTestcase
{
@@ -88,14 +83,6 @@
MgnlContext.getJCRSession(RepositoryConstants.WEBSITE).save();
ComponentsTestUtil.setInstance(I18nContentSupport.class, new DefaultI18nContentSupport());
-
- // info.magnolia.cms.security.SecurityTest.setUp()
- final SecuritySupportImpl sec = new SecuritySupportImpl();
- SystemUserManager systemUserManager = new SystemUserManager();
- systemUserManager.setRealmName(Realm.REALM_SYSTEM.getName());
- sec.addUserManager(Realm.REALM_SYSTEM.getName(), systemUserManager);
- sec.setRoleManager(new MgnlRoleManager());
- ComponentsTestUtil.setInstance(SecuritySupport.class, sec);
}
@Test
Modified: magnoliamodules/trunk/openutils-mgnlcriteria/src/test/java/net/sourceforge/openutils/mgnlcriteria/advanced/JcrContainsQuestionMarkTest.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlcriteria/src/test/java/net/sourceforge/openutils/mgnlcriteria/advanced/JcrContainsQuestionMarkTest.java 2013-10-22 20:13:36 UTC (rev 4433)
+++ magnoliamodules/trunk/openutils-mgnlcriteria/src/test/java/net/sourceforge/openutils/mgnlcriteria/advanced/JcrContainsQuestionMarkTest.java 2013-10-28 10:25:04 UTC (rev 4434)
@@ -21,11 +21,6 @@
import info.magnolia.cms.i18n.DefaultI18nContentSupport;
import info.magnolia.cms.i18n.I18nContentSupport;
-import info.magnolia.cms.security.MgnlRoleManager;
-import info.magnolia.cms.security.Realm;
-import info.magnolia.cms.security.SecuritySupport;
-import info.magnolia.cms.security.SecuritySupportImpl;
-import info.magnolia.cms.security.SystemUserManager;
import info.magnolia.context.MgnlContext;
import info.magnolia.repository.RepositoryConstants;
import info.magnolia.test.ComponentsTestUtil;
@@ -56,7 +51,7 @@
"/crit-bootstrap/userroles.anonymous.xml",
"/crit-bootstrap/users.system.anonymous.xml",
"/crit-bootstrap/config.server.auditLogging.xml",
- "/crit-bootstrap/config.server.i18n.content.xml" })
+ "/crit-bootstrap/config.server.i18n.content.xml" }, security = true)
public class JcrContainsQuestionMarkTest extends TestNgRepositoryTestcase
{
@@ -81,14 +76,6 @@
MgnlContext.getJCRSession(RepositoryConstants.WEBSITE).save();
ComponentsTestUtil.setInstance(I18nContentSupport.class, new DefaultI18nContentSupport());
-
- // info.magnolia.cms.security.SecurityTest.setUp()
- final SecuritySupportImpl sec = new SecuritySupportImpl();
- SystemUserManager systemUserManager = new SystemUserManager();
- systemUserManager.setRealmName(Realm.REALM_SYSTEM.getName());
- sec.addUserManager(Realm.REALM_SYSTEM.getName(), systemUserManager);
- sec.setRoleManager(new MgnlRoleManager());
- ComponentsTestUtil.setInstance(SecuritySupport.class, sec);
}
@SuppressWarnings("deprecation")
Modified: magnoliamodules/trunk/openutils-mgnlcriteria/src/test/java/net/sourceforge/openutils/mgnlcriteria/advanced/OrderingTest.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlcriteria/src/test/java/net/sourceforge/openutils/mgnlcriteria/advanced/OrderingTest.java 2013-10-22 20:13:36 UTC (rev 4433)
+++ magnoliamodules/trunk/openutils-mgnlcriteria/src/test/java/net/sourceforge/openutils/mgnlcriteria/advanced/OrderingTest.java 2013-10-28 10:25:04 UTC (rev 4434)
@@ -22,11 +22,6 @@
import info.magnolia.cms.core.MgnlNodeType;
import info.magnolia.cms.i18n.DefaultI18nContentSupport;
import info.magnolia.cms.i18n.I18nContentSupport;
-import info.magnolia.cms.security.MgnlRoleManager;
-import info.magnolia.cms.security.Realm;
-import info.magnolia.cms.security.SecuritySupport;
-import info.magnolia.cms.security.SecuritySupportImpl;
-import info.magnolia.cms.security.SystemUserManager;
import info.magnolia.context.MgnlContext;
import info.magnolia.repository.RepositoryConstants;
import info.magnolia.test.ComponentsTestUtil;
@@ -56,7 +51,7 @@
"/crit-bootstrap/userroles.anonymous.xml",
"/crit-bootstrap/users.system.anonymous.xml",
"/crit-bootstrap/config.server.auditLogging.xml",
- "/crit-bootstrap/config.server.i18n.content.xml" })
+ "/crit-bootstrap/config.server.i18n.content.xml" }, security = true)
public class OrderingTest extends TestNgRepositoryTestcase
{
@@ -112,14 +107,6 @@
MgnlContext.getJCRSession(RepositoryConstants.WEBSITE).save();
ComponentsTestUtil.setInstance(I18nContentSupport.class, new DefaultI18nContentSupport());
-
- // info.magnolia.cms.security.SecurityTest.setUp()
- final SecuritySupportImpl sec = new SecuritySupportImpl();
- SystemUserManager systemUserManager = new SystemUserManager();
- systemUserManager.setRealmName(Realm.REALM_SYSTEM.getName());
- sec.addUserManager(Realm.REALM_SYSTEM.getName(), systemUserManager);
- sec.setRoleManager(new MgnlRoleManager());
- ComponentsTestUtil.setInstance(SecuritySupport.class, sec);
}
/**
Modified: magnoliamodules/trunk/openutils-mgnlcriteria/src/test/java/net/sourceforge/openutils/mgnlcriteria/advanced/PaginationTest.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlcriteria/src/test/java/net/sourceforge/openutils/mgnlcriteria/advanced/PaginationTest.java 2013-10-22 20:13:36 UTC (rev 4433)
+++ magnoliamodules/trunk/openutils-mgnlcriteria/src/test/java/net/sourceforge/openutils/mgnlcriteria/advanced/PaginationTest.java 2013-10-28 10:25:04 UTC (rev 4434)
@@ -22,11 +22,6 @@
import info.magnolia.cms.core.MgnlNodeType;
import info.magnolia.cms.i18n.DefaultI18nContentSupport;
import info.magnolia.cms.i18n.I18nContentSupport;
-import info.magnolia.cms.security.MgnlRoleManager;
-import info.magnolia.cms.security.Realm;
-import info.magnolia.cms.security.SecuritySupport;
-import info.magnolia.cms.security.SecuritySupportImpl;
-import info.magnolia.cms.security.SystemUserManager;
import info.magnolia.context.MgnlContext;
import info.magnolia.repository.RepositoryConstants;
import info.magnolia.test.ComponentsTestUtil;
@@ -57,7 +52,7 @@
"/crit-bootstrap/userroles.anonymous.xml",
"/crit-bootstrap/users.system.anonymous.xml",
"/crit-bootstrap/config.server.auditLogging.xml",
- "/crit-bootstrap/config.server.i18n.content.xml" })
+ "/crit-bootstrap/config.server.i18n.content.xml" }, security = true)
public class PaginationTest extends TestNgRepositoryTestcase
{
@@ -83,14 +78,6 @@
MgnlContext.getJCRSession(RepositoryConstants.WEBSITE).save();
ComponentsTestUtil.setInstance(I18nContentSupport.class, new DefaultI18nContentSupport());
-
- // info.magnolia.cms.security.SecurityTest.setUp()
- final SecuritySupportImpl sec = new SecuritySupportImpl();
- SystemUserManager systemUserManager = new SystemUserManager();
- systemUserManager.setRealmName(Realm.REALM_SYSTEM.getName());
- sec.addUserManager(Realm.REALM_SYSTEM.getName(), systemUserManager);
- sec.setRoleManager(new MgnlRoleManager());
- ComponentsTestUtil.setInstance(SecuritySupport.class, sec);
}
/**
Modified: magnoliamodules/trunk/openutils-mgnlcriteria/src/test/java/net/sourceforge/openutils/mgnlcriteria/advanced/ScoreAnalizerAndSortTest.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlcriteria/src/test/java/net/sourceforge/openutils/mgnlcriteria/advanced/ScoreAnalizerAndSortTest.java 2013-10-22 20:13:36 UTC (rev 4433)
+++ magnoliamodules/trunk/openutils-mgnlcriteria/src/test/java/net/sourceforge/openutils/mgnlcriteria/advanced/ScoreAnalizerAndSortTest.java 2013-10-28 10:25:04 UTC (rev 4434)
@@ -21,11 +21,6 @@
import info.magnolia.cms.i18n.DefaultI18nContentSupport;
import info.magnolia.cms.i18n.I18nContentSupport;
-import info.magnolia.cms.security.MgnlRoleManager;
-import info.magnolia.cms.security.Realm;
-import info.magnolia.cms.security.SecuritySupport;
-import info.magnolia.cms.security.SecuritySupportImpl;
-import info.magnolia.cms.security.SystemUserManager;
import info.magnolia.context.MgnlContext;
import info.magnolia.repository.RepositoryConstants;
import info.magnolia.test.ComponentsTestUtil;
@@ -56,7 +51,7 @@
"/crit-bootstrap/userroles.anonymous.xml",
"/crit-bootstrap/users.system.anonymous.xml",
"/crit-bootstrap/config.server.auditLogging.xml",
- "/crit-bootstrap/config.server.i18n.content.xml" })
+ "/crit-bootstrap/config.server.i18n.content.xml" }, security = true)
public class ScoreAnalizerAndSortTest extends TestNgRepositoryTestcase
{
@@ -73,14 +68,6 @@
MgnlContext.getJCRSession(RepositoryConstants.WEBSITE).save();
ComponentsTestUtil.setInstance(I18nContentSupport.class, new DefaultI18nContentSupport());
-
- // info.magnolia.cms.security.SecurityTest.setUp()
- final SecuritySupportImpl sec = new SecuritySupportImpl();
- SystemUserManager systemUserManager = new SystemUserManager();
- systemUserManager.setRealmName(Realm.REALM_SYSTEM.getName());
- sec.addUserManager(Realm.REALM_SYSTEM.getName(), systemUserManager);
- sec.setRoleManager(new MgnlRoleManager());
- ComponentsTestUtil.setInstance(SecuritySupport.class, sec);
}
@Test
@@ -109,15 +96,23 @@
ResultIterator< ? extends Node> iterator = advResult.getItems();
- Assert.assertTrue(((AdvancedResultItem) iterator.next()).getScore() > ((AdvancedResultItem) iterator.next())
- .getScore());
+ AdvancedResultItem first = (AdvancedResultItem) iterator.next();
+ AdvancedResultItem second = (AdvancedResultItem) iterator.next();
+ Assert.assertTrue(first.getScore() >= second.getScore(), "First element score "
+ + first.getScore()
+ + " is not greater of "
+ + second.getScore());
+ // actually, the score should be the same, since the word is always contained in the title... accents should not
+ // be considered
+
iterator = advResult.getItems();
// not sure what the selector name "s" means, but that's the only valid selector for this query, according to
// jackrabbit
- Assert.assertTrue(((AdvancedResultItem) iterator.next()).getScore("s") > ((AdvancedResultItem) iterator.next())
- .getScore("s"));
+ Assert
+ .assertTrue(((AdvancedResultItem) iterator.next()).getScore("s") >= ((AdvancedResultItem) iterator.next())
+ .getScore("s"));
}
@Test
Modified: magnoliamodules/trunk/openutils-mgnlcriteria/src/test/java/net/sourceforge/openutils/mgnlcriteria/advanced/XpathEscapeTest.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlcriteria/src/test/java/net/sourceforge/openutils/mgnlcriteria/advanced/XpathEscapeTest.java 2013-10-22 20:13:36 UTC (rev 4433)
+++ magnoliamodules/trunk/openutils-mgnlcriteria/src/test/java/net/sourceforge/openutils/mgnlcriteria/advanced/XpathEscapeTest.java 2013-10-28 10:25:04 UTC (rev 4434)
@@ -22,11 +22,6 @@
import info.magnolia.cms.core.MgnlNodeType;
import info.magnolia.cms.i18n.DefaultI18nContentSupport;
import info.magnolia.cms.i18n.I18nContentSupport;
-import info.magnolia.cms.security.MgnlRoleManager;
-import info.magnolia.cms.security.Realm;
-import info.magnolia.cms.security.SecuritySupport;
-import info.magnolia.cms.security.SecuritySupportImpl;
-import info.magnolia.cms.security.SystemUserManager;
import info.magnolia.context.MgnlContext;
import info.magnolia.repository.RepositoryConstants;
import info.magnolia.test.ComponentsTestUtil;
@@ -60,7 +55,7 @@
"/crit-bootstrap/userroles.anonymous.xml",
"/crit-bootstrap/users.system.anonymous.xml",
"/crit-bootstrap/config.server.auditLogging.xml",
- "/crit-bootstrap/config.server.i18n.content.xml" })
+ "/crit-bootstrap/config.server.i18n.content.xml" }, security = true)
public class XpathEscapeTest extends TestNgRepositoryTestcase
{
@@ -76,14 +71,6 @@
MgnlContext.getJCRSession(RepositoryConstants.WEBSITE).save();
ComponentsTestUtil.setInstance(I18nContentSupport.class, new DefaultI18nContentSupport());
-
- // info.magnolia.cms.security.SecurityTest.setUp()
- final SecuritySupportImpl sec = new SecuritySupportImpl();
- SystemUserManager systemUserManager = new SystemUserManager();
- systemUserManager.setRealmName(Realm.REALM_SYSTEM.getName());
- sec.addUserManager(Realm.REALM_SYSTEM.getName(), systemUserManager);
- sec.setRoleManager(new MgnlRoleManager());
- ComponentsTestUtil.setInstance(SecuritySupport.class, sec);
}
@Test
Modified: magnoliamodules/trunk/openutils-mgnlcriteria/src/test/java/net/sourceforge/openutils/mgnlcriteria/advanced/impl/AccessibleResultItemResultIteratorTest.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlcriteria/src/test/java/net/sourceforge/openutils/mgnlcriteria/advanced/impl/AccessibleResultItemResultIteratorTest.java 2013-10-22 20:13:36 UTC (rev 4433)
+++ magnoliamodules/trunk/openutils-mgnlcriteria/src/test/java/net/sourceforge/openutils/mgnlcriteria/advanced/impl/AccessibleResultItemResultIteratorTest.java 2013-10-28 10:25:04 UTC (rev 4434)
@@ -21,12 +21,7 @@
import info.magnolia.cms.i18n.DefaultI18nContentSupport;
import info.magnolia.cms.i18n.I18nContentSupport;
-import info.magnolia.cms.security.MgnlRoleManager;
import info.magnolia.cms.security.PermissionUtil;
-import info.magnolia.cms.security.Realm;
-import info.magnolia.cms.security.SecuritySupport;
-import info.magnolia.cms.security.SecuritySupportImpl;
-import info.magnolia.cms.security.SystemUserManager;
import info.magnolia.context.MgnlContext;
import info.magnolia.jcr.util.PropertyUtil;
import info.magnolia.repository.RepositoryConstants;
@@ -63,7 +58,7 @@
"/crit-bootstrap/userroles.anonymous.xml",
"/crit-bootstrap/users.system.anonymous.xml",
"/crit-bootstrap/config.server.auditLogging.xml",
- "/crit-bootstrap/config.server.i18n.content.xml" })
+ "/crit-bootstrap/config.server.i18n.content.xml" }, security = true)
public class AccessibleResultItemResultIteratorTest extends TestNgRepositoryTestcase
{
@@ -106,13 +101,6 @@
ComponentsTestUtil.setInstance(I18nContentSupport.class, new DefaultI18nContentSupport());
- // info.magnolia.cms.security.SecurityTest.setUp()
- final SecuritySupportImpl sec = new SecuritySupportImpl();
- SystemUserManager systemUserManager = new SystemUserManager();
- systemUserManager.setRealmName(Realm.REALM_SYSTEM.getName());
- sec.addUserManager(Realm.REALM_SYSTEM.getName(), systemUserManager);
- sec.setRoleManager(new MgnlRoleManager());
- ComponentsTestUtil.setInstance(SecuritySupport.class, sec);
}
/**
Modified: magnoliamodules/trunk/openutils-mgnlcriteria/src/test/java/net/sourceforge/openutils/mgnlcriteria/advanced/impl/CorrectElementsWithoutMaxResults.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlcriteria/src/test/java/net/sourceforge/openutils/mgnlcriteria/advanced/impl/CorrectElementsWithoutMaxResults.java 2013-10-22 20:13:36 UTC (rev 4433)
+++ magnoliamodules/trunk/openutils-mgnlcriteria/src/test/java/net/sourceforge/openutils/mgnlcriteria/advanced/impl/CorrectElementsWithoutMaxResults.java 2013-10-28 10:25:04 UTC (rev 4434)
@@ -23,14 +23,8 @@
package net.sourceforge.openutils.mgnlcriteria.advanced.impl;
import info.magnolia.cms.core.MgnlNodeType;
-import info.magnolia.cms.security.MgnlRoleManager;
-import info.magnolia.cms.security.Realm;
-import info.magnolia.cms.security.SecuritySupport;
-import info.magnolia.cms.security.SecuritySupportImpl;
-import info.magnolia.cms.security.SystemUserManager;
import info.magnolia.context.MgnlContext;
import info.magnolia.repository.RepositoryConstants;
-import info.magnolia.test.ComponentsTestU...
[truncated message content] |
|
From: <fg...@us...> - 2013-11-02 13:52:18
|
Revision: 4447
http://openutils.svn.sourceforge.net/openutils/?rev=4447&view=rev
Author: fgiust
Date: 2013-11-02 13:52:15 +0000 (Sat, 02 Nov 2013)
Log Message:
-----------
fix invalid test configuration
Modified Paths:
--------------
magnoliamodules/trunk/openutils-mgnltagcloud/src/test/java/net/sourceforge/openutils/mgnltagcloud/manager/TagCloudManagerTest.java
magnoliamodules/trunk/openutils-mgnltests/src/main/java/it/openutils/mgnlutils/test/AbstractRepositoryTestcase.java
Modified: magnoliamodules/trunk/openutils-mgnltagcloud/src/test/java/net/sourceforge/openutils/mgnltagcloud/manager/TagCloudManagerTest.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnltagcloud/src/test/java/net/sourceforge/openutils/mgnltagcloud/manager/TagCloudManagerTest.java 2013-11-02 10:06:01 UTC (rev 4446)
+++ magnoliamodules/trunk/openutils-mgnltagcloud/src/test/java/net/sourceforge/openutils/mgnltagcloud/manager/TagCloudManagerTest.java 2013-11-02 13:52:15 UTC (rev 4447)
@@ -59,7 +59,7 @@
* @author cstrappazzon
* @version $Id$
*/
-@RepositoryTestConfiguration(repositoryConfig = "/utils-repository/test-repositories.xml", jackrabbitRepositoryConfig = "/repo-conf/jackrabbit-memory-search.xml", magnoliaProperties = "/test-magnolia.properties", startModules = {@ModuleConfiguration(name = "tagcloud", moduleclass = TagCloudModule.class) })
+@RepositoryTestConfiguration(jackrabbitRepositoryConfig = "/repo-conf/jackrabbit-memory-search.xml", magnoliaProperties = "/test-magnolia.properties", startModules = {@ModuleConfiguration(name = "tagcloud", moduleclass = TagCloudModule.class) })
public class TagCloudManagerTest extends TestNgRepositoryTestcase
{
Modified: magnoliamodules/trunk/openutils-mgnltests/src/main/java/it/openutils/mgnlutils/test/AbstractRepositoryTestcase.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnltests/src/main/java/it/openutils/mgnlutils/test/AbstractRepositoryTestcase.java 2013-11-02 10:06:01 UTC (rev 4446)
+++ magnoliamodules/trunk/openutils-mgnltests/src/main/java/it/openutils/mgnlutils/test/AbstractRepositoryTestcase.java 2013-11-02 13:52:15 UTC (rev 4447)
@@ -79,6 +79,7 @@
import java.io.IOException;
import java.io.InputStream;
import java.lang.reflect.Field;
+import java.net.URL;
import java.util.Collection;
import java.util.Collections;
import java.util.HashSet;
@@ -389,10 +390,15 @@
logger.setLevel(Level.WARN);
}
- InputStream repositoryConfigFileStream = ClasspathResourcesUtil
- .getResource(repositoryConfigFileName)
- .openStream();
+ URL repositoryConfigURL = ClasspathResourcesUtil.getResource(repositoryConfigFileName);
+ if (repositoryConfigURL == null)
+ {
+ throw new IllegalArgumentException("Unable to find repository config file " + repositoryConfigFileName);
+ }
+
+ InputStream repositoryConfigFileStream = repositoryConfigURL.openStream();
+
extractConfigFile("magnolia.repositories.config", repositoryConfigFileStream, "target/repositories.xml");
IOUtils.closeQuietly(repositoryConfigFileStream);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fg...@us...> - 2013-11-02 14:03:28
|
Revision: 4448
http://openutils.svn.sourceforge.net/openutils/?rev=4448&view=rev
Author: fgiust
Date: 2013-11-02 14:03:24 +0000 (Sat, 02 Nov 2013)
Log Message:
-----------
license headers
Modified Paths:
--------------
magnoliamodules/trunk/magnolia-test-webapp/src/main/java/com/browseengine/bobo/api/BoboIndexReader.java
magnoliamodules/trunk/magnolia-test-webapp/src/main/java/info/magnolia/module/development/DevModuleVersionHandler.java
magnoliamodules/trunk/magnolia5-test-webapp/pom.xml
magnoliamodules/trunk/magnolia5-test-webapp/src/main/java/info/magnolia/module/delta/PropertyValuesTask.java
magnoliamodules/trunk/magnolia5-test-webapp/src/main/java/info/magnolia/module/development/DevModuleVersionHandler.java
Added Paths:
-----------
magnoliamodules/trunk/magnolia-test-webapp/src/main/etc/
magnoliamodules/trunk/magnolia-test-webapp/src/main/etc/header.txt
magnoliamodules/trunk/magnolia5-test-webapp/src/main/assembly/
magnoliamodules/trunk/magnolia5-test-webapp/src/main/assembly/assembly-bundle.xml
magnoliamodules/trunk/magnolia5-test-webapp/src/main/etc/
magnoliamodules/trunk/magnolia5-test-webapp/src/main/etc/header.txt
Added: magnoliamodules/trunk/magnolia-test-webapp/src/main/etc/header.txt
===================================================================
--- magnoliamodules/trunk/magnolia-test-webapp/src/main/etc/header.txt (rev 0)
+++ magnoliamodules/trunk/magnolia-test-webapp/src/main/etc/header.txt 2013-11-02 14:03:24 UTC (rev 4448)
@@ -0,0 +1,16 @@
+
+${name} (${url})
+Copyright(C) ${year}, 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/>.
\ No newline at end of file
Property changes on: magnoliamodules/trunk/magnolia-test-webapp/src/main/etc/header.txt
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Added: svn:keywords
## -0,0 +1 ##
+Author Date Id Revision
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Modified: magnoliamodules/trunk/magnolia-test-webapp/src/main/java/com/browseengine/bobo/api/BoboIndexReader.java
===================================================================
--- magnoliamodules/trunk/magnolia-test-webapp/src/main/java/com/browseengine/bobo/api/BoboIndexReader.java 2013-11-02 13:52:15 UTC (rev 4447)
+++ magnoliamodules/trunk/magnolia-test-webapp/src/main/java/com/browseengine/bobo/api/BoboIndexReader.java 2013-11-02 14:03:24 UTC (rev 4448)
@@ -1,7 +1,7 @@
/**
*
- * Tagcloud module for Magnolia CMS (http://www.openmindlab.com/lab/products/mgnltagcloud.html)
- * Copyright(C) 2010-2013, Openmind S.r.l. http://www.openmindonline.it
+ * Magnolia test webapp (http://openutils.sourceforge.net/magnolia-test-webapp)
+ * Copyright(C) ${project.inceptionYear}-2013, Openmind S.r.l. http://www.openmindonline.it
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@ -16,7 +16,6 @@
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-
// lucene 3.6 compatibility patch for bobo-browse 3.2.0, see https://github.com/senseidb/bobo/commit/e78d91ef8a00965d8d55c819f967cac172c23d17
/**
* Bobo Browse Engine - High performance faceted/parametric search implementation
Modified: magnoliamodules/trunk/magnolia-test-webapp/src/main/java/info/magnolia/module/development/DevModuleVersionHandler.java
===================================================================
--- magnoliamodules/trunk/magnolia-test-webapp/src/main/java/info/magnolia/module/development/DevModuleVersionHandler.java 2013-11-02 13:52:15 UTC (rev 4447)
+++ magnoliamodules/trunk/magnolia-test-webapp/src/main/java/info/magnolia/module/development/DevModuleVersionHandler.java 2013-11-02 14:03:24 UTC (rev 4448)
@@ -1,3 +1,21 @@
+/**
+ *
+ * Magnolia test webapp (http://openutils.sourceforge.net/magnolia-test-webapp)
+ * Copyright(C) ${project.inceptionYear}-2013, Openmind S.r.l. http://www.openmindonline.it
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
package info.magnolia.module.development;
import info.magnolia.init.MagnoliaConfigurationProperties;
Modified: magnoliamodules/trunk/magnolia5-test-webapp/pom.xml
===================================================================
--- magnoliamodules/trunk/magnolia5-test-webapp/pom.xml 2013-11-02 13:52:15 UTC (rev 4447)
+++ magnoliamodules/trunk/magnolia5-test-webapp/pom.xml 2013-11-02 14:03:24 UTC (rev 4448)
@@ -10,7 +10,7 @@
<modelVersion>4.0.0</modelVersion>
<packaging>war</packaging>
<artifactId>magnolia5-test-webapp</artifactId>
- <name>Magnolia test webapp</name>
+ <name>Magnolia5 test webapp</name>
<description>A basic Magnolia webapp that can be used while developing openutils magnolia modules</description>
<version>0.1-SNAPSHOT</version>
<dependencies>
Added: magnoliamodules/trunk/magnolia5-test-webapp/src/main/assembly/assembly-bundle.xml
===================================================================
--- magnoliamodules/trunk/magnolia5-test-webapp/src/main/assembly/assembly-bundle.xml (rev 0)
+++ magnoliamodules/trunk/magnolia5-test-webapp/src/main/assembly/assembly-bundle.xml 2013-11-02 14:03:24 UTC (rev 4448)
@@ -0,0 +1,25 @@
+<assembly>
+ <id>openutils-test-webapp</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>
+ <fileSet>
+ <directory>src/main/java/</directory>
+ <outputDirectory>/sources/</outputDirectory>
+ <includes>
+ <include>**/*</include>
+ </includes>
+ </fileSet>
+ </fileSets>
+</assembly>
\ No newline at end of file
Property changes on: magnoliamodules/trunk/magnolia5-test-webapp/src/main/assembly/assembly-bundle.xml
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+text/xml
\ No newline at end of property
Added: svn:keywords
## -0,0 +1 ##
+Author Date Id Revision
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: magnoliamodules/trunk/magnolia5-test-webapp/src/main/etc/header.txt
===================================================================
--- magnoliamodules/trunk/magnolia5-test-webapp/src/main/etc/header.txt (rev 0)
+++ magnoliamodules/trunk/magnolia5-test-webapp/src/main/etc/header.txt 2013-11-02 14:03:24 UTC (rev 4448)
@@ -0,0 +1,16 @@
+
+${name} (${url})
+Copyright(C) ${year}, 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/>.
\ No newline at end of file
Property changes on: magnoliamodules/trunk/magnolia5-test-webapp/src/main/etc/header.txt
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Added: svn:keywords
## -0,0 +1 ##
+Author Date Id Revision
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Modified: magnoliamodules/trunk/magnolia5-test-webapp/src/main/java/info/magnolia/module/delta/PropertyValuesTask.java
===================================================================
--- magnoliamodules/trunk/magnolia5-test-webapp/src/main/java/info/magnolia/module/delta/PropertyValuesTask.java 2013-11-02 13:52:15 UTC (rev 4447)
+++ magnoliamodules/trunk/magnolia5-test-webapp/src/main/java/info/magnolia/module/delta/PropertyValuesTask.java 2013-11-02 14:03:24 UTC (rev 4448)
@@ -1,35 +1,20 @@
/**
- * This file Copyright (c) 2003-2013 Magnolia International
- * Ltd. (http://www.magnolia-cms.com). All rights reserved.
*
+ * Magnolia5 test webapp (http://openutils.sourceforge.net/magnolia5-test-webapp)
+ * Copyright(C) ${project.inceptionYear}-2013, Openmind S.r.l. http://www.openmindonline.it
*
- * This file is dual-licensed under both the Magnolia
- * Network Agreement and the GNU General Public License.
- * You may elect to use one or the other of these licenses.
+ * 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 file is distributed in the hope that it will be
- * useful, but AS-IS and WITHOUT ANY WARRANTY; without even the
- * implied warranty of MERCHANTABILITY or FITNESS FOR A
- * PARTICULAR PURPOSE, TITLE, or NONINFRINGEMENT.
- * Redistribution, except as permitted by whichever of the GPL
- * or MNA you select, is prohibited.
+ * 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.
*
- * 1. For the GPL license (GPL), you can redistribute and/or
- * modify this file under the terms of the GNU General
- * Public License, Version 3, as published by the Free Software
- * Foundation. You should have received a copy of the GNU
- * General Public License, Version 3 along with this program;
- * if not, write to the Free Software Foundation, Inc., 51
- * Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * 2. For the Magnolia Network Agreement (MNA), this file
- * and the accompanying materials are made available under the
- * terms of the MNA which accompanies this distribution, and
- * is available at http://www.magnolia-cms.com/mna.html
- *
- * Any modifications to this file must keep this entire header
- * intact.
- *
+ * 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 info.magnolia.module.delta;
Modified: magnoliamodules/trunk/magnolia5-test-webapp/src/main/java/info/magnolia/module/development/DevModuleVersionHandler.java
===================================================================
--- magnoliamodules/trunk/magnolia5-test-webapp/src/main/java/info/magnolia/module/development/DevModuleVersionHandler.java 2013-11-02 13:52:15 UTC (rev 4447)
+++ magnoliamodules/trunk/magnolia5-test-webapp/src/main/java/info/magnolia/module/development/DevModuleVersionHandler.java 2013-11-02 14:03:24 UTC (rev 4448)
@@ -1,3 +1,21 @@
+/**
+ *
+ * Magnolia5 test webapp (http://openutils.sourceforge.net/magnolia5-test-webapp)
+ * Copyright(C) ${project.inceptionYear}-2013, Openmind S.r.l. http://www.openmindonline.it
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
package info.magnolia.module.development;
import info.magnolia.cms.core.SystemProperty;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fg...@us...> - 2013-12-08 11:46:33
|
Revision: 4461
http://openutils.svn.sourceforge.net/openutils/?rev=4461&view=rev
Author: fgiust
Date: 2013-12-08 11:46:29 +0000 (Sun, 08 Dec 2013)
Log Message:
-----------
remove bobo patch
Modified Paths:
--------------
magnoliamodules/trunk/magnolia-test-webapp/pom.xml
magnoliamodules/trunk/magnolia-test-webapp/src/main/java/info/magnolia/module/development/DevModuleVersionHandler.java
magnoliamodules/trunk/openutils-mgnltagcloud/pom.xml
Removed Paths:
-------------
magnoliamodules/trunk/magnolia-test-webapp/src/main/java/com/
magnoliamodules/trunk/magnolia-test-webapp/src/main/java/info/magnolia/cms/
magnoliamodules/trunk/openutils-mgnltagcloud/src/test/java/com/
Modified: magnoliamodules/trunk/magnolia-test-webapp/pom.xml
===================================================================
--- magnoliamodules/trunk/magnolia-test-webapp/pom.xml 2013-12-08 11:43:27 UTC (rev 4460)
+++ magnoliamodules/trunk/magnolia-test-webapp/pom.xml 2013-12-08 11:46:29 UTC (rev 4461)
@@ -11,6 +11,7 @@
<packaging>war</packaging>
<artifactId>magnolia-test-webapp</artifactId>
<name>Magnolia test webapp</name>
+ <inceptionYear>2009</inceptionYear>
<description>A basic Magnolia webapp that can be used while developing openutils magnolia modules</description>
<version>0.1-SNAPSHOT</version>
<dependencies>
@@ -113,14 +114,14 @@
-->
<dependency>
<groupId>javax.servlet</groupId>
- <artifactId>servlet-api</artifactId>
- <version>2.5</version>
+ <artifactId>javax.servlet-api</artifactId>
+ <version>3.0.1</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>javax.servlet.jsp</groupId>
<artifactId>jsp-api</artifactId>
- <version>2.1</version>
+ <version>2.2</version>
<scope>provided</scope>
</dependency>
<dependency>
@@ -219,15 +220,9 @@
<version>5.0.10-SNAPSHOT</version>
</dependency>
<dependency>
- <groupId>org.springframework</groupId>
- <artifactId>spring-context</artifactId>
- <version>2.5.5</version><!-- temporarily used for bobo-browse patch -->
- <exclusions>
- <exclusion>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- </exclusion>
- </exclusions>
+ <groupId>net.sourceforge.openutils</groupId>
+ <artifactId>openutils-mgnlvanityurl</artifactId>
+ <version>5.0.10-SNAPSHOT</version>
</dependency>
</dependencies>
<dependencyManagement>
@@ -334,4 +329,4 @@
</snapshots>
</repository>
</repositories>
-</project>
\ No newline at end of file
+</project>
Modified: magnoliamodules/trunk/magnolia-test-webapp/src/main/java/info/magnolia/module/development/DevModuleVersionHandler.java
===================================================================
--- magnoliamodules/trunk/magnolia-test-webapp/src/main/java/info/magnolia/module/development/DevModuleVersionHandler.java 2013-12-08 11:43:27 UTC (rev 4460)
+++ magnoliamodules/trunk/magnolia-test-webapp/src/main/java/info/magnolia/module/development/DevModuleVersionHandler.java 2013-12-08 11:46:29 UTC (rev 4461)
@@ -1,7 +1,7 @@
/**
*
* Magnolia test webapp (http://openutils.sourceforge.net/magnolia-test-webapp)
- * Copyright(C) ${project.inceptionYear}-2013, Openmind S.r.l. http://www.openmindonline.it
+ * Copyright(C) 2009-2013, Openmind S.r.l. http://www.openmindonline.it
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
Modified: magnoliamodules/trunk/openutils-mgnltagcloud/pom.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnltagcloud/pom.xml 2013-12-08 11:43:27 UTC (rev 4460)
+++ magnoliamodules/trunk/openutils-mgnltagcloud/pom.xml 2013-12-08 11:46:29 UTC (rev 4461)
@@ -142,11 +142,11 @@
<scope>test</scope>
<version>${magnolia.version}</version>
</dependency>
+ <!-- jackrabbit 2.4
<dependency>
<groupId>com.browseengine.bobo</groupId>
<artifactId>bobo-browse</artifactId>
- <version>3.2.0</version>
- <!-- <version>2.5.1</version> for jackrabbit 2.4 -->
+ <version>2.5.1</version>
<exclusions>
<exclusion>
<groupId>org.springframework</groupId>
@@ -154,7 +154,19 @@
</exclusion>
</exclusions>
</dependency>
+ -->
<dependency>
+ <groupId>net.sourceforge.openutils</groupId>
+ <artifactId>bobo-browse</artifactId>
+ <version>3.2.0.lucene36</version>
+ <exclusions>
+ <exclusion>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-context</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
<groupId>fastutil</groupId>
<artifactId>fastutil</artifactId>
<version>5.0.5</version>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fg...@us...> - 2013-12-08 16:44:22
|
Revision: 4467
http://openutils.svn.sourceforge.net/openutils/?rev=4467&view=rev
Author: fgiust
Date: 2013-12-08 16:44:17 +0000 (Sun, 08 Dec 2013)
Log Message:
-----------
merge mgnltasks into mgnlutils
Modified Paths:
--------------
magnoliamodules/trunk/magnolia-test-webapp/pom.xml
magnoliamodules/trunk/openutils-mgnlcache/pom.xml
magnoliamodules/trunk/openutils-mgnlcontextmenu/pom.xml
magnoliamodules/trunk/openutils-mgnlcontrols/pom.xml
magnoliamodules/trunk/openutils-mgnlgroovy/pom.xml
magnoliamodules/trunk/openutils-mgnllms/pom.xml
magnoliamodules/trunk/openutils-mgnlmail/pom.xml
magnoliamodules/trunk/openutils-mgnlmedia/pom.xml
magnoliamodules/trunk/openutils-mgnlmessages/pom.xml
magnoliamodules/trunk/openutils-mgnlrules/pom.xml
magnoliamodules/trunk/openutils-mgnlstripes/pom.xml
magnoliamodules/trunk/openutils-mgnlstruts11/pom.xml
magnoliamodules/trunk/openutils-mgnltagcloud/pom.xml
magnoliamodules/trunk/openutils-mgnltasks/pom.xml
magnoliamodules/trunk/openutils-mgnltasks/src/main/resources/META-INF/magnolia/tasks.xml
magnoliamodules/trunk/openutils-mgnlutils/src/main/java/it/openutils/mgnltasks/dev/ModuleDevelopmentUtilsPage.java
magnoliamodules/trunk/openutils-mgnlutils/src/main/java/it/openutils/mgnlutils/el/MgnlUtilsElFunctions.java
magnoliamodules/trunk/openutils-mgnlutils/src/main/java/it/openutils/mgnlutils/setup/MgnlUtilsModule.java
magnoliamodules/trunk/openutils-mgnlutils/src/main/java/it/openutils/mgnlutils/setup/MgnlUtilsModuleVersionHandler.java
magnoliamodules/trunk/openutils-mgnlutils/src/main/resources/META-INF/magnolia/mgnlutils.xml
magnoliamodules/trunk/openutils-mgnlutils/src/main/resources/mgnl-bootstrap/mgnlutils-nooverwrite/config.server.rendering.freemarker.sharedVariables.mu.xml
Added Paths:
-----------
magnoliamodules/trunk/magnolia-test-webapp/src/main/java/net/
magnoliamodules/trunk/magnolia-test-webapp/src/main/java/net/sourceforge/
magnoliamodules/trunk/magnolia-test-webapp/src/main/java/net/sourceforge/openutils/
magnoliamodules/trunk/magnolia-test-webapp/src/main/java/net/sourceforge/openutils/demo/
magnoliamodules/trunk/magnolia-test-webapp/src/main/java/net/sourceforge/openutils/demo/MgnlUtilsDemoFunctions.java
magnoliamodules/trunk/openutils-mgnltasks/src/main/java/it/
magnoliamodules/trunk/openutils-mgnltasks/src/main/java/it/openutils/
magnoliamodules/trunk/openutils-mgnltasks/src/main/java/it/openutils/legacymgnltasks/
magnoliamodules/trunk/openutils-mgnltasks/src/main/java/it/openutils/legacymgnltasks/MgnlTasksModuleVersionHandler.java
magnoliamodules/trunk/openutils-mgnlutils/src/main/java/it/openutils/mgnltasks/
magnoliamodules/trunk/openutils-mgnlutils/src/main/java/it/openutils/mgnltasks/AddPermissionTask.java
magnoliamodules/trunk/openutils-mgnlutils/src/main/java/it/openutils/mgnltasks/AnonymousUserSetupTask.java
magnoliamodules/trunk/openutils-mgnlutils/src/main/java/it/openutils/mgnltasks/BaseCheckMissingTask.java
magnoliamodules/trunk/openutils-mgnlutils/src/main/java/it/openutils/mgnltasks/BootstrapMissingNodesTask.java
magnoliamodules/trunk/openutils-mgnlutils/src/main/java/it/openutils/mgnltasks/ChangeDefaultPasswordTask.java
magnoliamodules/trunk/openutils-mgnlutils/src/main/java/it/openutils/mgnltasks/ChangeExistingPropertyTask.java
magnoliamodules/trunk/openutils-mgnlutils/src/main/java/it/openutils/mgnltasks/ChangePropertyForEachChildrenTask.java
magnoliamodules/trunk/openutils-mgnlutils/src/main/java/it/openutils/mgnltasks/CheckAndCreateGroupTask.java
magnoliamodules/trunk/openutils-mgnlutils/src/main/java/it/openutils/mgnltasks/CheckAndCreateRoleTask.java
magnoliamodules/trunk/openutils-mgnlutils/src/main/java/it/openutils/mgnltasks/CheckAndCreateUserTask.java
magnoliamodules/trunk/openutils-mgnlutils/src/main/java/it/openutils/mgnltasks/CheckMissingParagraphsTask.java
magnoliamodules/trunk/openutils-mgnlutils/src/main/java/it/openutils/mgnltasks/CheckMissingTemplatesTask.java
magnoliamodules/trunk/openutils-mgnlutils/src/main/java/it/openutils/mgnltasks/ConditionalBootstrapResource.java
magnoliamodules/trunk/openutils-mgnlutils/src/main/java/it/openutils/mgnltasks/ConditionalTask.java
magnoliamodules/trunk/openutils-mgnlutils/src/main/java/it/openutils/mgnltasks/CreateDefaultRepositoryAclForAllUsersTask.java
magnoliamodules/trunk/openutils-mgnlutils/src/main/java/it/openutils/mgnltasks/CreateMissingPropertyTask.java
magnoliamodules/trunk/openutils-mgnlutils/src/main/java/it/openutils/mgnltasks/DeleteNodeTask.java
magnoliamodules/trunk/openutils-mgnlutils/src/main/java/it/openutils/mgnltasks/DiffModuleConfigBootstrapTask.java
magnoliamodules/trunk/openutils-mgnlutils/src/main/java/it/openutils/mgnltasks/DiffSimpleModuleVersionHandler.java
magnoliamodules/trunk/openutils-mgnlutils/src/main/java/it/openutils/mgnltasks/DirectoryBootstrapTask.java
magnoliamodules/trunk/openutils-mgnlutils/src/main/java/it/openutils/mgnltasks/DisableSubscribersTask.java
magnoliamodules/trunk/openutils-mgnlutils/src/main/java/it/openutils/mgnltasks/ExistenceConditionalBootstrapTask.java
magnoliamodules/trunk/openutils-mgnlutils/src/main/java/it/openutils/mgnltasks/FilesExtractionTask.java
magnoliamodules/trunk/openutils-mgnlutils/src/main/java/it/openutils/mgnltasks/ModuleConfigBootstrapTask.java
magnoliamodules/trunk/openutils-mgnlutils/src/main/java/it/openutils/mgnltasks/MoveSubnodesAndDeleteTask.java
magnoliamodules/trunk/openutils-mgnlutils/src/main/java/it/openutils/mgnltasks/NodeSortTask.java
magnoliamodules/trunk/openutils-mgnlutils/src/main/java/it/openutils/mgnltasks/ReplaceParagraphTask.java
magnoliamodules/trunk/openutils-mgnlutils/src/main/java/it/openutils/mgnltasks/ReplaceTemplateTask.java
magnoliamodules/trunk/openutils-mgnlutils/src/main/java/it/openutils/mgnltasks/SamplesExtractionTask.java
magnoliamodules/trunk/openutils-mgnlutils/src/main/java/it/openutils/mgnltasks/SetNodeOrderTask.java
magnoliamodules/trunk/openutils-mgnlutils/src/main/java/it/openutils/mgnltasks/SetPropertyTask.java
magnoliamodules/trunk/openutils-mgnlutils/src/main/java/it/openutils/mgnltasks/SimpleModuleVersionHandler.java
magnoliamodules/trunk/openutils-mgnlutils/src/main/java/it/openutils/mgnltasks/UpdateModuleVersionTask.java
magnoliamodules/trunk/openutils-mgnlutils/src/main/java/it/openutils/mgnltasks/dev/
magnoliamodules/trunk/openutils-mgnlutils/src/main/java/it/openutils/mgnlutils/el/BenExposingELResolver.java
magnoliamodules/trunk/openutils-mgnlutils/src/main/resources/it/
magnoliamodules/trunk/openutils-mgnlutils/src/main/resources/it/openutils/
magnoliamodules/trunk/openutils-mgnlutils/src/main/resources/it/openutils/mgnltasks/
magnoliamodules/trunk/openutils-mgnlutils/src/main/resources/it/openutils/mgnltasks/dev/
magnoliamodules/trunk/openutils-mgnlutils/src/main/resources/mgnl-bootstrap/mgnlutils/
magnoliamodules/trunk/openutils-mgnlutils/src/main/resources/mgnl-bootstrap/mgnlutils-nooverwrite/config.server.rendering.freemarker.sharedVariables.du.xml
magnoliamodules/trunk/openutils-mgnlutils/src/main/resources/mgnl-bootstrap/mgnlutils-nooverwrite/config.server.rendering.freemarker.sharedVariables.su.xml
magnoliamodules/trunk/openutils-mgnlutils/src/main/resources/mgnl-resources/tasks/
Removed Paths:
-------------
magnoliamodules/trunk/magnolia-test-webapp/src/main/webapp/templates/samples-lms/
magnoliamodules/trunk/openutils-mgnltasks/src/main/java/it/
magnoliamodules/trunk/openutils-mgnltasks/src/main/resources/it/
magnoliamodules/trunk/openutils-mgnltasks/src/main/resources/mgnl-resources/tasks/
Modified: magnoliamodules/trunk/magnolia-test-webapp/pom.xml
===================================================================
--- magnoliamodules/trunk/magnolia-test-webapp/pom.xml 2013-12-08 13:12:40 UTC (rev 4466)
+++ magnoliamodules/trunk/magnolia-test-webapp/pom.xml 2013-12-08 16:44:17 UTC (rev 4467)
@@ -219,11 +219,6 @@
<artifactId>openutils-mgnllms</artifactId>
<version>5.0.10-SNAPSHOT</version>
</dependency>
- <dependency>
- <groupId>net.sourceforge.openutils</groupId>
- <artifactId>openutils-mgnlvanityurl</artifactId>
- <version>5.0.10-SNAPSHOT</version>
- </dependency>
</dependencies>
<dependencyManagement>
<dependencies>
Added: magnoliamodules/trunk/magnolia-test-webapp/src/main/java/net/sourceforge/openutils/demo/MgnlUtilsDemoFunctions.java
===================================================================
--- magnoliamodules/trunk/magnolia-test-webapp/src/main/java/net/sourceforge/openutils/demo/MgnlUtilsDemoFunctions.java (rev 0)
+++ magnoliamodules/trunk/magnolia-test-webapp/src/main/java/net/sourceforge/openutils/demo/MgnlUtilsDemoFunctions.java 2013-12-08 16:44:17 UTC (rev 4467)
@@ -0,0 +1,47 @@
+/**
+ *
+ * Magnolia test webapp (http://openutils.sourceforge.net/magnolia-test-webapp)
+ * Copyright(C) 2009-2013, Openmind S.r.l. http://www.openmindonline.it
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sourceforge.openutils.demo;
+
+import info.magnolia.repository.RepositoryConstants;
+import net.sourceforge.openutils.mgnlcriteria.jcr.query.AdvancedResult;
+import net.sourceforge.openutils.mgnlcriteria.jcr.query.Criteria;
+import net.sourceforge.openutils.mgnlcriteria.jcr.query.JCRCriteriaFactory;
+import net.sourceforge.openutils.mgnlcriteria.jcr.query.criterion.Restrictions;
+
+
+/**
+ * @author fgiust
+ * @version $Id$
+ */
+public class MgnlUtilsDemoFunctions
+{
+
+ public static AdvancedResult find(String value)
+ {
+ Criteria criteria = JCRCriteriaFactory
+ .createCriteria()
+ .setWorkspace(RepositoryConstants.WEBSITE)
+ .add(Restrictions.hasNodeType("mgnl:page"))
+ .add(Restrictions.contains(".", value))
+ .addOrderByScore();
+
+ return criteria.execute();
+ }
+
+}
Property changes on: magnoliamodules/trunk/magnolia-test-webapp/src/main/java/net/sourceforge/openutils/demo/MgnlUtilsDemoFunctions.java
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Added: svn:keywords
## -0,0 +1 ##
+Author Date Id Revision
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Modified: magnoliamodules/trunk/openutils-mgnlcache/pom.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnlcache/pom.xml 2013-12-08 13:12:40 UTC (rev 4466)
+++ magnoliamodules/trunk/openutils-mgnlcache/pom.xml 2013-12-08 16:44:17 UTC (rev 4467)
@@ -60,7 +60,7 @@
</dependency>
<dependency>
<groupId>net.sourceforge.openutils</groupId>
- <artifactId>openutils-mgnltasks</artifactId>
+ <artifactId>openutils-mgnlutils</artifactId>
<version>5.0.10-SNAPSHOT</version>
</dependency>
<dependency>
Modified: magnoliamodules/trunk/openutils-mgnlcontextmenu/pom.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnlcontextmenu/pom.xml 2013-12-08 13:12:40 UTC (rev 4466)
+++ magnoliamodules/trunk/openutils-mgnlcontextmenu/pom.xml 2013-12-08 16:44:17 UTC (rev 4467)
@@ -114,11 +114,6 @@
</dependency>
<dependency>
<groupId>net.sourceforge.openutils</groupId>
- <artifactId>openutils-mgnltasks</artifactId>
- <version>5.0.10-SNAPSHOT</version>
- </dependency>
- <dependency>
- <groupId>net.sourceforge.openutils</groupId>
<artifactId>openutils-elfunctions</artifactId>
<version>1.1.1</version>
</dependency>
Modified: magnoliamodules/trunk/openutils-mgnlcontrols/pom.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnlcontrols/pom.xml 2013-12-08 13:12:40 UTC (rev 4466)
+++ magnoliamodules/trunk/openutils-mgnlcontrols/pom.xml 2013-12-08 16:44:17 UTC (rev 4467)
@@ -91,11 +91,6 @@
</dependency>
<dependency>
<groupId>net.sourceforge.openutils</groupId>
- <artifactId>openutils-mgnltasks</artifactId>
- <version>5.0.10-SNAPSHOT</version>
- </dependency>
- <dependency>
- <groupId>net.sourceforge.openutils</groupId>
<artifactId>openutils-mgnlext</artifactId>
<version>5.0.10-SNAPSHOT</version>
</dependency>
Modified: magnoliamodules/trunk/openutils-mgnlgroovy/pom.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnlgroovy/pom.xml 2013-12-08 13:12:40 UTC (rev 4466)
+++ magnoliamodules/trunk/openutils-mgnlgroovy/pom.xml 2013-12-08 16:44:17 UTC (rev 4467)
@@ -89,7 +89,7 @@
</dependency>
<dependency>
<groupId>net.sourceforge.openutils</groupId>
- <artifactId>openutils-mgnltasks</artifactId>
+ <artifactId>openutils-mgnlutils</artifactId>
<version>5.0.10-SNAPSHOT</version>
</dependency>
<dependency>
Modified: magnoliamodules/trunk/openutils-mgnllms/pom.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnllms/pom.xml 2013-12-08 13:12:40 UTC (rev 4466)
+++ magnoliamodules/trunk/openutils-mgnllms/pom.xml 2013-12-08 16:44:17 UTC (rev 4467)
@@ -107,7 +107,7 @@
</dependency>
<dependency>
<groupId>net.sourceforge.openutils</groupId>
- <artifactId>openutils-mgnltasks</artifactId>
+ <artifactId>openutils-mgnlutils</artifactId>
<version>5.0.10-SNAPSHOT</version>
</dependency>
<dependency>
Modified: magnoliamodules/trunk/openutils-mgnlmail/pom.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnlmail/pom.xml 2013-12-08 13:12:40 UTC (rev 4466)
+++ magnoliamodules/trunk/openutils-mgnlmail/pom.xml 2013-12-08 16:44:17 UTC (rev 4467)
@@ -97,7 +97,7 @@
</dependency>
<dependency>
<groupId>net.sourceforge.openutils</groupId>
- <artifactId>openutils-mgnltasks</artifactId>
+ <artifactId>openutils-mgnlutils</artifactId>
<version>5.0.10-SNAPSHOT</version>
</dependency>
<dependency>
Modified: magnoliamodules/trunk/openutils-mgnlmedia/pom.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnlmedia/pom.xml 2013-12-08 13:12:40 UTC (rev 4466)
+++ magnoliamodules/trunk/openutils-mgnlmedia/pom.xml 2013-12-08 16:44:17 UTC (rev 4467)
@@ -114,11 +114,6 @@
</dependency>
<dependency>
<groupId>net.sourceforge.openutils</groupId>
- <artifactId>openutils-mgnltasks</artifactId>
- <version>5.0.10-SNAPSHOT</version>
- </dependency>
- <dependency>
- <groupId>net.sourceforge.openutils</groupId>
<artifactId>openutils-mgnlcontrols</artifactId>
<version>5.0.10-SNAPSHOT</version>
</dependency>
Modified: magnoliamodules/trunk/openutils-mgnlmessages/pom.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnlmessages/pom.xml 2013-12-08 13:12:40 UTC (rev 4466)
+++ magnoliamodules/trunk/openutils-mgnlmessages/pom.xml 2013-12-08 16:44:17 UTC (rev 4467)
@@ -86,11 +86,6 @@
</dependency>
<dependency>
<groupId>net.sourceforge.openutils</groupId>
- <artifactId>openutils-mgnltasks</artifactId>
- <version>5.0.10-SNAPSHOT</version>
- </dependency>
- <dependency>
- <groupId>net.sourceforge.openutils</groupId>
<artifactId>openutils-mgnlext</artifactId>
<version>5.0.10-SNAPSHOT</version>
</dependency>
Modified: magnoliamodules/trunk/openutils-mgnlrules/pom.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnlrules/pom.xml 2013-12-08 13:12:40 UTC (rev 4466)
+++ magnoliamodules/trunk/openutils-mgnlrules/pom.xml 2013-12-08 16:44:17 UTC (rev 4467)
@@ -104,7 +104,7 @@
</dependency>
<dependency>
<groupId>net.sourceforge.openutils</groupId>
- <artifactId>openutils-mgnltasks</artifactId>
+ <artifactId>openutils-mgnlutils</artifactId>
<version>5.0.10-SNAPSHOT</version>
</dependency>
<dependency>
Modified: magnoliamodules/trunk/openutils-mgnlstripes/pom.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnlstripes/pom.xml 2013-12-08 13:12:40 UTC (rev 4466)
+++ magnoliamodules/trunk/openutils-mgnlstripes/pom.xml 2013-12-08 16:44:17 UTC (rev 4467)
@@ -71,7 +71,7 @@
</dependency>
<dependency>
<groupId>net.sourceforge.openutils</groupId>
- <artifactId>openutils-mgnltasks</artifactId>
+ <artifactId>openutils-mgnlutils</artifactId>
<version>5.0.10-SNAPSHOT</version>
</dependency>
<dependency>
Modified: magnoliamodules/trunk/openutils-mgnlstruts11/pom.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnlstruts11/pom.xml 2013-12-08 13:12:40 UTC (rev 4466)
+++ magnoliamodules/trunk/openutils-mgnlstruts11/pom.xml 2013-12-08 16:44:17 UTC (rev 4467)
@@ -95,7 +95,7 @@
</dependency>
<dependency>
<groupId>net.sourceforge.openutils</groupId>
- <artifactId>openutils-mgnltasks</artifactId>
+ <artifactId>openutils-mgnlutils</artifactId>
<version>5.0.10-SNAPSHOT</version>
</dependency>
<dependency>
Modified: magnoliamodules/trunk/openutils-mgnltagcloud/pom.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnltagcloud/pom.xml 2013-12-08 13:12:40 UTC (rev 4466)
+++ magnoliamodules/trunk/openutils-mgnltagcloud/pom.xml 2013-12-08 16:44:17 UTC (rev 4467)
@@ -185,11 +185,6 @@
</dependency>
<dependency>
<groupId>net.sourceforge.openutils</groupId>
- <artifactId>openutils-mgnltasks</artifactId>
- <version>5.0.10-SNAPSHOT</version>
- </dependency>
- <dependency>
- <groupId>net.sourceforge.openutils</groupId>
<artifactId>openutils-mgnlcontrols</artifactId>
<version>5.0.10-SNAPSHOT</version>
</dependency>
Modified: magnoliamodules/trunk/openutils-mgnltasks/pom.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnltasks/pom.xml 2013-12-08 13:12:40 UTC (rev 4466)
+++ magnoliamodules/trunk/openutils-mgnltasks/pom.xml 2013-12-08 16:44:17 UTC (rev 4467)
@@ -12,7 +12,7 @@
<artifactId>openutils-mgnltasks</artifactId>
<name>Tasks for for Magnolia CMS</name>
<version>5.0.10-SNAPSHOT</version>
- <description>A collection of useful magnolia update tasks that can be reused in custom modules</description>
+ <description>A collection of useful magnolia update tasks that can be reused in custom modules (transitional module, merged into mgnlutils)</description>
<inceptionYear>2008</inceptionYear>
<scm>
<connection>scm:svn:svn+ssh://svn.code.sf.net/p/openutils/code/magnoliamodules/trunk/openutils-mgnltasks</connection>
@@ -73,60 +73,5 @@
<artifactId>openutils-mgnlutils</artifactId>
<version>5.0.10-SNAPSHOT</version>
</dependency>
- <dependency>
- <groupId>net.sourceforge.openutils</groupId>
- <artifactId>openutils-mgnlcriteria</artifactId>
- <version>5.0.10-SNAPSHOT</version>
- </dependency>
- <dependency>
- <groupId>info.magnolia</groupId>
- <artifactId>magnolia-core</artifactId>
- <version>${magnolia.version}</version>
- <exclusions>
- <exclusion>
- <groupId>servlets.com</groupId>
- <artifactId>cos</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>info.magnolia</groupId>
- <artifactId>magnolia-module-admininterface</artifactId>
- <version>${magnolia.version}</version>
- <exclusions>
- <exclusion>
- <groupId>servlets.com</groupId>
- <artifactId>cos</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>servlet-api</artifactId>
- <version>2.5</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>javax.servlet.jsp</groupId>
- <artifactId>jsp-api</artifactId>
- <version>2.1</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.testng</groupId>
- <artifactId>testng</artifactId>
- <classifier>jdk15</classifier>
- <version>5.7</version>
- <scope>test</scope>
- <exclusions>
- <exclusion>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
</dependencies>
- <properties>
- <magnolia.version>4.5.11</magnolia.version>
- </properties>
</project>
\ No newline at end of file
Added: magnoliamodules/trunk/openutils-mgnltasks/src/main/java/it/openutils/legacymgnltasks/MgnlTasksModuleVersionHandler.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnltasks/src/main/java/it/openutils/legacymgnltasks/MgnlTasksModuleVersionHandler.java (rev 0)
+++ magnoliamodules/trunk/openutils-mgnltasks/src/main/java/it/openutils/legacymgnltasks/MgnlTasksModuleVersionHandler.java 2013-12-08 16:44:17 UTC (rev 4467)
@@ -0,0 +1,67 @@
+/**
+ *
+ * Tasks for for Magnolia CMS (http://www.openmindlab.com/lab/products/mgnltasks.html)
+ * Copyright(C) 2008-2013, Openmind S.r.l. http://www.openmindonline.it
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package it.openutils.legacymgnltasks;
+
+import info.magnolia.module.DefaultModuleVersionHandler;
+import info.magnolia.module.InstallContext;
+import info.magnolia.module.delta.Task;
+import info.magnolia.module.delta.TaskExecutionException;
+
+import java.util.ArrayList;
+import java.util.List;
+
+
+/**
+ * @author fgiust
+ * @version $Id$
+ */
+public class MgnlTasksModuleVersionHandler extends DefaultModuleVersionHandler
+{
+
+ /**
+ * {@inheritDoc}
+ */
+ @Override
+ protected List<Task> getStartupTasks(InstallContext installContext)
+ {
+ List<Task> tasks = new ArrayList<Task>();
+ tasks.add(new Task()
+ {
+
+ public void execute(InstallContext installContext) throws TaskExecutionException
+ {
+ installContext
+ .warn("Tasks module is deprecated. Since version 5.0.10 has been merged into mgnlutils, you can freely remove this module");
+ }
+
+ public String getName()
+ {
+ return "Tasks module deprecation warning";
+ }
+
+ public String getDescription()
+ {
+ return "Tasks module deprecation warning";
+ }
+ });
+
+ return tasks;
+ }
+
+}
Property changes on: magnoliamodules/trunk/openutils-mgnltasks/src/main/java/it/openutils/legacymgnltasks/MgnlTasksModuleVersionHandler.java
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Added: svn:keywords
## -0,0 +1 ##
+Author Date Id Revision
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Modified: magnoliamodules/trunk/openutils-mgnltasks/src/main/resources/META-INF/magnolia/tasks.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnltasks/src/main/resources/META-INF/magnolia/tasks.xml 2013-12-08 13:12:40 UTC (rev 4466)
+++ magnoliamodules/trunk/openutils-mgnltasks/src/main/resources/META-INF/magnolia/tasks.xml 2013-12-08 16:44:17 UTC (rev 4467)
@@ -2,17 +2,14 @@
<!DOCTYPE module SYSTEM "module.dtd">
<module>
<name>tasks</name>
- <displayName>Openutils magnolia tasks</displayName>
- <description>A collection of useful magnolia update tasks that can be reused in custom modules</description>
+ <displayName>tasks (transitional module, merged into mgnlutils)</displayName>
+ <description>tasks (transitional module, merged into mgnlutils)</description>
+ <versionHandler>it.openutils.legacymgnltasks.MgnlTasksModuleVersionHandler</versionHandler>
<version>${project.version}</version>
<dependencies>
<dependency>
<name>core</name>
<version>4.5.11/4.5.99</version>
</dependency>
- <dependency>
- <name>mgnlutils</name>
- <version>5.0.10/*</version>
- </dependency>
</dependencies>
</module>
\ No newline at end of file
Copied: magnoliamodules/trunk/openutils-mgnlutils/src/main/java/it/openutils/mgnltasks/AddPermissionTask.java (from rev 4460, magnoliamodules/trunk/openutils-mgnltasks/src/main/java/it/openutils/mgnltasks/AddPermissionTask.java)
===================================================================
--- magnoliamodules/trunk/openutils-mgnlutils/src/main/java/it/openutils/mgnltasks/AddPermissionTask.java (rev 0)
+++ magnoliamodules/trunk/openutils-mgnlutils/src/main/java/it/openutils/mgnltasks/AddPermissionTask.java 2013-12-08 16:44:17 UTC (rev 4467)
@@ -0,0 +1,144 @@
+/**
+ *
+ * Generic utilities for Magnolia CMS (http://www.openmindlab.com/lab/products/mgnlutils.html)
+ * Copyright(C) 2009-2012, Openmind S.r.l. http://www.openmindonline.it
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package it.openutils.mgnltasks;
+
+import info.magnolia.cms.core.MgnlNodeType;
+import info.magnolia.cms.core.Path;
+import info.magnolia.cms.security.AccessDeniedException;
+import info.magnolia.jcr.util.NodeUtil;
+import info.magnolia.module.InstallContext;
+import info.magnolia.module.delta.AbstractRepositoryTask;
+import info.magnolia.module.delta.Task;
+import info.magnolia.module.delta.TaskExecutionException;
+import info.magnolia.repository.RepositoryConstants;
+
+import javax.jcr.Node;
+import javax.jcr.RepositoryException;
+import javax.jcr.Session;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+
+/**
+ * Sets or add permissions on a repository:path for a given role.
+ * @author fgiust
+ * @version $Id$
+ */
+public class AddPermissionTask extends AbstractRepositoryTask implements Task
+{
+
+ private final String role;
+
+ private final String repo;
+
+ private final String path;
+
+ private final long permission;
+
+ private Logger log = LoggerFactory.getLogger(AddPermissionTask.class);
+
+ public AddPermissionTask(String role, String repo, String path, long permission)
+ {
+ super("Setup permissions on " + repo + ":" + path + " for " + role, "Setup permissions on "
+ + repo
+ + ":"
+ + path
+ + " for "
+ + role);
+ this.role = role;
+ this.repo = repo;
+ this.path = path;
+ this.permission = permission;
+
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ @Override
+ protected void doExecute(InstallContext installContext) throws RepositoryException, TaskExecutionException
+ {
+
+ Session hm = installContext.getJCRSession(RepositoryConstants.USER_ROLES);
+
+ Node roleNode = hm.getNode("/" + role);
+
+ setupAcl(roleNode, repo, path, permission);
+ }
+
+ /**
+ * @param role
+ * @param repository
+ * @param newpermissions
+ * @throws RepositoryException
+ * @throws AccessDeniedException
+ */
+ private void setupAcl(Node role, String repository, String path, long newpermissions) throws RepositoryException,
+ AccessDeniedException
+ {
+ Node acls = NodeUtil.createPath(role, "acl_" + repository, MgnlNodeType.NT_CONTENTNODE);
+
+ Iterable<Node> children = NodeUtil.getNodes(acls, MgnlNodeType.NT_CONTENTNODE);
+
+ boolean found = false;
+ for (Node acl : children)
+ {
+ if (!acl.hasProperty("path"))
+ {
+ continue;
+ }
+
+ String aclPath = acl.getProperty("path").getString();
+ if (path.equals(aclPath))
+ {
+ found = true;
+
+ long permissions = acl.getProperty("permissions").getLong();...
[truncated message content] |
|
From: <fg...@us...> - 2013-12-08 19:15:19
|
Revision: 4468
http://openutils.svn.sourceforge.net/openutils/?rev=4468&view=rev
Author: fgiust
Date: 2013-12-08 19:15:15 +0000 (Sun, 08 Dec 2013)
Log Message:
-----------
update jsp declarations to use jsp 2.1 (tomcat6+)
Modified Paths:
--------------
magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/resources/mgnl-files/templates/samples-contextmenu/page-editmenu.jsp
magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/resources/mgnl-files/templates/samples-contextmenu/paragraph-form.jsp
magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/resources/mgnl-files/templates/samples-contextmenu/paragraph-media.jsp
magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/resources/mgnl-files/templates/samples-contextmenu/paragraph-message.jsp
magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/resources/mgnl-files/templates/samples-contextmenu/paragraph-move-fields.jsp
magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/resources/mgnl-files/templates/samples-contextmenu/paragraph-textmedia.jsp
magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/resources/mgnl-files/templates/samples-contextmenu/template-contextmenu.jsp
magnoliamodules/trunk/openutils-mgnlcontrols/src/main/resources/mgnl-files/templates/samples-controls/paragraph-grid.jsp
magnoliamodules/trunk/openutils-mgnllms/src/main/resources/META-INF/tags/playerUrl.tag
magnoliamodules/trunk/openutils-mgnllms/src/main/resources/mgnl-files/templates/samples-lms/courses.jsp
magnoliamodules/trunk/openutils-mgnllms/src/main/resources/mgnl-files/templates/samples-lms/index.jsp
magnoliamodules/trunk/openutils-mgnlmedia/src/main/resources/META-INF/tags/media/crop.tag
magnoliamodules/trunk/openutils-mgnlmedia/src/main/resources/META-INF/tags/media/imageTag.tag
magnoliamodules/trunk/openutils-mgnlmedia/src/main/resources/META-INF/tags/media/media.tag
magnoliamodules/trunk/openutils-mgnlmedia/src/main/resources/META-INF/tags/media/player-genericswfobject.tag
magnoliamodules/trunk/openutils-mgnlmedia/src/main/resources/META-INF/tags/media/player-jwplayer5.tag
magnoliamodules/trunk/openutils-mgnlmedia/src/main/resources/META-INF/tags/media/player.tag
magnoliamodules/trunk/openutils-mgnlmedia/src/main/resources/META-INF/tags/media/swfobject.tag
magnoliamodules/trunk/openutils-mgnlmedia/src/main/resources/mgnl-files/templates/samples-media/paragraph-grid.jsp
magnoliamodules/trunk/openutils-mgnlmedia/src/main/resources/mgnl-files/templates/samples-media/paragraph-mediael.jsp
magnoliamodules/trunk/openutils-mgnlmedia/src/main/resources/mgnl-files/templates/samples-media/paragraph-mediatag.jsp
magnoliamodules/trunk/openutils-mgnlmedia/src/main/resources/mgnl-files/templates/samples-media/paragraph-playlist.jsp
magnoliamodules/trunk/openutils-mgnlmessages/src/main/resources/META-INF/tags/msg/msgs-global.tag
magnoliamodules/trunk/openutils-mgnlrules/src/main/resources/mgnl-files/WEB-INF/jsps/rules/evaluate.jsp
magnoliamodules/trunk/openutils-mgnlrules/src/main/resources/mgnl-files/templates/samples-rules/paragraph-conditional.jsp
magnoliamodules/trunk/openutils-mgnlrules/src/main/resources/mgnl-files/templates/samples-rules/paragraph-evaluate.jsp
magnoliamodules/trunk/openutils-mgnlrules/src/main/resources/mgnl-files/templates/samples-rules/paragraph-grid.jsp
magnoliamodules/trunk/openutils-mgnlrules/src/main/resources/mgnl-files/templates/samples-rules/paragraph-if-then-else.jsp
magnoliamodules/trunk/openutils-mgnlstripes/src/main/resources/mgnl-files/templates/samples-stripes/area.jsp
magnoliamodules/trunk/openutils-mgnlstripes/src/main/resources/mgnl-files/templates/samples-stripes/paragraph.jsp
magnoliamodules/trunk/openutils-mgnlstripes/src/main/resources/mgnl-files/templates/samples-stripes/template.jsp
magnoliamodules/trunk/openutils-mgnlstruts11/src/main/resources/mgnl-files/templates/samples-struts11/area.jsp
magnoliamodules/trunk/openutils-mgnlstruts11/src/main/resources/mgnl-files/templates/samples-struts11/paragraph.jsp
magnoliamodules/trunk/openutils-mgnlstruts11/src/main/resources/mgnl-files/templates/samples-struts11/template.jsp
magnoliamodules/trunk/openutils-mgnltagcloud/src/main/resources/META-INF/tags/tagcloud/tagcloud.tag
magnoliamodules/trunk/openutils-mgnltagcloud/src/main/resources/mgnl-files/templates/samples-tagcloud/template.jsp
magnoliamodules/trunk/openutils-mgnlutils/src/main/java/it/openutils/mgnlutils/el/BenExposingELResolver.java
magnoliamodules/trunk/openutils-mgnlutils/src/main/java/it/openutils/mgnlutils/setup/MgnlUtilsModule.java
Modified: magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/resources/mgnl-files/templates/samples-contextmenu/page-editmenu.jsp
===================================================================
--- magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/resources/mgnl-files/templates/samples-contextmenu/page-editmenu.jsp 2013-12-08 16:44:17 UTC (rev 4467)
+++ magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/resources/mgnl-files/templates/samples-contextmenu/page-editmenu.jsp 2013-12-08 19:15:15 UTC (rev 4468)
@@ -1,4 +1,4 @@
-<jsp:root version="2.0" xmlns:jsp="http://java.sun.com/JSP/Page" xmlns:c="http://java.sun.com/jsp/jstl/core"
+<jsp:root version="2.1" xmlns:jsp="http://java.sun.com/JSP/Page" xmlns:c="http://java.sun.com/jsp/jstl/core"
xmlns:fmt="http://java.sun.com/jsp/jstl/fmt" xmlns:fn="http://java.sun.com/jsp/jstl/functions" xmlns:cms="http://magnolia-cms.com/taglib/templating-components/cms"
xmlns:cmsu="cms-util-taglib" xmlns:cmsfn="http://magnolia-cms.com/taglib/templating-components/cmsfn" xmlns:media="http://net.sourceforge.openutils/mgnlMedia"
xmlns:contextmenu="http://openutils/mgnlcontextmenu">
Modified: magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/resources/mgnl-files/templates/samples-contextmenu/paragraph-form.jsp
===================================================================
--- magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/resources/mgnl-files/templates/samples-contextmenu/paragraph-form.jsp 2013-12-08 16:44:17 UTC (rev 4467)
+++ magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/resources/mgnl-files/templates/samples-contextmenu/paragraph-form.jsp 2013-12-08 19:15:15 UTC (rev 4468)
@@ -1,4 +1,4 @@
-<jsp:root version="2.0" xmlns:jsp="http://java.sun.com/JSP/Page" xmlns:c="http://java.sun.com/jsp/jstl/core"
+<jsp:root version="2.1" xmlns:jsp="http://java.sun.com/JSP/Page" xmlns:c="http://java.sun.com/jsp/jstl/core"
xmlns:fmt="http://java.sun.com/jsp/jstl/fmt" xmlns:fn="http://java.sun.com/jsp/jstl/functions" xmlns:cms="http://magnolia-cms.com/taglib/templating-components/cms"
xmlns:cmsu="cms-util-taglib" xmlns:cmsfn="http://magnolia-cms.com/taglib/templating-components/cmsfn" xmlns:media="http://net.sourceforge.openutils/mgnlMedia"
xmlns:contextmenu="http://openutils/mgnlcontextmenu">
Modified: magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/resources/mgnl-files/templates/samples-contextmenu/paragraph-media.jsp
===================================================================
--- magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/resources/mgnl-files/templates/samples-contextmenu/paragraph-media.jsp 2013-12-08 16:44:17 UTC (rev 4467)
+++ magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/resources/mgnl-files/templates/samples-contextmenu/paragraph-media.jsp 2013-12-08 19:15:15 UTC (rev 4468)
@@ -1,4 +1,4 @@
-<jsp:root version="2.0" xmlns:jsp="http://java.sun.com/JSP/Page" xmlns:c="http://java.sun.com/jsp/jstl/core"
+<jsp:root version="2.1" xmlns:jsp="http://java.sun.com/JSP/Page" xmlns:c="http://java.sun.com/jsp/jstl/core"
xmlns:fmt="http://java.sun.com/jsp/jstl/fmt" xmlns:fn="http://java.sun.com/jsp/jstl/functions" xmlns:cms="http://magnolia-cms.com/taglib/templating-components/cms"
xmlns:cmsu="cms-util-taglib" xmlns:cmsfn="http://magnolia-cms.com/taglib/templating-components/cmsfn" xmlns:media="http://net.sourceforge.openutils/mgnlMedia"
xmlns:contextmenu="http://openutils/mgnlcontextmenu">
Modified: magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/resources/mgnl-files/templates/samples-contextmenu/paragraph-message.jsp
===================================================================
--- magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/resources/mgnl-files/templates/samples-contextmenu/paragraph-message.jsp 2013-12-08 16:44:17 UTC (rev 4467)
+++ magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/resources/mgnl-files/templates/samples-contextmenu/paragraph-message.jsp 2013-12-08 19:15:15 UTC (rev 4468)
@@ -1,4 +1,4 @@
-<jsp:root version="2.0" xmlns:jsp="http://java.sun.com/JSP/Page" xmlns:c="http://java.sun.com/jsp/jstl/core"
+<jsp:root version="2.1" xmlns:jsp="http://java.sun.com/JSP/Page" xmlns:c="http://java.sun.com/jsp/jstl/core"
xmlns:fmt="http://java.sun.com/jsp/jstl/fmt" xmlns:fn="http://java.sun.com/jsp/jstl/functions" xmlns:cms="http://magnolia-cms.com/taglib/templating-components/cms"
xmlns:cmsu="cms-util-taglib" xmlns:cmsfn="http://magnolia-cms.com/taglib/templating-components/cmsfn" xmlns:media="http://net.sourceforge.openutils/mgnlMedia"
xmlns:contextmenu="http://openutils/mgnlcontextmenu">
Modified: magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/resources/mgnl-files/templates/samples-contextmenu/paragraph-move-fields.jsp
===================================================================
--- magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/resources/mgnl-files/templates/samples-contextmenu/paragraph-move-fields.jsp 2013-12-08 16:44:17 UTC (rev 4467)
+++ magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/resources/mgnl-files/templates/samples-contextmenu/paragraph-move-fields.jsp 2013-12-08 19:15:15 UTC (rev 4468)
@@ -1,4 +1,4 @@
-<jsp:root version="2.0" xmlns:jsp="http://java.sun.com/JSP/Page" xmlns:c="http://java.sun.com/jsp/jstl/core"
+<jsp:root version="2.1" xmlns:jsp="http://java.sun.com/JSP/Page" xmlns:c="http://java.sun.com/jsp/jstl/core"
xmlns:fmt="http://java.sun.com/jsp/jstl/fmt" xmlns:fn="http://java.sun.com/jsp/jstl/functions" xmlns:cms="http://magnolia-cms.com/taglib/templating-components/cms"
xmlns:cmsu="cms-util-taglib" xmlns:cmsfn="http://magnolia-cms.com/taglib/templating-components/cmsfn" xmlns:media="http://net.sourceforge.openutils/mgnlMedia"
xmlns:contextmenu="http://openutils/mgnlcontextmenu">
Modified: magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/resources/mgnl-files/templates/samples-contextmenu/paragraph-textmedia.jsp
===================================================================
--- magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/resources/mgnl-files/templates/samples-contextmenu/paragraph-textmedia.jsp 2013-12-08 16:44:17 UTC (rev 4467)
+++ magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/resources/mgnl-files/templates/samples-contextmenu/paragraph-textmedia.jsp 2013-12-08 19:15:15 UTC (rev 4468)
@@ -1,4 +1,4 @@
-<jsp:root version="2.0" xmlns:jsp="http://java.sun.com/JSP/Page" xmlns:c="http://java.sun.com/jsp/jstl/core"
+<jsp:root version="2.1" xmlns:jsp="http://java.sun.com/JSP/Page" xmlns:c="http://java.sun.com/jsp/jstl/core"
xmlns:fmt="http://java.sun.com/jsp/jstl/fmt" xmlns:fn="http://java.sun.com/jsp/jstl/functions" xmlns:cms="http://magnolia-cms.com/taglib/templating-components/cms"
xmlns:cmsu="cms-util-taglib" xmlns:cmsfn="http://magnolia-cms.com/taglib/templating-components/cmsfn" xmlns:media="http://net.sourceforge.openutils/mgnlMedia"
xmlns:contextmenu="http://openutils/mgnlcontextmenu">
Modified: magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/resources/mgnl-files/templates/samples-contextmenu/template-contextmenu.jsp
===================================================================
--- magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/resources/mgnl-files/templates/samples-contextmenu/template-contextmenu.jsp 2013-12-08 16:44:17 UTC (rev 4467)
+++ magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/resources/mgnl-files/templates/samples-contextmenu/template-contextmenu.jsp 2013-12-08 19:15:15 UTC (rev 4468)
@@ -1,4 +1,4 @@
-<jsp:root version="2.0" xmlns:jsp="http://java.sun.com/JSP/Page" xmlns:c="http://java.sun.com/jsp/jstl/core"
+<jsp:root version="2.1" xmlns:jsp="http://java.sun.com/JSP/Page" xmlns:c="http://java.sun.com/jsp/jstl/core"
xmlns:fmt="http://java.sun.com/jsp/jstl/fmt" xmlns:fn="http://java.sun.com/jsp/jstl/functions" xmlns:cms="http://magnolia-cms.com/taglib/templating-components/cms"
xmlns:cmsu="cms-util-taglib" xmlns:cmsfn="http://magnolia-cms.com/taglib/templating-components/cmsfn" xmlns:media="http://net.sourceforge.openutils/mgnlMedia"
xmlns:contextmenu="http://openutils/mgnlcontextmenu">
Modified: magnoliamodules/trunk/openutils-mgnlcontrols/src/main/resources/mgnl-files/templates/samples-controls/paragraph-grid.jsp
===================================================================
--- magnoliamodules/trunk/openutils-mgnlcontrols/src/main/resources/mgnl-files/templates/samples-controls/paragraph-grid.jsp 2013-12-08 16:44:17 UTC (rev 4467)
+++ magnoliamodules/trunk/openutils-mgnlcontrols/src/main/resources/mgnl-files/templates/samples-controls/paragraph-grid.jsp 2013-12-08 19:15:15 UTC (rev 4468)
@@ -1,4 +1,4 @@
-<jsp:root version="2.0" xmlns:jsp="http://java.sun.com/JSP/Page" xmlns:c="http://java.sun.com/jsp/jstl/core"
+<jsp:root version="2.1" xmlns:jsp="http://java.sun.com/JSP/Page" xmlns:c="http://java.sun.com/jsp/jstl/core"
xmlns:fmt="http://java.sun.com/jsp/jstl/fmt" xmlns:fn="http://java.sun.com/jsp/jstl/functions" xmlns:cms="http://magnolia-cms.com/taglib/templating-components/cms"
xmlns:cmsfn="http://magnolia-cms.com/taglib/templating-components/cmsfn" xmlns:media="http://net.sourceforge.openutils/mgnlMedia"
xmlns:mu="mgnlutils">
Modified: magnoliamodules/trunk/openutils-mgnllms/src/main/resources/META-INF/tags/playerUrl.tag
===================================================================
--- magnoliamodules/trunk/openutils-mgnllms/src/main/resources/META-INF/tags/playerUrl.tag 2013-12-08 16:44:17 UTC (rev 4467)
+++ magnoliamodules/trunk/openutils-mgnllms/src/main/resources/META-INF/tags/playerUrl.tag 2013-12-08 19:15:15 UTC (rev 4468)
@@ -1,4 +1,4 @@
-<jsp:root version="2.0" xmlns:jsp="http://java.sun.com/JSP/Page" xmlns:c="http://java.sun.com/jsp/jstl/core"
+<jsp:root version="2.1" xmlns:jsp="http://java.sun.com/JSP/Page" xmlns:c="http://java.sun.com/jsp/jstl/core"
xmlns:cms="cms-taglib" xmlns:cmsfn="http://www.magnolia.info/tlds/cmsfn-taglib.tld" xmlns:cmsu="cms-util-taglib"
xmlns:fmt="http://java.sun.com/jsp/jstl/fmt" xmlns:fn="http://java.sun.com/jsp/jstl/functions" xmlns:lmsfn="urn:jsptld:lms-fn">
<jsp:directive.attribute name="course" required="true" rtexprvalue="true"
Modified: magnoliamodules/trunk/openutils-mgnllms/src/main/resources/mgnl-files/templates/samples-lms/courses.jsp
===================================================================
--- magnoliamodules/trunk/openutils-mgnllms/src/main/resources/mgnl-files/templates/samples-lms/courses.jsp 2013-12-08 16:44:17 UTC (rev 4467)
+++ magnoliamodules/trunk/openutils-mgnllms/src/main/resources/mgnl-files/templates/samples-lms/courses.jsp 2013-12-08 19:15:15 UTC (rev 4468)
@@ -1,4 +1,4 @@
-<jsp:root version="2.0" xmlns:jsp="http://java.sun.com/JSP/Page" xmlns:c="http://java.sun.com/jsp/jstl/core"
+<jsp:root version="2.1" xmlns:jsp="http://java.sun.com/JSP/Page" xmlns:c="http://java.sun.com/jsp/jstl/core"
xmlns:fmt="http://java.sun.com/jsp/jstl/fmt" xmlns:fn="http://java.sun.com/jsp/jstl/functions" xmlns:cms="http://magnolia-cms.com/taglib/templating-components/cms"
xmlns:cmsu="cms-util-taglib" xmlns:cmsfn="http://magnolia-cms.com/taglib/templating-components/cmsfn" xmlns:media="http://net.sourceforge.openutils/mgnlMedia"
xmlns:lmsfn="urn:jsptld:lms-fn">
Modified: magnoliamodules/trunk/openutils-mgnllms/src/main/resources/mgnl-files/templates/samples-lms/index.jsp
===================================================================
--- magnoliamodules/trunk/openutils-mgnllms/src/main/resources/mgnl-files/templates/samples-lms/index.jsp 2013-12-08 16:44:17 UTC (rev 4467)
+++ magnoliamodules/trunk/openutils-mgnllms/src/main/resources/mgnl-files/templates/samples-lms/index.jsp 2013-12-08 19:15:15 UTC (rev 4468)
@@ -1,4 +1,4 @@
-<jsp:root version="2.0" xmlns:jsp="http://java.sun.com/JSP/Page" xmlns:c="http://java.sun.com/jsp/jstl/core"
+<jsp:root version="2.1" xmlns:jsp="http://java.sun.com/JSP/Page" xmlns:c="http://java.sun.com/jsp/jstl/core"
xmlns:fmt="http://java.sun.com/jsp/jstl/fmt" xmlns:fn="http://java.sun.com/jsp/jstl/functions" xmlns:cms="http://magnolia-cms.com/taglib/templating-components/cms"
xmlns:cmsu="cms-util-taglib" xmlns:cmsfn="http://magnolia-cms.com/taglib/templating-components/cmsfn" xmlns:media="http://net.sourceforge.openutils/mgnlMedia"
xmlns:lmsfn="urn:jsptld:lms-fn">
Modified: magnoliamodules/trunk/openutils-mgnlmedia/src/main/resources/META-INF/tags/media/crop.tag
===================================================================
--- magnoliamodules/trunk/openutils-mgnlmedia/src/main/resources/META-INF/tags/media/crop.tag 2013-12-08 16:44:17 UTC (rev 4467)
+++ magnoliamodules/trunk/openutils-mgnlmedia/src/main/resources/META-INF/tags/media/crop.tag 2013-12-08 19:15:15 UTC (rev 4468)
@@ -1,4 +1,4 @@
-<jsp:root version="2.0" xmlns:jsp="http://java.sun.com/JSP/Page" xmlns:cms="http://magnolia-cms.com/taglib/templating-components/cms"
+<jsp:root version="2.1" xmlns:jsp="http://java.sun.com/JSP/Page" xmlns:cms="http://magnolia-cms.com/taglib/templating-components/cms"
xmlns:c="urn:jsptld:http://java.sun.com/jsp/jstl/core" xmlns:media="http://net.sourceforge.openutils/mgnlMedia"
xmlns:cmsfn="http://magnolia-cms.com/taglib/templating-components/cmsfn" xmlns:fn="http://java.sun.com/jsp/jstl/functions"
xmlns:mu="mgnlutils">
Modified: magnoliamodules/trunk/openutils-mgnlmedia/src/main/resources/META-INF/tags/media/imageTag.tag
===================================================================
--- magnoliamodules/trunk/openutils-mgnlmedia/src/main/resources/META-INF/tags/media/imageTag.tag 2013-12-08 16:44:17 UTC (rev 4467)
+++ magnoliamodules/trunk/openutils-mgnlmedia/src/main/resources/META-INF/tags/media/imageTag.tag 2013-12-08 19:15:15 UTC (rev 4468)
@@ -1,4 +1,4 @@
-<jsp:root version="2.0" xmlns:jsp="http://java.sun.com/JSP/Page" xmlns:c="http://java.sun.com/jsp/jstl/core"
+<jsp:root version="2.1" xmlns:jsp="http://java.sun.com/JSP/Page" xmlns:c="http://java.sun.com/jsp/jstl/core"
xmlns:fmt="http://java.sun.com/jsp/jstl/fmt" xmlns:fn="http://java.sun.com/jsp/jstl/functions"
xmlns:image="urn:jsptld:http://it.openmindonline/imageTag">
<!--
Modified: magnoliamodules/trunk/openutils-mgnlmedia/src/main/resources/META-INF/tags/media/media.tag
===================================================================
--- magnoliamodules/trunk/openutils-mgnlmedia/src/main/resources/META-INF/tags/media/media.tag 2013-12-08 16:44:17 UTC (rev 4467)
+++ magnoliamodules/trunk/openutils-mgnlmedia/src/main/resources/META-INF/tags/media/media.tag 2013-12-08 19:15:15 UTC (rev 4468)
@@ -1,4 +1,4 @@
-<jsp:root version="2.0" xmlns:jsp="http://java.sun.com/JSP/Page" xmlns:c="http://java.sun.com/jsp/jstl/core"
+<jsp:root version="2.1" xmlns:jsp="http://java.sun.com/JSP/Page" xmlns:c="http://java.sun.com/jsp/jstl/core"
xmlns:cms="http://magnolia-cms.com/taglib/templating-components/cms" xmlns:cmsfn="http://magnolia-cms.com/taglib/templating-components/cmsfn" 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">
@@ -74,12 +74,11 @@
<c:set value="${media:node(item)}" var="mediaNode" />
<c:choose>
<c:when test="${!empty mediaNode}">
- <c:set var="media" value="${media:node(mediaNode)}" />
<c:choose>
- <c:when test="${crop and (media.type eq 'image' or media.type eq 'wallpaper' or videoImagePreview)}">
+ <c:when test="${crop and (mediaNode.type eq 'image' or mediaNode.type eq 'wallpaper' or videoImagePreview)}">
<media:crop item="${media}" width="${width}" height="${height}" property="${cropProperty}" jquery="${cropJquery}" jqueryui="${cropJqueryUI}" loadjs="${cropJs}" />
</c:when>
- <c:when test="${media.type eq 'image' or media.type eq 'wallpaper' or videoImagePreview}">
+ <c:when test="${mediaNode.type eq 'image' or mediaNode.type eq 'wallpaper' or videoImagePreview}">
<c:choose>
<c:when test="${width eq 0 and height eq 0}">
<c:set var="url" value="${media:url(mediaNode)}" />
@@ -145,7 +144,7 @@
<![CDATA[ />]]>
</c:if>
</c:when>
- <c:when test="${media.type eq 'video' or media.type eq 'audio' or media.type eq 'youtube' }">
+ <c:when test="${mediaNode.type eq 'video' or mediaNode.type eq 'audio' or mediaNode.type eq 'youtube' }">
<c:set var="url" value="${media:url(mediaNode)}"/>
@@ -183,7 +182,7 @@
</c:when>
- <c:when test="${media.type eq 'swf' }">
+ <c:when test="${mediaNode.type eq 'swf' }">
<c:if test="${!(width gt 0)}">
<c:set var="width" value="${media:width(mediaNode)}" />
Modified: magnoliamodules/trunk/openutils-mgnlmedia/src/main/resources/META-INF/tags/media/player-genericswfobject.tag
===================================================================
--- magnoliamodules/trunk/openutils-mgnlmedia/src/main/resources/META-INF/tags/media/player-genericswfobject.tag 2013-12-08 16:44:17 UTC (rev 4467)
+++ magnoliamodules/trunk/openutils-mgnlmedia/src/main/resources/META-INF/tags/media/player-genericswfobject.tag 2013-12-08 19:15:15 UTC (rev 4468)
@@ -1,4 +1,4 @@
-<jsp:root version="2.0" xmlns:jsp="http://java.sun.com/JSP/Page" xmlns:c="http://java.sun.com/jsp/jstl/core"
+<jsp:root version="2.1" xmlns:jsp="http://java.sun.com/JSP/Page" xmlns:c="http://java.sun.com/jsp/jstl/core"
xmlns:cms="http://magnolia-cms.com/taglib/templating-components/cms" xmlns:cmsfn="http://magnolia-cms.com/taglib/templating-components/cmsfn" 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">
Modified: magnoliamodules/trunk/openutils-mgnlmedia/src/main/resources/META-INF/tags/media/player-jwplayer5.tag
===================================================================
--- magnoliamodules/trunk/openutils-mgnlmedia/src/main/resources/META-INF/tags/media/player-jwplayer5.tag 2013-12-08 16:44:17 UTC (rev 4467)
+++ magnoliamodules/trunk/openutils-mgnlmedia/src/main/resources/META-INF/tags/media/player-jwplayer5.tag 2013-12-08 19:15:15 UTC (rev 4468)
@@ -1,4 +1,4 @@
-<jsp:root version="2.0" xmlns:jsp="http://java.sun.com/JSP/Page" xmlns:c="http://java.sun.com/jsp/jstl/core"
+<jsp:root version="2.1" xmlns:jsp="http://java.sun.com/JSP/Page" xmlns:c="http://java.sun.com/jsp/jstl/core"
xmlns:cms="http://magnolia-cms.com/taglib/templating-components/cms" xmlns:cmsfn="http://magnolia-cms.com/taglib/templating-components/cmsfn" 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">
Modified: magnoliamodules/trunk/openutils-mgnlmedia/src/main/resources/META-INF/tags/media/player.tag
===================================================================
--- magnoliamodules/trunk/openutils-mgnlmedia/src/main/resources/META-INF/tags/media/player.tag 2013-12-08 16:44:17 UTC (rev 4467)
+++ magnoliamodules/trunk/openutils-mgnlmedia/src/main/resources/META-INF/tags/media/player.tag 2013-12-08 19:15:15 UTC (rev 4468)
@@ -1,4 +1,4 @@
-<jsp:root version="2.0" xmlns:jsp="http://java.sun.com/JSP/Page" xmlns:c="http://java.sun.com/jsp/jstl/core"
+<jsp:root version="2.1" xmlns:jsp="http://java.sun.com/JSP/Page" xmlns:c="http://java.sun.com/jsp/jstl/core"
xmlns:cms="http://magnolia-cms.com/taglib/templating-components/cms" xmlns:cmsfn="http://magnolia-cms.com/taglib/templating-components/cmsfn" 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">
Modified: magnoliamodules/trunk/openutils-mgnlmedia/src/main/resources/META-INF/tags/media/swfobject.tag
===================================================================
--- magnoliamodules/trunk/openutils-mgnlmedia/src/main/resources/META-INF/tags/media/swfobject.tag 2013-12-08 16:44:17 UTC (rev 4467)
+++ magnoliamodules/trunk/openutils-mgnlmedia/src/main/resources/META-INF/tags/media/swfobject.tag 2013-12-08 19:15:15 UTC (rev 4468)
@@ -1,4 +1,4 @@
-<jsp:root version="2.0" xmlns:jsp="http://java.sun.com/JSP/Page" xmlns:c="http://java.sun.com/jsp/jstl/core"
+<jsp:root version="2.1" xmlns:jsp="http://java.sun.com/JSP/Page" xmlns:c="http://java.sun.com/jsp/jstl/core"
xmlns:cms="http://magnolia-cms.com/taglib/templating-components/cms" xmlns:cmsfn="http://magnolia-cms.com/taglib/templating-components/cmsfn" 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">
Modified: magnoliamodules/trunk/openutils-mgnlmedia/src/main/resources/mgnl-files/templates/samples-media/paragraph-grid.jsp
===================================================================
--- magnoliamodules/trunk/openutils-mgnlmedia/src/main/resources/mgnl-files/templates/samples-media/paragraph-grid.jsp 2013-12-08 16:44:17 UTC (rev 4467)
+++ magnoliamodules/trunk/openutils-mgnlmedia/src/main/resources/mgnl-files/templates/samples-media/paragraph-grid.jsp 2013-12-08 19:15:15 UTC (rev 4468)
@@ -1,4 +1,4 @@
-<jsp:root version="2.0" xmlns:jsp="http://java.sun.com/JSP/Page" xmlns:c="http://java.sun.com/jsp/jstl/core"
+<jsp:root version="2.1" xmlns:jsp="http://java.sun.com/JSP/Page" xmlns:c="http://java.sun.com/jsp/jstl/core"
xmlns:fmt="http://java.sun.com/jsp/jstl/fmt" xmlns:fn="http://java.sun.com/jsp/jstl/functions" xmlns:cms="http://magnolia-cms.com/taglib/templating-components/cms"
xmlns:cmsfn="http://magnolia-cms.com/taglib/templating-components/cmsfn" xmlns:media="http://net.sourceforge.openutils/mgnlMedia"
xmlns:mu="mgnlutils">
Modified: magnoliamodules/trunk/openutils-mgnlmedia/src/main/resources/mgnl-files/templates/samples-media/paragraph-mediael.jsp
===================================================================
--- magnoliamodules/trunk/openutils-mgnlmedia/src/main/resources/mgnl-files/templates/samples-media/paragraph-mediael.jsp 2013-12-08 16:44:17 UTC (rev 4467)
+++ magnoliamodules/trunk/openutils-mgnlmedia/src/main/resources/mgnl-files/templates/samples-media/paragraph-mediael.jsp 2013-12-08 19:15:15 UTC (rev 4468)
@@ -1,4 +1,4 @@
-<jsp:root version="2.0" xmlns:jsp="http://java.sun.com/JSP/Page" xmlns:c="http://java.sun.com/jsp/jstl/core"
+<jsp:root version="2.1" xmlns:jsp="http://java.sun.com/JSP/Page" xmlns:c="http://java.sun.com/jsp/jstl/core"
xmlns:fmt="http://java.sun.com/jsp/jstl/fmt" xmlns:fn="http://java.sun.com/jsp/jstl/functions" xmlns:cms="http://magnolia-cms.com/taglib/templating-components/cms"
xmlns:cmsfn="http://magnolia-cms.com/taglib/templating-components/cmsfn" xmlns:media="http://net.sourceforge.openutils/mgnlMedia"
xmlns:mu="mgnlutils">
Modified: magnoliamodules/trunk/openutils-mgnlmedia/src/main/resources/mgnl-files/templates/samples-media/paragraph-mediatag.jsp
===================================================================
--- magnoliamodules/trunk/openutils-mgnlmedia/src/main/resources/mgnl-files/templates/samples-media/paragraph-mediatag.jsp 2013-12-08 16:44:17 UTC (rev 4467)
+++ magnoliamodules/trunk/openutils-mgnlmedia/src/main/resources/mgnl-files/templates/samples-media/paragraph-mediatag.jsp 2013-12-08 19:15:15 UTC (rev 4468)
@@ -1,4 +1,4 @@
-<jsp:root version="2.0" xmlns:jsp="http://java.sun.com/JSP/Page" xmlns:c="http://java.sun.com/jsp/jstl/core"
+<jsp:root version="2.1" xmlns:jsp="http://java.sun.com/JSP/Page" xmlns:c="http://java.sun.com/jsp/jstl/core"
xmlns:fmt="http://java.sun.com/jsp/jstl/fmt" xmlns:fn="http://java.sun.com/jsp/jstl/functions" xmlns:cms="http://magnolia-cms.com/taglib/templating-components/cms"
xmlns:cmsfn="http://magnolia-cms.com/taglib/templating-components/cmsfn" xmlns:media="http://net.sourceforge.openutils/mgnlMedia"
xmlns:mu="mgnlutils">
Modified: magnoliamodules/trunk/openutils-mgnlmedia/src/main/resources/mgnl-files/templates/samples-media/paragraph-playlist.jsp
===================================================================
--- magnoliamodules/trunk/openutils-mgnlmedia/src/main/resources/mgnl-files/templates/samples-media/paragraph-playlist.jsp 2013-12-08 16:44:17 UTC (rev 4467)
+++ magnoliamodules/trunk/openutils-mgnlmedia/src/main/resources/mgnl-files/templates/samples-media/paragraph-playlist.jsp 2013-12-08 19:15:15 UTC (rev 4468)
@@ -1,4 +1,4 @@
-<jsp:root version="2.0" xmlns:jsp="http://java.sun.com/JSP/Page" xmlns:c="http://java.sun.com/jsp/jstl/core"
+<jsp:root version="2.1" xmlns:jsp="http://java.sun.com/JSP/Page" xmlns:c="http://java.sun.com/jsp/jstl/core"
xmlns:fmt="http://java.sun.com/jsp/jstl/fmt" xmlns:fn="http://java.sun.com/jsp/jstl/functions" xmlns:cms="http://magnolia-cms.com/taglib/templating-components/cms"
xmlns:cmsfn="http://magnolia-cms.com/taglib/templating-components/cmsfn" xmlns:media="http://net.sourceforge.openutils/mgnlMedia"
xmlns:mu="mgnlutils">
Modified: magnoliamodules/trunk/openutils-mgnlmessages/src/main/resources/META-INF/tags/msg/msgs-global.tag
=======================================...
[truncated message content] |
|
From: <fg...@us...> - 2013-12-08 19:15:28
|
Revision: 4469
http://openutils.svn.sourceforge.net/openutils/?rev=4469&view=rev
Author: fgiust
Date: 2013-12-08 19:15:25 +0000 (Sun, 08 Dec 2013)
Log Message:
-----------
update jsp declarations to use jsp 2.1 (tomcat6+)
Modified Paths:
--------------
magnoliamodules/trunk/magnolia-test-webapp/src/main/webapp/WEB-INF/tags/openutils/debug.tag
magnoliamodules/trunk/magnolia-test-webapp/src/main/webapp/docroot/dateutils-test.jsp
magnoliamodules/trunk/magnolia-test-webapp/src/main/webapp/docroot/elfunction-test.jsp
magnoliamodules/trunk/magnolia-test-webapp/src/main/webapp/template_criteria/criteria.jsp
magnoliamodules/trunk/magnolia5-test-webapp/src/main/webapp/WEB-INF/jsps/expressions/evaluate.jsp
magnoliamodules/trunk/magnolia5-test-webapp/src/main/webapp/WEB-INF/tags/openutils/debug.tag
magnoliamodules/trunk/magnolia5-test-webapp/src/main/webapp/docroot/dateutils-test.jsp
magnoliamodules/trunk/magnolia5-test-webapp/src/main/webapp/docroot/elfunction-test.jsp
magnoliamodules/trunk/magnolia5-test-webapp/src/main/webapp/template_criteria/criteria.jsp
Property Changed:
----------------
magnoliamodules/trunk/magnolia-test-webapp/src/main/webapp/templates/
Modified: magnoliamodules/trunk/magnolia-test-webapp/src/main/webapp/WEB-INF/tags/openutils/debug.tag
===================================================================
--- magnoliamodules/trunk/magnolia-test-webapp/src/main/webapp/WEB-INF/tags/openutils/debug.tag 2013-12-08 19:15:15 UTC (rev 4468)
+++ magnoliamodules/trunk/magnolia-test-webapp/src/main/webapp/WEB-INF/tags/openutils/debug.tag 2013-12-08 19:15:25 UTC (rev 4469)
@@ -1,4 +1,4 @@
-<jsp:root version="2.0" xmlns:jsp="http://java.sun.com/JSP/Page" xmlns:c="http://java.sun.com/jsp/jstl/core"
+<jsp:root version="2.1" xmlns:jsp="http://java.sun.com/JSP/Page" xmlns:c="http://java.sun.com/jsp/jstl/core"
xmlns:fmt="http://java.sun.com/jsp/jstl/fmt" xmlns:fn="http://java.sun.com/jsp/jstl/functions" xmlns:mgnl="http://magnolia-cms.com/taglib/templating-components/cms"
xmlns:cmsfn="http://magnolia-cms.com/taglib/templating-components/cmsfn" xmlns:su="http://openutils.sf.net/openutils-stringutils"
xmlns:mu="mgnlutils" xmlns:du="dateutils" xmlns:el="project">
Modified: magnoliamodules/trunk/magnolia-test-webapp/src/main/webapp/docroot/dateutils-test.jsp
===================================================================
--- magnoliamodules/trunk/magnolia-test-webapp/src/main/webapp/docroot/dateutils-test.jsp 2013-12-08 19:15:15 UTC (rev 4468)
+++ magnoliamodules/trunk/magnolia-test-webapp/src/main/webapp/docroot/dateutils-test.jsp 2013-12-08 19:15:25 UTC (rev 4469)
@@ -1,4 +1,4 @@
-<jsp:root version="2.0" xmlns:jsp="http://java.sun.com/JSP/Page" xmlns:du="dateutils"
+<jsp:root version="2.1" xmlns:jsp="http://java.sun.com/JSP/Page" xmlns:du="dateutils"
xmlns:c="urn:jsptld:http://java.sun.com/jsp/jstl/core">
<jsp:directive.page contentType="text/html; charset=UTF-8" session="false" />
<jsp:directive.page import="java.util.Calendar" />
Modified: magnoliamodules/trunk/magnolia-test-webapp/src/main/webapp/docroot/elfunction-test.jsp
===================================================================
--- magnoliamodules/trunk/magnolia-test-webapp/src/main/webapp/docroot/elfunction-test.jsp 2013-12-08 19:15:15 UTC (rev 4468)
+++ magnoliamodules/trunk/magnolia-test-webapp/src/main/webapp/docroot/elfunction-test.jsp 2013-12-08 19:15:25 UTC (rev 4469)
@@ -1,4 +1,4 @@
-<jsp:root version="2.0" xmlns:jsp="http://java.sun.com/JSP/Page" xmlns:su="urn:jsptld:http://openutils.sf.net/openutils-stringutils"
+<jsp:root version="2.1" xmlns:jsp="http://java.sun.com/JSP/Page" xmlns:su="urn:jsptld:http://openutils.sf.net/openutils-stringutils"
xmlns:c="urn:jsptld:http://java.sun.com/jsp/jstl/core">
<jsp:directive.page contentType="text/html; charset=UTF-8" session="false" />
<html xmlns:javaee="http://java.sun.com/xml/ns/javaee" xmlns:fo="http://www.w3.org/1999/XSL/Format">
Modified: magnoliamodules/trunk/magnolia-test-webapp/src/main/webapp/template_criteria/criteria.jsp
===================================================================
--- magnoliamodules/trunk/magnolia-test-webapp/src/main/webapp/template_criteria/criteria.jsp 2013-12-08 19:15:15 UTC (rev 4468)
+++ magnoliamodules/trunk/magnolia-test-webapp/src/main/webapp/template_criteria/criteria.jsp 2013-12-08 19:15:25 UTC (rev 4469)
@@ -1,4 +1,4 @@
-<jsp:root version="2.0" xmlns:jsp="http://java.sun.com/JSP/Page" xmlns:c="http://java.sun.com/jsp/jstl/core"
+<jsp:root version="2.1" xmlns:jsp="http://java.sun.com/JSP/Page" xmlns:c="http://java.sun.com/jsp/jstl/core"
xmlns:fmt="http://java.sun.com/jsp/jstl/fmt" xmlns:fn="http://java.sun.com/jsp/jstl/functions" xmlns:cms="urn:jsptld:cms-taglib"
xmlns:cmsu="urn:jsptld:cms-util-taglib" xmlns:cmsfn="http://www.magnolia.info/tlds/cmsfn-taglib.tld" xmlns:media="http://net.sourceforge.openutils/mgnlMedia"
xmlns:mcmenu="mgnlcontextmenu">
Index: magnoliamodules/trunk/magnolia-test-webapp/src/main/webapp/templates
===================================================================
--- magnoliamodules/trunk/magnolia-test-webapp/src/main/webapp/templates 2013-12-08 19:15:15 UTC (rev 4468)
+++ magnoliamodules/trunk/magnolia-test-webapp/src/main/webapp/templates 2013-12-08 19:15:25 UTC (rev 4469)
Property changes on: magnoliamodules/trunk/magnolia-test-webapp/src/main/webapp/templates
___________________________________________________________________
Modified: svn:ignore
## -8,3 +8,4 ##
samples-struts11
samples-rules
samples-tagcloud
+samples-lms
Modified: magnoliamodules/trunk/magnolia5-test-webapp/src/main/webapp/WEB-INF/jsps/expressions/evaluate.jsp
===================================================================
--- magnoliamodules/trunk/magnolia5-test-webapp/src/main/webapp/WEB-INF/jsps/expressions/evaluate.jsp 2013-12-08 19:15:15 UTC (rev 4468)
+++ magnoliamodules/trunk/magnolia5-test-webapp/src/main/webapp/WEB-INF/jsps/expressions/evaluate.jsp 2013-12-08 19:15:25 UTC (rev 4469)
@@ -1,4 +1,4 @@
-<jsp:root version="2.0" xmlns:jsp="http://java.sun.com/JSP/Page" xmlns:c="http://java.sun.com/jsp/jstl/core"
+<jsp:root version="2.1" xmlns:jsp="http://java.sun.com/JSP/Page" xmlns:c="http://java.sun.com/jsp/jstl/core"
xmlns:fmt="http://java.sun.com/jsp/jstl/fmt" xmlns:fn="http://java.sun.com/jsp/jstl/functions" xmlns:cms="urn:jsptld:cms-taglib"
xmlns:cmsu="urn:jsptld:cms-util-taglib" xmlns:cmsfn="http://www.magnolia.info/tlds/cmsfn-taglib.tld" xmlns:mexpr="mgnlexpressions">
<jsp:directive.page contentType="text/html; charset=UTF-8" session="true" />
Modified: magnoliamodules/trunk/magnolia5-test-webapp/src/main/webapp/WEB-INF/tags/openutils/debug.tag
===================================================================
--- magnoliamodules/trunk/magnolia5-test-webapp/src/main/webapp/WEB-INF/tags/openutils/debug.tag 2013-12-08 19:15:15 UTC (rev 4468)
+++ magnoliamodules/trunk/magnolia5-test-webapp/src/main/webapp/WEB-INF/tags/openutils/debug.tag 2013-12-08 19:15:25 UTC (rev 4469)
@@ -1,4 +1,4 @@
-<jsp:root version="2.0" xmlns:jsp="http://java.sun.com/JSP/Page" xmlns:c="http://java.sun.com/jsp/jstl/core"
+<jsp:root version="2.1" xmlns:jsp="http://java.sun.com/JSP/Page" xmlns:c="http://java.sun.com/jsp/jstl/core"
xmlns:fmt="http://java.sun.com/jsp/jstl/fmt" xmlns:fn="http://java.sun.com/jsp/jstl/functions" xmlns:mgnl="http://magnolia-cms.com/taglib/templating-components/cms"
xmlns:cmsfn="http://magnolia-cms.com/taglib/templating-components/cmsfn" xmlns:su="http://openutils.sf.net/openutils-stringutils"
xmlns:mu="mgnlutils" xmlns:du="dateutils" xmlns:el="project">
Modified: magnoliamodules/trunk/magnolia5-test-webapp/src/main/webapp/docroot/dateutils-test.jsp
===================================================================
--- magnoliamodules/trunk/magnolia5-test-webapp/src/main/webapp/docroot/dateutils-test.jsp 2013-12-08 19:15:15 UTC (rev 4468)
+++ magnoliamodules/trunk/magnolia5-test-webapp/src/main/webapp/docroot/dateutils-test.jsp 2013-12-08 19:15:25 UTC (rev 4469)
@@ -1,4 +1,4 @@
-<jsp:root version="2.0" xmlns:jsp="http://java.sun.com/JSP/Page" xmlns:du="dateutils"
+<jsp:root version="2.1" xmlns:jsp="http://java.sun.com/JSP/Page" xmlns:du="dateutils"
xmlns:c="urn:jsptld:http://java.sun.com/jsp/jstl/core">
<jsp:directive.page contentType="text/html; charset=UTF-8" session="false" />
<jsp:directive.page import="java.util.Calendar" />
Modified: magnoliamodules/trunk/magnolia5-test-webapp/src/main/webapp/docroot/elfunction-test.jsp
===================================================================
--- magnoliamodules/trunk/magnolia5-test-webapp/src/main/webapp/docroot/elfunction-test.jsp 2013-12-08 19:15:15 UTC (rev 4468)
+++ magnoliamodules/trunk/magnolia5-test-webapp/src/main/webapp/docroot/elfunction-test.jsp 2013-12-08 19:15:25 UTC (rev 4469)
@@ -1,4 +1,4 @@
-<jsp:root version="2.0" xmlns:jsp="http://java.sun.com/JSP/Page" xmlns:su="urn:jsptld:http://openutils.sf.net/openutils-stringutils"
+<jsp:root version="2.1" xmlns:jsp="http://java.sun.com/JSP/Page" xmlns:su="urn:jsptld:http://openutils.sf.net/openutils-stringutils"
xmlns:c="urn:jsptld:http://java.sun.com/jsp/jstl/core">
<jsp:directive.page contentType="text/html; charset=UTF-8" session="false" />
<html xmlns:javaee="http://java.sun.com/xml/ns/javaee" xmlns:fo="http://www.w3.org/1999/XSL/Format">
Modified: magnoliamodules/trunk/magnolia5-test-webapp/src/main/webapp/template_criteria/criteria.jsp
===================================================================
--- magnoliamodules/trunk/magnolia5-test-webapp/src/main/webapp/template_criteria/criteria.jsp 2013-12-08 19:15:15 UTC (rev 4468)
+++ magnoliamodules/trunk/magnolia5-test-webapp/src/main/webapp/template_criteria/criteria.jsp 2013-12-08 19:15:25 UTC (rev 4469)
@@ -1,4 +1,4 @@
-<jsp:root version="2.0" xmlns:jsp="http://java.sun.com/JSP/Page" xmlns:c="http://java.sun.com/jsp/jstl/core"
+<jsp:root version="2.1" xmlns:jsp="http://java.sun.com/JSP/Page" xmlns:c="http://java.sun.com/jsp/jstl/core"
xmlns:fmt="http://java.sun.com/jsp/jstl/fmt" xmlns:fn="http://java.sun.com/jsp/jstl/functions" xmlns:cms="urn:jsptld:cms-taglib"
xmlns:cmsu="urn:jsptld:cms-util-taglib" xmlns:cmsfn="http://www.magnolia.info/tlds/cmsfn-taglib.tld" xmlns:media="http://net.sourceforge.openutils/mgnlMedia"
xmlns:mcmenu="mgnlcontextmenu">
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fg...@us...> - 2013-12-08 19:52:08
|
Revision: 4473
http://openutils.svn.sourceforge.net/openutils/?rev=4473&view=rev
Author: fgiust
Date: 2013-12-08 19:52:03 +0000 (Sun, 08 Dec 2013)
Log Message:
-----------
cleanup sample templates
Modified Paths:
--------------
magnoliamodules/trunk/magnolia-test-webapp/pom.xml
magnoliamodules/trunk/magnolia-test-webapp/src/main/webapp/WEB-INF/config/default/log4j.xml
magnoliamodules/trunk/magnolia-test-webapp/src/main/webapp/template_criteria/criteria.jsp
magnoliamodules/trunk/magnolia-test-webapp/src/main/webapp/template_magnoliautils/magnoliaUtils.jsp
magnoliamodules/trunk/magnolia5-test-webapp/src/main/webapp/template_criteria/criteria.jsp
magnoliamodules/trunk/magnolia5-test-webapp/src/main/webapp/template_magnoliautils/magnoliaUtils.jsp
magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/resources/mgnl-files/templates/samples-contextmenu/template-contextmenu.jsp
magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/resources/samples-contextmenu/template-contextmenu.ftl
magnoliamodules/trunk/openutils-mgnlcontrols/src/main/resources/samples-controls/template-controls.ftl
magnoliamodules/trunk/openutils-mgnllms/src/main/resources/mgnl-files/templates/samples-lms/courses.jsp
magnoliamodules/trunk/openutils-mgnllms/src/main/resources/mgnl-files/templates/samples-lms/index.jsp
magnoliamodules/trunk/openutils-mgnlmedia/src/main/resources/samples-media/template.ftl
magnoliamodules/trunk/openutils-mgnlrules/src/main/resources/samples-rules/template-rules.ftl
magnoliamodules/trunk/openutils-mgnlstripes/src/main/resources/mgnl-files/templates/samples-stripes/template.jsp
magnoliamodules/trunk/openutils-mgnlstruts11/src/main/resources/mgnl-files/templates/samples-struts11/template.jsp
magnoliamodules/trunk/openutils-mgnltagcloud/src/main/resources/mgnl-files/templates/samples-tagcloud/template.jsp
magnoliamodules/trunk/openutils-mgnlutils/src/main/resources/mgnl-files/samples/sample-magnoliautils.jsp
magnoliamodules/trunk/openutils-mgnlutils/src/main/resources/samples-utils/sample-magnoliautils.ftl
Modified: magnoliamodules/trunk/magnolia-test-webapp/pom.xml
===================================================================
--- magnoliamodules/trunk/magnolia-test-webapp/pom.xml 2013-12-08 19:25:48 UTC (rev 4472)
+++ magnoliamodules/trunk/magnolia-test-webapp/pom.xml 2013-12-08 19:52:03 UTC (rev 4473)
@@ -189,11 +189,13 @@
<artifactId>openutils-mgnlstruts11</artifactId>
<version>5.0.10-SNAPSHOT</version>
</dependency>
+ <!--
<dependency>
<groupId>net.sourceforge.openutils</groupId>
<artifactId>openutils-mgnltasks</artifactId>
<version>5.0.10-SNAPSHOT</version>
</dependency>
+ -->
<dependency>
<groupId>net.sourceforge.openutils</groupId>
<artifactId>openutils-mgnlutils</artifactId>
Modified: magnoliamodules/trunk/magnolia-test-webapp/src/main/webapp/WEB-INF/config/default/log4j.xml
===================================================================
--- magnoliamodules/trunk/magnolia-test-webapp/src/main/webapp/WEB-INF/config/default/log4j.xml 2013-12-08 19:25:48 UTC (rev 4472)
+++ magnoliamodules/trunk/magnolia-test-webapp/src/main/webapp/WEB-INF/config/default/log4j.xml 2013-12-08 19:52:03 UTC (rev 4473)
@@ -52,7 +52,7 @@
<priority value="INFO" />
</category>
<category name="it.openutils.mgnlutils.el">
- <priority value="DEBUG" />
+ <priority value="INFO" />
</category>
<root>
<priority value="ALL" />
Modified: magnoliamodules/trunk/magnolia-test-webapp/src/main/webapp/template_criteria/criteria.jsp
===================================================================
--- magnoliamodules/trunk/magnolia-test-webapp/src/main/webapp/template_criteria/criteria.jsp 2013-12-08 19:25:48 UTC (rev 4472)
+++ magnoliamodules/trunk/magnolia-test-webapp/src/main/webapp/template_criteria/criteria.jsp 2013-12-08 19:52:03 UTC (rev 4473)
@@ -1,61 +1,64 @@
<jsp:root version="2.1" xmlns:jsp="http://java.sun.com/JSP/Page" xmlns:c="http://java.sun.com/jsp/jstl/core"
- xmlns:fmt="http://java.sun.com/jsp/jstl/fmt" xmlns:fn="http://java.sun.com/jsp/jstl/functions" xmlns:cms="urn:jsptld:cms-taglib"
- xmlns:cmsu="urn:jsptld:cms-util-taglib" xmlns:cmsfn="http://www.magnolia.info/tlds/cmsfn-taglib.tld" xmlns:media="http://net.sourceforge.openutils/mgnlMedia"
+ xmlns:fmt="http://java.sun.com/jsp/jstl/fmt" xmlns:fn="http://java.sun.com/jsp/jstl/functions" xmlns:cms="http://magnolia-cms.com/taglib/templating-components/cms"
+ xmlns:cmsfn="http://magnolia-cms.com/taglib/templating-components/cmsfn" xmlns:media="http://net.sourceforge.openutils/mgnlMedia"
xmlns:mcmenu="mgnlcontextmenu">
<jsp:directive.page contentType="text/html; charset=UTF-8" session="false" />
<jsp:directive.page import="info.magnolia.cms.core.ItemType" />
<jsp:directive.page import="info.magnolia.cms.beans.config.ContentRepository" />
<jsp:directive.page import="net.sourceforge.openutils.mgnlcriteria.jcr.query.*" />
<jsp:directive.page import="net.sourceforge.openutils.mgnlcriteria.jcr.query.criterion.*" />
- <jsp:text>
- <![CDATA[<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> ]]>
- </jsp:text>
+<![CDATA[
+<!DOCTYPE html>
+]]>
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
<head>
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
- <title>${actpage.title}</title>
- <cms:links />
+ <title>${content.title}</title>
+ <link rel="stylesheet" type="text/css"
+ href="${pageContext.request.contextPath}/.resources/bootstrap/3.0/css/bootstrap.min.css" />
+ <meta name="viewport" content="width=device-width, initial-scale=1.0" />
+ <cms:init />
</head>
<body>
- <cms:mainBar />
- <h1>${actpage.title}</h1>
- <p>Steps for testing this sample:</p>
- <ol>
- <li>
+ <div id="main" class="container">
+ <h1>${content.title}</h1>
+ <p>Steps for testing this sample:</p>
+ <ol>
+ <li>
<![CDATA[make sure that AclSearchIndex has been enabled in]]>
<![CDATA[ /magnolia-test-webapp/src/main/webapp/WEB-INF/config/repo-conf/jackrabbit-memory-search.xml]]>
- </li>
- <li>
+ </li>
+ <li>
<![CDATA[login as superuser and enter this page: all pets should be displayed]]>
- </li>
- <li>
+ </li>
+ <li>
<![CDATA[login as criteria-dogsexcluded/criteria and enter this page: dogs should not be displayed]]>
- </li>
- <li>
+ </li>
+ <li>
<![CDATA[login as criteria-dogsonly/criteria and enter this page: only dogs should be displayed]]>
- </li>
- </ol>
- <br />
-
- <jsp:scriptlet><![CDATA[
+ </li>
+ </ol>
+ <br />
+ <jsp:scriptlet><![CDATA[
Criteria criteria = JCRCriteriaFactory
.createCriteria()
- .setWorkspace(RepositoryConstants.WEBSITE)
+ .setWorkspace(info.magnolia.repository.RepositoryConstants.WEBSITE)
.setBasePath("/Criteria/pets")
- .add(Restrictions.eq("@jcr:primaryType", ItemType.CONTENT.getSystemName()))
+ .add(Restrictions.eq("@jcr:primaryType", "mgnl:page"))
.addOrder(Order.asc("@birthDate"));
AdvancedResult result = criteria.execute();
ResultIterator<AdvancedResultItem> iterator = result.getItems();
pageContext.setAttribute("iterator", iterator);
]]>
- </jsp:scriptlet>
- <p>Pets results:</p>
- <ul>
- <c:forEach var="item" items="${iterator}">
- <li>${item.handle} (${item.title})</li>
- </c:forEach>
- </ul>
+ </jsp:scriptlet>
+ <p>Pets results:</p>
+ <ul>
+ <c:forEach var="item" items="${iterator}">
+ <li>${item.handle} (${item.title})</li>
+ </c:forEach>
+ </ul>
+ </div>
</body>
</html>
</jsp:root>
\ No newline at end of file
Modified: magnoliamodules/trunk/magnolia-test-webapp/src/main/webapp/template_magnoliautils/magnoliaUtils.jsp
===================================================================
--- magnoliamodules/trunk/magnolia-test-webapp/src/main/webapp/template_magnoliautils/magnoliaUtils.jsp 2013-12-08 19:25:48 UTC (rev 4472)
+++ magnoliamodules/trunk/magnolia-test-webapp/src/main/webapp/template_magnoliautils/magnoliaUtils.jsp 2013-12-08 19:52:03 UTC (rev 4473)
@@ -12,6 +12,7 @@
<title> ${content.title}
</title>
<link rel="stylesheet" type="text/css" href="${pageContext.request.contextPath}/.resources/bootstrap/3.0/css/bootstrap.min.css" />
+ <meta name="viewport" content="width=device-width, initial-scale=1.0" />
<style>
<![CDATA[
code { display: block}
@@ -50,11 +51,11 @@
<tr>
<th>class
</th>
- <td>${node.class.name}
+ <td>${node['class'].name}
</td>
- <td>${contentMap.class.name }
+ <td>${contentMap['class'].name }
</td>
- <td>${oldcontent.class.name}
+ <td>${oldcontent['class'].name}
</td>
</tr>
<tr>
Modified: magnoliamodules/trunk/magnolia5-test-webapp/src/main/webapp/template_criteria/criteria.jsp
===================================================================
--- magnoliamodules/trunk/magnolia5-test-webapp/src/main/webapp/template_criteria/criteria.jsp 2013-12-08 19:25:48 UTC (rev 4472)
+++ magnoliamodules/trunk/magnolia5-test-webapp/src/main/webapp/template_criteria/criteria.jsp 2013-12-08 19:52:03 UTC (rev 4473)
@@ -13,12 +13,12 @@
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
<head>
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
- <title>${actpage.title}</title>
+ <title>${content.title}</title>
<cms:links />
</head>
<body>
<cms:mainBar />
- <h1>${actpage.title}</h1>
+ <h1>${content.title}</h1>
<p>Steps for testing this sample:</p>
<ol>
<li>
Modified: magnoliamodules/trunk/magnolia5-test-webapp/src/main/webapp/template_magnoliautils/magnoliaUtils.jsp
===================================================================
--- magnoliamodules/trunk/magnolia5-test-webapp/src/main/webapp/template_magnoliautils/magnoliaUtils.jsp 2013-12-08 19:25:48 UTC (rev 4472)
+++ magnoliamodules/trunk/magnolia5-test-webapp/src/main/webapp/template_magnoliautils/magnoliaUtils.jsp 2013-12-08 19:52:03 UTC (rev 4473)
@@ -12,6 +12,7 @@
<title> ${content.title}
</title>
<link rel="stylesheet" type="text/css" href="${pageContext.request.contextPath}/.resources/bootstrap/3.0/css/bootstrap.min.css" />
+ <meta name="viewport" content="width=device-width, initial-scale=1.0" />
<style>
<![CDATA[
code { display: block}
Modified: magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/resources/mgnl-files/templates/samples-contextmenu/template-contextmenu.jsp
===================================================================
--- magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/resources/mgnl-files/templates/samples-contextmenu/template-contextmenu.jsp 2013-12-08 19:25:48 UTC (rev 4472)
+++ magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/resources/mgnl-files/templates/samples-contextmenu/template-contextmenu.jsp 2013-12-08 19:52:03 UTC (rev 4473)
@@ -15,6 +15,7 @@
${contextmenu:links()}
<cms:init />
<link rel="stylesheet" type="text/css" href="${pageContext.request.contextPath}/.resources/bootstrap/3.0/css/bootstrap.min.css" />
+ <meta name="viewport" content="width=device-width, initial-scale=1.0" />
<!-- samples css/js -->
<link rel="stylesheet" type="text/css"
href="${pageContext.request.contextPath}/.resources/contextmenu/css/contextmenu-samples.css" />
Modified: magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/resources/samples-contextmenu/template-contextmenu.ftl
===================================================================
--- magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/resources/samples-contextmenu/template-contextmenu.ftl 2013-12-08 19:25:48 UTC (rev 4472)
+++ magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/resources/samples-contextmenu/template-contextmenu.ftl 2013-12-08 19:52:03 UTC (rev 4473)
@@ -12,6 +12,7 @@
[@cms.init /]
<link rel="stylesheet" type="text/css" href="${contextPath}/.resources/bootstrap/3.0/css/bootstrap.min.css" />
+ <meta name="viewport" content="width=device-width, initial-scale=1.0" />
<!-- samples css/js -->
<link rel="stylesheet" type="text/css" href="${contextPath}/.resources/contextmenu/css/contextmenu-samples.css" />
Modified: magnoliamodules/trunk/openutils-mgnlcontrols/src/main/resources/samples-controls/template-controls.ftl
===================================================================
--- magnoliamodules/trunk/openutils-mgnlcontrols/src/main/resources/samples-controls/template-controls.ftl 2013-12-08 19:25:48 UTC (rev 4472)
+++ magnoliamodules/trunk/openutils-mgnlcontrols/src/main/resources/samples-controls/template-controls.ftl 2013-12-08 19:52:03 UTC (rev 4473)
@@ -5,6 +5,7 @@
<title>${content.title!}</title>
[@cms.init /]
<link rel="stylesheet" type="text/css" href="${contextPath}/.resources/bootstrap/3.0/css/bootstrap.min.css" />
+ <meta name="viewport" content="width=device-width, initial-scale=1.0" />
<link rel="stylesheet" type="text/css" href="${contextPath}/.resources/controls/samples/css/contextmenu-samples.css" />
</head>
<body>
Modified: magnoliamodules/trunk/openutils-mgnllms/src/main/resources/mgnl-files/templates/samples-lms/courses.jsp
===================================================================
--- magnoliamodules/trunk/openutils-mgnllms/src/main/resources/mgnl-files/templates/samples-lms/courses.jsp 2013-12-08 19:25:48 UTC (rev 4472)
+++ magnoliamodules/trunk/openutils-mgnllms/src/main/resources/mgnl-files/templates/samples-lms/courses.jsp 2013-12-08 19:52:03 UTC (rev 4473)
@@ -4,20 +4,21 @@
xmlns:lmsfn="urn:jsptld:lms-fn">
<jsp:directive.page contentType="text/html; charset=UTF-8" session="false" />
<jsp:text>
- <![CDATA[<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> ]]>
+ <![CDATA[<!DOCTYPE html> ]]>
</jsp:text>
<html xmlns="http://www.w3.org/1999/xhtml" lang="en">
<head>
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
- <title>${actpage.title}</title>
+ <title>${content.title}</title>
<cms:init />
<link rel="stylesheet" type="text/css"
href="${pageContext.request.contextPath}/.resources/bootstrap/3.0/css/bootstrap.min.css" />
+ <meta name="viewport" content="width=device-width, initial-scale=1.0" />
</head>
<body>
<div id="main" class="container">
<div id="header">
- <h1>${actpage.title}</h1>
+ <h1>${content.title}</h1>
</div>
<p>Click on a course in the list below. It opens a popup with the course inside</p>
<ul>
Modified: magnoliamodules/trunk/openutils-mgnllms/src/main/resources/mgnl-files/templates/samples-lms/index.jsp
===================================================================
--- magnoliamodules/trunk/openutils-mgnllms/src/main/resources/mgnl-files/templates/samples-lms/index.jsp 2013-12-08 19:25:48 UTC (rev 4472)
+++ magnoliamodules/trunk/openutils-mgnllms/src/main/resources/mgnl-files/templates/samples-lms/index.jsp 2013-12-08 19:52:03 UTC (rev 4473)
@@ -4,20 +4,21 @@
xmlns:lmsfn="urn:jsptld:lms-fn">
<jsp:directive.page contentType="text/html; charset=UTF-8" session="false" />
<jsp:text>
- <![CDATA[<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> ]]>
+ <![CDATA[<!DOCTYPE html> ]]>
</jsp:text>
<html xmlns="http://www.w3.org/1999/xhtml" lang="en">
<head>
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
- <title>${actpage.title}</title>
+ <title>${content.title}</title>
<cms:init />
<link rel="stylesheet" type="text/css"
href="${pageContext.request.contextPath}/.resources/bootstrap/3.0/css/bootstrap.min.css" />
+ <meta name="viewport" content="width=device-width, initial-scale=1.0" />
</head>
<body>
<div id="main" class="container">
<div id="header">
- <h1>${actpage.title}</h1>
+ <h1>${content.title}</h1>
<p>Welcome to Magnolia LMS Module sample page.</p>
<p>The sample course repository is structured as:</p>
</div>
Modified: magnoliamodules/trunk/openutils-mgnlmedia/src/main/resources/samples-media/template.ftl
===================================================================
--- magnoliamodules/trunk/openutils-mgnlmedia/src/main/resources/samples-media/template.ftl 2013-12-08 19:25:48 UTC (rev 4472)
+++ magnoliamodules/trunk/openutils-mgnlmedia/src/main/resources/samples-media/template.ftl 2013-12-08 19:52:03 UTC (rev 4473)
@@ -5,6 +5,7 @@
<title>${content.title}</title>
[@cms.init /]
<link rel="stylesheet" type="text/css" href="${contextPath}/.resources/bootstrap/3.0/css/bootstrap.min.css" />
+ <meta name="viewport" content="width=device-width, initial-scale=1.0" />
<link rel="stylesheet" type="text/css" href="${contextPath}/.resources/contextmenu/css/media-samples.css" />
</head>
<body>
Modified: magnoliamodules/trunk/openutils-mgnlrules/src/main/resources/samples-rules/template-rules.ftl
===================================================================
--- magnoliamodules/trunk/openutils-mgnlrules/src/main/resources/samples-rules/template-rules.ftl 2013-12-08 19:25:48 UTC (rev 4472)
+++ magnoliamodules/trunk/openutils-mgnlrules/src/main/resources/samples-rules/template-rules.ftl 2013-12-08 19:52:03 UTC (rev 4473)
@@ -5,6 +5,7 @@
<title>${content.title!}</title>
[@cms.init /]
<link rel="stylesheet" type="text/css" href="${contextPath}/.resources/bootstrap/3.0/css/bootstrap.min.css" />
+ <meta name="viewport" content="width=device-width, initial-scale=1.0" />
<link rel="stylesheet" type="text/css" href="${contextPath}/.resources/rules/css/rules-samples.css" />
</head>
<body>
Modified: magnoliamodules/trunk/openutils-mgnlstripes/src/main/resources/mgnl-files/templates/samples-stripes/template.jsp
===================================================================
--- magnoliamodules/trunk/openutils-mgnlstripes/src/main/resources/mgnl-files/templates/samples-stripes/template.jsp 2013-12-08 19:25:48 UTC (rev 4472)
+++ magnoliamodules/trunk/openutils-mgnlstripes/src/main/resources/mgnl-files/templates/samples-stripes/template.jsp 2013-12-08 19:52:03 UTC (rev 4473)
@@ -1,19 +1,24 @@
<jsp:root version="2.1" xmlns:jsp="http://java.sun.com/JSP/Page" xmlns:c="http://java.sun.com/jsp/jstl/core"
xmlns:fmt="http://java.sun.com/jsp/jstl/fmt" xmlns:fn="http://java.sun.com/jsp/jstl/functions" xmlns:cms="http://magnolia-cms.com/taglib/templating-components/cms"
- xmlns:cmsfn="http://magnolia-cms.com/taglib/templating-components/cmsfn">
+ xmlns:cmsfn="http://magnolia-cms.com/taglib/templating-components/cmsfn" xmlns:mu="mgnlutils"
+ xmlns:tags="urn:jsptagdir:/WEB-INF/tags/openutils">
<jsp:directive.page contentType="text/html; charset=UTF-8" session="false" />
- <jsp:text>
- <![CDATA[<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> ]]>
- </jsp:text>
- <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
+<![CDATA[
+<!DOCTYPE html>
+]]>
+ <html>
<head>
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
<title>${content.title}</title>
+ <link rel="stylesheet" type="text/css" href="${pageContext.request.contextPath}/.resources/bootstrap/3.0/css/bootstrap.min.css" />
+ <meta name="viewport" content="width=device-width, initial-scale=1.0" />
<cms:init />
</head>
<body>
- <h1>${content.title}</h1>
- <cms:area name="main" />
+ <div id="main" class="container">
+ <h1>${content.title}</h1>
+ <cms:area name="main" />
+ </div>
</body>
</html>
</jsp:root>
\ No newline at end of file
Modified: magnoliamodules/trunk/openutils-mgnlstruts11/src/main/resources/mgnl-files/templates/samples-struts11/template.jsp
===================================================================
--- magnoliamodules/trunk/openutils-mgnlstruts11/src/main/resources/mgnl-files/templates/samples-struts11/template.jsp 2013-12-08 19:25:48 UTC (rev 4472)
+++ magnoliamodules/trunk/openutils-mgnlstruts11/src/main/resources/mgnl-files/templates/samples-struts11/template.jsp 2013-12-08 19:52:03 UTC (rev 4473)
@@ -1,19 +1,25 @@
<jsp:root version="2.1" xmlns:jsp="http://java.sun.com/JSP/Page" xmlns:c="http://java.sun.com/jsp/jstl/core"
xmlns:fmt="http://java.sun.com/jsp/jstl/fmt" xmlns:fn="http://java.sun.com/jsp/jstl/functions" xmlns:cms="http://magnolia-cms.com/taglib/templating-components/cms"
- xmlns:cmsfn="http://magnolia-cms.com/taglib/templating-components/cmsfn">
+ xmlns:cmsfn="http://magnolia-cms.com/taglib/templating-components/cmsfn" xmlns:mu="mgnlutils"
+ xmlns:tags="urn:jsptagdir:/WEB-INF/tags/openutils">
<jsp:directive.page contentType="text/html; charset=UTF-8" session="false" />
- <jsp:text>
- <![CDATA[<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> ]]>
- </jsp:text>
- <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
+<![CDATA[
+<!DOCTYPE html>
+]]>
+ <html>
<head>
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
<title>${content.title}</title>
+ <link rel="stylesheet" type="text/css"
+ href="${pageContext.request.contextPath}/.resources/bootstrap/3.0/css/bootstrap.min.css" />
+ <meta name="viewport" content="width=device-width, initial-scale=1.0" />
<cms:init />
</head>
<body>
- <h1>${content.title}</h1>
- <cms:area name="main" />
+ <div id="main" class="container">
+ <h1>${content.title}</h1>
+ <cms:area name="main" />
+ </div>
</body>
</html>
</jsp:root>
\ No newline at end of file
Modified: magnoliamodules/trunk/openutils-mgnltagcloud/src/main/resources/mgnl-files/templates/samples-tagcloud/template.jsp
===================================================================
--- magnoliamodules/trunk/openutils-mgnltagcloud/src/main/resources/mgnl-files/templates/samples-tagcloud/template.jsp 2013-12-08 19:25:48 UTC (rev 4472)
+++ magnoliamodules/trunk/openutils-mgnltagcloud/src/main/resources/mgnl-files/templates/samples-tagcloud/template.jsp 2013-12-08 19:52:03 UTC (rev 4473)
@@ -12,6 +12,7 @@
<title>${content.title}</title>
<link rel="stylesheet" type="text/css"
href="${pageContext.request.contextPath}/.resources/bootstrap/3.0/css/bootstrap.min.css" />
+ <meta name="viewport" content="width=device-width, initial-scale=1.0" />
<link rel="stylesheet" type="text/css"
href="${pageContext.request.contextPath}/.resources/tagcloud/samples/css/tagcloud-samples.css" />
</head>
Modified: magnoliamodules/trunk/openutils-mgnlutils/src/main/resources/mgnl-files/samples/sample-magnoliautils.jsp
===================================================================
--- magnoliamodules/trunk/openutils-mgnlutils/src/main/resources/mgnl-files/samples/sample-magnoliautils.jsp 2013-12-08 19:25:48 UTC (rev 4472)
+++ magnoliamodules/trunk/openutils-mgnlutils/src/main/resources/mgnl-files/samples/sample-magnoliautils.jsp 2013-12-08 19:52:03 UTC (rev 4473)
@@ -12,6 +12,7 @@
<title> ${content.title}
</title>
<link rel="stylesheet" type="text/css" href="${pageContext.request.contextPath}/.resources/bootstrap/3.0/css/bootstrap.min.css" />
+ <meta name="viewport" content="width=device-width, initial-scale=1.0" />
<style>
<![CDATA[
code { display: block}
@@ -27,6 +28,10 @@
<c:set var="oldcontent" value="${state.currentContent}" />
<c:set var="contentMap" value="${content}" />
<c:set var="node" value="${oldcontent.JCRNode}" />
+ <p>
+ You can now use javax.jcr.Node objects directly into jsps. Also ContentMap or old Content and NodeMapWrapper are
+ handled, so you can use the same set of properties for any of them.
+ </p>
<table class="table table-striped table-bordered table-hover">
<thead>
<tr>
@@ -50,11 +55,11 @@
<tr>
<th>class
</th>
- <td>${node.class.name}
+ <td>${node['class'].name}
</td>
- <td>${contentMap.class.name }
+ <td>${contentMap['class'].name }
</td>
- <td>${oldcontent.class.name}
+ <td>${oldcontent['class'].name}
</td>
</tr>
<tr>
Modified: magnoliamodules/trunk/openutils-mgnlutils/src/main/resources/samples-utils/sample-magnoliautils.ftl
===================================================================
--- magnoliamodules/trunk/openutils-mgnlutils/src/main/resources/samples-utils/sample-magnoliautils.ftl 2013-12-08 19:25:48 UTC (rev 4472)
+++ magnoliamodules/trunk/openutils-mgnlutils/src/main/resources/samples-utils/sample-magnoliautils.ftl 2013-12-08 19:52:03 UTC (rev 4473)
@@ -5,6 +5,7 @@
<title> ${content.title}
</title>
<link rel="stylesheet" type="text/css" href="${contextPath}/.resources/bootstrap/3.0/css/bootstrap.min.css" />
+ <meta name="viewport" content="width=device-width, initial-scale=1.0" />
<style>
<![CDATA[
code { display: block}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fg...@us...> - 2013-12-08 20:39:25
|
Revision: 4484
http://openutils.svn.sourceforge.net/openutils/?rev=4484&view=rev
Author: fgiust
Date: 2013-12-08 20:39:23 +0000 (Sun, 08 Dec 2013)
Log Message:
-----------
upgrade version numbers
Modified Paths:
--------------
magnoliamodules/trunk/magnolia-test-webapp/pom.xml
magnoliamodules/trunk/magnolia5-test-webapp/pom.xml
magnoliamodules/trunk/openutils-mgnllms/pom.xml
magnoliamodules/trunk/openutils-mgnlmedia/pom.xml
magnoliamodules/trunk/openutils-mgnlmessages/pom.xml
magnoliamodules/trunk/openutils-mgnlrepoutils/pom.xml
magnoliamodules/trunk/openutils-mgnltagcloud/pom.xml
magnoliamodules/trunk/openutils-mgnlutils/pom.xml
Modified: magnoliamodules/trunk/magnolia-test-webapp/pom.xml
===================================================================
--- magnoliamodules/trunk/magnolia-test-webapp/pom.xml 2013-12-08 20:33:44 UTC (rev 4483)
+++ magnoliamodules/trunk/magnolia-test-webapp/pom.xml 2013-12-08 20:39:23 UTC (rev 4484)
@@ -147,7 +147,7 @@
<dependency>
<groupId>net.sourceforge.openutils</groupId>
<artifactId>openutils-mgnlcriteria</artifactId>
- <version>5.0.10-SNAPSHOT</version>
+ <version>5.0.11-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>net.sourceforge.openutils</groupId>
Modified: magnoliamodules/trunk/magnolia5-test-webapp/pom.xml
===================================================================
--- magnoliamodules/trunk/magnolia5-test-webapp/pom.xml 2013-12-08 20:33:44 UTC (rev 4483)
+++ magnoliamodules/trunk/magnolia5-test-webapp/pom.xml 2013-12-08 20:39:23 UTC (rev 4484)
@@ -157,7 +157,7 @@
<dependency>
<groupId>net.sourceforge.openutils</groupId>
<artifactId>openutils-mgnlcriteria</artifactId>
- <version>5.0.10-SNAPSHOT</version>
+ <version>5.0.11-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>net.sourceforge.openutils</groupId>
Modified: magnoliamodules/trunk/openutils-mgnllms/pom.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnllms/pom.xml 2013-12-08 20:33:44 UTC (rev 4483)
+++ magnoliamodules/trunk/openutils-mgnllms/pom.xml 2013-12-08 20:39:23 UTC (rev 4484)
@@ -177,7 +177,7 @@
<dependency>
<groupId>net.sourceforge.openutils</groupId>
<artifactId>openutils-mgnlcriteria</artifactId>
- <version>5.0.10-SNAPSHOT</version>
+ <version>5.0.10</version>
</dependency>
<dependency>
<groupId>javax.servlet</groupId>
Modified: magnoliamodules/trunk/openutils-mgnlmedia/pom.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnlmedia/pom.xml 2013-12-08 20:33:44 UTC (rev 4483)
+++ magnoliamodules/trunk/openutils-mgnlmedia/pom.xml 2013-12-08 20:39:23 UTC (rev 4484)
@@ -163,7 +163,7 @@
<dependency>
<groupId>net.sourceforge.openutils</groupId>
<artifactId>openutils-mgnltests</artifactId>
- <version>5.0.10-SNAPSHOT</version>
+ <version>5.0.10</version>
<scope>test</scope>
</dependency>
<dependency>
@@ -174,7 +174,7 @@
<dependency>
<groupId>net.sourceforge.openutils</groupId>
<artifactId>openutils-mgnlcriteria</artifactId>
- <version>5.0.10-SNAPSHOT</version>
+ <version>5.0.10</version>
</dependency>
<dependency>
<groupId>javax.servlet.jsp</groupId>
Modified: magnoliamodules/trunk/openutils-mgnlmessages/pom.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnlmessages/pom.xml 2013-12-08 20:33:44 UTC (rev 4483)
+++ magnoliamodules/trunk/openutils-mgnlmessages/pom.xml 2013-12-08 20:39:23 UTC (rev 4484)
@@ -92,7 +92,7 @@
<dependency>
<groupId>net.sourceforge.openutils</groupId>
<artifactId>openutils-mgnlcriteria</artifactId>
- <version>5.0.10-SNAPSHOT</version>
+ <version>5.0.10</version>
</dependency>
<dependency>
<groupId>net.sourceforge.openutils</groupId>
@@ -102,7 +102,7 @@
<dependency>
<groupId>net.sourceforge.openutils</groupId>
<artifactId>openutils-mgnltests</artifactId>
- <version>5.0.10-SNAPSHOT</version>
+ <version>5.0.10</version>
<scope>test</scope>
</dependency>
<dependency>
Modified: magnoliamodules/trunk/openutils-mgnlrepoutils/pom.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnlrepoutils/pom.xml 2013-12-08 20:33:44 UTC (rev 4483)
+++ magnoliamodules/trunk/openutils-mgnlrepoutils/pom.xml 2013-12-08 20:39:23 UTC (rev 4484)
@@ -76,7 +76,7 @@
<dependency>
<groupId>net.sourceforge.openutils</groupId>
<artifactId>openutils-mgnlcriteria</artifactId>
- <version>5.0.10-SNAPSHOT</version>
+ <version>5.0.10</version>
</dependency>
<dependency>
<groupId>net.sourceforge.openutils</groupId>
Modified: magnoliamodules/trunk/openutils-mgnltagcloud/pom.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnltagcloud/pom.xml 2013-12-08 20:33:44 UTC (rev 4483)
+++ magnoliamodules/trunk/openutils-mgnltagcloud/pom.xml 2013-12-08 20:39:23 UTC (rev 4484)
@@ -196,7 +196,7 @@
<dependency>
<groupId>net.sourceforge.openutils</groupId>
<artifactId>openutils-mgnltests</artifactId>
- <version>5.0.10-SNAPSHOT</version>
+ <version>5.0.10</version>
<scope>test</scope>
</dependency>
<dependency>
Modified: magnoliamodules/trunk/openutils-mgnlutils/pom.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnlutils/pom.xml 2013-12-08 20:33:44 UTC (rev 4483)
+++ magnoliamodules/trunk/openutils-mgnlutils/pom.xml 2013-12-08 20:39:23 UTC (rev 4484)
@@ -116,7 +116,7 @@
<dependency>
<groupId>net.sourceforge.openutils</groupId>
<artifactId>openutils-mgnlcriteria</artifactId>
- <version>5.0.10-SNAPSHOT</version>
+ <version>5.0.10</version>
</dependency>
<dependency>
<groupId>javax.servlet</groupId>
@@ -133,7 +133,7 @@
<dependency>
<groupId>net.sourceforge.openutils</groupId>
<artifactId>openutils-mgnltests</artifactId>
- <version>5.0.10-SNAPSHOT</version>
+ <version>5.0.10</version>
<scope>test</scope>
</dependency>
<dependency>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fg...@us...> - 2013-12-08 20:52:23
|
Revision: 4488
http://openutils.svn.sourceforge.net/openutils/?rev=4488&view=rev
Author: fgiust
Date: 2013-12-08 20:52:18 +0000 (Sun, 08 Dec 2013)
Log Message:
-----------
upgrade mgnlutils version
Modified Paths:
--------------
magnoliamodules/trunk/magnolia-test-webapp/pom.xml
magnoliamodules/trunk/openutils-mgnlcache/pom.xml
magnoliamodules/trunk/openutils-mgnlcontextmenu/pom.xml
magnoliamodules/trunk/openutils-mgnlcontrols/pom.xml
magnoliamodules/trunk/openutils-mgnlgroovy/pom.xml
magnoliamodules/trunk/openutils-mgnllms/pom.xml
magnoliamodules/trunk/openutils-mgnlmail/pom.xml
magnoliamodules/trunk/openutils-mgnlmedia/pom.xml
magnoliamodules/trunk/openutils-mgnlmessages/pom.xml
magnoliamodules/trunk/openutils-mgnlrepoutils/pom.xml
magnoliamodules/trunk/openutils-mgnlrules/pom.xml
magnoliamodules/trunk/openutils-mgnlstripes/pom.xml
magnoliamodules/trunk/openutils-mgnlstruts11/pom.xml
magnoliamodules/trunk/openutils-mgnltagcloud/pom.xml
magnoliamodules/trunk/openutils-mgnltasks/pom.xml
Modified: magnoliamodules/trunk/magnolia-test-webapp/pom.xml
===================================================================
--- magnoliamodules/trunk/magnolia-test-webapp/pom.xml 2013-12-08 20:43:59 UTC (rev 4487)
+++ magnoliamodules/trunk/magnolia-test-webapp/pom.xml 2013-12-08 20:52:18 UTC (rev 4488)
@@ -199,7 +199,7 @@
<dependency>
<groupId>net.sourceforge.openutils</groupId>
<artifactId>openutils-mgnlutils</artifactId>
- <version>5.0.10-SNAPSHOT</version>
+ <version>5.0.10</version>
</dependency>
<dependency>
<groupId>net.sourceforge.openutils</groupId>
Modified: magnoliamodules/trunk/openutils-mgnlcache/pom.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnlcache/pom.xml 2013-12-08 20:43:59 UTC (rev 4487)
+++ magnoliamodules/trunk/openutils-mgnlcache/pom.xml 2013-12-08 20:52:18 UTC (rev 4488)
@@ -61,7 +61,7 @@
<dependency>
<groupId>net.sourceforge.openutils</groupId>
<artifactId>openutils-mgnlutils</artifactId>
- <version>5.0.10-SNAPSHOT</version>
+ <version>5.0.10</version>
</dependency>
<dependency>
<groupId>javax.servlet</groupId>
Modified: magnoliamodules/trunk/openutils-mgnlcontextmenu/pom.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnlcontextmenu/pom.xml 2013-12-08 20:43:59 UTC (rev 4487)
+++ magnoliamodules/trunk/openutils-mgnlcontextmenu/pom.xml 2013-12-08 20:52:18 UTC (rev 4488)
@@ -110,7 +110,7 @@
<dependency>
<groupId>net.sourceforge.openutils</groupId>
<artifactId>openutils-mgnlutils</artifactId>
- <version>5.0.10-SNAPSHOT</version>
+ <version>5.0.10</version>
</dependency>
<dependency>
<groupId>net.sourceforge.openutils</groupId>
Modified: magnoliamodules/trunk/openutils-mgnlcontrols/pom.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnlcontrols/pom.xml 2013-12-08 20:43:59 UTC (rev 4487)
+++ magnoliamodules/trunk/openutils-mgnlcontrols/pom.xml 2013-12-08 20:52:18 UTC (rev 4488)
@@ -97,7 +97,7 @@
<dependency>
<groupId>net.sourceforge.openutils</groupId>
<artifactId>openutils-mgnlutils</artifactId>
- <version>5.0.10-SNAPSHOT</version>
+ <version>5.0.10</version>
</dependency>
<dependency>
<groupId>javax.servlet</groupId>
Modified: magnoliamodules/trunk/openutils-mgnlgroovy/pom.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnlgroovy/pom.xml 2013-12-08 20:43:59 UTC (rev 4487)
+++ magnoliamodules/trunk/openutils-mgnlgroovy/pom.xml 2013-12-08 20:52:18 UTC (rev 4488)
@@ -90,7 +90,7 @@
<dependency>
<groupId>net.sourceforge.openutils</groupId>
<artifactId>openutils-mgnlutils</artifactId>
- <version>5.0.10-SNAPSHOT</version>
+ <version>5.0.10</version>
</dependency>
<dependency>
<groupId>javax.servlet</groupId>
Modified: magnoliamodules/trunk/openutils-mgnllms/pom.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnllms/pom.xml 2013-12-08 20:43:59 UTC (rev 4487)
+++ magnoliamodules/trunk/openutils-mgnllms/pom.xml 2013-12-08 20:52:18 UTC (rev 4488)
@@ -108,7 +108,7 @@
<dependency>
<groupId>net.sourceforge.openutils</groupId>
<artifactId>openutils-mgnlutils</artifactId>
- <version>5.0.10-SNAPSHOT</version>
+ <version>5.0.10</version>
</dependency>
<dependency>
<groupId>net.sourceforge.openutils</groupId>
Modified: magnoliamodules/trunk/openutils-mgnlmail/pom.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnlmail/pom.xml 2013-12-08 20:43:59 UTC (rev 4487)
+++ magnoliamodules/trunk/openutils-mgnlmail/pom.xml 2013-12-08 20:52:18 UTC (rev 4488)
@@ -98,7 +98,7 @@
<dependency>
<groupId>net.sourceforge.openutils</groupId>
<artifactId>openutils-mgnlutils</artifactId>
- <version>5.0.10-SNAPSHOT</version>
+ <version>5.0.10</version>
</dependency>
<dependency>
<groupId>javax.servlet</groupId>
Modified: magnoliamodules/trunk/openutils-mgnlmedia/pom.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnlmedia/pom.xml 2013-12-08 20:43:59 UTC (rev 4487)
+++ magnoliamodules/trunk/openutils-mgnlmedia/pom.xml 2013-12-08 20:52:18 UTC (rev 4488)
@@ -125,7 +125,7 @@
<dependency>
<groupId>net.sourceforge.openutils</groupId>
<artifactId>openutils-mgnlutils</artifactId>
- <version>5.0.10-SNAPSHOT</version>
+ <version>5.0.10</version>
</dependency>
<dependency>
<groupId>net.sourceforge.openutils</groupId>
Modified: magnoliamodules/trunk/openutils-mgnlmessages/pom.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnlmessages/pom.xml 2013-12-08 20:43:59 UTC (rev 4487)
+++ magnoliamodules/trunk/openutils-mgnlmessages/pom.xml 2013-12-08 20:52:18 UTC (rev 4488)
@@ -97,7 +97,7 @@
<dependency>
<groupId>net.sourceforge.openutils</groupId>
<artifactId>openutils-mgnlutils</artifactId>
- <version>5.0.10-SNAPSHOT</version>
+ <version>5.0.10</version>
</dependency>
<dependency>
<groupId>net.sourceforge.openutils</groupId>
Modified: magnoliamodules/trunk/openutils-mgnlrepoutils/pom.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnlrepoutils/pom.xml 2013-12-08 20:43:59 UTC (rev 4487)
+++ magnoliamodules/trunk/openutils-mgnlrepoutils/pom.xml 2013-12-08 20:52:18 UTC (rev 4488)
@@ -81,7 +81,7 @@
<dependency>
<groupId>net.sourceforge.openutils</groupId>
<artifactId>openutils-mgnlutils</artifactId>
- <version>5.0.10-SNAPSHOT</version>
+ <version>5.0.10</version>
</dependency>
<dependency>
<groupId>javax.servlet</groupId>
Modified: magnoliamodules/trunk/openutils-mgnlrules/pom.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnlrules/pom.xml 2013-12-08 20:43:59 UTC (rev 4487)
+++ magnoliamodules/trunk/openutils-mgnlrules/pom.xml 2013-12-08 20:52:18 UTC (rev 4488)
@@ -105,7 +105,7 @@
<dependency>
<groupId>net.sourceforge.openutils</groupId>
<artifactId>openutils-mgnlutils</artifactId>
- <version>5.0.10-SNAPSHOT</version>
+ <version>5.0.10</version>
</dependency>
<dependency>
<groupId>info.magnolia</groupId>
Modified: magnoliamodules/trunk/openutils-mgnlstripes/pom.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnlstripes/pom.xml 2013-12-08 20:43:59 UTC (rev 4487)
+++ magnoliamodules/trunk/openutils-mgnlstripes/pom.xml 2013-12-08 20:52:18 UTC (rev 4488)
@@ -72,7 +72,7 @@
<dependency>
<groupId>net.sourceforge.openutils</groupId>
<artifactId>openutils-mgnlutils</artifactId>
- <version>5.0.10-SNAPSHOT</version>
+ <version>5.0.10</version>
</dependency>
<dependency>
<groupId>info.magnolia</groupId>
Modified: magnoliamodules/trunk/openutils-mgnlstruts11/pom.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnlstruts11/pom.xml 2013-12-08 20:43:59 UTC (rev 4487)
+++ magnoliamodules/trunk/openutils-mgnlstruts11/pom.xml 2013-12-08 20:52:18 UTC (rev 4488)
@@ -96,7 +96,7 @@
<dependency>
<groupId>net.sourceforge.openutils</groupId>
<artifactId>openutils-mgnlutils</artifactId>
- <version>5.0.10-SNAPSHOT</version>
+ <version>5.0.10</version>
</dependency>
<dependency>
<groupId>struts</groupId>
Modified: magnoliamodules/trunk/openutils-mgnltagcloud/pom.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnltagcloud/pom.xml 2013-12-08 20:43:59 UTC (rev 4487)
+++ magnoliamodules/trunk/openutils-mgnltagcloud/pom.xml 2013-12-08 20:52:18 UTC (rev 4488)
@@ -191,7 +191,7 @@
<dependency>
<groupId>net.sourceforge.openutils</groupId>
<artifactId>openutils-mgnlutils</artifactId>
- <version>5.0.10-SNAPSHOT</version>
+ <version>5.0.10</version>
</dependency>
<dependency>
<groupId>net.sourceforge.openutils</groupId>
Modified: magnoliamodules/trunk/openutils-mgnltasks/pom.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnltasks/pom.xml 2013-12-08 20:43:59 UTC (rev 4487)
+++ magnoliamodules/trunk/openutils-mgnltasks/pom.xml 2013-12-08 20:52:18 UTC (rev 4488)
@@ -71,7 +71,7 @@
<dependency>
<groupId>net.sourceforge.openutils</groupId>
<artifactId>openutils-mgnlutils</artifactId>
- <version>5.0.10-SNAPSHOT</version>
+ <version>5.0.10</version>
</dependency>
</dependencies>
</project>
\ 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...> - 2013-12-08 21:04:17
|
Revision: 4495
http://openutils.svn.sourceforge.net/openutils/?rev=4495&view=rev
Author: fgiust
Date: 2013-12-08 21:04:13 +0000 (Sun, 08 Dec 2013)
Log Message:
-----------
openutils-mgnlext 5.0.10
Modified Paths:
--------------
magnoliamodules/trunk/openutils-mgnlcontrols/pom.xml
magnoliamodules/trunk/openutils-mgnllms/pom.xml
magnoliamodules/trunk/openutils-mgnlmedia/pom.xml
magnoliamodules/trunk/openutils-mgnlmessages/pom.xml
Modified: magnoliamodules/trunk/openutils-mgnlcontrols/pom.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnlcontrols/pom.xml 2013-12-08 20:57:33 UTC (rev 4494)
+++ magnoliamodules/trunk/openutils-mgnlcontrols/pom.xml 2013-12-08 21:04:13 UTC (rev 4495)
@@ -92,7 +92,7 @@
<dependency>
<groupId>net.sourceforge.openutils</groupId>
<artifactId>openutils-mgnlext</artifactId>
- <version>5.0.10-SNAPSHOT</version>
+ <version>5.0.10</version>
</dependency>
<dependency>
<groupId>net.sourceforge.openutils</groupId>
Modified: magnoliamodules/trunk/openutils-mgnllms/pom.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnllms/pom.xml 2013-12-08 20:57:33 UTC (rev 4494)
+++ magnoliamodules/trunk/openutils-mgnllms/pom.xml 2013-12-08 21:04:13 UTC (rev 4495)
@@ -118,7 +118,7 @@
<dependency>
<groupId>net.sourceforge.openutils</groupId>
<artifactId>openutils-mgnlext</artifactId>
- <version>5.0.10-SNAPSHOT</version>
+ <version>5.0.10</version>
</dependency>
<dependency>
<groupId>net.sourceforge.openutils</groupId>
Modified: magnoliamodules/trunk/openutils-mgnlmedia/pom.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnlmedia/pom.xml 2013-12-08 20:57:33 UTC (rev 4494)
+++ magnoliamodules/trunk/openutils-mgnlmedia/pom.xml 2013-12-08 21:04:13 UTC (rev 4495)
@@ -120,7 +120,7 @@
<dependency>
<groupId>net.sourceforge.openutils</groupId>
<artifactId>openutils-mgnlext</artifactId>
- <version>5.0.10-SNAPSHOT</version>
+ <version>5.0.10</version>
</dependency>
<dependency>
<groupId>net.sourceforge.openutils</groupId>
Modified: magnoliamodules/trunk/openutils-mgnlmessages/pom.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnlmessages/pom.xml 2013-12-08 20:57:33 UTC (rev 4494)
+++ magnoliamodules/trunk/openutils-mgnlmessages/pom.xml 2013-12-08 21:04:13 UTC (rev 4495)
@@ -87,7 +87,7 @@
<dependency>
<groupId>net.sourceforge.openutils</groupId>
<artifactId>openutils-mgnlext</artifactId>
- <version>5.0.10-SNAPSHOT</version>
+ <version>5.0.10</version>
</dependency>
<dependency>
<groupId>net.sourceforge.openutils</groupId>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fg...@us...> - 2013-12-08 21:20:23
|
Revision: 4505
http://openutils.svn.sourceforge.net/openutils/?rev=4505&view=rev
Author: fgiust
Date: 2013-12-08 21:20:19 +0000 (Sun, 08 Dec 2013)
Log Message:
-----------
upgrade versions
Modified Paths:
--------------
magnoliamodules/trunk/openutils-mgnlcontextmenu/pom.xml
magnoliamodules/trunk/openutils-mgnllms/pom.xml
magnoliamodules/trunk/openutils-mgnlmedia/pom.xml
magnoliamodules/trunk/openutils-mgnlrules/pom.xml
magnoliamodules/trunk/openutils-mgnltagcloud/pom.xml
Modified: magnoliamodules/trunk/openutils-mgnlcontextmenu/pom.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnlcontextmenu/pom.xml 2013-12-08 21:17:24 UTC (rev 4504)
+++ magnoliamodules/trunk/openutils-mgnlcontextmenu/pom.xml 2013-12-08 21:20:19 UTC (rev 4505)
@@ -105,7 +105,7 @@
<dependency>
<groupId>net.sourceforge.openutils</groupId>
<artifactId>openutils-mgnlcontrols</artifactId>
- <version>5.0.10-SNAPSHOT</version>
+ <version>5.0.10</version>
</dependency>
<dependency>
<groupId>net.sourceforge.openutils</groupId>
Modified: magnoliamodules/trunk/openutils-mgnllms/pom.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnllms/pom.xml 2013-12-08 21:17:24 UTC (rev 4504)
+++ magnoliamodules/trunk/openutils-mgnllms/pom.xml 2013-12-08 21:20:19 UTC (rev 4505)
@@ -113,7 +113,7 @@
<dependency>
<groupId>net.sourceforge.openutils</groupId>
<artifactId>openutils-mgnlcontrols</artifactId>
- <version>5.0.10-SNAPSHOT</version>
+ <version>5.0.10</version>
</dependency>
<dependency>
<groupId>net.sourceforge.openutils</groupId>
Modified: magnoliamodules/trunk/openutils-mgnlmedia/pom.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnlmedia/pom.xml 2013-12-08 21:17:24 UTC (rev 4504)
+++ magnoliamodules/trunk/openutils-mgnlmedia/pom.xml 2013-12-08 21:20:19 UTC (rev 4505)
@@ -115,7 +115,7 @@
<dependency>
<groupId>net.sourceforge.openutils</groupId>
<artifactId>openutils-mgnlcontrols</artifactId>
- <version>5.0.10-SNAPSHOT</version>
+ <version>5.0.10</version>
</dependency>
<dependency>
<groupId>net.sourceforge.openutils</groupId>
Modified: magnoliamodules/trunk/openutils-mgnlrules/pom.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnlrules/pom.xml 2013-12-08 21:17:24 UTC (rev 4504)
+++ magnoliamodules/trunk/openutils-mgnlrules/pom.xml 2013-12-08 21:20:19 UTC (rev 4505)
@@ -100,7 +100,7 @@
<dependency>
<groupId>net.sourceforge.openutils</groupId>
<artifactId>openutils-mgnlcontrols</artifactId>
- <version>5.0.10-SNAPSHOT</version>
+ <version>5.0.10</version>
</dependency>
<dependency>
<groupId>net.sourceforge.openutils</groupId>
Modified: magnoliamodules/trunk/openutils-mgnltagcloud/pom.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnltagcloud/pom.xml 2013-12-08 21:17:24 UTC (rev 4504)
+++ magnoliamodules/trunk/openutils-mgnltagcloud/pom.xml 2013-12-08 21:20:19 UTC (rev 4505)
@@ -186,7 +186,7 @@
<dependency>
<groupId>net.sourceforge.openutils</groupId>
<artifactId>openutils-mgnlcontrols</artifactId>
- <version>5.0.10-SNAPSHOT</version>
+ <version>5.0.10</version>
</dependency>
<dependency>
<groupId>net.sourceforge.openutils</groupId>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <gca...@us...> - 2015-04-17 11:06:05
|
Revision: 4635
http://openutils.svn.sourceforge.net/openutils/?rev=4635&view=rev
Author: gcatania
Date: 2015-04-17 11:06:02 +0000 (Fri, 17 Apr 2015)
Log Message:
-----------
update parent version
Modified Paths:
--------------
magnoliamodules/trunk/magnolia-test-webapp/pom.xml
magnoliamodules/trunk/openutils-mgnlbootstrapsync/pom.xml
magnoliamodules/trunk/openutils-mgnlcache/pom.xml
magnoliamodules/trunk/openutils-mgnlcas/pom.xml
magnoliamodules/trunk/openutils-mgnlcontextmenu/pom.xml
magnoliamodules/trunk/openutils-mgnlcontrols/pom.xml
magnoliamodules/trunk/openutils-mgnlcriteria/pom.xml
magnoliamodules/trunk/openutils-mgnlext/pom.xml
magnoliamodules/trunk/openutils-mgnlgroovy/pom.xml
magnoliamodules/trunk/openutils-mgnllms/pom.xml
magnoliamodules/trunk/openutils-mgnlmail/pom.xml
magnoliamodules/trunk/openutils-mgnlmedia/pom.xml
magnoliamodules/trunk/openutils-mgnlmessages/pom.xml
magnoliamodules/trunk/openutils-mgnlrepoutils/pom.xml
magnoliamodules/trunk/openutils-mgnlrules/pom.xml
magnoliamodules/trunk/openutils-mgnlstripes/pom.xml
magnoliamodules/trunk/openutils-mgnlstruts11/pom.xml
magnoliamodules/trunk/openutils-mgnltagcloud/pom.xml
magnoliamodules/trunk/openutils-mgnltasks/pom.xml
magnoliamodules/trunk/openutils-mgnltests/pom.xml
magnoliamodules/trunk/openutils-mgnlutils/pom.xml
Modified: magnoliamodules/trunk/magnolia-test-webapp/pom.xml
===================================================================
--- magnoliamodules/trunk/magnolia-test-webapp/pom.xml 2015-04-17 10:55:38 UTC (rev 4634)
+++ magnoliamodules/trunk/magnolia-test-webapp/pom.xml 2015-04-17 11:06:02 UTC (rev 4635)
@@ -5,7 +5,7 @@
<groupId>net.sourceforge.openutils</groupId>
<artifactId>openutils-parent</artifactId>
<relativePath>../openutils-parent</relativePath>
- <version>1.14</version>
+ <version>1.15</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<packaging>war</packaging>
Modified: magnoliamodules/trunk/openutils-mgnlbootstrapsync/pom.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnlbootstrapsync/pom.xml 2015-04-17 10:55:38 UTC (rev 4634)
+++ magnoliamodules/trunk/openutils-mgnlbootstrapsync/pom.xml 2015-04-17 11:06:02 UTC (rev 4635)
@@ -5,7 +5,7 @@
<groupId>net.sourceforge.openutils</groupId>
<artifactId>openutils-parent</artifactId>
<relativePath>../openutils-parent</relativePath>
- <version>1.14</version>
+ <version>1.15</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<packaging>jar</packaging>
Modified: magnoliamodules/trunk/openutils-mgnlcache/pom.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnlcache/pom.xml 2015-04-17 10:55:38 UTC (rev 4634)
+++ magnoliamodules/trunk/openutils-mgnlcache/pom.xml 2015-04-17 11:06:02 UTC (rev 4635)
@@ -3,7 +3,7 @@
<groupId>net.sourceforge.openutils</groupId>
<artifactId>openutils-parent</artifactId>
<relativePath>../openutils-parent</relativePath>
- <version>1.14</version>
+ <version>1.15</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<packaging>jar</packaging>
Modified: magnoliamodules/trunk/openutils-mgnlcas/pom.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnlcas/pom.xml 2015-04-17 10:55:38 UTC (rev 4634)
+++ magnoliamodules/trunk/openutils-mgnlcas/pom.xml 2015-04-17 11:06:02 UTC (rev 4635)
@@ -4,7 +4,7 @@
<groupId>net.sourceforge.openutils</groupId>
<artifactId>openutils-parent</artifactId>
<relativePath>../openutils-parent</relativePath>
- <version>1.14</version>
+ <version>1.15</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<packaging>jar</packaging>
Modified: magnoliamodules/trunk/openutils-mgnlcontextmenu/pom.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnlcontextmenu/pom.xml 2015-04-17 10:55:38 UTC (rev 4634)
+++ magnoliamodules/trunk/openutils-mgnlcontextmenu/pom.xml 2015-04-17 11:06:02 UTC (rev 4635)
@@ -4,7 +4,7 @@
<groupId>net.sourceforge.openutils</groupId>
<artifactId>openutils-parent</artifactId>
<relativePath>../openutils-parent</relativePath>
- <version>1.14</version>
+ <version>1.15</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<packaging>jar</packaging>
Modified: magnoliamodules/trunk/openutils-mgnlcontrols/pom.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnlcontrols/pom.xml 2015-04-17 10:55:38 UTC (rev 4634)
+++ magnoliamodules/trunk/openutils-mgnlcontrols/pom.xml 2015-04-17 11:06:02 UTC (rev 4635)
@@ -3,7 +3,7 @@
<groupId>net.sourceforge.openutils</groupId>
<artifactId>openutils-parent</artifactId>
<relativePath>../openutils-parent</relativePath>
- <version>1.14</version>
+ <version>1.15</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<packaging>jar</packaging>
Modified: magnoliamodules/trunk/openutils-mgnlcriteria/pom.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnlcriteria/pom.xml 2015-04-17 10:55:38 UTC (rev 4634)
+++ magnoliamodules/trunk/openutils-mgnlcriteria/pom.xml 2015-04-17 11:06:02 UTC (rev 4635)
@@ -4,7 +4,7 @@
<groupId>net.sourceforge.openutils</groupId>
<artifactId>openutils-parent</artifactId>
<relativePath>../openutils-parent</relativePath>
- <version>1.14</version>
+ <version>1.15</version>
</parent>
<artifactId>openutils-mgnlcriteria</artifactId>
<name>Criteria API for Magnolia CMS</name>
Modified: magnoliamodules/trunk/openutils-mgnlext/pom.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnlext/pom.xml 2015-04-17 10:55:38 UTC (rev 4634)
+++ magnoliamodules/trunk/openutils-mgnlext/pom.xml 2015-04-17 11:06:02 UTC (rev 4635)
@@ -3,7 +3,7 @@
<groupId>net.sourceforge.openutils</groupId>
<artifactId>openutils-parent</artifactId>
<relativePath>../openutils-parent</relativePath>
- <version>1.14</version>
+ <version>1.15</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<packaging>jar</packaging>
Modified: magnoliamodules/trunk/openutils-mgnlgroovy/pom.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnlgroovy/pom.xml 2015-04-17 10:55:38 UTC (rev 4634)
+++ magnoliamodules/trunk/openutils-mgnlgroovy/pom.xml 2015-04-17 11:06:02 UTC (rev 4635)
@@ -3,7 +3,7 @@
<groupId>net.sourceforge.openutils</groupId>
<artifactId>openutils-parent</artifactId>
<relativePath>../openutils-parent</relativePath>
- <version>1.14</version>
+ <version>1.15</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<packaging>jar</packaging>
Modified: magnoliamodules/trunk/openutils-mgnllms/pom.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnllms/pom.xml 2015-04-17 10:55:38 UTC (rev 4634)
+++ magnoliamodules/trunk/openutils-mgnllms/pom.xml 2015-04-17 11:06:02 UTC (rev 4635)
@@ -3,7 +3,7 @@
<groupId>net.sourceforge.openutils</groupId>
<artifactId>openutils-parent</artifactId>
<relativePath>../openutils-parent</relativePath>
- <version>1.14</version>
+ <version>1.15</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<packaging>jar</packaging>
Modified: magnoliamodules/trunk/openutils-mgnlmail/pom.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnlmail/pom.xml 2015-04-17 10:55:38 UTC (rev 4634)
+++ magnoliamodules/trunk/openutils-mgnlmail/pom.xml 2015-04-17 11:06:02 UTC (rev 4635)
@@ -3,7 +3,7 @@
<groupId>net.sourceforge.openutils</groupId>
<artifactId>openutils-parent</artifactId>
<relativePath>../openutils-parent</relativePath>
- <version>1.14</version>
+ <version>1.15</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<packaging>jar</packaging>
Modified: magnoliamodules/trunk/openutils-mgnlmedia/pom.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnlmedia/pom.xml 2015-04-17 10:55:38 UTC (rev 4634)
+++ magnoliamodules/trunk/openutils-mgnlmedia/pom.xml 2015-04-17 11:06:02 UTC (rev 4635)
@@ -3,7 +3,7 @@
<groupId>net.sourceforge.openutils</groupId>
<artifactId>openutils-parent</artifactId>
<relativePath>../openutils-parent</relativePath>
- <version>1.14</version>
+ <version>1.15</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<packaging>jar</packaging>
Modified: magnoliamodules/trunk/openutils-mgnlmessages/pom.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnlmessages/pom.xml 2015-04-17 10:55:38 UTC (rev 4634)
+++ magnoliamodules/trunk/openutils-mgnlmessages/pom.xml 2015-04-17 11:06:02 UTC (rev 4635)
@@ -3,7 +3,7 @@
<groupId>net.sourceforge.openutils</groupId>
<artifactId>openutils-parent</artifactId>
<relativePath>../openutils-parent</relativePath>
- <version>1.14</version>
+ <version>1.15</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<packaging>jar</packaging>
Modified: magnoliamodules/trunk/openutils-mgnlrepoutils/pom.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnlrepoutils/pom.xml 2015-04-17 10:55:38 UTC (rev 4634)
+++ magnoliamodules/trunk/openutils-mgnlrepoutils/pom.xml 2015-04-17 11:06:02 UTC (rev 4635)
@@ -3,7 +3,7 @@
<groupId>net.sourceforge.openutils</groupId>
<artifactId>openutils-parent</artifactId>
<relativePath>../openutils-parent</relativePath>
- <version>1.14</version>
+ <version>1.15</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<packaging>jar</packaging>
Modified: magnoliamodules/trunk/openutils-mgnlrules/pom.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnlrules/pom.xml 2015-04-17 10:55:38 UTC (rev 4634)
+++ magnoliamodules/trunk/openutils-mgnlrules/pom.xml 2015-04-17 11:06:02 UTC (rev 4635)
@@ -4,7 +4,7 @@
<groupId>net.sourceforge.openutils</groupId>
<artifactId>openutils-parent</artifactId>
<relativePath>../openutils-parent</relativePath>
- <version>1.14</version>
+ <version>1.15</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<packaging>jar</packaging>
Modified: magnoliamodules/trunk/openutils-mgnlstripes/pom.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnlstripes/pom.xml 2015-04-17 10:55:38 UTC (rev 4634)
+++ magnoliamodules/trunk/openutils-mgnlstripes/pom.xml 2015-04-17 11:06:02 UTC (rev 4635)
@@ -4,7 +4,7 @@
<groupId>net.sourceforge.openutils</groupId>
<artifactId>openutils-parent</artifactId>
<relativePath>../openutils-parent</relativePath>
- <version>1.14</version>
+ <version>1.15</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<packaging>jar</packaging>
Modified: magnoliamodules/trunk/openutils-mgnlstruts11/pom.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnlstruts11/pom.xml 2015-04-17 10:55:38 UTC (rev 4634)
+++ magnoliamodules/trunk/openutils-mgnlstruts11/pom.xml 2015-04-17 11:06:02 UTC (rev 4635)
@@ -5,7 +5,7 @@
<groupId>net.sourceforge.openutils</groupId>
<artifactId>openutils-parent</artifactId>
<relativePath>../openutils-parent</relativePath>
- <version>1.14</version>
+ <version>1.15</version>
</parent>
<artifactId>openutils-mgnlstruts11</artifactId>
<packaging>jar</packaging>
Modified: magnoliamodules/trunk/openutils-mgnltagcloud/pom.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnltagcloud/pom.xml 2015-04-17 10:55:38 UTC (rev 4634)
+++ magnoliamodules/trunk/openutils-mgnltagcloud/pom.xml 2015-04-17 11:06:02 UTC (rev 4635)
@@ -4,7 +4,7 @@
<groupId>net.sourceforge.openutils</groupId>
<artifactId>openutils-parent</artifactId>
<relativePath>../openutils-parent</relativePath>
- <version>1.14</version>
+ <version>1.15</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<packaging>jar</packaging>
Modified: magnoliamodules/trunk/openutils-mgnltasks/pom.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnltasks/pom.xml 2015-04-17 10:55:38 UTC (rev 4634)
+++ magnoliamodules/trunk/openutils-mgnltasks/pom.xml 2015-04-17 11:06:02 UTC (rev 4635)
@@ -4,7 +4,7 @@
<groupId>net.sourceforge.openutils</groupId>
<artifactId>openutils-parent</artifactId>
<relativePath>../openutils-parent</relativePath>
- <version>1.14</version>
+ <version>1.15</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<packaging>jar</packaging>
Modified: magnoliamodules/trunk/openutils-mgnltests/pom.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnltests/pom.xml 2015-04-17 10:55:38 UTC (rev 4634)
+++ magnoliamodules/trunk/openutils-mgnltests/pom.xml 2015-04-17 11:06:02 UTC (rev 4635)
@@ -3,7 +3,7 @@
<groupId>net.sourceforge.openutils</groupId>
<artifactId>openutils-parent</artifactId>
<relativePath>../openutils-parent</relativePath>
- <version>1.14</version>
+ <version>1.15</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<packaging>jar</packaging>
Modified: magnoliamodules/trunk/openutils-mgnlutils/pom.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnlutils/pom.xml 2015-04-17 10:55:38 UTC (rev 4634)
+++ magnoliamodules/trunk/openutils-mgnlutils/pom.xml 2015-04-17 11:06:02 UTC (rev 4635)
@@ -3,7 +3,7 @@
<groupId>net.sourceforge.openutils</groupId>
<artifactId>openutils-parent</artifactId>
<relativePath>../openutils-parent</relativePath>
- <version>1.14</version>
+ <version>1.15</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<packaging>jar</packaging>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|