You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jackrabbit.apache.org by ju...@apache.org on 2011/09/11 20:57:13 UTC
svn commit: r1169501 [2/2] - in /jackrabbit/branches/JCR-2936: ./
jackrabbit-core/src/main/java/org/apache/jackrabbit/core/persistence/util/
jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/
jackrabbit-core/src/main/java/org/apache/jackra...
Modified: jackrabbit/branches/JCR-2936/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/nodetype/EffectiveNodeTypeImpl.java
URL: http://svn.apache.org/viewvc/jackrabbit/branches/JCR-2936/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/nodetype/EffectiveNodeTypeImpl.java?rev=1169501&r1=1169500&r2=1169501&view=diff
==============================================================================
--- jackrabbit/branches/JCR-2936/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/nodetype/EffectiveNodeTypeImpl.java (original)
+++ jackrabbit/branches/JCR-2936/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/nodetype/EffectiveNodeTypeImpl.java Sun Sep 11 18:57:11 2011
@@ -353,7 +353,7 @@ public class EffectiveNodeTypeImpl imple
try {
definitionProvider.getQNodeDefinition(this, name, null);
} catch (NoSuchNodeTypeException e) {
- String msg = "internal eror: inconsistent node type";
+ String msg = "internal error: inconsistent node type";
log.debug(msg);
throw new ConstraintViolationException(msg, e);
}
@@ -388,7 +388,7 @@ public class EffectiveNodeTypeImpl imple
* don't know which one is applicable, we check all of them
*/
QItemDefinition[] defs = getNamedItemDefs(name);
- if (hasRemoveConstaint(defs)) {
+ if (hasRemoveConstraint(defs)) {
throw new ConstraintViolationException("can't remove mandatory or protected item");
}
}
@@ -398,7 +398,7 @@ public class EffectiveNodeTypeImpl imple
*/
public boolean hasRemoveNodeConstraint(Name nodeName) {
QNodeDefinition[] defs = getNamedQNodeDefinitions(nodeName);
- return hasRemoveConstaint(defs);
+ return hasRemoveConstraint(defs);
}
/**
@@ -406,7 +406,7 @@ public class EffectiveNodeTypeImpl imple
*/
public boolean hasRemovePropertyConstraint(Name propertyName) {
QPropertyDefinition[] defs = getNamedQPropertyDefinitions(propertyName);
- return hasRemoveConstaint(defs);
+ return hasRemoveConstraint(defs);
}
//---------------------------------------------< impl. specific methods >---
@@ -417,7 +417,7 @@ public class EffectiveNodeTypeImpl imple
* @param defs
* @return <code>true</code> if a mandatory or protected definition is present.
*/
- private static boolean hasRemoveConstaint(QItemDefinition[] defs) {
+ private static boolean hasRemoveConstraint(QItemDefinition[] defs) {
/**
* as there might be multiple definitions with the same name that may be
* applicable, return true as soon as the first mandatory or protected
Modified: jackrabbit/branches/JCR-2936/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/nodetype/ItemDefinitionProvider.java
URL: http://svn.apache.org/viewvc/jackrabbit/branches/JCR-2936/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/nodetype/ItemDefinitionProvider.java?rev=1169501&r1=1169500&r2=1169501&view=diff
==============================================================================
--- jackrabbit/branches/JCR-2936/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/nodetype/ItemDefinitionProvider.java (original)
+++ jackrabbit/branches/JCR-2936/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/nodetype/ItemDefinitionProvider.java Sun Sep 11 18:57:11 2011
@@ -97,7 +97,7 @@ public interface ItemDefinitionProvider
*
* @param parentNodeTypeNames
* @param propertyName
- * @param propertType
+ * @param propertyType
* @param isMultiValued
* @param propertyId Used to retrieve the definition from the persistent
* layer if it cannot be determined from the information present.
@@ -106,7 +106,7 @@ public interface ItemDefinitionProvider
*/
public QPropertyDefinition getQPropertyDefinition(Name[] parentNodeTypeNames,
Name propertyName,
- int propertType,
+ int propertyType,
boolean isMultiValued,
PropertyId propertyId) throws RepositoryException;
Modified: jackrabbit/branches/JCR-2936/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/nodetype/ItemDefinitionProviderImpl.java
URL: http://svn.apache.org/viewvc/jackrabbit/branches/JCR-2936/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/nodetype/ItemDefinitionProviderImpl.java?rev=1169501&r1=1169500&r2=1169501&view=diff
==============================================================================
--- jackrabbit/branches/JCR-2936/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/nodetype/ItemDefinitionProviderImpl.java (original)
+++ jackrabbit/branches/JCR-2936/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/nodetype/ItemDefinitionProviderImpl.java Sun Sep 11 18:57:11 2011
@@ -97,15 +97,15 @@ public class ItemDefinitionProviderImpl
public QPropertyDefinition getQPropertyDefinition(Name[] parentNodeTypeNames,
Name propertyName,
- int propertType,
+ int propertyType,
boolean isMultiValued,
PropertyId propertyId) throws RepositoryException {
QPropertyDefinition definition;
try {
EffectiveNodeType ent = entProvider.getEffectiveNodeType(parentNodeTypeNames);
- definition = getQPropertyDefinition(ent, propertyName, propertType, isMultiValued, true);
+ definition = getQPropertyDefinition(ent, propertyName, propertyType, isMultiValued, true);
} catch (RepositoryException e) {
- log.debug("Cannot determine property defintion of {}: {}", propertyId, e);
+ log.debug("Cannot determine property definition of {}: {}", propertyId, e);
definition = getPropertyDefinition(service, sessionInfo, propertyId);
}
return definition;
Modified: jackrabbit/branches/JCR-2936/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/nodetype/NodeTypeImpl.java
URL: http://svn.apache.org/viewvc/jackrabbit/branches/JCR-2936/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/nodetype/NodeTypeImpl.java?rev=1169501&r1=1169500&r2=1169501&view=diff
==============================================================================
--- jackrabbit/branches/JCR-2936/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/nodetype/NodeTypeImpl.java (original)
+++ jackrabbit/branches/JCR-2936/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/nodetype/NodeTypeImpl.java Sun Sep 11 18:57:11 2011
@@ -114,7 +114,7 @@ public class NodeTypeImpl extends Abstra
* type conversions are attempted if the type of the given values does not
* match the required type as specified in the given definition.
*
- * @param def The definiton of the property
+ * @param def The definition of the property
* @param values An array of <code>QValue</code> objects.
* @throws ConstraintViolationException If a constraint is violated.
* @throws RepositoryException If another error occurs.
Modified: jackrabbit/branches/JCR-2936/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/operation/AbstractRemove.java
URL: http://svn.apache.org/viewvc/jackrabbit/branches/JCR-2936/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/operation/AbstractRemove.java?rev=1169501&r1=1169500&r2=1169501&view=diff
==============================================================================
--- jackrabbit/branches/JCR-2936/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/operation/AbstractRemove.java (original)
+++ jackrabbit/branches/JCR-2936/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/operation/AbstractRemove.java Sun Sep 11 18:57:11 2011
@@ -30,7 +30,7 @@ import javax.jcr.version.VersionExceptio
/**
* <code>AbstractRemove</code> is the base class for non-transient remove
- * operations executed on the workspace such as removing versions or activites.
+ * operations executed on the workspace such as removing versions or activities.
*/
public abstract class AbstractRemove extends AbstractOperation {
Modified: jackrabbit/branches/JCR-2936/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/operation/AddLabel.java
URL: http://svn.apache.org/viewvc/jackrabbit/branches/JCR-2936/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/operation/AddLabel.java?rev=1169501&r1=1169500&r2=1169501&view=diff
==============================================================================
--- jackrabbit/branches/JCR-2936/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/operation/AddLabel.java (original)
+++ jackrabbit/branches/JCR-2936/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/operation/AddLabel.java Sun Sep 11 18:57:11 2011
@@ -71,8 +71,8 @@ public class AddLabel extends AbstractOp
}
/**
- * Invalidates the jcr:versionlabel nodestate present with the given
- * version history. If '<code>moveLabel</code>' is true, all decendant states
+ * Invalidates the jcr:versionLabel nodestate present with the given
+ * version history. If '<code>moveLabel</code>' is true, all descendant states
* (property states) are invalidated as well.
*
* @see Operation#persisted()
Modified: jackrabbit/branches/JCR-2936/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/operation/RemoveActivity.java
URL: http://svn.apache.org/viewvc/jackrabbit/branches/JCR-2936/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/operation/RemoveActivity.java?rev=1169501&r1=1169500&r2=1169501&view=diff
==============================================================================
--- jackrabbit/branches/JCR-2936/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/operation/RemoveActivity.java (original)
+++ jackrabbit/branches/JCR-2936/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/operation/RemoveActivity.java Sun Sep 11 18:57:11 2011
@@ -58,7 +58,7 @@ public class RemoveActivity extends Abst
/**
* Invalidates the <code>NodeState</code> that has been updated and all
- * its decendants. Second, the parent state gets invalidated.
+ * its descendants. Second, the parent state gets invalidated.
*
* @see org.apache.jackrabbit.jcr2spi.operation.Operation#persisted()
*/
Modified: jackrabbit/branches/JCR-2936/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/operation/RemoveLabel.java
URL: http://svn.apache.org/viewvc/jackrabbit/branches/JCR-2936/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/operation/RemoveLabel.java?rev=1169501&r1=1169500&r2=1169501&view=diff
==============================================================================
--- jackrabbit/branches/JCR-2936/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/operation/RemoveLabel.java (original)
+++ jackrabbit/branches/JCR-2936/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/operation/RemoveLabel.java Sun Sep 11 18:57:11 2011
@@ -69,7 +69,7 @@ public class RemoveLabel extends Abstrac
}
/**
- * Invalidates the jcr:versionlabel nodestate present with the given
+ * Invalidates the jcr:versionLabel nodestate present with the given
* version history and all decendant states (property states).
*
* @see Operation#persisted()
Modified: jackrabbit/branches/JCR-2936/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/operation/Update.java
URL: http://svn.apache.org/viewvc/jackrabbit/branches/JCR-2936/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/operation/Update.java?rev=1169501&r1=1169500&r2=1169501&view=diff
==============================================================================
--- jackrabbit/branches/JCR-2936/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/operation/Update.java (original)
+++ jackrabbit/branches/JCR-2936/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/operation/Update.java Sun Sep 11 18:57:11 2011
@@ -53,7 +53,7 @@ public class Update extends AbstractOper
/**
* Invalidates the <code>NodeState</code> that has been updated and all
- * its decendants.
+ * its descendants.
*
* @see Operation#persisted()
*/
Modified: jackrabbit/branches/JCR-2936/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/operation/WorkspaceImport.java
URL: http://svn.apache.org/viewvc/jackrabbit/branches/JCR-2936/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/operation/WorkspaceImport.java?rev=1169501&r1=1169500&r2=1169501&view=diff
==============================================================================
--- jackrabbit/branches/JCR-2936/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/operation/WorkspaceImport.java (original)
+++ jackrabbit/branches/JCR-2936/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/operation/WorkspaceImport.java Sun Sep 11 18:57:11 2011
@@ -61,7 +61,7 @@ public class WorkspaceImport extends Abs
/**
* Invalidates the <code>NodeState</code> that has been updated and all
- * its decendants.
+ * its descendants.
*
* @see Operation#persisted()
*/
Modified: jackrabbit/branches/JCR-2936/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/state/WorkspaceItemStateFactory.java
URL: http://svn.apache.org/viewvc/jackrabbit/branches/JCR-2936/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/state/WorkspaceItemStateFactory.java?rev=1169501&r1=1169500&r2=1169501&view=diff
==============================================================================
--- jackrabbit/branches/JCR-2936/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/state/WorkspaceItemStateFactory.java (original)
+++ jackrabbit/branches/JCR-2936/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/state/WorkspaceItemStateFactory.java Sun Sep 11 18:57:11 2011
@@ -89,7 +89,7 @@ public class WorkspaceItemStateFactory e
if (isUpToDate(cached, entry)) {
info = cached.info;
} else {
- // otherwise retreive item info from service and cache the whole batch
+ // otherwise retrieve item info from service and cache the whole batch
Iterator<? extends ItemInfo> infos = service.getItemInfos(sessionInfo, nodeId);
info = first(infos, cache, entry.getGeneration());
if (info == null || !info.denotesNode()) {
@@ -168,7 +168,7 @@ public class WorkspaceItemStateFactory e
if (isUpToDate(cached, entry)) {
info = cached.info;
} else {
- // otherwise retreive item info from service and cache the whole batch
+ // otherwise retrieve item info from service and cache the whole batch
Iterator<? extends ItemInfo> infos = service.getItemInfos(sessionInfo, propertyId);
info = first(infos, cache, entry.getGeneration());
if (info == null || info.denotesNode()) {
@@ -215,7 +215,7 @@ public class WorkspaceItemStateFactory e
} else {
long generation = entry.getGeneration();
if (isOutdated(cached, entry)) {
- // if not, retreive the item info from the service and put the whole batch into the cache
+ // if not, retrieve the item info from the service and put the whole batch into the cache
infos = service.getItemInfos(sessionInfo, propertyId);
info = first(infos, cache, generation);
} else if (infos != null) {
Modified: jackrabbit/branches/JCR-2936/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/xml/ImportHandler.java
URL: http://svn.apache.org/viewvc/jackrabbit/branches/JCR-2936/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/xml/ImportHandler.java?rev=1169501&r1=1169500&r2=1169501&view=diff
==============================================================================
--- jackrabbit/branches/JCR-2936/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/xml/ImportHandler.java (original)
+++ jackrabbit/branches/JCR-2936/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/xml/ImportHandler.java Sun Sep 11 18:57:11 2011
@@ -73,7 +73,7 @@ public class ImportHandler extends Defau
/**
* this flag is used to determine whether a namespace context needs to be
* started in the startElement event or if the namespace context has already
- * been started in a preceeding startPrefixMapping event;
+ * been started in a preceding startPrefixMapping event;
* the flag is set per element in the first startPrefixMapping event and is
* cleared again in the following startElement event;
*/
Modified: jackrabbit/branches/JCR-2936/jackrabbit-spi-commons/src/main/java/org/apache/jackrabbit/spi/commons/AbstractRepositoryService.java
URL: http://svn.apache.org/viewvc/jackrabbit/branches/JCR-2936/jackrabbit-spi-commons/src/main/java/org/apache/jackrabbit/spi/commons/AbstractRepositoryService.java?rev=1169501&r1=1169500&r2=1169501&view=diff
==============================================================================
--- jackrabbit/branches/JCR-2936/jackrabbit-spi-commons/src/main/java/org/apache/jackrabbit/spi/commons/AbstractRepositoryService.java (original)
+++ jackrabbit/branches/JCR-2936/jackrabbit-spi-commons/src/main/java/org/apache/jackrabbit/spi/commons/AbstractRepositoryService.java Sun Sep 11 18:57:11 2011
@@ -477,7 +477,7 @@ public abstract class AbstractRepository
/**
* This default implementation first calls {@link #checkSessionInfo(SessionInfo)}
- * with the <code>sessionInfo</code>, then returns the namepsace URI for the
+ * with the <code>sessionInfo</code>, then returns the namespace URI for the
* given <code>prefix</code>.
*/
public String getNamespaceURI(SessionInfo sessionInfo, String prefix)
Modified: jackrabbit/branches/JCR-2936/jackrabbit-spi-commons/src/main/java/org/apache/jackrabbit/spi/commons/ItemInfoBuilder.java
URL: http://svn.apache.org/viewvc/jackrabbit/branches/JCR-2936/jackrabbit-spi-commons/src/main/java/org/apache/jackrabbit/spi/commons/ItemInfoBuilder.java?rev=1169501&r1=1169500&r2=1169501&view=diff
==============================================================================
--- jackrabbit/branches/JCR-2936/jackrabbit-spi-commons/src/main/java/org/apache/jackrabbit/spi/commons/ItemInfoBuilder.java (original)
+++ jackrabbit/branches/JCR-2936/jackrabbit-spi-commons/src/main/java/org/apache/jackrabbit/spi/commons/ItemInfoBuilder.java Sun Sep 11 18:57:11 2011
@@ -145,7 +145,7 @@ public final class ItemInfoBuilder {
void createChildInfos(NodeId id, Iterator<ChildInfo> childInfos);
/**
- * Notification that a new {@link PropertyInfo} has been bult.
+ * Notification that a new {@link PropertyInfo} has been built.
* @param propertyInfo
*/
void createPropertyInfo(PropertyInfo propertyInfo);
Modified: jackrabbit/branches/JCR-2936/jackrabbit-spi-commons/src/main/java/org/apache/jackrabbit/spi/commons/QItemDefinitionImpl.java
URL: http://svn.apache.org/viewvc/jackrabbit/branches/JCR-2936/jackrabbit-spi-commons/src/main/java/org/apache/jackrabbit/spi/commons/QItemDefinitionImpl.java?rev=1169501&r1=1169500&r2=1169501&view=diff
==============================================================================
--- jackrabbit/branches/JCR-2936/jackrabbit-spi-commons/src/main/java/org/apache/jackrabbit/spi/commons/QItemDefinitionImpl.java (original)
+++ jackrabbit/branches/JCR-2936/jackrabbit-spi-commons/src/main/java/org/apache/jackrabbit/spi/commons/QItemDefinitionImpl.java Sun Sep 11 18:57:11 2011
@@ -69,7 +69,7 @@ public abstract class QItemDefinitionImp
* Creates a new <code>QItemDefinitionImpl</code>.
*
* @param name the name of the child item.
- * @param declaringNodeType the delaring node type
+ * @param declaringNodeType the declaring node type
* @param isAutoCreated if this item is auto created.
* @param isMandatory if this is a mandatory item.
* @param onParentVersion the on parent version behaviour.
Modified: jackrabbit/branches/JCR-2936/jackrabbit-spi-commons/src/main/java/org/apache/jackrabbit/spi/commons/QNodeTypeDefinitionImpl.java
URL: http://svn.apache.org/viewvc/jackrabbit/branches/JCR-2936/jackrabbit-spi-commons/src/main/java/org/apache/jackrabbit/spi/commons/QNodeTypeDefinitionImpl.java?rev=1169501&r1=1169500&r2=1169501&view=diff
==============================================================================
--- jackrabbit/branches/JCR-2936/jackrabbit-spi-commons/src/main/java/org/apache/jackrabbit/spi/commons/QNodeTypeDefinitionImpl.java (original)
+++ jackrabbit/branches/JCR-2936/jackrabbit-spi-commons/src/main/java/org/apache/jackrabbit/spi/commons/QNodeTypeDefinitionImpl.java Sun Sep 11 18:57:11 2011
@@ -174,7 +174,7 @@ public class QNodeTypeDefinitionImpl imp
}
/**
- * Createa a new <code>QNodeTypeDefinitionImpl</code> from a JCR
+ * Create a a new <code>QNodeTypeDefinitionImpl</code> from a JCR
* NodeType definition.
*
* @param def node type definition
Modified: jackrabbit/branches/JCR-2936/jackrabbit-spi-commons/src/main/java/org/apache/jackrabbit/spi/commons/QPropertyDefinitionImpl.java
URL: http://svn.apache.org/viewvc/jackrabbit/branches/JCR-2936/jackrabbit-spi-commons/src/main/java/org/apache/jackrabbit/spi/commons/QPropertyDefinitionImpl.java?rev=1169501&r1=1169500&r2=1169501&view=diff
==============================================================================
--- jackrabbit/branches/JCR-2936/jackrabbit-spi-commons/src/main/java/org/apache/jackrabbit/spi/commons/QPropertyDefinitionImpl.java (original)
+++ jackrabbit/branches/JCR-2936/jackrabbit-spi-commons/src/main/java/org/apache/jackrabbit/spi/commons/QPropertyDefinitionImpl.java Sun Sep 11 18:57:11 2011
@@ -97,7 +97,7 @@ public class QPropertyDefinitionImpl ext
* Creates a new serializable property definition.
*
* @param name the name of the child item.
- * @param declaringNodeType the delaring node type
+ * @param declaringNodeType the declaring node type
* @param isAutoCreated if this item is auto created.
* @param isMandatory if this is a mandatory item.
* @param onParentVersion the on parent version behaviour.
Modified: jackrabbit/branches/JCR-2936/jackrabbit-spi-commons/src/main/java/org/apache/jackrabbit/spi/commons/batch/ConsolidatingChangeLog.java
URL: http://svn.apache.org/viewvc/jackrabbit/branches/JCR-2936/jackrabbit-spi-commons/src/main/java/org/apache/jackrabbit/spi/commons/batch/ConsolidatingChangeLog.java?rev=1169501&r1=1169500&r2=1169501&view=diff
==============================================================================
--- jackrabbit/branches/JCR-2936/jackrabbit-spi-commons/src/main/java/org/apache/jackrabbit/spi/commons/batch/ConsolidatingChangeLog.java (original)
+++ jackrabbit/branches/JCR-2936/jackrabbit-spi-commons/src/main/java/org/apache/jackrabbit/spi/commons/batch/ConsolidatingChangeLog.java Sun Sep 11 18:57:11 2011
@@ -54,13 +54,14 @@ public class ConsolidatingChangeLog exte
* child.
* @param parentId node id of the parent
* @param name name of the child
- * @return the path of the item <code>name</code>
+ * @return the path of the item <code>name</code> or <code>null</code> if <code>parentId</code>'s
+ * path is not absolute
* @throws RepositoryException
*/
protected static Path getPath(NodeId parentId, Name name) throws RepositoryException {
Path parent = parentId.getPath();
if (!parent.isAbsolute()) {
- throw new IllegalArgumentException("Path not absoulte: " + parent);
+ return null;
}
return PATH_FACTORY.create(parent, name, true);
@@ -69,7 +70,8 @@ public class ConsolidatingChangeLog exte
/**
* Determine the {@link Path} from an {@link ItemId}.
* @param itemId
- * @return path of the item <code>itemId</code>
+ * @return path of the item <code>itemId</code> or <code>null</code> if <code>itemId</code>'s
+ * path is not absolute
*/
protected static Path getPath(ItemId itemId) {
Path path = itemId.getPath();
@@ -366,6 +368,9 @@ public class ConsolidatingChangeLog exte
if (other instanceof Remove) {
Path thisPath = ConsolidatingChangeLog.getPath(parentId, propertyName);
Path otherPath = ConsolidatingChangeLog.getPath(((Remove) other).itemId);
+ if (thisPath == null || otherPath == null) {
+ return CANCEL_NONE;
+ }
if (thisPath.equals(otherPath)) {
return CANCEL_BOTH;
}
@@ -377,6 +382,9 @@ public class ConsolidatingChangeLog exte
SetValue setValue = (SetValue) other;
Path thisPath = ConsolidatingChangeLog.getPath(parentId, propertyName);
Path otherPath = ConsolidatingChangeLog.getPath(setValue.propertyId);
+ if (thisPath == null || otherPath == null) {
+ return CANCEL_NONE;
+ }
if (thisPath.equals(otherPath)) {
if (!isMultivalued && setValue.values[0] == null) {
return CANCEL_BOTH;
Modified: jackrabbit/branches/JCR-2936/jackrabbit-spi-commons/src/main/java/org/apache/jackrabbit/spi/commons/conversion/PathParser.java
URL: http://svn.apache.org/viewvc/jackrabbit/branches/JCR-2936/jackrabbit-spi-commons/src/main/java/org/apache/jackrabbit/spi/commons/conversion/PathParser.java?rev=1169501&r1=1169500&r2=1169501&view=diff
==============================================================================
--- jackrabbit/branches/JCR-2936/jackrabbit-spi-commons/src/main/java/org/apache/jackrabbit/spi/commons/conversion/PathParser.java (original)
+++ jackrabbit/branches/JCR-2936/jackrabbit-spi-commons/src/main/java/org/apache/jackrabbit/spi/commons/conversion/PathParser.java Sun Sep 11 18:57:11 2011
@@ -146,7 +146,7 @@ public class PathParser {
/**
* Parses the given <code>jcrPath</code> and returns a <code>Path</code>. If
* <code>parent</code> is not <code>null</code>, it is prepended to the
- * built path before it is returned. If the specifed <code>jcrPath</code>
+ * built path before it is returned. If the specified <code>jcrPath</code>
* is an identifier based absolute path beginning with an identifier segment
* the given <code>identifierResolver</code> will be used to resolve it to an
* absolute path.<p/>
Modified: jackrabbit/branches/JCR-2936/jackrabbit-spi-commons/src/main/java/org/apache/jackrabbit/spi/commons/name/NameFactoryImpl.java
URL: http://svn.apache.org/viewvc/jackrabbit/branches/JCR-2936/jackrabbit-spi-commons/src/main/java/org/apache/jackrabbit/spi/commons/name/NameFactoryImpl.java?rev=1169501&r1=1169500&r2=1169501&view=diff
==============================================================================
--- jackrabbit/branches/JCR-2936/jackrabbit-spi-commons/src/main/java/org/apache/jackrabbit/spi/commons/name/NameFactoryImpl.java (original)
+++ jackrabbit/branches/JCR-2936/jackrabbit-spi-commons/src/main/java/org/apache/jackrabbit/spi/commons/name/NameFactoryImpl.java Sun Sep 11 18:57:11 2011
@@ -200,7 +200,7 @@ public class NameFactoryImpl implements
//------------------------------------------------------< Cloneable >---
/**
* Creates a clone of this <code>Name</code>.
- * Overriden in order to make <code>clone()</code> public.
+ * Overridden in order to make <code>clone()</code> public.
*
* @return a clone of this instance
* @throws CloneNotSupportedException never thrown
Modified: jackrabbit/branches/JCR-2936/jackrabbit-spi-commons/src/main/java/org/apache/jackrabbit/spi/commons/name/PathBuilder.java
URL: http://svn.apache.org/viewvc/jackrabbit/branches/JCR-2936/jackrabbit-spi-commons/src/main/java/org/apache/jackrabbit/spi/commons/name/PathBuilder.java?rev=1169501&r1=1169500&r2=1169501&view=diff
==============================================================================
--- jackrabbit/branches/JCR-2936/jackrabbit-spi-commons/src/main/java/org/apache/jackrabbit/spi/commons/name/PathBuilder.java (original)
+++ jackrabbit/branches/JCR-2936/jackrabbit-spi-commons/src/main/java/org/apache/jackrabbit/spi/commons/name/PathBuilder.java Sun Sep 11 18:57:11 2011
@@ -96,7 +96,7 @@ public final class PathBuilder {
}
/**
- * Adds the given elemenets
+ * Adds the given elements
*
* @param elements
*/
Modified: jackrabbit/branches/JCR-2936/jackrabbit-spi-commons/src/main/java/org/apache/jackrabbit/spi/commons/nodetype/NodeTypeDefDiff.java
URL: http://svn.apache.org/viewvc/jackrabbit/branches/JCR-2936/jackrabbit-spi-commons/src/main/java/org/apache/jackrabbit/spi/commons/nodetype/NodeTypeDefDiff.java?rev=1169501&r1=1169500&r2=1169501&view=diff
==============================================================================
--- jackrabbit/branches/JCR-2936/jackrabbit-spi-commons/src/main/java/org/apache/jackrabbit/spi/commons/nodetype/NodeTypeDefDiff.java (original)
+++ jackrabbit/branches/JCR-2936/jackrabbit-spi-commons/src/main/java/org/apache/jackrabbit/spi/commons/nodetype/NodeTypeDefDiff.java Sun Sep 11 18:57:11 2011
@@ -40,7 +40,7 @@ import java.util.Set;
* <p/>
* The result of the comparison can be categorized as one of the following types:
* <p/>
- * <b><code>NONE</code></b> inidcates that there is no modification at all.
+ * <b><code>NONE</code></b> indicates that there is no modification at all.
* <p/>
* A <b><code>TRIVIAL</code></b> modification has no impact on the consistency
* of existing content. The following modifications are considered
@@ -357,9 +357,9 @@ public class NodeTypeDefDiff {
return result;
}
- private String modificationTypeToString(int modifcationType) {
+ private String modificationTypeToString(int modificationType) {
String typeString = "unknown";
- switch (modifcationType) {
+ switch (modificationType) {
case NONE:
typeString = "NONE";
break;
Modified: jackrabbit/branches/JCR-2936/jackrabbit-spi-commons/src/main/java/org/apache/jackrabbit/spi/commons/nodetype/NodeTypeDefinitionFactory.java
URL: http://svn.apache.org/viewvc/jackrabbit/branches/JCR-2936/jackrabbit-spi-commons/src/main/java/org/apache/jackrabbit/spi/commons/nodetype/NodeTypeDefinitionFactory.java?rev=1169501&r1=1169500&r2=1169501&view=diff
==============================================================================
--- jackrabbit/branches/JCR-2936/jackrabbit-spi-commons/src/main/java/org/apache/jackrabbit/spi/commons/nodetype/NodeTypeDefinitionFactory.java (original)
+++ jackrabbit/branches/JCR-2936/jackrabbit-spi-commons/src/main/java/org/apache/jackrabbit/spi/commons/nodetype/NodeTypeDefinitionFactory.java Sun Sep 11 18:57:11 2011
@@ -55,7 +55,7 @@ public class NodeTypeDefinitionFactory {
/**
* Creates a new node type definition factory that operates on the given
- * sesion to create the templates.
+ * session to create the templates.
*
* @param session repository session.
* @throws RepositoryException if an error occurs.
Modified: jackrabbit/branches/JCR-2936/jackrabbit-spi-commons/src/main/java/org/apache/jackrabbit/spi/commons/nodetype/constraint/ValueConstraint.java
URL: http://svn.apache.org/viewvc/jackrabbit/branches/JCR-2936/jackrabbit-spi-commons/src/main/java/org/apache/jackrabbit/spi/commons/nodetype/constraint/ValueConstraint.java?rev=1169501&r1=1169500&r2=1169501&view=diff
==============================================================================
--- jackrabbit/branches/JCR-2936/jackrabbit-spi-commons/src/main/java/org/apache/jackrabbit/spi/commons/nodetype/constraint/ValueConstraint.java (original)
+++ jackrabbit/branches/JCR-2936/jackrabbit-spi-commons/src/main/java/org/apache/jackrabbit/spi/commons/nodetype/constraint/ValueConstraint.java Sun Sep 11 18:57:11 2011
@@ -116,7 +116,7 @@ public abstract class ValueConstraint im
//-----------------------------------< static factory and check methods >---
/**
* Create a new <code>ValueConstraint</code> from the String representation.
- * Note, that the definition must be independant of session specific namespace
+ * Note, that the definition must be independent of session specific namespace
* mappings in case of the following constraint types:
* <ul><li>{@link PropertyType#NAME},</li>
* <li>{@link PropertyType#PATH} or</li>
@@ -276,7 +276,7 @@ public abstract class ValueConstraint im
* type conversions are attempted if the type of the given values does not
* match the required type as specified in the given definition.
*
- * @param pd propert definition
+ * @param pd property definition
* @param values values to check
* @throws ConstraintViolationException if the constraints are violated
*/
Modified: jackrabbit/branches/JCR-2936/jackrabbit-spi-commons/src/main/java/org/apache/jackrabbit/spi/commons/query/OrderQueryNode.java
URL: http://svn.apache.org/viewvc/jackrabbit/branches/JCR-2936/jackrabbit-spi-commons/src/main/java/org/apache/jackrabbit/spi/commons/query/OrderQueryNode.java?rev=1169501&r1=1169500&r2=1169501&view=diff
==============================================================================
--- jackrabbit/branches/JCR-2936/jackrabbit-spi-commons/src/main/java/org/apache/jackrabbit/spi/commons/query/OrderQueryNode.java (original)
+++ jackrabbit/branches/JCR-2936/jackrabbit-spi-commons/src/main/java/org/apache/jackrabbit/spi/commons/query/OrderQueryNode.java Sun Sep 11 18:57:11 2011
@@ -32,7 +32,7 @@ import java.util.List;
public class OrderQueryNode extends QueryNode {
/**
- * The order spects
+ * The order specs
*/
private final List<OrderSpec> specs = new ArrayList<OrderSpec>();
@@ -168,7 +168,7 @@ public class OrderQueryNode extends Quer
}
/**
- * Returns <code>true</code> if the property <code>i</code> should be orderd
+ * Returns <code>true</code> if the property <code>i</code> should be ordered
* ascending. If <code>false</code> the property is ordered descending.
*
* @param i index of the property
Modified: jackrabbit/branches/JCR-2936/jackrabbit-spi-commons/src/main/java/org/apache/jackrabbit/spi/commons/query/QueryConstants.java
URL: http://svn.apache.org/viewvc/jackrabbit/branches/JCR-2936/jackrabbit-spi-commons/src/main/java/org/apache/jackrabbit/spi/commons/query/QueryConstants.java?rev=1169501&r1=1169500&r2=1169501&view=diff
==============================================================================
--- jackrabbit/branches/JCR-2936/jackrabbit-spi-commons/src/main/java/org/apache/jackrabbit/spi/commons/query/QueryConstants.java (original)
+++ jackrabbit/branches/JCR-2936/jackrabbit-spi-commons/src/main/java/org/apache/jackrabbit/spi/commons/query/QueryConstants.java Sun Sep 11 18:57:11 2011
@@ -169,7 +169,7 @@ public interface QueryConstants {
/**
* greater than operation: >
- * general comparision
+ * general comparison
*/
int OPERATION_GT_GENERAL = OPERATION_GT_VALUE + 1;
Modified: jackrabbit/branches/JCR-2936/jackrabbit-spi-commons/src/main/java/org/apache/jackrabbit/spi/commons/query/QueryNode.java
URL: http://svn.apache.org/viewvc/jackrabbit/branches/JCR-2936/jackrabbit-spi-commons/src/main/java/org/apache/jackrabbit/spi/commons/query/QueryNode.java?rev=1169501&r1=1169500&r2=1169501&view=diff
==============================================================================
--- jackrabbit/branches/JCR-2936/jackrabbit-spi-commons/src/main/java/org/apache/jackrabbit/spi/commons/query/QueryNode.java (original)
+++ jackrabbit/branches/JCR-2936/jackrabbit-spi-commons/src/main/java/org/apache/jackrabbit/spi/commons/query/QueryNode.java Sun Sep 11 18:57:11 2011
@@ -103,7 +103,7 @@ public abstract class QueryNode {
}
/**
- * Accepts a {@link QueryNodeVisitor} and calls the apropriate <code>visit</code>
+ * Accepts a {@link QueryNodeVisitor} and calls the appropriate <code>visit</code>
* method on the visitor depending on the concrete implementation of
* this <code>QueryNode</code>.
*
Modified: jackrabbit/branches/JCR-2936/jackrabbit-spi-commons/src/main/java/org/apache/jackrabbit/spi/commons/query/RelationQueryNode.java
URL: http://svn.apache.org/viewvc/jackrabbit/branches/JCR-2936/jackrabbit-spi-commons/src/main/java/org/apache/jackrabbit/spi/commons/query/RelationQueryNode.java?rev=1169501&r1=1169500&r2=1169501&view=diff
==============================================================================
--- jackrabbit/branches/JCR-2936/jackrabbit-spi-commons/src/main/java/org/apache/jackrabbit/spi/commons/query/RelationQueryNode.java (original)
+++ jackrabbit/branches/JCR-2936/jackrabbit-spi-commons/src/main/java/org/apache/jackrabbit/spi/commons/query/RelationQueryNode.java Sun Sep 11 18:57:11 2011
@@ -30,8 +30,8 @@ import org.apache.jackrabbit.spi.commons
public class RelationQueryNode extends NAryQueryNode<QueryNode> implements QueryConstants {
/**
- * Acts as an syntetic placeholder for a location step that matches any
- * name. This is required becase a JCR path does not allow a Name with
+ * Acts as an synthetic placeholder for a location step that matches any
+ * name. This is required because a JCR path does not allow a Name with
* a single '*' (star) character.
*/
public static final Name STAR_NAME_TEST = NameFactoryImpl.getInstance().create(Name.NS_REP_URI, "__star__");
Modified: jackrabbit/branches/JCR-2936/jackrabbit-spi-commons/src/main/java/org/apache/jackrabbit/spi/commons/query/qom/QueryObjectModelFactoryImpl.java
URL: http://svn.apache.org/viewvc/jackrabbit/branches/JCR-2936/jackrabbit-spi-commons/src/main/java/org/apache/jackrabbit/spi/commons/query/qom/QueryObjectModelFactoryImpl.java?rev=1169501&r1=1169500&r2=1169501&view=diff
==============================================================================
--- jackrabbit/branches/JCR-2936/jackrabbit-spi-commons/src/main/java/org/apache/jackrabbit/spi/commons/query/qom/QueryObjectModelFactoryImpl.java (original)
+++ jackrabbit/branches/JCR-2936/jackrabbit-spi-commons/src/main/java/org/apache/jackrabbit/spi/commons/query/qom/QueryObjectModelFactoryImpl.java Sun Sep 11 18:57:11 2011
@@ -230,7 +230,7 @@ public abstract class QueryObjectModelFa
throw new RepositoryException("Unknown Source implementation");
}
if (!(joinCondition instanceof JoinConditionImpl)) {
- throw new RepositoryException("Unknwon JoinCondition implementation");
+ throw new RepositoryException("Unknown JoinCondition implementation");
}
return new JoinImpl(
resolver,
Modified: jackrabbit/branches/JCR-2936/jackrabbit-spi-commons/src/main/java/org/apache/jackrabbit/spi/commons/query/sql/JCRSQLQueryBuilder.java
URL: http://svn.apache.org/viewvc/jackrabbit/branches/JCR-2936/jackrabbit-spi-commons/src/main/java/org/apache/jackrabbit/spi/commons/query/sql/JCRSQLQueryBuilder.java?rev=1169501&r1=1169500&r2=1169501&view=diff
==============================================================================
--- jackrabbit/branches/JCR-2936/jackrabbit-spi-commons/src/main/java/org/apache/jackrabbit/spi/commons/query/sql/JCRSQLQueryBuilder.java (original)
+++ jackrabbit/branches/JCR-2936/jackrabbit-spi-commons/src/main/java/org/apache/jackrabbit/spi/commons/query/sql/JCRSQLQueryBuilder.java Sun Sep 11 18:57:11 2011
@@ -830,7 +830,7 @@ public class JCRSQLQueryBuilder implemen
/**
* Creates a new <code>MergingPathQueryNode</code> with the operation
- * tpye of a parent node. <code>operation</code> must be one of:
+ * type of a parent node. <code>operation</code> must be one of:
* {@link org.apache.jackrabbit.spi.commons.query.QueryNode#TYPE_OR},
* {@link org.apache.jackrabbit.spi.commons.query.QueryNode#TYPE_AND} or
* {@link org.apache.jackrabbit.spi.commons.query.QueryNode#TYPE_NOT}.
Modified: jackrabbit/branches/JCR-2936/jackrabbit-spi-commons/src/main/java/org/apache/jackrabbit/spi/commons/query/xpath/XPathQueryBuilder.java
URL: http://svn.apache.org/viewvc/jackrabbit/branches/JCR-2936/jackrabbit-spi-commons/src/main/java/org/apache/jackrabbit/spi/commons/query/xpath/XPathQueryBuilder.java?rev=1169501&r1=1169500&r2=1169501&view=diff
==============================================================================
--- jackrabbit/branches/JCR-2936/jackrabbit-spi-commons/src/main/java/org/apache/jackrabbit/spi/commons/query/xpath/XPathQueryBuilder.java (original)
+++ jackrabbit/branches/JCR-2936/jackrabbit-spi-commons/src/main/java/org/apache/jackrabbit/spi/commons/query/xpath/XPathQueryBuilder.java Sun Sep 11 18:57:11 2011
@@ -635,7 +635,7 @@ public class XPathQueryBuilder implement
}
/**
- * Assigns a Name to one of the follwing QueryNodes:
+ * Assigns a Name to one of the following QueryNodes:
* {@link RelationQueryNode}, {@link DerefQueryNode}, {@link RelationQueryNode},
* {@link PathQueryNode}, {@link OrderQueryNode}, {@link TextsearchQueryNode}.
*
@@ -761,7 +761,7 @@ public class XPathQueryBuilder implement
* Creates the primary path query node.
*
* @param node xpath node representing the root of the parsed tree.
- * @return the path qurey node
+ * @return the path query node
*/
private PathQueryNode createPathQueryNode(SimpleNode node) {
root.setLocationNode(factory.createPathQueryNode(root));
@@ -918,7 +918,7 @@ public class XPathQueryBuilder implement
RelationQueryNode rel = (RelationQueryNode) queryNode;
if (rel.getOperation() == RelationQueryNode.OPERATION_EQ_GENERAL) {
// set dummy value to set type of relation query node
- // will be overwritten when the tree is furhter parsed.
+ // will be overwritten when the tree is further parsed.
rel.setPositionValue(1);
rel.addPathElement(PATH_FACTORY.createElement(FN_POSITION_FULL));
} else {
Modified: jackrabbit/branches/JCR-2936/test/performance/base/src/main/java/org/apache/jackrabbit/performance/AbstractPerformanceTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/branches/JCR-2936/test/performance/base/src/main/java/org/apache/jackrabbit/performance/AbstractPerformanceTest.java?rev=1169501&r1=1169500&r2=1169501&view=diff
==============================================================================
--- jackrabbit/branches/JCR-2936/test/performance/base/src/main/java/org/apache/jackrabbit/performance/AbstractPerformanceTest.java (original)
+++ jackrabbit/branches/JCR-2936/test/performance/base/src/main/java/org/apache/jackrabbit/performance/AbstractPerformanceTest.java Sun Sep 11 18:57:11 2011
@@ -55,9 +55,7 @@ public abstract class AbstractPerformanc
testPattern = Pattern.compile(System.getProperty("only", ".*"));
// Create a repository using the Jackrabbit default configuration
- if (repoPattern.matcher(name).matches()) {
- testPerformance(name, getDefaultConfig());
- }
+ testPerformance(name, getDefaultConfig());
// Create repositories for any special configurations included
File directory = new File(new File("src", "test"), "resources");
@@ -69,17 +67,14 @@ public abstract class AbstractPerformanc
if (file.isFile() && xml.endsWith(".xml")) {
String repositoryName =
name + "-" + xml.substring(0, xml.length() - 4);
- if (repoPattern.matcher(repositoryName).matches()) {
- testPerformance(
- repositoryName,
- FileUtils.openInputStream(file));
- }
+ testPerformance(
+ repositoryName, FileUtils.openInputStream(file));
}
}
}
}
- private void testPerformance(String name, InputStream xml)
+ protected void testPerformance(String name, InputStream xml)
throws Exception {
ByteArrayOutputStream buffer = new ByteArrayOutputStream();
try {
@@ -121,7 +116,8 @@ public abstract class AbstractPerformanc
}
private void runTest(AbstractTest test, String name, byte[] conf) {
- if (testPattern.matcher(test.toString()).matches()) {
+ if (repoPattern.matcher(name).matches()
+ && testPattern.matcher(test.toString()).matches()) {
// Create the repository directory
File dir = new File(
new File("target", "repository"),
Modified: jackrabbit/branches/JCR-2936/test/performance/base/src/main/java/org/apache/jackrabbit/performance/AbstractTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/branches/JCR-2936/test/performance/base/src/main/java/org/apache/jackrabbit/performance/AbstractTest.java?rev=1169501&r1=1169500&r2=1169501&view=diff
==============================================================================
--- jackrabbit/branches/JCR-2936/test/performance/base/src/main/java/org/apache/jackrabbit/performance/AbstractTest.java (original)
+++ jackrabbit/branches/JCR-2936/test/performance/base/src/main/java/org/apache/jackrabbit/performance/AbstractTest.java Sun Sep 11 18:57:11 2011
@@ -133,6 +133,19 @@ public abstract class AbstractTest {
protected void afterSuite() throws Exception {
}
+ protected void failOnRepositoryVersions(String... versions)
+ throws RepositoryException {
+ String repositoryVersion =
+ repository.getDescriptor(Repository.REP_VERSION_DESC);
+ for (String version : versions) {
+ if (repositoryVersion.startsWith(version)) {
+ throw new RepositoryException(
+ "Unable to run " + getClass().getName()
+ + " on repository version " + version);
+ }
+ }
+ }
+
protected Repository getRepository() {
return repository;
}
Modified: jackrabbit/branches/JCR-2936/test/performance/base/src/main/java/org/apache/jackrabbit/performance/BigFileReadTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/branches/JCR-2936/test/performance/base/src/main/java/org/apache/jackrabbit/performance/BigFileReadTest.java?rev=1169501&r1=1169500&r2=1169501&view=diff
==============================================================================
--- jackrabbit/branches/JCR-2936/test/performance/base/src/main/java/org/apache/jackrabbit/performance/BigFileReadTest.java (original)
+++ jackrabbit/branches/JCR-2936/test/performance/base/src/main/java/org/apache/jackrabbit/performance/BigFileReadTest.java Sun Sep 11 18:57:11 2011
@@ -28,7 +28,7 @@ import org.apache.commons.io.output.Null
public class BigFileReadTest extends AbstractTest {
- private static final int FILE_COUNT = 10;
+ private static final int FILE_COUNT = 100;
private static final int FILE_SIZE = 100;
@@ -39,7 +39,9 @@ public class BigFileReadTest extends Abs
private int i = 0;
public void beforeSuite() throws RepositoryException {
- session = getRepository().login(getCredentials());
+ failOnRepositoryVersions("1.4", "1.5", "1.6");
+
+ session = loginWriter();
root = session.getRootNode().addNode(
"BigFileReadTest", "nt:folder");
@@ -68,7 +70,6 @@ public class BigFileReadTest extends Abs
public void afterSuite() throws RepositoryException {
root.remove();
session.save();
- session.logout();
}
}
Modified: jackrabbit/branches/JCR-2936/test/performance/base/src/main/java/org/apache/jackrabbit/performance/BigFileWriteTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/branches/JCR-2936/test/performance/base/src/main/java/org/apache/jackrabbit/performance/BigFileWriteTest.java?rev=1169501&r1=1169500&r2=1169501&view=diff
==============================================================================
--- jackrabbit/branches/JCR-2936/test/performance/base/src/main/java/org/apache/jackrabbit/performance/BigFileWriteTest.java (original)
+++ jackrabbit/branches/JCR-2936/test/performance/base/src/main/java/org/apache/jackrabbit/performance/BigFileWriteTest.java Sun Sep 11 18:57:11 2011
@@ -31,6 +31,8 @@ public class BigFileWriteTest extends Ab
private Node file;
public void beforeSuite() throws RepositoryException {
+ failOnRepositoryVersions("1.4", "1.5", "1.6");
+
session = loginWriter();
}
Modified: jackrabbit/branches/JCR-2936/test/performance/jackrabbit23/src/test/java/org/apache/jackrabbit/performance/PerformanceTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/branches/JCR-2936/test/performance/jackrabbit23/src/test/java/org/apache/jackrabbit/performance/PerformanceTest.java?rev=1169501&r1=1169500&r2=1169501&view=diff
==============================================================================
--- jackrabbit/branches/JCR-2936/test/performance/jackrabbit23/src/test/java/org/apache/jackrabbit/performance/PerformanceTest.java (original)
+++ jackrabbit/branches/JCR-2936/test/performance/jackrabbit23/src/test/java/org/apache/jackrabbit/performance/PerformanceTest.java Sun Sep 11 18:57:11 2011
@@ -16,6 +16,7 @@
*/
package org.apache.jackrabbit.performance;
+import org.apache.jackrabbit.core.query.lucene.join.QueryEngine;
import org.testng.annotations.Test;
public class PerformanceTest extends AbstractPerformanceTest {
@@ -23,6 +24,9 @@ public class PerformanceTest extends Abs
@Test
public void testPerformance() throws Exception {
testPerformance("2.3");
- }
+ System.setProperty(QueryEngine.NATIVE_SORT_SYSTEM_PROPERTY, "true");
+ testPerformance("2.3-expSort", getDefaultConfig());
+ System.setProperty(QueryEngine.NATIVE_SORT_SYSTEM_PROPERTY, "false");
+ }
}