You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jackrabbit.apache.org by md...@apache.org on 2010/02/02 17:43:58 UTC
svn commit: r905699 [2/3] - in /jackrabbit/trunk/jackrabbit-jcr2spi/src:
main/java/org/apache/jackrabbit/jcr2spi/
main/java/org/apache/jackrabbit/jcr2spi/hierarchy/
main/java/org/apache/jackrabbit/jcr2spi/nodetype/
main/java/org/apache/jackrabbit/jcr2s...
Modified: jackrabbit/trunk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/operation/RemoveActivity.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/operation/RemoveActivity.java?rev=905699&r1=905698&r2=905699&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/operation/RemoveActivity.java (original)
+++ jackrabbit/trunk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/operation/RemoveActivity.java Tue Feb 2 16:41:59 2010
@@ -16,20 +16,21 @@
*/
package org.apache.jackrabbit.jcr2spi.operation;
-import org.apache.jackrabbit.jcr2spi.state.NodeState;
-import org.apache.jackrabbit.jcr2spi.hierarchy.HierarchyManager;
+import java.util.Iterator;
+
+import javax.jcr.AccessDeniedException;
+import javax.jcr.RepositoryException;
+import javax.jcr.UnsupportedRepositoryOperationException;
+import javax.jcr.version.VersionException;
+
import org.apache.jackrabbit.jcr2spi.hierarchy.HierarchyEntry;
+import org.apache.jackrabbit.jcr2spi.hierarchy.HierarchyManager;
+import org.apache.jackrabbit.jcr2spi.state.NodeState;
import org.apache.jackrabbit.spi.ItemId;
import org.apache.jackrabbit.spi.PropertyId;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import javax.jcr.AccessDeniedException;
-import javax.jcr.UnsupportedRepositoryOperationException;
-import javax.jcr.RepositoryException;
-import javax.jcr.version.VersionException;
-import java.util.Iterator;
-
/**
* <code>RemoveVersion</code>...
*/
@@ -51,6 +52,7 @@
/**
* @see org.apache.jackrabbit.jcr2spi.operation.Operation#accept(org.apache.jackrabbit.jcr2spi.operation.OperationVisitor)
*/
+ @Override
public void accept(OperationVisitor visitor) throws AccessDeniedException, UnsupportedRepositoryOperationException, VersionException, RepositoryException {
assert status == STATUS_PENDING;
visitor.visit(this);
@@ -62,10 +64,11 @@
*
* @see org.apache.jackrabbit.jcr2spi.operation.Operation#persisted()
*/
+ @Override
public void persisted() {
assert status == STATUS_PENDING;
status = STATUS_PERSISTED;
-
+
// invalidate all references to the removed activity
while (refs.hasNext()) {
HierarchyEntry entry = hMgr.lookup(refs.next());
@@ -79,6 +82,7 @@
}
//----------------------------------------< Access Operation Parameters >---
+ @Override
public ItemId getRemoveId() throws RepositoryException {
return removeState.getWorkspaceId();
}
Modified: jackrabbit/trunk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/operation/RemoveVersion.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/operation/RemoveVersion.java?rev=905699&r1=905698&r2=905699&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/operation/RemoveVersion.java (original)
+++ jackrabbit/trunk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/operation/RemoveVersion.java Tue Feb 2 16:41:59 2010
@@ -16,21 +16,22 @@
*/
package org.apache.jackrabbit.jcr2spi.operation;
-import org.apache.jackrabbit.jcr2spi.state.ItemState;
-import org.apache.jackrabbit.jcr2spi.state.NodeState;
+import java.util.Iterator;
+
+import javax.jcr.AccessDeniedException;
+import javax.jcr.RepositoryException;
+import javax.jcr.UnsupportedRepositoryOperationException;
+import javax.jcr.version.VersionException;
+
import org.apache.jackrabbit.jcr2spi.hierarchy.NodeEntry;
import org.apache.jackrabbit.jcr2spi.hierarchy.PropertyEntry;
+import org.apache.jackrabbit.jcr2spi.state.ItemState;
+import org.apache.jackrabbit.jcr2spi.state.NodeState;
import org.apache.jackrabbit.jcr2spi.version.VersionManager;
import org.apache.jackrabbit.spi.ItemId;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import javax.jcr.AccessDeniedException;
-import javax.jcr.UnsupportedRepositoryOperationException;
-import javax.jcr.RepositoryException;
-import javax.jcr.version.VersionException;
-import java.util.Iterator;
-
/**
* <code>RemoveVersion</code>...
*/
@@ -54,6 +55,7 @@
/**
* @see Operation#accept(OperationVisitor)
*/
+ @Override
public void accept(OperationVisitor visitor) throws AccessDeniedException, UnsupportedRepositoryOperationException, VersionException, RepositoryException {
assert status == STATUS_PENDING;
visitor.visit(this);
@@ -65,6 +67,7 @@
*
* @see Operation#persisted()
*/
+ @Override
public void persisted() {
assert status == STATUS_PENDING;
status = STATUS_PERSISTED;
@@ -84,6 +87,7 @@
}
//----------------------------------------< Access Operation Parameters >---
+ @Override
public ItemId getRemoveId() throws RepositoryException {
return removeState.getWorkspaceId();
}
Modified: jackrabbit/trunk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/operation/ReorderNodes.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/operation/ReorderNodes.java?rev=905699&r1=905698&r2=905699&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/operation/ReorderNodes.java (original)
+++ jackrabbit/trunk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/operation/ReorderNodes.java Tue Feb 2 16:41:59 2010
@@ -16,17 +16,17 @@
*/
package org.apache.jackrabbit.jcr2spi.operation;
-import org.apache.jackrabbit.jcr2spi.state.NodeState;
-import org.apache.jackrabbit.spi.Path;
-import org.apache.jackrabbit.spi.NodeId;
-
-import javax.jcr.nodetype.ConstraintViolationException;
import javax.jcr.AccessDeniedException;
-import javax.jcr.UnsupportedRepositoryOperationException;
-import javax.jcr.RepositoryException;
import javax.jcr.ItemNotFoundException;
+import javax.jcr.RepositoryException;
+import javax.jcr.UnsupportedRepositoryOperationException;
+import javax.jcr.nodetype.ConstraintViolationException;
import javax.jcr.version.VersionException;
+import org.apache.jackrabbit.jcr2spi.state.NodeState;
+import org.apache.jackrabbit.spi.NodeId;
+import org.apache.jackrabbit.spi.Path;
+
/**
* <code>ReorderNodes</code>...
*/
@@ -77,6 +77,7 @@
/**
* @see Operation#undo()
*/
+ @Override
public void undo() throws RepositoryException {
assert status == STATUS_PENDING;
status = STATUS_UNDO;
Modified: jackrabbit/trunk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/operation/SetMixin.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/operation/SetMixin.java?rev=905699&r1=905698&r2=905699&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/operation/SetMixin.java (original)
+++ jackrabbit/trunk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/operation/SetMixin.java Tue Feb 2 16:41:59 2010
@@ -16,16 +16,16 @@
*/
package org.apache.jackrabbit.jcr2spi.operation;
-import org.apache.jackrabbit.spi.Name;
-import org.apache.jackrabbit.jcr2spi.state.NodeState;
-import org.apache.jackrabbit.spi.NodeId;
-import org.apache.jackrabbit.spi.commons.name.NameConstants;
-
-import javax.jcr.RepositoryException;
import javax.jcr.AccessDeniedException;
+import javax.jcr.RepositoryException;
import javax.jcr.UnsupportedRepositoryOperationException;
-import javax.jcr.version.VersionException;
import javax.jcr.nodetype.NoSuchNodeTypeException;
+import javax.jcr.version.VersionException;
+
+import org.apache.jackrabbit.jcr2spi.state.NodeState;
+import org.apache.jackrabbit.spi.Name;
+import org.apache.jackrabbit.spi.NodeId;
+import org.apache.jackrabbit.spi.commons.name.NameConstants;
/**
* <code>SetMixin</code>...
@@ -77,6 +77,7 @@
/**
* @see Operation#undo()
*/
+ @Override
public void undo() throws RepositoryException {
assert status == STATUS_PENDING;
status = STATUS_UNDO;
Modified: jackrabbit/trunk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/operation/SetPrimaryType.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/operation/SetPrimaryType.java?rev=905699&r1=905698&r2=905699&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/operation/SetPrimaryType.java (original)
+++ jackrabbit/trunk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/operation/SetPrimaryType.java Tue Feb 2 16:41:59 2010
@@ -16,15 +16,15 @@
*/
package org.apache.jackrabbit.jcr2spi.operation;
-import org.apache.jackrabbit.spi.NodeId;
-import org.apache.jackrabbit.spi.Name;
-import org.apache.jackrabbit.jcr2spi.state.NodeState;
-
-import javax.jcr.RepositoryException;
import javax.jcr.AccessDeniedException;
+import javax.jcr.RepositoryException;
import javax.jcr.UnsupportedRepositoryOperationException;
-import javax.jcr.version.VersionException;
import javax.jcr.nodetype.NoSuchNodeTypeException;
+import javax.jcr.version.VersionException;
+
+import org.apache.jackrabbit.jcr2spi.state.NodeState;
+import org.apache.jackrabbit.spi.Name;
+import org.apache.jackrabbit.spi.NodeId;
/**
* <code>SetPrimaryNodeType</code>...
@@ -67,6 +67,7 @@
/**
* @see Operation#undo()
*/
+ @Override
public void undo() throws RepositoryException {
assert status == STATUS_PENDING;
status = STATUS_UNDO;
Modified: jackrabbit/trunk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/operation/SetPropertyValue.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/operation/SetPropertyValue.java?rev=905699&r1=905698&r2=905699&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/operation/SetPropertyValue.java (original)
+++ jackrabbit/trunk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/operation/SetPropertyValue.java Tue Feb 2 16:41:59 2010
@@ -16,20 +16,21 @@
*/
package org.apache.jackrabbit.jcr2spi.operation;
-import org.apache.jackrabbit.jcr2spi.state.PropertyState;
-import org.apache.jackrabbit.spi.QValue;
-import org.apache.jackrabbit.spi.PropertyId;
+import java.util.ArrayList;
+import java.util.List;
-import javax.jcr.RepositoryException;
-import javax.jcr.ValueFormatException;
import javax.jcr.AccessDeniedException;
import javax.jcr.ItemExistsException;
+import javax.jcr.RepositoryException;
import javax.jcr.UnsupportedRepositoryOperationException;
-import javax.jcr.version.VersionException;
+import javax.jcr.ValueFormatException;
import javax.jcr.lock.LockException;
import javax.jcr.nodetype.ConstraintViolationException;
-import java.util.List;
-import java.util.ArrayList;
+import javax.jcr.version.VersionException;
+
+import org.apache.jackrabbit.jcr2spi.state.PropertyState;
+import org.apache.jackrabbit.spi.PropertyId;
+import org.apache.jackrabbit.spi.QValue;
/**
* <code>SetPropertyValue</code>...
@@ -75,6 +76,7 @@
/**
* @see Operation#undo()
*/
+ @Override
public void undo() throws RepositoryException {
assert status == STATUS_PENDING;
status = STATUS_UNDO;
Modified: jackrabbit/trunk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/query/QueryManagerImpl.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/query/QueryManagerImpl.java?rev=905699&r1=905698&r2=905699&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/query/QueryManagerImpl.java (original)
+++ jackrabbit/trunk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/query/QueryManagerImpl.java Tue Feb 2 16:41:59 2010
@@ -162,6 +162,7 @@
this.node = node;
}
+ @Override
protected QueryObjectModel createQuery(QueryObjectModelTree qomTree)
throws InvalidQueryException, RepositoryException {
return new QueryObjectModelImpl(session, mgrProvider, itemMgr,
Modified: jackrabbit/trunk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/query/QueryObjectModelImpl.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/query/QueryObjectModelImpl.java?rev=905699&r1=905698&r2=905699&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/query/QueryObjectModelImpl.java (original)
+++ jackrabbit/trunk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/query/QueryObjectModelImpl.java Tue Feb 2 16:41:59 2010
@@ -67,6 +67,7 @@
/**
* @return always {@link Query#JCR_JQOM}.
*/
+ @Override
public String getLanguage() {
return Query.JCR_JQOM;
}
Modified: jackrabbit/trunk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/state/AbstractItemStateFactory.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/state/AbstractItemStateFactory.java?rev=905699&r1=905698&r2=905699&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/state/AbstractItemStateFactory.java (original)
+++ jackrabbit/trunk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/state/AbstractItemStateFactory.java Tue Feb 2 16:41:59 2010
@@ -16,12 +16,12 @@
*/
package org.apache.jackrabbit.jcr2spi.state;
+import java.util.HashSet;
+import java.util.Set;
+
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import java.util.Set;
-import java.util.HashSet;
-
/**
* <code>AbstractItemStateFactory</code>...
*/
@@ -33,7 +33,6 @@
//---------------------------------------------------< ItemStateFactory >---
/**
- * @inheritDoc
* @see ItemStateFactory#addCreationListener(ItemStateCreationListener)
*/
public void addCreationListener(ItemStateCreationListener listener) {
@@ -43,7 +42,6 @@
}
/**
- * @inheritDoc
* @see ItemStateFactory#removeCreationListener(ItemStateCreationListener)
*/
public void removeCreationListener(ItemStateCreationListener listener) {
Modified: jackrabbit/trunk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/state/ChangeLog.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/state/ChangeLog.java?rev=905699&r1=905698&r2=905699&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/state/ChangeLog.java (original)
+++ jackrabbit/trunk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/state/ChangeLog.java Tue Feb 2 16:41:59 2010
@@ -16,20 +16,21 @@
*/
package org.apache.jackrabbit.jcr2spi.state;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Set;
+
+import javax.jcr.InvalidItemStateException;
+import javax.jcr.RepositoryException;
+import javax.jcr.nodetype.ConstraintViolationException;
+
+import org.apache.jackrabbit.jcr2spi.hierarchy.HierarchyEntry;
import org.apache.jackrabbit.jcr2spi.operation.Operation;
import org.apache.jackrabbit.jcr2spi.operation.SetMixin;
import org.apache.jackrabbit.jcr2spi.operation.SetPrimaryType;
-import org.apache.jackrabbit.jcr2spi.hierarchy.HierarchyEntry;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import javax.jcr.InvalidItemStateException;
-import javax.jcr.RepositoryException;
-import javax.jcr.nodetype.ConstraintViolationException;
-import java.util.Set;
-import java.util.List;
-import java.util.ArrayList;
-
/**
* Registers changes made to states and references and consolidates
* empty changes.
@@ -74,7 +75,7 @@
//-----------------------------------------------< Inform the ChangeLog >---
/**
* Call this method when this change log has been successfully persisted.
- * This implementation will call {@link Operation#persisted() on the
+ * This implementation will call {@link Operation#persisted()} on the
* individual operations followed by setting all remaining modified
* states to EXISTING.
*/
Modified: jackrabbit/trunk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/state/ItemState.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/state/ItemState.java?rev=905699&r1=905698&r2=905699&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/state/ItemState.java (original)
+++ jackrabbit/trunk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/state/ItemState.java Tue Feb 2 16:41:59 2010
@@ -57,6 +57,7 @@
/**
* Listeners (weak references)
*/
+ @SuppressWarnings("unchecked")
private final transient Collection<ItemStateLifeCycleListener> listeners = new WeakIdentityCollection(5);
/**
Modified: jackrabbit/trunk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/state/NodeState.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/state/NodeState.java?rev=905699&r1=905698&r2=905699&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/state/NodeState.java (original)
+++ jackrabbit/trunk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/state/NodeState.java Tue Feb 2 16:41:59 2010
@@ -17,8 +17,8 @@
package org.apache.jackrabbit.jcr2spi.state;
import java.util.Arrays;
-import java.util.List;
import java.util.Iterator;
+import java.util.List;
import javax.jcr.ItemNotFoundException;
import javax.jcr.RepositoryException;
@@ -101,6 +101,7 @@
* @return always true
* @see ItemState#isNode
*/
+ @Override
public final boolean isNode() {
return true;
}
@@ -109,6 +110,7 @@
* {@inheritDoc}
* @see ItemState#getId()
*/
+ @Override
public ItemId getId() throws RepositoryException {
return getNodeId();
}
@@ -117,6 +119,7 @@
* {@inheritDoc}
* @see ItemState#getWorkspaceId()
*/
+ @Override
public ItemId getWorkspaceId() throws RepositoryException {
return getNodeEntry().getWorkspaceId();
}
@@ -124,6 +127,7 @@
/**
* @see ItemState#merge(ItemState, boolean)
*/
+ @Override
public MergeResult merge(ItemState another, boolean keepChanges) {
boolean modified = false;
if (another != null && another != this) {
@@ -160,6 +164,7 @@
* @return Always returns false unless the definition has been modified
* along with a move operation.
*/
+ @Override
public boolean revert() {
// TODO: ev. reset the 'markModified' flag
if (StateUtility.isMovedState(this)) {
Modified: jackrabbit/trunk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/state/PropertyState.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/state/PropertyState.java?rev=905699&r1=905698&r2=905699&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/state/PropertyState.java (original)
+++ jackrabbit/trunk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/state/PropertyState.java Tue Feb 2 16:41:59 2010
@@ -102,6 +102,7 @@
* @return always false
* @see ItemState#isNode
*/
+ @Override
public boolean isNode() {
return false;
}
@@ -110,6 +111,7 @@
* {@inheritDoc}
* @see ItemState#getId()
*/
+ @Override
public ItemId getId() throws RepositoryException {
return ((PropertyEntry) getHierarchyEntry()).getId();
}
@@ -118,6 +120,7 @@
* {@inheritDoc}
* @see ItemState#getWorkspaceId()
*/
+ @Override
public ItemId getWorkspaceId() throws RepositoryException {
return ((PropertyEntry) getHierarchyEntry()).getWorkspaceId();
}
@@ -130,6 +133,7 @@
*
* @see ItemState#merge(ItemState, boolean)
*/
+ @Override
public MergeResult merge(ItemState another, boolean keepChanges) {
boolean modified = false;
if (another != null && another != this) {
@@ -159,6 +163,7 @@
* @see ItemState#revert()
* @return true if
*/
+ @Override
public boolean revert() {
if (getStatus() == Status.NEW) {
throw new IllegalStateException("Cannot call revert on a NEW property state.");
Modified: jackrabbit/trunk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/state/SessionItemStateManager.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/state/SessionItemStateManager.java?rev=905699&r1=905698&r2=905699&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/state/SessionItemStateManager.java (original)
+++ jackrabbit/trunk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/state/SessionItemStateManager.java Tue Feb 2 16:41:59 2010
@@ -236,7 +236,6 @@
//---------------------------------------------------< OperationVisitor >---
/**
- * @inheritDoc
* @see OperationVisitor#visit(AddNode)
*/
public void visit(AddNode operation) throws LockException, ConstraintViolationException, AccessDeniedException, ItemExistsException, NoSuchNodeTypeException, UnsupportedRepositoryOperationException, VersionException, RepositoryException {
@@ -253,7 +252,6 @@
}
/**
- * @inheritDoc
* @see OperationVisitor#visit(AddProperty)
*/
public void visit(AddProperty operation) throws ValueFormatException, LockException, ConstraintViolationException, AccessDeniedException, ItemExistsException, UnsupportedRepositoryOperationException, VersionException, RepositoryException {
@@ -277,7 +275,6 @@
}
/**
- * @inheritDoc
* @see OperationVisitor#visit(Move)
*/
public void visit(Move operation) throws LockException, ConstraintViolationException, AccessDeniedException, ItemExistsException, UnsupportedRepositoryOperationException, VersionException, RepositoryException {
@@ -312,7 +309,6 @@
}
/**
- * @inheritDoc
* @see OperationVisitor#visit(Remove)
*/
public void visit(Remove operation) throws ConstraintViolationException, AccessDeniedException, UnsupportedRepositoryOperationException, VersionException, RepositoryException {
@@ -321,13 +317,12 @@
| ItemStateValidator.CHECK_VERSIONING
| ItemStateValidator.CHECK_CONSTRAINTS;
removeItemState(state, options);
-
+
transientStateMgr.addOperation(operation);
operation.getParentState().markModified();
}
/**
- * @inheritDoc
* @see OperationVisitor#visit(SetMixin)
*/
public void visit(SetMixin operation) throws ConstraintViolationException, AccessDeniedException, NoSuchNodeTypeException, UnsupportedRepositoryOperationException, VersionException, RepositoryException {
@@ -400,7 +395,6 @@
}
/**
- * @inheritDoc
* @see OperationVisitor#visit(SetPropertyValue)
*/
public void visit(SetPropertyValue operation) throws ValueFormatException, LockException, ConstraintViolationException, AccessDeniedException, ItemExistsException, UnsupportedRepositoryOperationException, VersionException, RepositoryException {
@@ -413,7 +407,6 @@
}
/**
- * @inheritDoc
* @see OperationVisitor#visit(ReorderNodes)
*/
public void visit(ReorderNodes operation) throws ConstraintViolationException, AccessDeniedException, UnsupportedRepositoryOperationException, VersionException, RepositoryException {
Modified: jackrabbit/trunk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/state/TransientISFactory.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/state/TransientISFactory.java?rev=905699&r1=905698&r2=905699&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/state/TransientISFactory.java (original)
+++ jackrabbit/trunk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/state/TransientISFactory.java Tue Feb 2 16:41:59 2010
@@ -16,25 +16,25 @@
*/
package org.apache.jackrabbit.jcr2spi.state;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import java.util.Collections;
+import java.util.Iterator;
+import java.util.Set;
+
+import javax.jcr.ItemNotFoundException;
+import javax.jcr.RepositoryException;
+
+import org.apache.jackrabbit.jcr2spi.hierarchy.NodeEntry;
+import org.apache.jackrabbit.jcr2spi.hierarchy.PropertyEntry;
+import org.apache.jackrabbit.jcr2spi.nodetype.ItemDefinitionProvider;
import org.apache.jackrabbit.spi.ChildInfo;
-import org.apache.jackrabbit.spi.QNodeDefinition;
+import org.apache.jackrabbit.spi.Name;
import org.apache.jackrabbit.spi.NodeId;
import org.apache.jackrabbit.spi.PropertyId;
+import org.apache.jackrabbit.spi.QNodeDefinition;
import org.apache.jackrabbit.spi.QPropertyDefinition;
-import org.apache.jackrabbit.spi.Name;
import org.apache.jackrabbit.spi.QValue;
-import org.apache.jackrabbit.jcr2spi.hierarchy.NodeEntry;
-import org.apache.jackrabbit.jcr2spi.hierarchy.PropertyEntry;
-import org.apache.jackrabbit.jcr2spi.nodetype.ItemDefinitionProvider;
-
-import javax.jcr.RepositoryException;
-import javax.jcr.ItemNotFoundException;
-
-import java.util.Iterator;
-import java.util.Collections;
-import java.util.Set;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* <code>TransientISFactory</code>...
@@ -57,7 +57,6 @@
//------------------------------------------< TransientItemStateFactory >---
/**
- * @inheritDoc
* @see TransientItemStateFactory#createNewNodeState(NodeEntry , Name, QNodeDefinition)
*/
public NodeState createNewNodeState(NodeEntry entry, Name nodetypeName,
@@ -72,7 +71,6 @@
}
/**
- * @inheritDoc
* @see TransientItemStateFactory#createNewPropertyState(PropertyEntry, QPropertyDefinition, QValue[], int)
*/
public PropertyState createNewPropertyState(PropertyEntry entry, QPropertyDefinition definition, QValue[] values, int propertyType) throws RepositoryException {
@@ -84,7 +82,6 @@
//---------------------------------------------------< ItemStateFactory >---
/**
- * @inheritDoc
* @see ItemStateFactory#createRootState(NodeEntry)
*/
public NodeState createRootState(NodeEntry entry) throws ItemNotFoundException, RepositoryException {
@@ -93,7 +90,6 @@
}
/**
- * @inheritDoc
* @see ItemStateFactory#createNodeState(NodeId,NodeEntry)
*/
public NodeState createNodeState(NodeId nodeId, NodeEntry entry)
@@ -103,7 +99,6 @@
}
/**
- * @inheritDoc
* @see ItemStateFactory#createDeepNodeState(NodeId, NodeEntry)
*/
public NodeState createDeepNodeState(NodeId nodeId, NodeEntry anyParent)
@@ -113,7 +108,6 @@
}
/**
- * @inheritDoc
* @see ItemStateFactory#createPropertyState(PropertyId, PropertyEntry)
*/
public PropertyState createPropertyState(PropertyId propertyId,
@@ -133,7 +127,6 @@
}
/**
- * @inheritDoc
* @see ItemStateFactory#getChildNodeInfos(NodeId)
*/
public Iterator<ChildInfo> getChildNodeInfos(NodeId nodeId) throws ItemNotFoundException, RepositoryException {
@@ -141,7 +134,6 @@
}
/**
- * @inheritDoc
* @see ItemStateFactory#getNodeReferences(NodeState,org.apache.jackrabbit.spi.Name,boolean)
*/
public Iterator<PropertyId> getNodeReferences(NodeState nodeState, Name propertyName, boolean weak) {
Modified: jackrabbit/trunk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/state/TransientItemStateManager.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/state/TransientItemStateManager.java?rev=905699&r1=905698&r2=905699&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/state/TransientItemStateManager.java (original)
+++ jackrabbit/trunk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/state/TransientItemStateManager.java Tue Feb 2 16:41:59 2010
@@ -16,6 +16,16 @@
*/
package org.apache.jackrabbit.jcr2spi.state;
+import java.util.Collection;
+import java.util.Iterator;
+import java.util.LinkedHashSet;
+import java.util.Set;
+
+import javax.jcr.InvalidItemStateException;
+import javax.jcr.ItemExistsException;
+import javax.jcr.RepositoryException;
+import javax.jcr.nodetype.ConstraintViolationException;
+
import org.apache.commons.collections.iterators.IteratorChain;
import org.apache.jackrabbit.jcr2spi.hierarchy.HierarchyEntry;
import org.apache.jackrabbit.jcr2spi.hierarchy.NodeEntry;
@@ -28,15 +38,6 @@
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import javax.jcr.InvalidItemStateException;
-import javax.jcr.ItemExistsException;
-import javax.jcr.RepositoryException;
-import javax.jcr.nodetype.ConstraintViolationException;
-import java.util.Collection;
-import java.util.Iterator;
-import java.util.LinkedHashSet;
-import java.util.Set;
-
/**
* <code>TransientItemStateManager</code> adds support for transient changes on
* {@link ItemState}s and also provides methods to create new item states.
@@ -75,7 +76,7 @@
/**
* Set of operations
*/
- private Set<Operation> operations = new LinkedHashSet<Operation>();
+ private final Set<Operation> operations = new LinkedHashSet<Operation>();
/**
*
Modified: jackrabbit/trunk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/state/WorkspaceItemStateFactory.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/state/WorkspaceItemStateFactory.java?rev=905699&r1=905698&r2=905699&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/state/WorkspaceItemStateFactory.java (original)
+++ jackrabbit/trunk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/state/WorkspaceItemStateFactory.java Tue Feb 2 16:41:59 2010
@@ -17,12 +17,12 @@
package org.apache.jackrabbit.jcr2spi.state;
import java.util.ArrayList;
+import java.util.Collections;
import java.util.HashMap;
import java.util.Iterator;
import java.util.List;
import java.util.Map;
import java.util.NoSuchElementException;
-import java.util.Collections;
import java.util.Set;
import javax.jcr.ItemExistsException;
@@ -69,7 +69,6 @@
}
/**
- * @inheritDoc
* @see ItemStateFactory#createRootState(NodeEntry)
*/
public NodeState createRootState(NodeEntry entry) throws ItemNotFoundException, RepositoryException {
@@ -83,7 +82,6 @@
* Creates the node with information retrieved from the
* <code>RepositoryService</code>.
*
- * @inheritDoc
* @see ItemStateFactory#createNodeState(NodeId,NodeEntry)
*/
public NodeState createNodeState(NodeId nodeId, NodeEntry entry)
@@ -103,7 +101,6 @@
}
/**
- * @inheritDoc
* @see ItemStateFactory#createDeepNodeState(NodeId,NodeEntry)
*/
public NodeState createDeepNodeState(NodeId nodeId, NodeEntry anyParent) throws ItemNotFoundException, RepositoryException {
@@ -119,7 +116,6 @@
* Creates the PropertyState with information retrieved from the
* <code>RepositoryService</code>.
*
- * @inheritDoc
* @see ItemStateFactory#createPropertyState(PropertyId,PropertyEntry)
*/
public PropertyState createPropertyState(PropertyId propertyId,
@@ -135,7 +131,6 @@
}
/**
- * @inheritDoc
* @see ItemStateFactory#createDeepPropertyState(PropertyId,NodeEntry)
*/
public PropertyState createDeepPropertyState(PropertyId propertyId, NodeEntry anyParent) throws ItemNotFoundException, RepositoryException {
@@ -150,7 +145,6 @@
}
/**
- * @inheritDoc
* @see ItemStateFactory#getChildNodeInfos(NodeId)
* @param nodeId
*/
@@ -160,7 +154,6 @@
}
/**
- * @inheritDoc
* @see ItemStateFactory#getNodeReferences(NodeState,org.apache.jackrabbit.spi.Name,boolean)
*/
public Iterator<PropertyId> getNodeReferences(NodeState nodeState, Name propertyName, boolean weak) {
Modified: jackrabbit/trunk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/version/VersionHistoryImpl.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/version/VersionHistoryImpl.java?rev=905699&r1=905698&r2=905699&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/version/VersionHistoryImpl.java (original)
+++ jackrabbit/trunk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/version/VersionHistoryImpl.java Tue Feb 2 16:41:59 2010
@@ -34,8 +34,8 @@
import javax.jcr.version.VersionHistory;
import javax.jcr.version.VersionIterator;
-import org.apache.jackrabbit.commons.iterator.RangeIteratorAdapter;
import org.apache.jackrabbit.commons.iterator.FrozenNodeIteratorAdapter;
+import org.apache.jackrabbit.commons.iterator.RangeIteratorAdapter;
import org.apache.jackrabbit.commons.iterator.VersionIteratorAdapter;
import org.apache.jackrabbit.jcr2spi.ItemLifeCycleListener;
import org.apache.jackrabbit.jcr2spi.LazyItemIterator;
@@ -133,7 +133,7 @@
v = v.getLinearPredecessor();
}
versions.add(0, rootV);
-
+
return new VersionIteratorAdapter(versions);
}
@@ -150,7 +150,7 @@
public NodeIterator getAllLinearFrozenNodes() throws RepositoryException {
return new FrozenNodeIteratorAdapter(getAllLinearVersions());
}
-
+
/**
* @see VersionHistory#getVersion(String)
*/
@@ -276,7 +276,7 @@
checkStatus();
return getProperty(NameConstants.JCR_VERSIONABLEUUID).getString();
}
-
+
//---------------------------------------------------------------< Item >---
/**
*
@@ -284,6 +284,7 @@
* @return
* @see Item#isSame(Item)
*/
+ @Override
public boolean isSame(Item otherItem) throws RepositoryException {
checkStatus();
if (otherItem instanceof VersionHistoryImpl) {
@@ -302,6 +303,7 @@
* @throws ConstraintViolationException
* @throws RepositoryException
*/
+ @Override
protected void checkIsWritable() throws UnsupportedRepositoryOperationException, ConstraintViolationException, RepositoryException {
super.checkIsWritable();
throw new ConstraintViolationException("VersionHistory is protected");
@@ -313,6 +315,7 @@
* @throws RepositoryException
* @see NodeImpl#isWritable()
*/
+ @Override
protected boolean isWritable() throws RepositoryException {
super.isWritable();
return false;
Modified: jackrabbit/trunk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/version/VersionImpl.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/version/VersionImpl.java?rev=905699&r1=905698&r2=905699&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/version/VersionImpl.java (original)
+++ jackrabbit/trunk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/version/VersionImpl.java Tue Feb 2 16:41:59 2010
@@ -16,25 +16,26 @@
*/
package org.apache.jackrabbit.jcr2spi.version;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import java.util.Calendar;
+
+import javax.jcr.Item;
+import javax.jcr.Node;
+import javax.jcr.RepositoryException;
+import javax.jcr.UnsupportedRepositoryOperationException;
+import javax.jcr.Value;
+import javax.jcr.nodetype.ConstraintViolationException;
+import javax.jcr.version.Version;
+import javax.jcr.version.VersionHistory;
+import javax.jcr.version.VersionIterator;
+
+import org.apache.jackrabbit.jcr2spi.ItemLifeCycleListener;
import org.apache.jackrabbit.jcr2spi.NodeImpl;
import org.apache.jackrabbit.jcr2spi.SessionImpl;
-import org.apache.jackrabbit.jcr2spi.ItemLifeCycleListener;
import org.apache.jackrabbit.jcr2spi.state.NodeState;
import org.apache.jackrabbit.spi.Name;
import org.apache.jackrabbit.spi.commons.name.NameConstants;
-
-import javax.jcr.version.Version;
-import javax.jcr.version.VersionHistory;
-import javax.jcr.version.VersionIterator;
-import javax.jcr.RepositoryException;
-import javax.jcr.Value;
-import javax.jcr.Node;
-import javax.jcr.Item;
-import javax.jcr.UnsupportedRepositoryOperationException;
-import javax.jcr.nodetype.ConstraintViolationException;
-import java.util.Calendar;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* <code>VersionImpl</code>...
@@ -86,7 +87,7 @@
// no linear successor found
return null;
}
-
+
/**
* @see Version#getPredecessors()
*/
@@ -126,6 +127,7 @@
* @return
* @see Item#isSame(Item)
*/
+ @Override
public boolean isSame(Item otherItem) throws RepositoryException {
checkStatus();
if (otherItem instanceof VersionImpl) {
@@ -151,6 +153,7 @@
* @throws ConstraintViolationException
* @throws RepositoryException
*/
+ @Override
protected void checkIsWritable() throws UnsupportedRepositoryOperationException, ConstraintViolationException, RepositoryException {
super.checkIsWritable();
throw new ConstraintViolationException("Version is protected");
@@ -162,6 +165,7 @@
* @throws RepositoryException
* @see NodeImpl#isWritable()
*/
+ @Override
protected boolean isWritable() throws RepositoryException {
super.isWritable();
return false;
Modified: jackrabbit/trunk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/version/VersionManagerImpl.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/version/VersionManagerImpl.java?rev=905699&r1=905698&r2=905699&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/version/VersionManagerImpl.java (original)
+++ jackrabbit/trunk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/version/VersionManagerImpl.java Tue Feb 2 16:41:59 2010
@@ -16,43 +16,42 @@
*/
package org.apache.jackrabbit.jcr2spi.version;
-import org.apache.jackrabbit.jcr2spi.state.NodeState;
-import org.apache.jackrabbit.jcr2spi.state.Status;
-import org.apache.jackrabbit.jcr2spi.state.PropertyState;
-import org.apache.jackrabbit.jcr2spi.operation.Operation;
-import org.apache.jackrabbit.jcr2spi.operation.Checkout;
-import org.apache.jackrabbit.jcr2spi.operation.Checkin;
-import org.apache.jackrabbit.jcr2spi.operation.Restore;
-import org.apache.jackrabbit.jcr2spi.operation.ResolveMergeConflict;
-import org.apache.jackrabbit.jcr2spi.operation.Merge;
-import org.apache.jackrabbit.jcr2spi.operation.AddLabel;
-import org.apache.jackrabbit.jcr2spi.operation.RemoveLabel;
-import org.apache.jackrabbit.jcr2spi.operation.RemoveVersion;
-import org.apache.jackrabbit.jcr2spi.operation.Checkpoint;
-import org.apache.jackrabbit.jcr2spi.operation.CreateActivity;
-import org.apache.jackrabbit.jcr2spi.operation.CreateConfiguration;
-import org.apache.jackrabbit.jcr2spi.operation.RemoveActivity;
-import org.apache.jackrabbit.jcr2spi.WorkspaceManager;
-import org.apache.jackrabbit.jcr2spi.hierarchy.NodeEntry;
+import java.util.Iterator;
-import javax.jcr.RepositoryException;
-import javax.jcr.ItemNotFoundException;
-import javax.jcr.NoSuchWorkspaceException;
import javax.jcr.AccessDeniedException;
-import javax.jcr.MergeException;
import javax.jcr.InvalidItemStateException;
+import javax.jcr.ItemNotFoundException;
+import javax.jcr.MergeException;
+import javax.jcr.NoSuchWorkspaceException;
+import javax.jcr.RepositoryException;
import javax.jcr.UnsupportedRepositoryOperationException;
import javax.jcr.lock.LockException;
import javax.jcr.version.VersionException;
+import org.apache.jackrabbit.jcr2spi.WorkspaceManager;
+import org.apache.jackrabbit.jcr2spi.hierarchy.NodeEntry;
+import org.apache.jackrabbit.jcr2spi.operation.AddLabel;
+import org.apache.jackrabbit.jcr2spi.operation.Checkin;
+import org.apache.jackrabbit.jcr2spi.operation.Checkout;
+import org.apache.jackrabbit.jcr2spi.operation.Checkpoint;
+import org.apache.jackrabbit.jcr2spi.operation.CreateActivity;
+import org.apache.jackrabbit.jcr2spi.operation.CreateConfiguration;
+import org.apache.jackrabbit.jcr2spi.operation.Merge;
+import org.apache.jackrabbit.jcr2spi.operation.Operation;
+import org.apache.jackrabbit.jcr2spi.operation.RemoveActivity;
+import org.apache.jackrabbit.jcr2spi.operation.RemoveLabel;
+import org.apache.jackrabbit.jcr2spi.operation.RemoveVersion;
+import org.apache.jackrabbit.jcr2spi.operation.ResolveMergeConflict;
+import org.apache.jackrabbit.jcr2spi.operation.Restore;
+import org.apache.jackrabbit.jcr2spi.state.NodeState;
+import org.apache.jackrabbit.jcr2spi.state.PropertyState;
+import org.apache.jackrabbit.jcr2spi.state.Status;
import org.apache.jackrabbit.spi.Name;
-import org.apache.jackrabbit.spi.Path;
import org.apache.jackrabbit.spi.NodeId;
+import org.apache.jackrabbit.spi.Path;
import org.apache.jackrabbit.spi.QValue;
import org.apache.jackrabbit.spi.commons.name.NameConstants;
-import java.util.Iterator;
-
/**
* <code>VersionManagerImpl</code>...
*/
@@ -156,11 +155,11 @@
workspaceManager.execute(op);
}
- public Iterator merge(NodeState nodeState, String workspaceName, boolean bestEffort) throws RepositoryException {
+ public Iterator<NodeId> merge(NodeState nodeState, String workspaceName, boolean bestEffort) throws RepositoryException {
return merge(nodeState, workspaceName, bestEffort, false);
}
- public Iterator merge(NodeState nodeState, String workspaceName, boolean bestEffort, boolean isShallow) throws NoSuchWorkspaceException, AccessDeniedException, MergeException, LockException, InvalidItemStateException, RepositoryException {
+ public Iterator<NodeId> merge(NodeState nodeState, String workspaceName, boolean bestEffort, boolean isShallow) throws NoSuchWorkspaceException, AccessDeniedException, MergeException, LockException, InvalidItemStateException, RepositoryException {
Merge op = Merge.create(nodeState, workspaceName, bestEffort, isShallow, this);
workspaceManager.execute(op);
return op.getFailedIds();
@@ -219,7 +218,7 @@
workspaceManager.execute(op);
}
- public Iterator mergeActivity(NodeState activityState) throws UnsupportedRepositoryOperationException, RepositoryException {
+ public Iterator<NodeId> mergeActivity(NodeState activityState) throws UnsupportedRepositoryOperationException, RepositoryException {
Merge op = Merge.create(activityState, null, false, false, this);
workspaceManager.execute(op);
return op.getFailedIds();
Modified: jackrabbit/trunk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/xml/DocViewImportHandler.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/xml/DocViewImportHandler.java?rev=905699&r1=905698&r2=905699&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/xml/DocViewImportHandler.java (original)
+++ jackrabbit/trunk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/xml/DocViewImportHandler.java Tue Feb 2 16:41:59 2010
@@ -16,26 +16,27 @@
*/
package org.apache.jackrabbit.jcr2spi.xml;
+import java.io.IOException;
+import java.io.Reader;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Stack;
+
+import javax.jcr.NamespaceException;
+import javax.jcr.PropertyType;
+import javax.jcr.RepositoryException;
+
+import org.apache.jackrabbit.spi.Name;
+import org.apache.jackrabbit.spi.NameFactory;
import org.apache.jackrabbit.spi.commons.conversion.NameException;
import org.apache.jackrabbit.spi.commons.conversion.NamePathResolver;
import org.apache.jackrabbit.spi.commons.name.NameConstants;
-import org.apache.jackrabbit.spi.Name;
-import org.apache.jackrabbit.spi.NameFactory;
import org.apache.jackrabbit.util.ISO9075;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.xml.sax.Attributes;
import org.xml.sax.SAXException;
-import javax.jcr.NamespaceException;
-import javax.jcr.PropertyType;
-import javax.jcr.RepositoryException;
-import java.io.IOException;
-import java.io.Reader;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Stack;
-
/**
* <code>DocViewImportHandler</code> processes Document View XML SAX events
* and 'translates' them into <code>{@link Importer}</code> method calls.
@@ -163,6 +164,7 @@
* See also {@link org.apache.jackrabbit.commons.xml.DocumentViewExporter#exportProperty(String, String, int, javax.jcr.Value[])}
* regarding special handling of multi-valued properties on export.
*/
+ @Override
public void startElement(String namespaceURI, String localName,
String qName, Attributes atts)
throws SAXException {
@@ -259,6 +261,7 @@
/**
* {@inheritDoc}
*/
+ @Override
public void characters(char[] ch, int start, int length)
throws SAXException {
/**
@@ -271,6 +274,7 @@
/**
* {@inheritDoc}
*/
+ @Override
public void ignorableWhitespace(char[] ch, int start, int length)
throws SAXException {
/**
@@ -283,6 +287,7 @@
/**
* {@inheritDoc}
*/
+ @Override
public void endElement(String namespaceURI, String localName, String qName)
throws SAXException {
// process buffered character data
Modified: jackrabbit/trunk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/xml/ImportHandler.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/xml/ImportHandler.java?rev=905699&r1=905698&r2=905699&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/xml/ImportHandler.java (original)
+++ jackrabbit/trunk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/xml/ImportHandler.java Tue Feb 2 16:41:59 2010
@@ -16,15 +16,19 @@
*/
package org.apache.jackrabbit.jcr2spi.xml;
+import javax.jcr.NamespaceException;
+import javax.jcr.NamespaceRegistry;
+import javax.jcr.RepositoryException;
+
+import org.apache.jackrabbit.spi.Name;
+import org.apache.jackrabbit.spi.NameFactory;
+import org.apache.jackrabbit.spi.PathFactory;
+import org.apache.jackrabbit.spi.commons.conversion.DefaultNamePathResolver;
+import org.apache.jackrabbit.spi.commons.conversion.NamePathResolver;
import org.apache.jackrabbit.spi.commons.conversion.NameResolver;
import org.apache.jackrabbit.spi.commons.conversion.ParsingNameResolver;
-import org.apache.jackrabbit.spi.commons.conversion.NamePathResolver;
-import org.apache.jackrabbit.spi.commons.conversion.DefaultNamePathResolver;
import org.apache.jackrabbit.spi.commons.conversion.ParsingPathResolver;
import org.apache.jackrabbit.spi.commons.namespace.NamespaceResolver;
-import org.apache.jackrabbit.spi.Name;
-import org.apache.jackrabbit.spi.NameFactory;
-import org.apache.jackrabbit.spi.PathFactory;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.xml.sax.Attributes;
@@ -34,10 +38,6 @@
import org.xml.sax.helpers.DefaultHandler;
import org.xml.sax.helpers.NamespaceSupport;
-import javax.jcr.NamespaceException;
-import javax.jcr.NamespaceRegistry;
-import javax.jcr.RepositoryException;
-
/**
* An <code>ImportHandler</code> instance can be used to import serialized
* data in System View XML or Document View XML. Processing of the XML is
@@ -96,6 +96,7 @@
/**
* {@inheritDoc}
*/
+ @Override
public void warning(SAXParseException e) throws SAXException {
// log exception and carry on...
log.warn("warning encountered at line: " + e.getLineNumber()
@@ -106,6 +107,7 @@
/**
* {@inheritDoc}
*/
+ @Override
public void error(SAXParseException e) throws SAXException {
// log exception and carry on...
log.error("error encountered at line: " + e.getLineNumber()
@@ -116,6 +118,7 @@
/**
* {@inheritDoc}
*/
+ @Override
public void fatalError(SAXParseException e) throws SAXException {
// log and re-throw exception
log.error("fatal error encountered at line: " + e.getLineNumber()
@@ -128,6 +131,7 @@
/**
* {@inheritDoc}
*/
+ @Override
public void startDocument() throws SAXException {
systemViewXML = false;
initialized = false;
@@ -155,6 +159,7 @@
/**
* {@inheritDoc}
*/
+ @Override
public void endDocument() throws SAXException {
// delegate to target handler
targetHandler.endDocument();
@@ -165,6 +170,7 @@
/**
* {@inheritDoc}
*/
+ @Override
public void startPrefixMapping(String prefix, String uri)
throws SAXException {
// check if new context needs to be started
@@ -205,6 +211,7 @@
/**
* {@inheritDoc}
*/
+ @Override
public void endPrefixMapping(String prefix) throws SAXException {
/**
* nothing to do here as namespace context has already been popped
@@ -215,6 +222,7 @@
/**
* {@inheritDoc}
*/
+ @Override
public void startElement(String namespaceURI, String localName, String qName,
Attributes atts) throws SAXException {
// check if new context needs to be started
@@ -248,6 +256,7 @@
/**
* {@inheritDoc}
*/
+ @Override
public void characters(char[] ch, int start, int length) throws SAXException {
// delegate to target handler
targetHandler.characters(ch, start, length);
@@ -256,6 +265,7 @@
/**
* {@inheritDoc}
*/
+ @Override
public void endElement(String namespaceURI, String localName, String qName)
throws SAXException {
// leaving element, pop namespace context
Modified: jackrabbit/trunk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/xml/SysViewImportHandler.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/xml/SysViewImportHandler.java?rev=905699&r1=905698&r2=905699&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/xml/SysViewImportHandler.java (original)
+++ jackrabbit/trunk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/xml/SysViewImportHandler.java Tue Feb 2 16:41:59 2010
@@ -16,21 +16,22 @@
*/
package org.apache.jackrabbit.jcr2spi.xml;
-import org.apache.jackrabbit.spi.commons.conversion.NameException;
-import org.apache.jackrabbit.spi.commons.conversion.NamePathResolver;
-import org.apache.jackrabbit.spi.commons.name.NameConstants;
-import org.apache.jackrabbit.spi.Name;
-import org.xml.sax.Attributes;
-import org.xml.sax.SAXException;
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Stack;
import javax.jcr.InvalidSerializedDataException;
import javax.jcr.NamespaceException;
import javax.jcr.PropertyType;
import javax.jcr.RepositoryException;
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Stack;
+
+import org.apache.jackrabbit.spi.Name;
+import org.apache.jackrabbit.spi.commons.conversion.NameException;
+import org.apache.jackrabbit.spi.commons.conversion.NamePathResolver;
+import org.apache.jackrabbit.spi.commons.name.NameConstants;
+import org.xml.sax.Attributes;
+import org.xml.sax.SAXException;
/**
* <code>SysViewImportHandler</code> ...
@@ -66,7 +67,7 @@
private Name currentPropName;
private int currentPropType = PropertyType.UNDEFINED;
// list of AppendableValue objects
- private List<Importer.TextValue> currentPropValues = new ArrayList<Importer.TextValue>();
+ private final List<Importer.TextValue> currentPropValues = new ArrayList<Importer.TextValue>();
private AppendableValue currentPropValue;
/**
@@ -114,6 +115,7 @@
/**
* {@inheritDoc}
*/
+ @Override
public void startElement(String namespaceURI, String localName,
String qName, Attributes atts)
throws SAXException {
@@ -193,6 +195,7 @@
/**
* {@inheritDoc}
*/
+ @Override
public void characters(char[] ch, int start, int length)
throws SAXException {
if (currentPropValue != null) {
@@ -209,6 +212,7 @@
/**
* {@inheritDoc}
*/
+ @Override
public void ignorableWhitespace(char[] ch, int start, int length)
throws SAXException {
if (currentPropValue != null) {
@@ -228,6 +232,7 @@
/**
* {@inheritDoc}
*/
+ @Override
public void endElement(String namespaceURI, String localName, String qName)
throws SAXException {
// check element name
Modified: jackrabbit/trunk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/xml/TargetImportHandler.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/xml/TargetImportHandler.java?rev=905699&r1=905698&r2=905699&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/xml/TargetImportHandler.java (original)
+++ jackrabbit/trunk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/xml/TargetImportHandler.java Tue Feb 2 16:41:59 2010
@@ -16,14 +16,6 @@
*/
package org.apache.jackrabbit.jcr2spi.xml;
-import org.apache.jackrabbit.spi.commons.conversion.NamePathResolver;
-import org.apache.jackrabbit.util.TransientFileFactory;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.xml.sax.SAXException;
-import org.xml.sax.helpers.DefaultHandler;
-
-import javax.jcr.RepositoryException;
import java.io.File;
import java.io.FileOutputStream;
import java.io.FileReader;
@@ -33,6 +25,15 @@
import java.io.StringReader;
import java.io.Writer;
+import javax.jcr.RepositoryException;
+
+import org.apache.jackrabbit.spi.commons.conversion.NamePathResolver;
+import org.apache.jackrabbit.util.TransientFileFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.xml.sax.SAXException;
+import org.xml.sax.helpers.DefaultHandler;
+
/**
* <code>TargetImportHandler</code> serves as the base class for the concrete
* classes <code>{@link DocViewImportHandler}</code> and
@@ -79,6 +80,7 @@
* @throws SAXException if the importer can not be initialized
* @see DefaultHandler#startDocument()
*/
+ @Override
public void startDocument() throws SAXException {
try {
importer.start();
@@ -94,6 +96,7 @@
* @throws SAXException if the importer can not be closed
* @see DefaultHandler#endDocument()
*/
+ @Override
public void endDocument() throws SAXException {
try {
importer.end();
@@ -304,6 +307,7 @@
tmpFile = fileFactory.createTransientFile("txt", null, null);
final FileOutputStream fout = new FileOutputStream(tmpFile);
writer = new OutputStreamWriter(fout) {
+ @Override
public void flush() throws IOException {
// flush this writer
super.flush();
Modified: jackrabbit/trunk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/xml/WorkspaceContentHandler.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/xml/WorkspaceContentHandler.java?rev=905699&r1=905698&r2=905699&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/xml/WorkspaceContentHandler.java (original)
+++ jackrabbit/trunk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/xml/WorkspaceContentHandler.java Tue Feb 2 16:41:59 2010
@@ -67,6 +67,7 @@
}
}
+ @Override
public void endDocument() throws SAXException {
delegatee.endDocument();
try {
@@ -80,42 +81,52 @@
}
}
+ @Override
public void startDocument() throws SAXException {
delegatee.startDocument();
}
+ @Override
public void characters(char ch[], int start, int length) throws SAXException {
delegatee.characters(ch, start, length);
}
+ @Override
public void ignorableWhitespace(char ch[], int start, int length) throws SAXException {
delegatee.ignorableWhitespace(ch, start, length);
}
+ @Override
public void endPrefixMapping(String prefix) throws SAXException {
delegatee.endPrefixMapping(prefix);
}
+ @Override
public void skippedEntity(String name) throws SAXException {
delegatee.skippedEntity(name);
}
+ @Override
public void setDocumentLocator(Locator locator) {
delegatee.setDocumentLocator(locator);
}
+ @Override
public void processingInstruction(String target, String data) throws SAXException {
delegatee.processingInstruction(target, data);
}
+ @Override
public void startPrefixMapping(String prefix, String uri) throws SAXException {
delegatee.startPrefixMapping(prefix, uri);
}
+ @Override
public void endElement(String namespaceURI, String localName, String qName) throws SAXException {
delegatee.endElement(namespaceURI, localName, qName);
}
+ @Override
public void startElement(String namespaceURI, String localName, String qName, Attributes atts) throws SAXException {
delegatee.startElement(namespaceURI, localName, qName, atts);
}
Modified: jackrabbit/trunk/jackrabbit-jcr2spi/src/test/java/org/apache/jackrabbit/jcr2spi/AbstractMoveTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-jcr2spi/src/test/java/org/apache/jackrabbit/jcr2spi/AbstractMoveTest.java?rev=905699&r1=905698&r2=905699&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-jcr2spi/src/test/java/org/apache/jackrabbit/jcr2spi/AbstractMoveTest.java (original)
+++ jackrabbit/trunk/jackrabbit-jcr2spi/src/test/java/org/apache/jackrabbit/jcr2spi/AbstractMoveTest.java Tue Feb 2 16:41:59 2010
@@ -16,16 +16,16 @@
*/
package org.apache.jackrabbit.jcr2spi;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.apache.jackrabbit.test.AbstractJCRTest;
-
-import javax.jcr.Node;
import javax.jcr.ItemExistsException;
+import javax.jcr.Node;
import javax.jcr.RepositoryException;
-import javax.jcr.version.VersionException;
-import javax.jcr.nodetype.ConstraintViolationException;
import javax.jcr.lock.LockException;
+import javax.jcr.nodetype.ConstraintViolationException;
+import javax.jcr.version.VersionException;
+
+import org.apache.jackrabbit.test.AbstractJCRTest;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* <code>AbstractMoveTest</code>...
@@ -40,6 +40,7 @@
protected String destinationPath;
+ @Override
protected void setUp() throws Exception {
super.setUp();
@@ -55,6 +56,7 @@
destinationPath = destParentNode.getPath() + "/" + nodeName2;
}
+ @Override
protected void tearDown() throws Exception {
srcParentNode = null;
destParentNode = null;
Modified: jackrabbit/trunk/jackrabbit-jcr2spi/src/test/java/org/apache/jackrabbit/jcr2spi/AbstractMoveTreeTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-jcr2spi/src/test/java/org/apache/jackrabbit/jcr2spi/AbstractMoveTreeTest.java?rev=905699&r1=905698&r2=905699&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-jcr2spi/src/test/java/org/apache/jackrabbit/jcr2spi/AbstractMoveTreeTest.java (original)
+++ jackrabbit/trunk/jackrabbit-jcr2spi/src/test/java/org/apache/jackrabbit/jcr2spi/AbstractMoveTreeTest.java Tue Feb 2 16:41:59 2010
@@ -16,19 +16,20 @@
*/
package org.apache.jackrabbit.jcr2spi;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.apache.jackrabbit.test.AbstractJCRTest;
+import java.util.ArrayList;
+import java.util.List;
+import javax.jcr.ItemExistsException;
import javax.jcr.Node;
import javax.jcr.Property;
import javax.jcr.RepositoryException;
-import javax.jcr.ItemExistsException;
-import javax.jcr.version.VersionException;
-import javax.jcr.nodetype.ConstraintViolationException;
import javax.jcr.lock.LockException;
-import java.util.List;
-import java.util.ArrayList;
+import javax.jcr.nodetype.ConstraintViolationException;
+import javax.jcr.version.VersionException;
+
+import org.apache.jackrabbit.test.AbstractJCRTest;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* <code>AbstractMoveTreeTest</code>...
@@ -46,8 +47,9 @@
protected String srcPath;
protected String destinationPath;
- protected List childPaths = new ArrayList();
+ protected List<String> childPaths = new ArrayList<String>();
+ @Override
protected void setUp() throws Exception {
super.setUp();
@@ -68,6 +70,7 @@
doMove(moveNode.getPath(), destinationPath);
}
+ @Override
protected void tearDown() throws Exception {
childNode = null;
grandChildNode = null;
Modified: jackrabbit/trunk/jackrabbit-jcr2spi/src/test/java/org/apache/jackrabbit/jcr2spi/AddNewPropertyTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-jcr2spi/src/test/java/org/apache/jackrabbit/jcr2spi/AddNewPropertyTest.java?rev=905699&r1=905698&r2=905699&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-jcr2spi/src/test/java/org/apache/jackrabbit/jcr2spi/AddNewPropertyTest.java (original)
+++ jackrabbit/trunk/jackrabbit-jcr2spi/src/test/java/org/apache/jackrabbit/jcr2spi/AddNewPropertyTest.java Tue Feb 2 16:41:59 2010
@@ -16,18 +16,18 @@
*/
package org.apache.jackrabbit.jcr2spi;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.apache.jackrabbit.test.AbstractJCRTest;
-import org.apache.jackrabbit.test.NotExecutableException;
-
-import javax.jcr.RepositoryException;
+import javax.jcr.ItemNotFoundException;
import javax.jcr.Property;
+import javax.jcr.RepositoryException;
import javax.jcr.Value;
-import javax.jcr.ItemNotFoundException;
-import javax.jcr.version.VersionException;
-import javax.jcr.nodetype.ConstraintViolationException;
import javax.jcr.lock.LockException;
+import javax.jcr.nodetype.ConstraintViolationException;
+import javax.jcr.version.VersionException;
+
+import org.apache.jackrabbit.test.AbstractJCRTest;
+import org.apache.jackrabbit.test.NotExecutableException;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* <code>AddNewPropertyTest</code>...
@@ -38,11 +38,13 @@
private String propname;
+ @Override
protected void tearDown() throws Exception {
testRootNode.refresh(false);
super.tearDown();
}
+ @Override
protected void setUp() throws Exception {
super.setUp();
String propName = propertyName1;
Modified: jackrabbit/trunk/jackrabbit-jcr2spi/src/test/java/org/apache/jackrabbit/jcr2spi/AddPropertyTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-jcr2spi/src/test/java/org/apache/jackrabbit/jcr2spi/AddPropertyTest.java?rev=905699&r1=905698&r2=905699&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-jcr2spi/src/test/java/org/apache/jackrabbit/jcr2spi/AddPropertyTest.java (original)
+++ jackrabbit/trunk/jackrabbit-jcr2spi/src/test/java/org/apache/jackrabbit/jcr2spi/AddPropertyTest.java Tue Feb 2 16:41:59 2010
@@ -16,16 +16,16 @@
*/
package org.apache.jackrabbit.jcr2spi;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.apache.jackrabbit.test.AbstractJCRTest;
-import org.apache.jackrabbit.test.NotExecutableException;
-import org.apache.jackrabbit.jcr2spi.state.Status;
-
import javax.jcr.Item;
-import javax.jcr.RepositoryException;
-import javax.jcr.Property;
import javax.jcr.Node;
+import javax.jcr.Property;
+import javax.jcr.RepositoryException;
+
+import org.apache.jackrabbit.jcr2spi.state.Status;
+import org.apache.jackrabbit.test.AbstractJCRTest;
+import org.apache.jackrabbit.test.NotExecutableException;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/** <code>AddPropertyTest</code>... */
public class AddPropertyTest extends AbstractJCRTest {
@@ -34,6 +34,7 @@
private Node testNode;
+ @Override
protected void setUp() throws Exception {
super.setUp();
testNode = testRootNode.addNode(nodeName1);
@@ -41,6 +42,7 @@
testRootNode.save();
}
+ @Override
protected void tearDown() throws Exception {
testNode = null;
super.tearDown();
Modified: jackrabbit/trunk/jackrabbit-jcr2spi/src/test/java/org/apache/jackrabbit/jcr2spi/ExternalModificationTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-jcr2spi/src/test/java/org/apache/jackrabbit/jcr2spi/ExternalModificationTest.java?rev=905699&r1=905698&r2=905699&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-jcr2spi/src/test/java/org/apache/jackrabbit/jcr2spi/ExternalModificationTest.java (original)
+++ jackrabbit/trunk/jackrabbit-jcr2spi/src/test/java/org/apache/jackrabbit/jcr2spi/ExternalModificationTest.java Tue Feb 2 16:41:59 2010
@@ -16,18 +16,18 @@
*/
package org.apache.jackrabbit.jcr2spi;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.apache.jackrabbit.test.AbstractJCRTest;
-import org.apache.jackrabbit.test.NotExecutableException;
-import org.apache.jackrabbit.jcr2spi.state.Status;
-
-import javax.jcr.Session;
-import javax.jcr.RepositoryException;
-import javax.jcr.Node;
import javax.jcr.InvalidItemStateException;
import javax.jcr.Item;
+import javax.jcr.Node;
import javax.jcr.Property;
+import javax.jcr.RepositoryException;
+import javax.jcr.Session;
+
+import org.apache.jackrabbit.jcr2spi.state.Status;
+import org.apache.jackrabbit.test.AbstractJCRTest;
+import org.apache.jackrabbit.test.NotExecutableException;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/** <code>ExternalModificationTest</code>... */
public class ExternalModificationTest extends AbstractJCRTest {
@@ -38,6 +38,7 @@
private Node refNode;
private Session testSession;
+ @Override
protected void setUp() throws Exception {
super.setUp();
@@ -50,6 +51,7 @@
testSession = getHelper().getReadWriteSession();
}
+ @Override
protected void tearDown() throws Exception {
if (testSession != null) {
testSession.logout();
Modified: jackrabbit/trunk/jackrabbit-jcr2spi/src/test/java/org/apache/jackrabbit/jcr2spi/GetItemsTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-jcr2spi/src/test/java/org/apache/jackrabbit/jcr2spi/GetItemsTest.java?rev=905699&r1=905698&r2=905699&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-jcr2spi/src/test/java/org/apache/jackrabbit/jcr2spi/GetItemsTest.java (original)
+++ jackrabbit/trunk/jackrabbit-jcr2spi/src/test/java/org/apache/jackrabbit/jcr2spi/GetItemsTest.java Tue Feb 2 16:41:59 2010
@@ -99,6 +99,7 @@
session = repository.login("default");
}
+ @Override
protected void tearDown() throws Exception {
if (session != null) {
session.logout();
Modified: jackrabbit/trunk/jackrabbit-jcr2spi/src/test/java/org/apache/jackrabbit/jcr2spi/GetPropertyTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-jcr2spi/src/test/java/org/apache/jackrabbit/jcr2spi/GetPropertyTest.java?rev=905699&r1=905698&r2=905699&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-jcr2spi/src/test/java/org/apache/jackrabbit/jcr2spi/GetPropertyTest.java (original)
+++ jackrabbit/trunk/jackrabbit-jcr2spi/src/test/java/org/apache/jackrabbit/jcr2spi/GetPropertyTest.java Tue Feb 2 16:41:59 2010
@@ -42,6 +42,7 @@
private Session readOnly;
+ @Override
protected void setUp() throws Exception {
super.setUp();
@@ -59,6 +60,7 @@
readOnly = getHelper().getReadOnlySession();
}
+ @Override
protected void tearDown() throws Exception {
if (readOnly != null) {
readOnly.logout();
Modified: jackrabbit/trunk/jackrabbit-jcr2spi/src/test/java/org/apache/jackrabbit/jcr2spi/HierarchyNodeTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-jcr2spi/src/test/java/org/apache/jackrabbit/jcr2spi/HierarchyNodeTest.java?rev=905699&r1=905698&r2=905699&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-jcr2spi/src/test/java/org/apache/jackrabbit/jcr2spi/HierarchyNodeTest.java (original)
+++ jackrabbit/trunk/jackrabbit-jcr2spi/src/test/java/org/apache/jackrabbit/jcr2spi/HierarchyNodeTest.java Tue Feb 2 16:41:59 2010
@@ -34,8 +34,8 @@
*/
public class HierarchyNodeTest extends AbstractJCRTest {
- private Set<String> hierarchyNodeProps = new HashSet<String>();
- private Set<String> resourceProps = new HashSet<String>();
+ private final Set<String> hierarchyNodeProps = new HashSet<String>();
+ private final Set<String> resourceProps = new HashSet<String>();
private String ntFolder;
private String ntFile;
@@ -43,6 +43,7 @@
private Node fileNode;
+ @Override
protected void setUp() throws Exception {
super.setUp();
Session s = testRootNode.getSession();
@@ -78,6 +79,7 @@
}
}
+ @Override
protected void tearDown() throws Exception {
fileNode = null;
super.tearDown();
Modified: jackrabbit/trunk/jackrabbit-jcr2spi/src/test/java/org/apache/jackrabbit/jcr2spi/LazyItemIteratorTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-jcr2spi/src/test/java/org/apache/jackrabbit/jcr2spi/LazyItemIteratorTest.java?rev=905699&r1=905698&r2=905699&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-jcr2spi/src/test/java/org/apache/jackrabbit/jcr2spi/LazyItemIteratorTest.java (original)
+++ jackrabbit/trunk/jackrabbit-jcr2spi/src/test/java/org/apache/jackrabbit/jcr2spi/LazyItemIteratorTest.java Tue Feb 2 16:41:59 2010
@@ -16,13 +16,13 @@
*/
package org.apache.jackrabbit.jcr2spi;
-import org.apache.jackrabbit.test.AbstractJCRTest;
-import org.apache.jackrabbit.test.NotExecutableException;
-
import javax.jcr.Node;
import javax.jcr.RangeIterator;
import javax.jcr.RepositoryException;
+import org.apache.jackrabbit.test.AbstractJCRTest;
+import org.apache.jackrabbit.test.NotExecutableException;
+
/**
* <code>LazyItemIteratorTest</code> contains implementation specific test
* cases, that check if the <code>LazyItemIterator</code> returns a better
@@ -31,6 +31,7 @@
*/
public class LazyItemIteratorTest extends AbstractJCRTest {
+ @Override
protected void setUp() throws Exception {
super.setUp();
}
Modified: jackrabbit/trunk/jackrabbit-jcr2spi/src/test/java/org/apache/jackrabbit/jcr2spi/MoveCombinedTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-jcr2spi/src/test/java/org/apache/jackrabbit/jcr2spi/MoveCombinedTest.java?rev=905699&r1=905698&r2=905699&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-jcr2spi/src/test/java/org/apache/jackrabbit/jcr2spi/MoveCombinedTest.java (original)
+++ jackrabbit/trunk/jackrabbit-jcr2spi/src/test/java/org/apache/jackrabbit/jcr2spi/MoveCombinedTest.java Tue Feb 2 16:41:59 2010
@@ -16,14 +16,14 @@
*/
package org.apache.jackrabbit.jcr2spi;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
import javax.jcr.Node;
import javax.jcr.Property;
import javax.jcr.RepositoryException;
import javax.jcr.Session;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
/** <code>MoveCombinedTest</code>... */
public class MoveCombinedTest extends AbstractMoveTest {
@@ -31,11 +31,13 @@
private Session testSession;
+ @Override
protected void setUp() throws Exception {
super.setUp();
testSession = getHelper().getReadOnlySession();
}
+ @Override
protected void tearDown() throws Exception {
if (testSession != null) {
testSession.logout();
@@ -44,6 +46,7 @@
super.tearDown();
}
+ @Override
protected boolean isSessionMove() {
return true;
}
Modified: jackrabbit/trunk/jackrabbit-jcr2spi/src/test/java/org/apache/jackrabbit/jcr2spi/MoveMultipleTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-jcr2spi/src/test/java/org/apache/jackrabbit/jcr2spi/MoveMultipleTest.java?rev=905699&r1=905698&r2=905699&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-jcr2spi/src/test/java/org/apache/jackrabbit/jcr2spi/MoveMultipleTest.java (original)
+++ jackrabbit/trunk/jackrabbit-jcr2spi/src/test/java/org/apache/jackrabbit/jcr2spi/MoveMultipleTest.java Tue Feb 2 16:41:59 2010
@@ -16,16 +16,16 @@
*/
package org.apache.jackrabbit.jcr2spi;
-import org.apache.jackrabbit.util.Text;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
import javax.jcr.InvalidItemStateException;
import javax.jcr.Node;
import javax.jcr.Property;
import javax.jcr.RepositoryException;
import javax.jcr.Session;
+import org.apache.jackrabbit.util.Text;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
/**
* <code>MoveMultipleTest</code>...
*/
@@ -35,11 +35,13 @@
private String originalPath;
+ @Override
protected void setUp() throws Exception {
super.setUp();
originalPath = moveNode.getPath();
}
+ @Override
protected boolean isSessionMove() {
return true;
}
Modified: jackrabbit/trunk/jackrabbit-jcr2spi/src/test/java/org/apache/jackrabbit/jcr2spi/MoveNewTreeTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-jcr2spi/src/test/java/org/apache/jackrabbit/jcr2spi/MoveNewTreeTest.java?rev=905699&r1=905698&r2=905699&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-jcr2spi/src/test/java/org/apache/jackrabbit/jcr2spi/MoveNewTreeTest.java (original)
+++ jackrabbit/trunk/jackrabbit-jcr2spi/src/test/java/org/apache/jackrabbit/jcr2spi/MoveNewTreeTest.java Tue Feb 2 16:41:59 2010
@@ -16,15 +16,16 @@
*/
package org.apache.jackrabbit.jcr2spi;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.List;
-import javax.jcr.RepositoryException;
import javax.jcr.Item;
import javax.jcr.PathNotFoundException;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Iterator;
+import javax.jcr.RepositoryException;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* <code>MoveTreeTest</code>...
@@ -33,10 +34,12 @@
private static Logger log = LoggerFactory.getLogger(MoveNewTreeTest.class);
+ @Override
protected boolean saveBeforeMove() {
return false;
}
+ @Override
protected boolean isSessionMove() {
return true;
}
@@ -119,13 +122,13 @@
assertFalse(msg, superuser.itemExists(srcPath + "/" + nodeName2 + "/" + nodeName3));
int degree = destParentNode.getDepth();
- List l = new ArrayList();
+ List<Item> l = new ArrayList<Item>();
l.add(childNode);
l.add(childProperty);
l.add(grandChildNode);
- for (Iterator it = l.iterator(); it.hasNext();) {
- Item item = (Item) it.next();
+ for (Iterator<Item> it = l.iterator(); it.hasNext();) {
+ Item item = it.next();
assertTrue(msg, item.isNew());
assertTrue(msg, childNode.getAncestor(degree).isSame(destParentNode));
}
Modified: jackrabbit/trunk/jackrabbit-jcr2spi/src/test/java/org/apache/jackrabbit/jcr2spi/MoveReferenceableTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-jcr2spi/src/test/java/org/apache/jackrabbit/jcr2spi/MoveReferenceableTest.java?rev=905699&r1=905698&r2=905699&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-jcr2spi/src/test/java/org/apache/jackrabbit/jcr2spi/MoveReferenceableTest.java (original)
+++ jackrabbit/trunk/jackrabbit-jcr2spi/src/test/java/org/apache/jackrabbit/jcr2spi/MoveReferenceableTest.java Tue Feb 2 16:41:59 2010
@@ -16,12 +16,12 @@
*/
package org.apache.jackrabbit.jcr2spi;
+import javax.jcr.Node;
+import javax.jcr.RepositoryException;
+
+import org.apache.jackrabbit.test.NotExecutableException;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import org.apache.jackrabbit.test.NotExecutableException;
-
-import javax.jcr.RepositoryException;
-import javax.jcr.Node;
/**
* <code>MoveReferenceableTest</code>...
@@ -30,6 +30,7 @@
private static Logger log = LoggerFactory.getLogger(MoveReferenceableTest.class);
+ @Override
protected void setUp() throws Exception {
super.setUp();
@@ -41,6 +42,7 @@
moveNode.save();
}
+ @Override
protected boolean isSessionMove() {
return true;
}
Modified: jackrabbit/trunk/jackrabbit-jcr2spi/src/test/java/org/apache/jackrabbit/jcr2spi/MoveSNSTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-jcr2spi/src/test/java/org/apache/jackrabbit/jcr2spi/MoveSNSTest.java?rev=905699&r1=905698&r2=905699&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-jcr2spi/src/test/java/org/apache/jackrabbit/jcr2spi/MoveSNSTest.java (original)
+++ jackrabbit/trunk/jackrabbit-jcr2spi/src/test/java/org/apache/jackrabbit/jcr2spi/MoveSNSTest.java Tue Feb 2 16:41:59 2010
@@ -16,15 +16,15 @@
*/
package org.apache.jackrabbit.jcr2spi;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.apache.jackrabbit.test.NotExecutableException;
-
+import javax.jcr.Item;
import javax.jcr.Node;
-import javax.jcr.RepositoryException;
import javax.jcr.NodeIterator;
import javax.jcr.PathNotFoundException;
-import javax.jcr.Item;
+import javax.jcr.RepositoryException;
+
+import org.apache.jackrabbit.test.NotExecutableException;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* <code>MoveSNSTest</code> (Implementation specific tests. JSR170 only
@@ -38,6 +38,7 @@
private Node sourceSibling;
private Node destSibling;
+ @Override
protected void setUp() throws Exception {
super.setUp();
if (destParentNode.hasNode(nodeName2)) {
@@ -56,12 +57,14 @@
testRootNode.save();
}
+ @Override
protected void tearDown() throws Exception {
sourceSibling = null;
destSibling = null;
super.tearDown();
}
+ @Override
protected boolean isSessionMove() {
return true;
}
Modified: jackrabbit/trunk/jackrabbit-jcr2spi/src/test/java/org/apache/jackrabbit/jcr2spi/MoveTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-jcr2spi/src/test/java/org/apache/jackrabbit/jcr2spi/MoveTest.java?rev=905699&r1=905698&r2=905699&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-jcr2spi/src/test/java/org/apache/jackrabbit/jcr2spi/MoveTest.java (original)
+++ jackrabbit/trunk/jackrabbit-jcr2spi/src/test/java/org/apache/jackrabbit/jcr2spi/MoveTest.java Tue Feb 2 16:41:59 2010
@@ -16,18 +16,18 @@
*/
package org.apache.jackrabbit.jcr2spi;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.apache.jackrabbit.test.NotExecutableException;
-
-import javax.jcr.RepositoryException;
+import javax.jcr.Item;
+import javax.jcr.ItemExistsException;
import javax.jcr.Node;
import javax.jcr.NodeIterator;
import javax.jcr.PathNotFoundException;
-import javax.jcr.Item;
import javax.jcr.Property;
-import javax.jcr.ItemExistsException;
import javax.jcr.Repository;
+import javax.jcr.RepositoryException;
+
+import org.apache.jackrabbit.test.NotExecutableException;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* <code>MoveTest</code>...
@@ -36,6 +36,7 @@
private static Logger log = LoggerFactory.getLogger(MoveTest.class);
+ @Override
protected boolean isSessionMove() {
return true;
}
@@ -260,7 +261,7 @@
}
} else {
// move the node: same name property and node must be supported
- // see Issue 725
+ // see Issue 725
doMove(moveNode.getPath(), destProperty.getPath());
}
}
Modified: jackrabbit/trunk/jackrabbit-jcr2spi/src/test/java/org/apache/jackrabbit/jcr2spi/MoveToNewTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-jcr2spi/src/test/java/org/apache/jackrabbit/jcr2spi/MoveToNewTest.java?rev=905699&r1=905698&r2=905699&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-jcr2spi/src/test/java/org/apache/jackrabbit/jcr2spi/MoveToNewTest.java (original)
+++ jackrabbit/trunk/jackrabbit-jcr2spi/src/test/java/org/apache/jackrabbit/jcr2spi/MoveToNewTest.java Tue Feb 2 16:41:59 2010
@@ -16,15 +16,15 @@
*/
package org.apache.jackrabbit.jcr2spi;
-import org.apache.jackrabbit.test.AbstractJCRTest;
-import org.apache.jackrabbit.util.Text;
-
import javax.jcr.InvalidItemStateException;
import javax.jcr.Node;
import javax.jcr.NodeIterator;
import javax.jcr.RepositoryException;
import javax.jcr.Session;
+import org.apache.jackrabbit.test.AbstractJCRTest;
+import org.apache.jackrabbit.util.Text;
+
/** <code>MoveToNewTest</code>... */
public class MoveToNewTest extends AbstractJCRTest {
@@ -33,6 +33,7 @@
protected Node moveNode;
protected String destinationPath;
+ @Override
protected void setUp() throws Exception {
super.setUp();
@@ -48,6 +49,7 @@
destinationPath = destParentNode.getPath() + "/" + nodeName2;
}
+ @Override
protected void tearDown() throws Exception {
srcParentNode = null;
destParentNode = null;
Modified: jackrabbit/trunk/jackrabbit-jcr2spi/src/test/java/org/apache/jackrabbit/jcr2spi/MoveTreeTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-jcr2spi/src/test/java/org/apache/jackrabbit/jcr2spi/MoveTreeTest.java?rev=905699&r1=905698&r2=905699&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-jcr2spi/src/test/java/org/apache/jackrabbit/jcr2spi/MoveTreeTest.java (original)
+++ jackrabbit/trunk/jackrabbit-jcr2spi/src/test/java/org/apache/jackrabbit/jcr2spi/MoveTreeTest.java Tue Feb 2 16:41:59 2010
@@ -16,12 +16,12 @@
*/
package org.apache.jackrabbit.jcr2spi;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import javax.jcr.RepositoryException;
import javax.jcr.Item;
import javax.jcr.PathNotFoundException;
+import javax.jcr.RepositoryException;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* <code>MoveTreeTest</code>...
@@ -30,10 +30,12 @@
private static Logger log = LoggerFactory.getLogger(MoveTreeTest.class);
+ @Override
protected boolean saveBeforeMove() {
return true;
}
+ @Override
protected boolean isSessionMove() {
return true;
}
Modified: jackrabbit/trunk/jackrabbit-jcr2spi/src/test/java/org/apache/jackrabbit/jcr2spi/NodeOrderTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-jcr2spi/src/test/java/org/apache/jackrabbit/jcr2spi/NodeOrderTest.java?rev=905699&r1=905698&r2=905699&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-jcr2spi/src/test/java/org/apache/jackrabbit/jcr2spi/NodeOrderTest.java (original)
+++ jackrabbit/trunk/jackrabbit-jcr2spi/src/test/java/org/apache/jackrabbit/jcr2spi/NodeOrderTest.java Tue Feb 2 16:41:59 2010
@@ -16,16 +16,16 @@
*/
package org.apache.jackrabbit.jcr2spi;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.apache.jackrabbit.test.AbstractJCRTest;
-import org.apache.jackrabbit.test.NotExecutableException;
-
import javax.jcr.Node;
import javax.jcr.NodeIterator;
import javax.jcr.RepositoryException;
import javax.jcr.Session;
+import org.apache.jackrabbit.test.AbstractJCRTest;
+import org.apache.jackrabbit.test.NotExecutableException;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
/**
* <code>NodeOrderTest</code>...
*/
@@ -35,6 +35,7 @@
private Node[] children;
+ @Override
protected void setUp() throws Exception {
super.setUp();
if (!testRootNode.getPrimaryNodeType().hasOrderableChildNodes()) {
@@ -48,6 +49,7 @@
testRootNode.save();
}
+ @Override
protected void tearDown() throws Exception {
children = null;
super.tearDown();