|
From: <fg...@us...> - 2013-05-18 16:07:22
|
Revision: 4222
http://openutils.svn.sourceforge.net/openutils/?rev=4222&view=rev
Author: fgiust
Date: 2013-05-18 16:07:19 +0000 (Sat, 18 May 2013)
Log Message:
-----------
removing magnolia 4.5 deprecated APIs and add compatibility with the Node interface + ContentMap
Modified Paths:
--------------
magnoliamodules/trunk/openutils-mgnlcriteria/pom.xml
magnoliamodules/trunk/openutils-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/advanced/impl/AccessibleResultItemResultIterator.java
magnoliamodules/trunk/openutils-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/advanced/impl/AdvancedResultImpl.java
magnoliamodules/trunk/openutils-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/advanced/impl/AdvancedResultItemImpl.java
magnoliamodules/trunk/openutils-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/advanced/impl/AdvancedResultItemResultIterator.java
magnoliamodules/trunk/openutils-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/advanced/impl/MappedDefaultContent.java
magnoliamodules/trunk/openutils-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/advanced/impl/QueryExecutorHelper.java
magnoliamodules/trunk/openutils-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/jcr/query/AdvancedResultItem.java
magnoliamodules/trunk/openutils-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/jcr/query/DirectJcrQuery.java
magnoliamodules/trunk/openutils-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/jcr/query/JCRCriteriaFactory.java
magnoliamodules/trunk/openutils-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/jcr/query/ResultIteratorImpl.java
magnoliamodules/trunk/openutils-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/jcr/query/xpath/impl/AbstractCriteriaImpl.java
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/lucene/AclSearchIndexTest.java
magnoliamodules/trunk/openutils-mgnlcriteria/src/test/java/net/sourceforge/openutils/mgnlcriteria/tests/CriteriaTestUtils.java
Added Paths:
-----------
magnoliamodules/trunk/openutils-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/utils/ToBeanUtils.java
Removed Paths:
-------------
magnoliamodules/trunk/openutils-mgnlcriteria/src/test/java/it/
Modified: magnoliamodules/trunk/openutils-mgnlcriteria/pom.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnlcriteria/pom.xml 2013-04-05 20:56:05 UTC (rev 4221)
+++ magnoliamodules/trunk/openutils-mgnlcriteria/pom.xml 2013-05-18 16:07:19 UTC (rev 4222)
@@ -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">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>net.sourceforge.openutils</groupId>
@@ -167,6 +168,12 @@
<scope>test</scope>
</dependency>
<dependency>
+ <groupId>net.sourceforge.openutils</groupId>
+ <artifactId>openutils-mgnltests</artifactId>
+ <version>5.0.0</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
<groupId>javax.servlet</groupId>
<artifactId>servlet-api</artifactId>
<version>2.4</version>
Modified: magnoliamodules/trunk/openutils-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/advanced/impl/AccessibleResultItemResultIterator.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/advanced/impl/AccessibleResultItemResultIterator.java 2013-04-05 20:56:05 UTC (rev 4221)
+++ magnoliamodules/trunk/openutils-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/advanced/impl/AccessibleResultItemResultIterator.java 2013-05-18 16:07:19 UTC (rev 4222)
@@ -19,11 +19,13 @@
package net.sourceforge.openutils.mgnlcriteria.advanced.impl;
-import info.magnolia.cms.core.HierarchyManager;
import info.magnolia.cms.security.PermissionUtil;
+import info.magnolia.jcr.RuntimeRepositoryException;
+import info.magnolia.jcr.util.NodeUtil;
import java.util.NoSuchElementException;
+import javax.jcr.RepositoryException;
import javax.jcr.Session;
import javax.jcr.query.RowIterator;
@@ -53,9 +55,9 @@
/**
*
*/
- public AccessibleResultItemResultIterator(RowIterator rowIterator, HierarchyManager hm)
+ public AccessibleResultItemResultIterator(RowIterator rowIterator)
{
- super(rowIterator, hm);
+ super(rowIterator);
}
/**
@@ -78,10 +80,20 @@
do
{
next = super.next();
- if (!PermissionUtil.isGranted(hm.getWorkspace().getName(), next.getHandle(), Session.ACTION_READ))
+ try
{
- next = null;
+ if (!PermissionUtil.isGranted(
+ next.getSession().getWorkspace().getName(),
+ NodeUtil.getPathIfPossible(next.getJCRNode()),
+ Session.ACTION_READ))
+ {
+ next = null;
+ }
}
+ catch (RepositoryException e)
+ {
+ throw new RuntimeRepositoryException(e);
+ }
}
while (next == null && super.hasNext());
// return true if a next result exists and it is accessible
Modified: magnoliamodules/trunk/openutils-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/advanced/impl/AdvancedResultImpl.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/advanced/impl/AdvancedResultImpl.java 2013-04-05 20:56:05 UTC (rev 4221)
+++ magnoliamodules/trunk/openutils-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/advanced/impl/AdvancedResultImpl.java 2013-05-18 16:07:19 UTC (rev 4222)
@@ -19,9 +19,9 @@
package net.sourceforge.openutils.mgnlcriteria.advanced.impl;
-import info.magnolia.cms.core.HierarchyManager;
import info.magnolia.content2bean.Content2BeanException;
import info.magnolia.content2bean.Content2BeanUtil;
+import info.magnolia.jcr.RuntimeRepositoryException;
import javax.jcr.Item;
import javax.jcr.RepositoryException;
@@ -37,6 +37,7 @@
import net.sourceforge.openutils.mgnlcriteria.jcr.query.ResultIterator;
import net.sourceforge.openutils.mgnlcriteria.jcr.query.ResultIteratorImpl;
import net.sourceforge.openutils.mgnlcriteria.utils.JcrCompatUtils;
+import net.sourceforge.openutils.mgnlcriteria.utils.ToBeanUtils;
import org.apache.jackrabbit.core.query.lucene.QueryResultImpl;
import org.slf4j.Logger;
@@ -58,15 +59,10 @@
private final String statement;
- private HierarchyManager hm;
-
private String spellCheckerSuggestion;
private final Query spellCheckerQuery;
- /**
- * Logger.
- */
private Logger log = LoggerFactory.getLogger(AdvancedResultImpl.class);
private final boolean applyLocalPaging;
@@ -86,10 +82,9 @@
int itemsPerPage,
int pageNumberStartingFromOne,
String statement,
- HierarchyManager hm,
Query spellCheckerQuery)
{
- this(jcrQueryResult, itemsPerPage, pageNumberStartingFromOne, statement, hm, spellCheckerQuery, false);
+ this(jcrQueryResult, itemsPerPage, pageNumberStartingFromOne, statement, spellCheckerQuery, false);
}
/**
@@ -106,19 +101,10 @@
int itemsPerPage,
int pageNumberStartingFromOne,
String statement,
- HierarchyManager hm,
Query spellCheckerQuery,
boolean applyLocalPaging)
{
- this(
- jcrQueryResult,
- itemsPerPage,
- pageNumberStartingFromOne,
- statement,
- hm,
- spellCheckerQuery,
- applyLocalPaging,
- 0);
+ this(jcrQueryResult, itemsPerPage, pageNumberStartingFromOne, statement, spellCheckerQuery, applyLocalPaging, 0);
}
/**
@@ -136,7 +122,6 @@
int itemsPerPage,
int pageNumberStartingFromOne,
String statement,
- HierarchyManager hm,
Query spellCheckerQuery,
boolean applyLocalPaging,
int offset)
@@ -144,7 +129,6 @@
this.jcrQueryResult = jcrQueryResult;
this.itemsPerPage = itemsPerPage;
this.statement = statement;
- this.hm = hm;
this.spellCheckerQuery = spellCheckerQuery;
this.pageNumberStartingFromOne = pageNumberStartingFromOne;
this.applyLocalPaging = applyLocalPaging;
@@ -223,7 +207,7 @@
rows.skip(offset);
// removing folllowing records and alter getSize()
- return new AccessibleResultItemResultIterator(rows, this.hm)
+ return new AccessibleResultItemResultIterator(rows)
{
/**
@@ -246,7 +230,7 @@
};
}
- return new AccessibleResultItemResultIterator(rows, this.hm);
+ return new AccessibleResultItemResultIterator(rows);
}
/**
@@ -327,7 +311,7 @@
rows.skip(offset);
// removing folllowing records and alter getSize()
- return new ResultIteratorImpl<K>(rows, this.hm)
+ return new ResultIteratorImpl<K>(rows)
{
/**
@@ -360,24 +344,17 @@
return null;
}
- return (K) Content2BeanUtil.toBean(
- new AdvancedResultItemImpl(row, jcrNode, this.hm),
- true,
- theclass);
+ return (K) ToBeanUtils.toBean(new AdvancedResultItemImpl(row, jcrNode), true, theclass);
}
catch (RepositoryException e)
{
- throw new RuntimeException(e);
+ throw new RuntimeRepositoryException(e);
}
- catch (Content2BeanException e)
- {
- throw new RuntimeException(e);
- }
}
};
}
- return new ResultIteratorImpl<K>(rows, hm)
+ return new ResultIteratorImpl<K>(rows)
{
@SuppressWarnings("unchecked")
@@ -392,19 +369,12 @@
return null;
}
- return (K) Content2BeanUtil.toBean(
- new AdvancedResultItemImpl(row, jcrNode, this.hm),
- true,
- theclass);
+ return (K) ToBeanUtils.toBean(new AdvancedResultItemImpl(row, jcrNode), true, theclass);
}
catch (RepositoryException e)
{
- throw new RuntimeException(e);
+ throw new RuntimeRepositoryException(e);
}
- catch (Content2BeanException e)
- {
- throw new RuntimeException(e);
- }
}
};
}
Modified: magnoliamodules/trunk/openutils-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/advanced/impl/AdvancedResultItemImpl.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/advanced/impl/AdvancedResultItemImpl.java 2013-04-05 20:56:05 UTC (rev 4221)
+++ magnoliamodules/trunk/openutils-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/advanced/impl/AdvancedResultItemImpl.java 2013-05-18 16:07:19 UTC (rev 4222)
@@ -19,17 +19,47 @@
package net.sourceforge.openutils.mgnlcriteria.advanced.impl;
-import info.magnolia.cms.core.HierarchyManager;
import info.magnolia.cms.security.AccessDeniedException;
+import info.magnolia.jcr.RuntimeRepositoryException;
+import info.magnolia.jcr.util.ContentMap;
+import info.magnolia.jcr.wrapper.I18nNodeWrapper;
+import java.io.InputStream;
import java.lang.reflect.InvocationTargetException;
-import java.lang.reflect.Method;
+import java.math.BigDecimal;
+import java.util.Calendar;
+import javax.jcr.Binary;
+import javax.jcr.InvalidItemStateException;
+import javax.jcr.InvalidLifecycleTransitionException;
import javax.jcr.Item;
+import javax.jcr.ItemExistsException;
+import javax.jcr.ItemNotFoundException;
+import javax.jcr.ItemVisitor;
+import javax.jcr.MergeException;
+import javax.jcr.NoSuchWorkspaceException;
import javax.jcr.Node;
+import javax.jcr.NodeIterator;
+import javax.jcr.PathNotFoundException;
+import javax.jcr.Property;
+import javax.jcr.PropertyIterator;
+import javax.jcr.ReferentialIntegrityException;
import javax.jcr.RepositoryException;
+import javax.jcr.Session;
+import javax.jcr.UnsupportedRepositoryOperationException;
import javax.jcr.Value;
+import javax.jcr.ValueFormatException;
+import javax.jcr.lock.Lock;
+import javax.jcr.lock.LockException;
+import javax.jcr.nodetype.ConstraintViolationException;
+import javax.jcr.nodetype.NoSuchNodeTypeException;
+import javax.jcr.nodetype.NodeDefinition;
+import javax.jcr.nodetype.NodeType;
import javax.jcr.query.Row;
+import javax.jcr.version.ActivityViolationException;
+import javax.jcr.version.Version;
+import javax.jcr.version.VersionException;
+import javax.jcr.version.VersionHistory;
import net.sourceforge.openutils.mgnlcriteria.jcr.query.AdvancedResultItem;
@@ -42,11 +72,13 @@
* @author fgiust
* @version $Id$
*/
-public class AdvancedResultItemImpl extends MappedDefaultContent implements AdvancedResultItem
+public class AdvancedResultItemImpl extends ContentMap implements AdvancedResultItem
{
private final Row row;
+ private final Node node;
+
/**
* Logger.
*/
@@ -62,11 +94,10 @@
* @throws IllegalStateException
* @throws IllegalArgumentException
*/
- public AdvancedResultItemImpl(Row row, Item item, HierarchyManager hierarchyManager)
- throws RepositoryException,
- AccessDeniedException
+ public AdvancedResultItemImpl(Row row, Item item) throws RepositoryException, AccessDeniedException
{
- super((Node) item, hierarchyManager);
+ super(new I18nNodeWrapper((Node) item));
+ this.node = new I18nNodeWrapper((Node) item);
this.row = row;
}
@@ -143,53 +174,1231 @@
*/
public double getScore(String selector)
{
-
- Method jcrRowGetScore = null;
+ if (selector == null)
+ {
+ try
+ {
+ return row.getScore();
+ }
+ catch (RepositoryException e)
+ {
+ log.warn("unable to extract score from {}", row);
+ }
+ }
try
{
- jcrRowGetScore = row.getClass().getDeclaredMethod("getScore", new Class[]{String.class });
- jcrRowGetScore.setAccessible(true);
+ return row.getScore(selector);
}
- catch (SecurityException e)
+ catch (RepositoryException e)
{
+ log.warn("unable to extract score from {} using selector {}", row, selector);
}
- catch (NoSuchMethodException e)
+
+ return 0;
+ }
+
+ /**
+ * @return
+ * @throws RepositoryException
+ * @see javax.jcr.Item#getPath()
+ */
+ public String getPath() throws RepositoryException
+ {
+ return node.getPath();
+ }
+
+ /**
+ * @ * @see javax.jcr.Item#getName()
+ */
+ public String getName()
+ {
+ try
{
+ return node.getName();
}
+ catch (RepositoryException e)
+ {
+ throw new RuntimeRepositoryException(e);
+ }
+ }
- if (jcrRowGetScore != null)
+ /**
+ * @param depth
+ * @return
+ * @throws ItemNotFoundException
+ * @throws AccessDeniedException
+ * @throws RepositoryException
+ * @see javax.jcr.Item#getAncestor(int)
+ */
+ public Item getAncestor(int depth) throws ItemNotFoundException, javax.jcr.AccessDeniedException,
+ RepositoryException
+ {
+ return node.getAncestor(depth);
+ }
+
+ /**
+ * @param relPath
+ * @return
+ * @throws ItemExistsException
+ * @throws PathNotFoundException
+ * @throws VersionException
+ * @throws ConstraintViolationException
+ * @throws LockException
+ * @throws RepositoryException
+ * @see javax.jcr.Node#addNode(java.lang.String)
+ */
+ public Node addNode(String relPath) throws ItemExistsException, PathNotFoundException, VersionException,
+ ConstraintViolationException, LockException, RepositoryException
+ {
+ return node.addNode(relPath);
+ }
+
+ /**
+ * @return
+ * @throws ItemNotFoundException
+ * @throws AccessDeniedException
+ * @throws RepositoryException
+ * @see javax.jcr.Item#getParent()
+ */
+ public Node getParent() throws ItemNotFoundException, javax.jcr.AccessDeniedException, RepositoryException
+ {
+ return node.getParent();
+ }
+
+ /**
+ * @return
+ * @throws RepositoryException
+ * @see javax.jcr.Item#getDepth()
+ */
+ public int getDepth() throws RepositoryException
+ {
+ return node.getDepth();
+ }
+
+ /**
+ * @return
+ * @throws RepositoryException
+ * @see javax.jcr.Item#getSession()
+ */
+ public Session getSession() throws RepositoryException
+ {
+ return node.getSession();
+ }
+
+ /**
+ * @return
+ * @see javax.jcr.Item#isNode()
+ */
+ public boolean isNode()
+ {
+ return node.isNode();
+ }
+
+ /**
+ * @return
+ * @see javax.jcr.Item#isNew()
+ */
+ public boolean isNew()
+ {
+ return node.isNew();
+ }
+
+ /**
+ * @return
+ * @see javax.jcr.Item#isModified()
+ */
+ public boolean isModified()
+ {
+ return node.isModified();
+ }
+
+ /**
+ * @param otherItem
+ * @return
+ * @throws RepositoryException
+ * @see javax.jcr.Item#isSame(javax.jcr.Item)
+ */
+ public boolean isSame(Item otherItem) throws RepositoryException
+ {
+ return node.isSame(otherItem);
+ }
+
+ /**
+ * @param relPath
+ * @param primaryNodeTypeName
+ * @return
+ * @throws ItemExistsException
+ * @throws PathNotFoundException
+ * @throws NoSuchNodeTypeException
+ * @throws LockException
+ * @throws VersionException
+ * @throws ConstraintViolationException
+ * @throws RepositoryException
+ * @see javax.jcr.Node#addNode(java.lang.String, java.lang.String)
+ */
+ public Node addNode(String relPath, String primaryNodeTypeName) throws ItemExistsException, PathNotFoundException,
+ NoSuchNodeTypeException, LockException, VersionException, ConstraintViolationException, RepositoryException
+ {
+ return node.addNode(relPath, primaryNodeTypeName);
+ }
+
+ /**
+ * @param visitor
+ * @throws RepositoryException
+ * @see javax.jcr.Item#accept(javax.jcr.ItemVisitor)
+ */
+ public void accept(ItemVisitor visitor) throws RepositoryException
+ {
+ node.accept(visitor);
+ }
+
+ /**
+ * @throws AccessDeniedException
+ * @throws ItemExistsException
+ * @throws ConstraintViolationException
+ * @throws InvalidItemStateException
+ * @throws ReferentialIntegrityException
+ * @throws VersionException
+ * @throws LockException
+ * @throws NoSuchNodeTypeException
+ * @throws RepositoryException
+ * @deprecated
+ * @see javax.jcr.Item#save()
+ */
+ @Deprecated
+ public void save() throws javax.jcr.AccessDeniedException, ItemExistsException, ConstraintViolationException,
+ InvalidItemStateException, ReferentialIntegrityException, VersionException, LockException,
+ NoSuchNodeTypeException, RepositoryException
+ {
+ node.save();
+ }
+
+ /**
+ * @param srcChildRelPath
+ * @param destChildRelPath
+ * @throws UnsupportedRepositoryOperationException
+ * @throws VersionException
+ * @throws ConstraintViolationException
+ * @throws ItemNotFoundException
+ * @throws LockException
+ * @throws RepositoryException
+ * @see javax.jcr.Node#orderBefore(java.lang.String, java.lang.String)
+ */
+ public void orderBefore(String srcChildRelPath, String destChildRelPath)
+ throws UnsupportedRepositoryOperationException, VersionException, ConstraintViolationException,
+ ItemNotFoundException, LockException, RepositoryException
+ {
+ node.orderBefore(srcChildRelPath, destChildRelPath);
+ }
+
+ /**
+ * @param keepChanges
+ * @throws InvalidItemStateException
+ * @throws RepositoryException
+ * @see javax.jcr.Item#refresh(boolean)
+ */
+ public void refresh(boolean keepChanges) throws InvalidItemStateException, RepositoryException
+ {
+ node.refresh(keepChanges);
+ }
+
+ /**
+ * @param name
+ * @param value
+ * @return
+ * @throws ValueFormatException
+ * @throws VersionException
+ * @throws LockException
+ * @throws ConstraintViolationException
+ * @throws RepositoryException
+ * @see javax.jcr.Node#setProperty(java.lang.String, javax.jcr.Value)
+ */
+ public Property setProperty(String name, Value value) throws ValueFormatException, VersionException, LockException,
+ ConstraintViolationException, RepositoryException
+ {
+ return node.setProperty(name, value);
+ }
+
+ /**
+ * @throws VersionException
+ * @throws LockException
+ * @throws ConstraintViolationException
+ * @throws AccessDeniedException
+ * @throws RepositoryException
+ * @see javax.jcr.Item#remove()
+ */
+ public void remove() throws VersionException, LockException, ConstraintViolationException,
+ javax.jcr.AccessDeniedException, RepositoryException
+ {
+ node.remove();
+ }
+
+ /**
+ * @param name
+ * @param value
+ * @param type
+ * @return
+ * @throws ValueFormatException
+ * @throws VersionException
+ * @throws LockException
+ * @throws ConstraintViolationException
+ * @throws RepositoryException
+ * @see javax.jcr.Node#setProperty(java.lang.String, javax.jcr.Value, int)
+ */
+ public Property setProperty(String name, Value value, int type) throws ValueFormatException, VersionException,
+ LockException, ConstraintViolationException, RepositoryException
+ {
+ return node.setProperty(name, value, type);
+ }
+
+ /**
+ * @param name
+ * @param values
+ * @return
+ * @throws ValueFormatException
+ * @throws VersionException
+ * @throws LockException
+ * @throws ConstraintViolationException
+ * @throws RepositoryException
+ * @see javax.jcr.Node#setProperty(java.lang.String, javax.jcr.Value[])
+ */
+ public Property setProperty(String name, Value[] values) throws ValueFormatException, VersionException,
+ LockException, ConstraintViolationException, RepositoryException
+ {
+ return node.setProperty(name, values);
+ }
+
+ /**
+ * @param name
+ * @param values
+ * @param type
+ * @return
+ * @throws ValueFormatException
+ * @throws VersionException
+ * @throws LockException
+ * @throws ConstraintViolationException
+ * @throws RepositoryException
+ * @see javax.jcr.Node#setProperty(java.lang.String, javax.jcr.Value[], int)
+ */
+ public Property setProperty(String name, Value[] values, int type) throws ValueFormatException, VersionException,
+ LockException, ConstraintViolationException, RepositoryException
+ {
+ return node.setProperty(name, values, type);
+ }
+
+ /**
+ * @param name
+ * @param values
+ * @return
+ * @throws ValueFormatException
+ * @throws VersionException
+ * @throws LockException
+ * @throws ConstraintViolationException
+ * @throws RepositoryException
+ * @see javax.jcr.Node#setProperty(java.lang.String, java.lang.String[])
+ */
+ public Property setProperty(String name, String[] values) throws ValueFormatException, VersionException,
+ LockException, ConstraintViolationException, RepositoryException
+ {
+ return node.setProperty(name, values);
+ }
+
+ /**
+ * @param name
+ * @param values
+ * @param type
+ * @return
+ * @throws ValueFormatException
+ * @throws VersionException
+ * @throws LockException
+ * @throws ConstraintViolationException
+ * @throws RepositoryException
+ * @see javax.jcr.Node#setProperty(java.lang.String, java.lang.String[], int)
+ */
+ public Property setProperty(String name, String[] values, int type) throws ValueFormatException, VersionException,
+ LockException, ConstraintViolationException, RepositoryException
+ {
+ return node.setProperty(name, values, type);
+ }
+
+ /**
+ * @param name
+ * @param value
+ * @return
+ * @throws ValueFormatException
+ * @throws VersionException
+ * @throws LockException
+ * @throws ConstraintViolationException
+ * @throws RepositoryException
+ * @see javax.jcr.Node#setProperty(java.lang.String, java.lang.String)
+ */
+ public Property setProperty(String name, String value) throws ValueFormatException, VersionException,
+ LockException, ConstraintViolationException, RepositoryException
+ {
+ return node.setProperty(name, value);
+ }
+
+ /**
+ * @param name
+ * @param value
+ * @param type
+ * @return
+ * @throws ValueFormatException
+ * @throws VersionException
+ * @throws LockException
+ * @throws ConstraintViolationException
+ * @throws RepositoryException
+ * @see javax.jcr.Node#setProperty(java.lang.String, java.lang.String, int)
+ */
+ public Property setProperty(String name, String value, int type) throws ValueFormatException, VersionException,
+ LockException, ConstraintViolationException, RepositoryException
+ {
+ return node.setProperty(name, value, type);
+ }
+
+ /**
+ * @param name
+ * @param value
+ * @return
+ * @throws ValueFormatException
+ * @throws VersionException
+ * @throws LockException
+ * @throws ConstraintViolationException
+ * @throws RepositoryException
+ * @deprecated
+ * @see javax.jcr.Node#setProperty(java.lang.String, java.io.InputStream)
+ */
+ @Deprecated
+ public Property setProperty(String name, InputStream value) throws ValueFormatException, VersionException,
+ LockException, ConstraintViolationException, RepositoryException
+ {
+ return node.setProperty(name, value);
+ }
+
+ /**
+ * @param name
+ * @param value
+ * @return
+ * @throws ValueFormatException
+ * @throws VersionException
+ * @throws LockException
+ * @throws ConstraintViolationException
+ * @throws RepositoryException
+ * @see javax.jcr.Node#setProperty(java.lang.String, javax.jcr.Binary)
+ */
+ public Property setProperty(String name, Binary value) throws ValueFormatException, VersionException,
+ LockException, ConstraintViolationException, RepositoryException
+ {
+ return node.setProperty(name, value);
+ }
+
+ /**
+ * @param name
+ * @param value
+ * @return
+ * @throws ValueFormatException
+ * @throws VersionException
+ * @throws LockException
+ * @throws ConstraintViolationException
+ * @throws RepositoryException
+ * @see javax.jcr.Node#setProperty(java.lang.String, boolean)
+ */
+ public Property setProperty(String name, boolean value) throws ValueFormatException, VersionException,
+ LockExcep...
[truncated message content] |
|
From: <fg...@us...> - 2013-05-18 16:21:49
|
Revision: 4224
http://openutils.svn.sourceforge.net/openutils/?rev=4224&view=rev
Author: fgiust
Date: 2013-05-18 16:21:46 +0000 (Sat, 18 May 2013)
Log Message:
-----------
update license header
Modified Paths:
--------------
magnoliamodules/trunk/openutils-mgnlcriteria/pom.xml
magnoliamodules/trunk/openutils-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/advanced/impl/AccessibleResultItemResultIterator.java
magnoliamodules/trunk/openutils-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/advanced/impl/AdvancedCriteriaImpl.java
magnoliamodules/trunk/openutils-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/advanced/impl/AdvancedResultImpl.java
magnoliamodules/trunk/openutils-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/advanced/impl/AdvancedResultItemImpl.java
magnoliamodules/trunk/openutils-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/advanced/impl/AdvancedResultItemResultIterator.java
magnoliamodules/trunk/openutils-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/advanced/impl/MappedDefaultContent.java
magnoliamodules/trunk/openutils-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/advanced/impl/QueryExecutorHelper.java
magnoliamodules/trunk/openutils-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/jcr/query/AdvancedResult.java
magnoliamodules/trunk/openutils-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/jcr/query/AdvancedResultItem.java
magnoliamodules/trunk/openutils-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/jcr/query/Criteria.java
magnoliamodules/trunk/openutils-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/jcr/query/DirectJcrQuery.java
magnoliamodules/trunk/openutils-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/jcr/query/ExecutableQuery.java
magnoliamodules/trunk/openutils-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/jcr/query/JCRCriteriaFactory.java
magnoliamodules/trunk/openutils-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/jcr/query/JCRQueryException.java
magnoliamodules/trunk/openutils-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/jcr/query/ResultIterator.java
magnoliamodules/trunk/openutils-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/jcr/query/ResultIteratorImpl.java
magnoliamodules/trunk/openutils-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/jcr/query/TranslatableCriteria.java
magnoliamodules/trunk/openutils-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/jcr/query/criterion/BaseCriterion.java
magnoliamodules/trunk/openutils-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/jcr/query/criterion/BetweenExpression.java
magnoliamodules/trunk/openutils-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/jcr/query/criterion/Conjunction.java
magnoliamodules/trunk/openutils-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/jcr/query/criterion/Criterion.java
magnoliamodules/trunk/openutils-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/jcr/query/criterion/Disjunction.java
magnoliamodules/trunk/openutils-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/jcr/query/criterion/InExpression.java
magnoliamodules/trunk/openutils-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/jcr/query/criterion/IsNotNullExpression.java
magnoliamodules/trunk/openutils-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/jcr/query/criterion/IsNullExpression.java
magnoliamodules/trunk/openutils-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/jcr/query/criterion/JCRFunctionExpression.java
magnoliamodules/trunk/openutils-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/jcr/query/criterion/Junction.java
magnoliamodules/trunk/openutils-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/jcr/query/criterion/LikeExpression.java
magnoliamodules/trunk/openutils-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/jcr/query/criterion/LogicalExpression.java
magnoliamodules/trunk/openutils-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/jcr/query/criterion/MatchMode.java
magnoliamodules/trunk/openutils-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/jcr/query/criterion/NotExpression.java
magnoliamodules/trunk/openutils-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/jcr/query/criterion/Order.java
magnoliamodules/trunk/openutils-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/jcr/query/criterion/Restrictions.java
magnoliamodules/trunk/openutils-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/jcr/query/criterion/SimpleExpression.java
magnoliamodules/trunk/openutils-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/jcr/query/lucene/AclQueryDecorator.java
magnoliamodules/trunk/openutils-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/jcr/query/lucene/AclSearchIndex.java
magnoliamodules/trunk/openutils-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/jcr/query/xpath/JCRMagnoliaCriteriaQueryTranslator.java
magnoliamodules/trunk/openutils-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/jcr/query/xpath/XPathSelect.java
magnoliamodules/trunk/openutils-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/jcr/query/xpath/impl/AbstractCriteriaImpl.java
magnoliamodules/trunk/openutils-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/jcr/query/xpath/utils/XPathTextUtils.java
magnoliamodules/trunk/openutils-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/utils/ASCIIFoldingAnalyzer.java
magnoliamodules/trunk/openutils-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/utils/BaseAnalyzer.java
magnoliamodules/trunk/openutils-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/utils/JcrCompatUtils.java
magnoliamodules/trunk/openutils-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/utils/Latin1Analyzer.java
magnoliamodules/trunk/openutils-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/utils/ToBeanUtils.java
magnoliamodules/trunk/openutils-mgnlcriteria/src/main/java/org/apache/jackrabbit/core/query/lucene/QueryDecoratorSupport.java
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/criterion/ConjunctionTest.java
magnoliamodules/trunk/openutils-mgnlcriteria/src/test/java/net/sourceforge/openutils/mgnlcriteria/jcr/query/lucene/AclSearchIndexTest.java
magnoliamodules/trunk/openutils-mgnlcriteria/src/test/java/net/sourceforge/openutils/mgnlcriteria/jcr/query/xpath/impl/MagnoliaCriteriaTest.java
magnoliamodules/trunk/openutils-mgnlcriteria/src/test/java/net/sourceforge/openutils/mgnlcriteria/tests/CriteriaTestUtils.java
Modified: magnoliamodules/trunk/openutils-mgnlcriteria/pom.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnlcriteria/pom.xml 2013-05-18 16:19:24 UTC (rev 4223)
+++ magnoliamodules/trunk/openutils-mgnlcriteria/pom.xml 2013-05-18 16:21:46 UTC (rev 4224)
@@ -73,7 +73,7 @@
<include>src/**/*.java</include>
</includes>
<properties>
- <year>${project.inceptionYear}-2011</year>
+ <year>${project.inceptionYear}-2013</year>
<name>${project.name}</name>
<description>${project.description}</description>
<url>${project.url}</url>
Modified: magnoliamodules/trunk/openutils-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/advanced/impl/AccessibleResultItemResultIterator.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/advanced/impl/AccessibleResultItemResultIterator.java 2013-05-18 16:19:24 UTC (rev 4223)
+++ magnoliamodules/trunk/openutils-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/advanced/impl/AccessibleResultItemResultIterator.java 2013-05-18 16:21:46 UTC (rev 4224)
@@ -1,7 +1,7 @@
/**
*
* Criteria API for Magnolia CMS (http://www.openmindlab.com/lab/products/mgnlcriteria.html)
- * Copyright(C) 2009-2011, 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-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/advanced/impl/AdvancedCriteriaImpl.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/advanced/impl/AdvancedCriteriaImpl.java 2013-05-18 16:19:24 UTC (rev 4223)
+++ magnoliamodules/trunk/openutils-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/advanced/impl/AdvancedCriteriaImpl.java 2013-05-18 16:21:46 UTC (rev 4224)
@@ -1,7 +1,7 @@
/**
*
* Criteria API for Magnolia CMS (http://www.openmindlab.com/lab/products/mgnlcriteria.html)
- * Copyright(C) 2009-2011, 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-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/advanced/impl/AdvancedResultImpl.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/advanced/impl/AdvancedResultImpl.java 2013-05-18 16:19:24 UTC (rev 4223)
+++ magnoliamodules/trunk/openutils-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/advanced/impl/AdvancedResultImpl.java 2013-05-18 16:21:46 UTC (rev 4224)
@@ -1,7 +1,7 @@
/**
*
* Criteria API for Magnolia CMS (http://www.openmindlab.com/lab/products/mgnlcriteria.html)
- * Copyright(C) 2009-2011, 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-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/advanced/impl/AdvancedResultItemImpl.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/advanced/impl/AdvancedResultItemImpl.java 2013-05-18 16:19:24 UTC (rev 4223)
+++ magnoliamodules/trunk/openutils-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/advanced/impl/AdvancedResultItemImpl.java 2013-05-18 16:21:46 UTC (rev 4224)
@@ -1,7 +1,7 @@
/**
*
* Criteria API for Magnolia CMS (http://www.openmindlab.com/lab/products/mgnlcriteria.html)
- * Copyright(C) 2009-2011, 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-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/advanced/impl/AdvancedResultItemResultIterator.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/advanced/impl/AdvancedResultItemResultIterator.java 2013-05-18 16:19:24 UTC (rev 4223)
+++ magnoliamodules/trunk/openutils-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/advanced/impl/AdvancedResultItemResultIterator.java 2013-05-18 16:21:46 UTC (rev 4224)
@@ -1,7 +1,7 @@
/**
*
* Criteria API for Magnolia CMS (http://www.openmindlab.com/lab/products/mgnlcriteria.html)
- * Copyright(C) 2009-2011, 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-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/advanced/impl/MappedDefaultContent.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/advanced/impl/MappedDefaultContent.java 2013-05-18 16:19:24 UTC (rev 4223)
+++ magnoliamodules/trunk/openutils-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/advanced/impl/MappedDefaultContent.java 2013-05-18 16:21:46 UTC (rev 4224)
@@ -1,7 +1,7 @@
/**
*
* Criteria API for Magnolia CMS (http://www.openmindlab.com/lab/products/mgnlcriteria.html)
- * Copyright(C) 2009-2011, 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-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/advanced/impl/QueryExecutorHelper.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/advanced/impl/QueryExecutorHelper.java 2013-05-18 16:19:24 UTC (rev 4223)
+++ magnoliamodules/trunk/openutils-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/advanced/impl/QueryExecutorHelper.java 2013-05-18 16:21:46 UTC (rev 4224)
@@ -1,7 +1,7 @@
/**
*
* Criteria API for Magnolia CMS (http://www.openmindlab.com/lab/products/mgnlcriteria.html)
- * Copyright(C) 2009-2011, 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-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/jcr/query/AdvancedResult.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/jcr/query/AdvancedResult.java 2013-05-18 16:19:24 UTC (rev 4223)
+++ magnoliamodules/trunk/openutils-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/jcr/query/AdvancedResult.java 2013-05-18 16:21:46 UTC (rev 4224)
@@ -1,7 +1,7 @@
/**
*
* Criteria API for Magnolia CMS (http://www.openmindlab.com/lab/products/mgnlcriteria.html)
- * Copyright(C) 2009-2011, 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-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/jcr/query/AdvancedResultItem.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/jcr/query/AdvancedResultItem.java 2013-05-18 16:19:24 UTC (rev 4223)
+++ magnoliamodules/trunk/openutils-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/jcr/query/AdvancedResultItem.java 2013-05-18 16:21:46 UTC (rev 4224)
@@ -1,7 +1,7 @@
/**
*
* Criteria API for Magnolia CMS (http://www.openmindlab.com/lab/products/mgnlcriteria.html)
- * Copyright(C) 2009-2011, 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-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/jcr/query/Criteria.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/jcr/query/Criteria.java 2013-05-18 16:19:24 UTC (rev 4223)
+++ magnoliamodules/trunk/openutils-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/jcr/query/Criteria.java 2013-05-18 16:21:46 UTC (rev 4224)
@@ -1,7 +1,7 @@
/**
*
* Criteria API for Magnolia CMS (http://www.openmindlab.com/lab/products/mgnlcriteria.html)
- * Copyright(C) 2009-2011, 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-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/jcr/query/DirectJcrQuery.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/jcr/query/DirectJcrQuery.java 2013-05-18 16:19:24 UTC (rev 4223)
+++ magnoliamodules/trunk/openutils-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/jcr/query/DirectJcrQuery.java 2013-05-18 16:21:46 UTC (rev 4224)
@@ -1,7 +1,7 @@
/**
*
* Criteria API for Magnolia CMS (http://www.openmindlab.com/lab/products/mgnlcriteria.html)
- * Copyright(C) 2009-2011, 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-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/jcr/query/ExecutableQuery.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/jcr/query/ExecutableQuery.java 2013-05-18 16:19:24 UTC (rev 4223)
+++ magnoliamodules/trunk/openutils-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/jcr/query/ExecutableQuery.java 2013-05-18 16:21:46 UTC (rev 4224)
@@ -1,7 +1,7 @@
/**
*
* Criteria API for Magnolia CMS (http://www.openmindlab.com/lab/products/mgnlcriteria.html)
- * Copyright(C) 2009-2011, 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-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/jcr/query/JCRCriteriaFactory.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/jcr/query/JCRCriteriaFactory.java 2013-05-18 16:19:24 UTC (rev 4223)
+++ magnoliamodules/trunk/openutils-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/jcr/query/JCRCriteriaFactory.java 2013-05-18 16:21:46 UTC (rev 4224)
@@ -1,7 +1,7 @@
/**
*
* Criteria API for Magnolia CMS (http://www.openmindlab.com/lab/products/mgnlcriteria.html)
- * Copyright(C) 2009-2011, 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-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/jcr/query/JCRQueryException.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/jcr/query/JCRQueryException.java 2013-05-18 16:19:24 UTC (rev 4223)
+++ magnoliamodules/trunk/openutils-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/jcr/query/JCRQueryException.java 2013-05-18 16:21:46 UTC (rev 4224)
@@ -1,7 +1,7 @@
/**
*
* Criteria API for Magnolia CMS (http://www.openmindlab.com/lab/products/mgnlcriteria.html)
- * Copyright(C) 2009-2011, 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-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/jcr/query/ResultIterator.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/jcr/query/ResultIterator.java 2013-05-18 16:19:24 UTC (rev 4223)
+++ magnoliamodules/trunk/openutils-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/jcr/query/ResultIterator.java 2013-05-18 16:21:46 UTC (rev 4224)
@@ -1,7 +1,7 @@
/**
*
* Criteria API for Magnolia CMS (http://www.openmindlab.com/lab/products/mgnlcriteria.html)
- * Copyright(C) 2009-2011, 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-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/jcr/query/ResultIteratorImpl.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/jcr/query/ResultIteratorImpl.java 2013-05-18 16:19:24 UTC (rev 4223)
+++ magnoliamodules/trunk/openutils-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/jcr/query/ResultIteratorImpl.java 2013-05-18 16:21:46 UTC (rev 4224)
@@ -1,7 +1,7 @@
/**
*
* Criteria API for Magnolia CMS (http://www.openmindlab.com/lab/products/mgnlcriteria.html)
- * Copyright(C) 2009-2011, 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-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/jcr/query/TranslatableCriteria.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/jcr/query/TranslatableCriteria.java 2013-05-18 16:19:24 UTC (rev 4223)
+++ magnoliamodules/trunk/openutils-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/jcr/query/TranslatableCriteria.java 2013-05-18 16:21:46 UTC (rev 4224)
@@ -1,7 +1,7 @@
/**
*
* Criteria API for Magnolia CMS (http://www.openmindlab.com/lab/products/mgnlcriteria.html)
- * Copyright(C) 2009-2011, 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-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/jcr/query/criterion/BaseCriterion.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/jcr/query/criterion/BaseCriterion.java 2013-05-18 16:19:24 UTC (rev 4223)
+++ magnoliamodules/trunk/openutils-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/jcr/query/criterion/BaseCriterion.java 2013-05-18 16:21:46 UTC (rev 4224)
@@ -1,7 +1,7 @@
/**
*
* Criteria API for Magnolia CMS (http://www.openmindlab.com/lab/products/mgnlcriteria.html)
- * Copyright(C) 2009-2011, 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-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/jcr/query/criterion/BetweenExpression.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/jcr/query/criterion/BetweenExpression.java 2013-05-18 16:19:24 UTC (rev 4223)
+++ magnoliamodules/trunk/openutils-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/jcr/query/criterion/BetweenExpression.java 2013-05-18 16:21:46 UTC (rev 4224)
@@ -1,7 +1,7 @@
/**
*
* Criteria API for Magnolia CMS (http://www.openmindlab.com/lab/products/mgnlcriteria.html)
- * Copyright(C) 2009-2011, 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-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/jcr/query/criterion/Conjunction.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/jcr/query/criterion/Conjunction.java 2013-05-18 16:19:24 UTC (rev 4223)
+++ magnoliamodules/trunk/openutils-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/jcr/query/criterion/Conjunction.java 2013-05-18 16:21:46 UTC (rev 4224)
@@ -1,7 +1,7 @@
/**
*
* Criteria API for Magnolia CMS (http://www.openmindlab.com/lab/products/mgnlcriteria.html)
- * Copyright(C) 2009-2011, 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-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/jcr/query/criterion/Criterion.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/jcr/query/criterion/Criterion.java 2013-05-18 16:19:24 UTC (rev 4223)
+++ magnoliamodules/trunk/openutils-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/jcr/query/criterion/Criterion.java 2013-05-18 16:21:46 UTC (rev 4224)
@@ -1,7 +1,7 @@
/**
*
* Criteria API for Magnolia CMS (http://www.openmindlab.com/lab/products/mgnlcriteria.html)
- * Copyright(C) 2009-2011, 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-mgnlcriteria/src/ma...
[truncated message content] |
|
From: <fg...@us...> - 2013-10-21 09:43:31
|
Revision: 4424
http://openutils.svn.sourceforge.net/openutils/?rev=4424&view=rev
Author: fgiust
Date: 2013-10-21 09:43:26 +0000 (Mon, 21 Oct 2013)
Log Message:
-----------
cleanup warning
Modified Paths:
--------------
magnoliamodules/trunk/openutils-mgnlcriteria/pom.xml
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
Modified: magnoliamodules/trunk/openutils-mgnlcriteria/pom.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnlcriteria/pom.xml 2013-10-21 09:41:48 UTC (rev 4423)
+++ magnoliamodules/trunk/openutils-mgnlcriteria/pom.xml 2013-10-21 09:43:26 UTC (rev 4424)
@@ -178,7 +178,7 @@
</dependencies>
<properties>
<magnolia.version>4.5.11</magnolia.version>
- <jackrabbit.version>2.4.4</jackrabbit.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-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-21 09:41:48 UTC (rev 4423)
+++ magnoliamodules/trunk/openutils-mgnlcriteria/src/test/java/net/sourceforge/openutils/mgnlcriteria/advanced/BasePathTest.java 2013-10-21 09:43:26 UTC (rev 4424)
@@ -92,7 +92,9 @@
// info.magnolia.cms.security.SecurityTest.setUp()
final SecuritySupportImpl sec = new SecuritySupportImpl();
- sec.addUserManager(Realm.REALM_SYSTEM.getName(), new SystemUserManager());
+ 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-21 09:41:48 UTC (rev 4423)
+++ magnoliamodules/trunk/openutils-mgnlcriteria/src/test/java/net/sourceforge/openutils/mgnlcriteria/advanced/BasePathWithSpacesTest.java 2013-10-21 09:43:26 UTC (rev 4424)
@@ -74,7 +74,9 @@
// info.magnolia.cms.security.SecurityTest.setUp()
final SecuritySupportImpl sec = new SecuritySupportImpl();
- sec.addUserManager(Realm.REALM_SYSTEM.getName(), new SystemUserManager());
+ 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-21 09:41:48 UTC (rev 4423)
+++ magnoliamodules/trunk/openutils-mgnlcriteria/src/test/java/net/sourceforge/openutils/mgnlcriteria/advanced/Content2BeanTest.java 2013-10-21 09:43:26 UTC (rev 4424)
@@ -81,7 +81,9 @@
// info.magnolia.cms.security.SecurityTest.setUp()
final SecuritySupportImpl sec = new SecuritySupportImpl();
- sec.addUserManager(Realm.REALM_SYSTEM.getName(), new SystemUserManager());
+ 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/FirstDigitEscapeTest.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlcriteria/src/test/java/net/sourceforge/openutils/mgnlcriteria/advanced/FirstDigitEscapeTest.java 2013-10-21 09:41:48 UTC (rev 4423)
+++ magnoliamodules/trunk/openutils-mgnlcriteria/src/test/java/net/sourceforge/openutils/mgnlcriteria/advanced/FirstDigitEscapeTest.java 2013-10-21 09:43:26 UTC (rev 4424)
@@ -73,7 +73,9 @@
// info.magnolia.cms.security.SecurityTest.setUp()
final SecuritySupportImpl sec = new SecuritySupportImpl();
- sec.addUserManager(Realm.REALM_SYSTEM.getName(), new SystemUserManager());
+ 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/JcrContainsCriteriaSearchTest.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlcriteria/src/test/java/net/sourceforge/openutils/mgnlcriteria/advanced/JcrContainsCriteriaSearchTest.java 2013-10-21 09:41:48 UTC (rev 4423)
+++ magnoliamodules/trunk/openutils-mgnlcriteria/src/test/java/net/sourceforge/openutils/mgnlcriteria/advanced/JcrContainsCriteriaSearchTest.java 2013-10-21 09:43:26 UTC (rev 4424)
@@ -91,7 +91,9 @@
// info.magnolia.cms.security.SecurityTest.setUp()
final SecuritySupportImpl sec = new SecuritySupportImpl();
- sec.addUserManager(Realm.REALM_SYSTEM.getName(), new SystemUserManager());
+ 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/JcrContainsQuestionMarkTest.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlcriteria/src/test/java/net/sourceforge/openutils/mgnlcriteria/advanced/JcrContainsQuestionMarkTest.java 2013-10-21 09:41:48 UTC (rev 4423)
+++ magnoliamodules/trunk/openutils-mgnlcriteria/src/test/java/net/sourceforge/openutils/mgnlcriteria/advanced/JcrContainsQuestionMarkTest.java 2013-10-21 09:43:26 UTC (rev 4424)
@@ -84,7 +84,9 @@
// info.magnolia.cms.security.SecurityTest.setUp()
final SecuritySupportImpl sec = new SecuritySupportImpl();
- sec.addUserManager(Realm.REALM_SYSTEM.getName(), new SystemUserManager());
+ 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/OrderingTest.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlcriteria/src/test/java/net/sourceforge/openutils/mgnlcriteria/advanced/OrderingTest.java 2013-10-21 09:41:48 UTC (rev 4423)
+++ magnoliamodules/trunk/openutils-mgnlcriteria/src/test/java/net/sourceforge/openutils/mgnlcriteria/advanced/OrderingTest.java 2013-10-21 09:43:26 UTC (rev 4424)
@@ -115,7 +115,9 @@
// info.magnolia.cms.security.SecurityTest.setUp()
final SecuritySupportImpl sec = new SecuritySupportImpl();
- sec.addUserManager(Realm.REALM_SYSTEM.getName(), new SystemUserManager());
+ 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-21 09:41:48 UTC (rev 4423)
+++ magnoliamodules/trunk/openutils-mgnlcriteria/src/test/java/net/sourceforge/openutils/mgnlcriteria/advanced/PaginationTest.java 2013-10-21 09:43:26 UTC (rev 4424)
@@ -86,7 +86,9 @@
// info.magnolia.cms.security.SecurityTest.setUp()
final SecuritySupportImpl sec = new SecuritySupportImpl();
- sec.addUserManager(Realm.REALM_SYSTEM.getName(), new SystemUserManager());
+ 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-21 09:41:48 UTC (rev 4423)
+++ magnoliamodules/trunk/openutils-mgnlcriteria/src/test/java/net/sourceforge/openutils/mgnlcriteria/advanced/ScoreAnalizerAndSortTest.java 2013-10-21 09:43:26 UTC (rev 4424)
@@ -76,7 +76,9 @@
// info.magnolia.cms.security.SecurityTest.setUp()
final SecuritySupportImpl sec = new SecuritySupportImpl();
- sec.addUserManager(Realm.REALM_SYSTEM.getName(), new SystemUserManager());
+ 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/XpathEscapeTest.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlcriteria/src/test/java/net/sourceforge/openutils/mgnlcriteria/advanced/XpathEscapeTest.java 2013-10-21 09:41:48 UTC (rev 4423)
+++ magnoliamodules/trunk/openutils-mgnlcriteria/src/test/java/net/sourceforge/openutils/mgnlcriteria/advanced/XpathEscapeTest.java 2013-10-21 09:43:26 UTC (rev 4424)
@@ -79,7 +79,9 @@
// info.magnolia.cms.security.SecurityTest.setUp()
final SecuritySupportImpl sec = new SecuritySupportImpl();
- sec.addUserManager(Realm.REALM_SYSTEM.getName(), new SystemUserManager());
+ 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/AccessibleResultItemResultIteratorTest.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlcriteria/src/test/java/net/sourceforge/openutils/mgnlcriteria/advanced/impl/AccessibleResultItemResultIteratorTest.java 2013-10-21 09:41:48 UTC (rev 4423)
+++ magnoliamodules/trunk/openutils-mgnlcriteria/src/test/java/net/sourceforge/openutils/mgnlcriteria/advanced/impl/AccessibleResultItemResultIteratorTest.java 2013-10-21 09:43:26 UTC (rev 4424)
@@ -108,7 +108,9 @@
// info.magnolia.cms.security.SecurityTest.setUp()
final SecuritySupportImpl sec = new SecuritySupportImpl();
- sec.addUserManager(Realm.REALM_SYSTEM.getName(), new SystemUserManager());
+ 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-21 09:41:48 UTC (rev 4423)
+++ magnoliamodules/trunk/openutils-mgnlcriteria/src/test/java/net/sourceforge/openutils/mgnlcriteria/advanced/impl/CorrectElementsWithoutMaxResults.java 2013-10-21 09:43:26 UTC (rev 4424)
@@ -86,7 +86,9 @@
// info.magnolia.cms.security.SecurityTest.setUp()
final SecuritySupportImpl sec = new SecuritySupportImpl();
- sec.addUserManager(Realm.REALM_SYSTEM.getName(), new SystemUserManager());
+ 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/jcr/query/CriteriaTest.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlcriteria/src/test/java/net/sourceforge/openutils/mgnlcriteria/jcr/query/CriteriaTest.java 2013-10-21 09:41:48 UTC (rev 4423)
+++ magnoliamodules/trunk/openutils-mgnlcriteria/src/test/java/net/sourceforge/openutils/mgnlcriteria/jcr/query/CriteriaTest.java 2013-10-21 09:43:26 UTC (rev 4424)
@@ -99,7 +99,9 @@
// info.magnolia.cms.security.SecurityTest.setUp()
final SecuritySupportImpl sec = new SecuritySupportImpl();
- sec.addUserManager(Realm.REALM_SYSTEM.getName(), new SystemUserManager());
+ 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/jcr/query/EscapeSignTest.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlcriteria/src/test/java/net/sourceforge/openutils/mgnlcriteria/jcr/query/EscapeSignTest.java 2013-10-21 09:41:48 UTC (rev 4423)
+++ magnoliamodules/trunk/openutils-mgnlcriteria/src/test/java/net/sourceforge/openutils/mgnlcriteria/jcr/query/EscapeSignTest.java 2013-10-21 09:43:26 UTC (rev 4424)
@@ -76,7 +76,9 @@
// info.magnolia.cms.security.SecurityTest.setUp()
final SecuritySupportImpl sec = new SecuritySupportImpl();
- sec.addUserManager(Realm.REALM_SYSTEM.getName(), new SystemUserManager());
+ 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/jcr/query/lucene/AclSearchIndexTest.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlcriteria/src/test/java/net/sourceforge/openutils/mgnlcriteria/jcr/query/lucene/AclSearchIndexTest.java 2013-10-21 09:41:48 UTC (rev 4423)
+++ magnoliamodules/trunk/openutils-mgnlcriteria/src/test/java/net/sourceforge/openutils/mgnlcriteria/jcr/query/lucene/AclSearchIndexTest.java 2013-10-21 09:43:26 UTC (rev 4424)
@@ -103,7 +103,9 @@
// info.magnolia.cms.security.SecurityTest.setUp()
final SecuritySupportImpl sec = new SecuritySupportImpl();
- sec.addUserManager(Realm.REALM_SYSTEM.getName(), new SystemUserManager());
+ 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);
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|