You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jackrabbit.apache.org by re...@apache.org on 2011/12/28 16:32:46 UTC
svn commit: r1225207 [2/3] - in
/jackrabbit/trunk/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api:
./ lock/ observation/ query/ retention/ security/ version/
Modified: jackrabbit/trunk/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/SetValueVersionExceptionTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/SetValueVersionExceptionTest.java?rev=1225207&r1=1225206&r2=1225207&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/SetValueVersionExceptionTest.java (original)
+++ jackrabbit/trunk/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/SetValueVersionExceptionTest.java Wed Dec 28 15:32:44 2011
@@ -75,7 +75,7 @@ public class SetValueVersionExceptionTes
property = node.setProperty(propertyName1, value);
multiProperty = node.setProperty(propertyName2, values);
- testRootNode.save();
+ testRootNode.getSession().save();
node.checkin();
}
@@ -277,7 +277,7 @@ public class SetValueVersionExceptionTes
ensureMixinType(referenceableNode, mixReferenceable);
// implementation specific if mixin takes effect immediately or upon save
- testRootNode.save();
+ testRootNode.getSession().save();
String refPropName = getProperty("propertyname3");
String nodeType = getProperty("nodetype2");
@@ -291,7 +291,7 @@ public class SetValueVersionExceptionTes
ensureCanSetProperty(node, refPropName, node.getSession().getValueFactory().createValue(referenceableNode));
Property property = node.setProperty(refPropName, referenceableNode);
- testRootNode.save();
+ testRootNode.getSession().save();
node.checkin();
Modified: jackrabbit/trunk/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/ShareableNodeTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/ShareableNodeTest.java?rev=1225207&r1=1225206&r2=1225207&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/ShareableNodeTest.java (original)
+++ jackrabbit/trunk/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/ShareableNodeTest.java Wed Dec 28 15:32:44 2011
@@ -75,7 +75,7 @@ public class ShareableNodeTest extends A
Node a2 = testRootNode.addNode("a2");
Node b1 = a1.addNode("b1");
a2.addNode("b");
- testRootNode.save();
+ testRootNode.getSession().save();
// add mixin
ensureMixinType(b1, mixShareable);
@@ -105,7 +105,7 @@ public class ShareableNodeTest extends A
Node a1 = testRootNode.addNode("a1");
Node a2 = testRootNode.addNode("a2");
Node b1 = a1.addNode("b1");
- testRootNode.save();
+ testRootNode.getSession().save();
// add mixin
ensureMixinType(b1, mixShareable);
@@ -135,7 +135,7 @@ public class ShareableNodeTest extends A
Node a1 = testRootNode.addNode("a1");
Node a2 = testRootNode.addNode("a2");
Node b1 = a1.addNode("b1");
- testRootNode.save();
+ testRootNode.getSession().save();
// add mixin
ensureMixinType(b1, mixShareable);
@@ -165,7 +165,7 @@ public class ShareableNodeTest extends A
Node a1 = testRootNode.addNode("a1");
Node a2 = testRootNode.addNode("a2");
Node b1 = a1.addNode("b1");
- testRootNode.save();
+ testRootNode.getSession().save();
// add mixin
ensureMixinType(b1, mixShareable);
@@ -194,7 +194,7 @@ public class ShareableNodeTest extends A
Node a1 = testRootNode.addNode("a1");
Node a2 = testRootNode.addNode("a2");
Node b1 = a1.addNode("b1");
- testRootNode.save();
+ testRootNode.getSession().save();
// add mixin
ensureMixinType(b1, mixShareable);
@@ -225,7 +225,7 @@ public class ShareableNodeTest extends A
Node a1 = testRootNode.addNode("a1");
Node a2 = testRootNode.addNode("a2");
Node b1 = a1.addNode("b1");
- testRootNode.save();
+ testRootNode.getSession().save();
// add mixin
ensureMixinType(b1, mixShareable);
@@ -255,7 +255,7 @@ public class ShareableNodeTest extends A
Node a1 = testRootNode.addNode("a1");
Node a2 = testRootNode.addNode("a2");
Node b1 = a1.addNode("b1");
- testRootNode.save();
+ testRootNode.getSession().save();
// add mixin
ensureMixinType(b1, mixShareable);
@@ -278,7 +278,7 @@ public class ShareableNodeTest extends A
// setup parent node and first child
Node a = testRootNode.addNode("a");
Node b = a.addNode("b");
- testRootNode.save();
+ testRootNode.getSession().save();
ensureMixinType(b, mixShareable);
b.save();
@@ -292,7 +292,7 @@ public class ShareableNodeTest extends A
Node a1 = testRootNode.addNode("a1");
Node a2 = testRootNode.addNode("a2");
Node b1 = a1.addNode("b1");
- testRootNode.save();
+ testRootNode.getSession().save();
// make b1 shareable
ensureMixinType(b1, mixShareable);
@@ -336,7 +336,7 @@ public class ShareableNodeTest extends A
Node a1 = testRootNode.addNode("a1");
Node a2 = testRootNode.addNode("a2");
Node b1 = a1.addNode("b1");
- testRootNode.save();
+ testRootNode.getSession().save();
// add mixin
ensureMixinType(b1, mixShareable);
@@ -370,7 +370,7 @@ public class ShareableNodeTest extends A
Node a1 = testRootNode.addNode("a1");
Node a2 = testRootNode.addNode("a2");
Node b1 = a1.addNode("b1");
- testRootNode.save();
+ testRootNode.getSession().save();
// add mixin
ensureMixinType(b1, mixShareable);
@@ -383,7 +383,7 @@ public class ShareableNodeTest extends A
// remove shared set
b1.removeSharedSet();
- testRootNode.save();
+ testRootNode.getSession().save();
// verify neither a1 nor a2 contain any more children
assertFalse(a1.hasNodes());
@@ -400,7 +400,7 @@ public class ShareableNodeTest extends A
Node a1 = testRootNode.addNode("a1");
Node a2 = testRootNode.addNode("a2");
Node b1 = a1.addNode("b1");
- testRootNode.save();
+ testRootNode.getSession().save();
// add mixin
ensureMixinType(b1, mixShareable);
@@ -432,7 +432,7 @@ public class ShareableNodeTest extends A
Node a1 = testRootNode.addNode("a1");
Node a2 = testRootNode.addNode("a2");
Node b1 = a1.addNode("b1");
- testRootNode.save();
+ testRootNode.getSession().save();
// add mixin
ensureMixinType(b1, mixShareable);
@@ -462,7 +462,7 @@ public class ShareableNodeTest extends A
Node a1 = testRootNode.addNode("a1");
Node a2 = testRootNode.addNode("a2");
Node b1 = a1.addNode("b1");
- testRootNode.save();
+ testRootNode.getSession().save();
// add mixin
ensureMixinType(b1, mixShareable);
@@ -498,7 +498,7 @@ public class ShareableNodeTest extends A
Node a1 = s.addNode("a1");
Node a2 = s.addNode("a2");
Node b1 = a1.addNode("b1");
- testRootNode.save();
+ testRootNode.getSession().save();
// add mixin
ensureMixinType(b1, mixShareable);
@@ -537,7 +537,7 @@ public class ShareableNodeTest extends A
// setup parent nodes and first child
Node a1 = testRootNode.addNode("a1");
Node b1 = a1.addNode("b1");
- testRootNode.save();
+ testRootNode.getSession().save();
// add mixin
ensureMixinType(b1, mixShareable);
@@ -563,7 +563,7 @@ public class ShareableNodeTest extends A
Node a1 = testRootNode.addNode("a1");
Node a2 = testRootNode.addNode("a2");
Node b1 = a1.addNode("b1");
- testRootNode.save();
+ testRootNode.getSession().save();
// add mixin
ensureMixinType(b1, mixShareable);
@@ -599,7 +599,7 @@ public class ShareableNodeTest extends A
Node a1 = testRootNode.addNode("a1");
Node a2 = testRootNode.addNode("a2");
Node b1 = a1.addNode("b1");
- testRootNode.save();
+ testRootNode.getSession().save();
// add mixin
ensureMixinType(b1, mixShareable);
@@ -643,7 +643,7 @@ public class ShareableNodeTest extends A
Node a1 = p.addNode("a1");
Node a2 = p.addNode("a2");
Node b1 = a1.addNode("b1");
- testRootNode.save();
+ testRootNode.getSession().save();
// add mixin
ensureMixinType(b1, mixShareable);
@@ -669,7 +669,7 @@ public class ShareableNodeTest extends A
// delete p and save
p.remove();
- testRootNode.save();
+ testRootNode.getSession().save();
// and import again underneath test root
InputStream in = new FileInputStream(tmpFile);
@@ -697,7 +697,7 @@ public class ShareableNodeTest extends A
Node a2 = testRootNode.addNode("a2");
Node a3 = testRootNode.addNode("a3");
Node b1 = a1.addNode("b1");
- testRootNode.save();
+ testRootNode.getSession().save();
// add mixin
ensureMixinType(b1, mixShareable);
@@ -754,7 +754,7 @@ public class ShareableNodeTest extends A
Node a2 = testRootNode.addNode("a2");
Node a3 = testRootNode.addNode("a3");
Node b1 = a1.addNode("b1");
- testRootNode.save();
+ testRootNode.getSession().save();
// add mixin
ensureMixinType(b1, mixShareable);
@@ -811,7 +811,7 @@ public class ShareableNodeTest extends A
Node a2 = testRootNode.addNode("a2");
Node a3 = testRootNode.addNode("a3");
Node b1 = a1.addNode("b1");
- testRootNode.save();
+ testRootNode.getSession().save();
// add mixin
ensureMixinType(b1, mixShareable);
@@ -869,7 +869,7 @@ public class ShareableNodeTest extends A
Node a2 = testRootNode.addNode("a2");
Node a3 = testRootNode.addNode("a3");
Node b1 = a1.addNode("b1");
- testRootNode.save();
+ testRootNode.getSession().save();
// add mixin
ensureMixinType(b1, mixShareable);
@@ -924,7 +924,7 @@ public class ShareableNodeTest extends A
ensureMixinType(a1, mixLockable);
Node a2 = testRootNode.addNode("a2");
Node b1 = a1.addNode("b1");
- testRootNode.save();
+ testRootNode.getSession().save();
// add mixin
ensureMixinType(b1, mixShareable);
@@ -973,7 +973,7 @@ public class ShareableNodeTest extends A
Node a1 = testRootNode.addNode("a1");
Node a2 = testRootNode.addNode("a2");
Node b1 = a1.addNode("b1");
- testRootNode.save();
+ testRootNode.getSession().save();
// make b1 shareable
ensureMixinType(b1, mixShareable);
@@ -1025,7 +1025,7 @@ public class ShareableNodeTest extends A
Node a1 = testRootNode.addNode("a1");
Node a2 = testRootNode.addNode("a2");
Node b1 = a1.addNode("b1");
- testRootNode.save();
+ testRootNode.getSession().save();
Workspace workspace = b1.getSession().getWorkspace();
@@ -1056,7 +1056,7 @@ public class ShareableNodeTest extends A
Node a1 = testRootNode.addNode("a1");
Node a2 = testRootNode.addNode("a2");
Node b1 = a1.addNode("b1");
- testRootNode.save();
+ testRootNode.getSession().save();
// add mixin
ensureMixinType(b1, mixShareable);
@@ -1085,7 +1085,7 @@ public class ShareableNodeTest extends A
// setup parent node and first child
Node a = testRootNode.addNode("a");
Node b = a.addNode("b");
- testRootNode.save();
+ testRootNode.getSession().save();
// add mixin
ensureMixinType(b, mixShareable);
@@ -1110,7 +1110,7 @@ public class ShareableNodeTest extends A
Node a1 = testRootNode.addNode("a1");
Node a2 = testRootNode.addNode("a2");
Node b1 = a1.addNode("b1");
- testRootNode.save();
+ testRootNode.getSession().save();
// add mixin
ensureMixinType(b1, mixShareable);
@@ -1149,7 +1149,7 @@ public class ShareableNodeTest extends A
// setup parent nodes and first child
Node a = testRootNode.addNode("a");
Node b1 = a.addNode("b1");
- testRootNode.save();
+ testRootNode.getSession().save();
// add mixin
ensureMixinType(b1, mixShareable);
@@ -1175,7 +1175,7 @@ public class ShareableNodeTest extends A
Node a1 = testRootNode.addNode("a1");
Node a2 = testRootNode.addNode("a2");
Node b = a1.addNode("b");
- testRootNode.save();
+ testRootNode.getSession().save();
// add mixin
ensureMixinType(b, mixShareable);
@@ -1202,7 +1202,7 @@ public class ShareableNodeTest extends A
Node a1 = testRootNode.addNode("a1");
Node a2 = testRootNode.addNode("a2");
Node b = a1.addNode("b");
- testRootNode.save();
+ testRootNode.getSession().save();
// add mixin
ensureMixinType(b, mixShareable);
@@ -1232,7 +1232,7 @@ public class ShareableNodeTest extends A
Node a1 = testRootNode.addNode("a1");
Node a2 = testRootNode.addNode("a2");
Node b1 = a1.addNode("b1");
- testRootNode.save();
+ testRootNode.getSession().save();
// add mixin
ensureMixinType(b1, mixShareable);
@@ -1267,7 +1267,7 @@ public class ShareableNodeTest extends A
Node a1 = testRootNode.addNode("a1");
Node a2 = testRootNode.addNode("a2");
Node b1 = a1.addNode("b1");
- testRootNode.save();
+ testRootNode.getSession().save();
// add mixin
ensureMixinType(b1, mixShareable);
@@ -1305,7 +1305,7 @@ public class ShareableNodeTest extends A
Node a1 = testRootNode.addNode("a1");
Node a2 = testRootNode.addNode("a2");
Node b1 = a1.addNode("b1");
- testRootNode.save();
+ testRootNode.getSession().save();
// add mixin
ensureMixinType(b1, mixShareable);
@@ -1339,7 +1339,7 @@ public class ShareableNodeTest extends A
Node a1 = testRootNode.addNode("a1");
Node a2 = testRootNode.addNode("a2");
Node b1 = a1.addNode("b1");
- testRootNode.save();
+ testRootNode.getSession().save();
// add mixin
ensureMixinType(b1, mixShareable);
@@ -1382,7 +1382,7 @@ public class ShareableNodeTest extends A
parents[i] = testRootNode.addNode("a" + (i + 1));
}
Node b = parents[0].addNode("b");
- testRootNode.save();
+ testRootNode.getSession().save();
// add mixin
ensureMixinType(b, mixShareable);
@@ -1400,7 +1400,7 @@ public class ShareableNodeTest extends A
for (int i = 0; i < parents.length; i++) {
parents[i].remove();
}
- testRootNode.save();
+ testRootNode.getSession().save();
}
/**
@@ -1411,7 +1411,7 @@ public class ShareableNodeTest extends A
Node a2 = a1.addNode("a2");
Node b1 = a1.addNode("b1");
ensureMixinType(b1, mixShareable);
- testRootNode.save();
+ testRootNode.getSession().save();
//now we have a shareable node N with path a1/b1
Modified: jackrabbit/trunk/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/ValueFactoryTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/ValueFactoryTest.java?rev=1225207&r1=1225206&r2=1225207&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/ValueFactoryTest.java (original)
+++ jackrabbit/trunk/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/ValueFactoryTest.java Wed Dec 28 15:32:44 2011
@@ -117,7 +117,7 @@ public class ValueFactoryTest extends Ab
if (n1.canAddMixin(mixReferenceable)) {
n1.addMixin(mixReferenceable);
// make sure jcr:uuid is available
- testRootNode.save();
+ testRootNode.getSession().save();
return n1;
}
else {
Modified: jackrabbit/trunk/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/WorkspaceCopySameNameSibsTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/WorkspaceCopySameNameSibsTest.java?rev=1225207&r1=1225206&r2=1225207&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/WorkspaceCopySameNameSibsTest.java (original)
+++ jackrabbit/trunk/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/WorkspaceCopySameNameSibsTest.java Wed Dec 28 15:32:44 2011
@@ -78,7 +78,7 @@ public class WorkspaceCopySameNameSibsTe
public void testCopyNodesNodeExistsAtDestPath() throws RepositoryException {
// create a parent node where allowSameNameSiblings are set to false
Node snsfNode = testRootNode.addNode(nodeName3, sameNameSibsFalseNodeType.getName());
- testRootNode.save();
+ testRootNode.getSession().save();
String dstAbsPath = snsfNode.getPath() + "/" + node1.getName();
workspace.copy(node1.getPath(), dstAbsPath);
@@ -104,7 +104,7 @@ public class WorkspaceCopySameNameSibsTe
public void testCopyNodesNodeExistsAtDestPath2() throws RepositoryException {
// create a parent node where allowSameNameSiblings are set to true
Node snsfNode = testRootNode.addNode(nodeName3, sameNameSibsTrueNodeType.getName());
- testRootNode.save();
+ testRootNode.getSession().save();
String dstAbsPath = snsfNode.getPath() + "/" + node1.getName();
workspace.copy(node1.getPath(), dstAbsPath);
Modified: jackrabbit/trunk/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/WorkspaceCopyTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/WorkspaceCopyTest.java?rev=1225207&r1=1225206&r2=1225207&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/WorkspaceCopyTest.java (original)
+++ jackrabbit/trunk/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/WorkspaceCopyTest.java Wed Dec 28 15:32:44 2011
@@ -77,7 +77,7 @@ public class WorkspaceCopyTest extends A
// if parent node is nt:base then no sub nodes can be created
String nodetype = testNodeTypeNoChildren == null ? ntBase : testNodeTypeNoChildren;
Node subNodesNotAllowedNode = testRootNode.addNode(nodeName3, nodetype);
- testRootNode.save();
+ testRootNode.getSession().save();
try {
String dstAbsPath = subNodesNotAllowedNode.getPath() + "/" + node2.getName();
workspace.copy(node2.getPath(), dstAbsPath);
Modified: jackrabbit/trunk/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/WorkspaceMoveSameNameSibsTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/WorkspaceMoveSameNameSibsTest.java?rev=1225207&r1=1225206&r2=1225207&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/WorkspaceMoveSameNameSibsTest.java (original)
+++ jackrabbit/trunk/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/WorkspaceMoveSameNameSibsTest.java Wed Dec 28 15:32:44 2011
@@ -53,7 +53,7 @@ public class WorkspaceMoveSameNameSibsTe
// create a new node to move nodes
Node newNode = testRootNode.addNode(nodeName2, testNodeType);
- testRootNode.save();
+ testRootNode.getSession().save();
// copy node three times below a node and check the order
for (int i = 0; i < orderList.length; i++) {
@@ -82,7 +82,7 @@ public class WorkspaceMoveSameNameSibsTe
public void testMoveNodesNodeExistsAtDestPath() throws RepositoryException {
// create a parent node where allowSameNameSiblings are set to false
Node snsfNode = testRootNode.addNode(nodeName3, sameNameSibsFalseNodeType.getName());
- testRootNode.save();
+ testRootNode.getSession().save();
String dstAbsPath = snsfNode.getPath() + "/" + node1.getName();
workspace.copy(node1.getPath(), dstAbsPath);
Modified: jackrabbit/trunk/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/WorkspaceMoveTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/WorkspaceMoveTest.java?rev=1225207&r1=1225206&r2=1225207&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/WorkspaceMoveTest.java (original)
+++ jackrabbit/trunk/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/WorkspaceMoveTest.java Wed Dec 28 15:32:44 2011
@@ -76,7 +76,7 @@ public class WorkspaceMoveTest extends A
// if parent node is nt:base then no sub nodes can be created
String nodetype = testNodeTypeNoChildren == null ? ntBase : testNodeTypeNoChildren;
Node subNodesNotAllowedNode = testRootNode.addNode(nodeName3, nodetype);
- testRootNode.save();
+ testRootNode.getSession().save();
try {
String dstAbsPath = subNodesNotAllowedNode.getPath() + "/" + node2.getName();
workspace.move(node2.getPath(), dstAbsPath);
Modified: jackrabbit/trunk/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/lock/AbstractLockTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/lock/AbstractLockTest.java?rev=1225207&r1=1225206&r2=1225207&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/lock/AbstractLockTest.java (original)
+++ jackrabbit/trunk/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/lock/AbstractLockTest.java Wed Dec 28 15:32:44 2011
@@ -51,7 +51,7 @@ public abstract class AbstractLockTest e
lockedNode = testRootNode.addNode(nodeName1, testNodeType);
ensureMixinType(lockedNode, mixLockable);
childNode = lockedNode.addNode(nodeName2, testNodeType);
- testRootNode.save();
+ testRootNode.getSession().save();
lockMgr = getLockManager(testRootNode.getSession());
lock = lockMgr.lock(lockedNode.getPath(), isDeep(), isSessionScoped(), getTimeoutHint(), getLockOwner());
Modified: jackrabbit/trunk/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/lock/DeepLockTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/lock/DeepLockTest.java?rev=1225207&r1=1225206&r2=1225207&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/lock/DeepLockTest.java (original)
+++ jackrabbit/trunk/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/lock/DeepLockTest.java Wed Dec 28 15:32:44 2011
@@ -52,7 +52,7 @@ public class DeepLockTest extends Abstra
public void testParentChildDeepLock()
throws RepositoryException, NotExecutableException {
ensureMixinType(childNode, mixLockable);
- testRootNode.save();
+ testRootNode.getSession().save();
// try to lock child node
try {
Modified: jackrabbit/trunk/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/lock/LockManagerTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/lock/LockManagerTest.java?rev=1225207&r1=1225206&r2=1225207&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/lock/LockManagerTest.java (original)
+++ jackrabbit/trunk/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/lock/LockManagerTest.java Wed Dec 28 15:32:44 2011
@@ -51,7 +51,7 @@ public class LockManagerTest extends Abs
}
testNode = testRootNode.addNode(nodeName1, testNodeType);
- testRootNode.save();
+ testRootNode.getSession().save();
testPath = testNode.getPath();
lockMgr = getLockManager(superuser);
Modified: jackrabbit/trunk/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/lock/LockTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/lock/LockTest.java?rev=1225207&r1=1225206&r2=1225207&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/lock/LockTest.java (original)
+++ jackrabbit/trunk/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/lock/LockTest.java Wed Dec 28 15:32:44 2011
@@ -50,7 +50,7 @@ public class LockTest extends AbstractJC
// create new node
Node n = testRootNode.addNode(nodeName1, testNodeType);
ensureMixinType(n, mixLockable);
- testRootNode.save();
+ testRootNode.getSession().save();
// lock node and get lock token
Lock lock = n.lock(false, false);
@@ -108,7 +108,7 @@ public class LockTest extends AbstractJC
// create new node and lock it
Node n1 = testRootNode.addNode(nodeName1, testNodeType);
ensureMixinType(n1, mixLockable);
- testRootNode.save();
+ testRootNode.getSession().save();
// lock node
Lock lock = n1.lock(false, true);
@@ -148,7 +148,7 @@ public class LockTest extends AbstractJC
ensureMixinType(n1, mixLockable);
Node n1Sub = n1.addNode(nodeName1, testNodeType);
ensureMixinType(n1Sub, mixLockable);
- testRootNode.save();
+ testRootNode.getSession().save();
// lock node
n1.lock(true, true);
@@ -172,7 +172,7 @@ public class LockTest extends AbstractJC
// create new node and lock it
Node n1 = testRootNode.addNode(nodeName1, testNodeType);
ensureMixinType(n1, mixLockable);
- testRootNode.save();
+ testRootNode.getSession().save();
// lock node
Lock lock = n1.lock(false, true);
@@ -198,7 +198,7 @@ public class LockTest extends AbstractJC
// create new node and lock it
Node n1 = testRootNode.addNode(nodeName1, testNodeType);
ensureMixinType(n1, mixLockable);
- testRootNode.save();
+ testRootNode.getSession().save();
// lock node
Lock lock = n1.lock(false, true);
@@ -219,7 +219,7 @@ public class LockTest extends AbstractJC
Node n1 = testRootNode.addNode(nodeName1, testNodeType);
ensureMixinType(n1, mixLockable);
Node n2 = n1.addNode(nodeName2, testNodeType);
- testRootNode.save();
+ testRootNode.getSession().save();
// lock parent node
n1.lock(false, true);
@@ -243,7 +243,7 @@ public class LockTest extends AbstractJC
ensureMixinType(node, mixLockable);
// try to make it versionable if it is not
ensureMixinType(node, mixVersionable);
- testRootNode.save();
+ testRootNode.getSession().save();
node.checkin();
@@ -273,7 +273,7 @@ public class LockTest extends AbstractJC
ensureMixinType(n1, mixLockable);
Node n2 = n1.addNode(nodeName2, testNodeType);
ensureMixinType(n2, mixLockable);
- testRootNode.save();
+ testRootNode.getSession().save();
// lock parent node
n1.lock(false, true);
@@ -297,7 +297,7 @@ public class LockTest extends AbstractJC
ensureMixinType(n1, mixLockable);
Node n2 = n1.addNode(nodeName2, testNodeType);
ensureMixinType(n2, mixLockable);
- testRootNode.save();
+ testRootNode.getSession().save();
// lock child node
n2.lock(false, true);
@@ -320,7 +320,7 @@ public class LockTest extends AbstractJC
ensureMixinType(n1, mixLockable);
Node n2 = testRootNode.addNode(nodeName2, testNodeType);
ensureMixinType(n2, mixLockable);
- testRootNode.save();
+ testRootNode.getSession().save();
// lock node 1 "undeeply"
Lock lock1 = n1.lock(false, true);
@@ -345,7 +345,7 @@ public class LockTest extends AbstractJC
ensureMixinType(n1, mixLockable);
Node n2 = testRootNode.addNode(nodeName2, testNodeType);
ensureMixinType(n2, mixLockable);
- testRootNode.save();
+ testRootNode.getSession().save();
// lock node 1 session-scoped
Lock lock1 = n1.lock(false, true);
@@ -369,7 +369,7 @@ public class LockTest extends AbstractJC
// add node
Node n1 = testRootNode.addNode(nodeName1, testNodeType);
ensureMixinType(n1, mixLockable);
- testRootNode.save();
+ testRootNode.getSession().save();
// create new session
Session otherSuperuser = getHelper().getSuperuserSession();
@@ -409,7 +409,7 @@ public class LockTest extends AbstractJC
// add node
Node n1 = testRootNode.addNode(nodeName1, testNodeType);
ensureMixinType(n1, mixLockable);
- testRootNode.save();
+ testRootNode.getSession().save();
// create new session
Session otherSuperuser = getHelper().getSuperuserSession();
@@ -451,7 +451,7 @@ public class LockTest extends AbstractJC
// add node
Node n1 = testRootNode.addNode(nodeName1, testNodeType);
ensureMixinType(n1, mixLockable);
- testRootNode.save();
+ testRootNode.getSession().save();
// create new session
Session otherSuperuser = getHelper().getSuperuserSession();
@@ -483,7 +483,7 @@ public class LockTest extends AbstractJC
// create new node
Node n = testRootNode.addNode(nodeName1, testNodeType);
ensureMixinType(n, mixLockable);
- testRootNode.save();
+ testRootNode.getSession().save();
// lock node and get lock token
Lock lock = n.lock(false, true);
@@ -508,7 +508,7 @@ public class LockTest extends AbstractJC
// create new node
Node n = testRootNode.addNode(nodeName1, testNodeType);
ensureMixinType(n, mixLockable);
- testRootNode.save();
+ testRootNode.getSession().save();
// lock node and get lock token
Lock lock = n.lock(false, true);
@@ -540,7 +540,7 @@ public class LockTest extends AbstractJC
ensureMixinType(n1, mixLockable);
Node n2 = n1.addNode(nodeName2, testNodeType);
ensureMixinType(n2, mixLockable);
- testRootNode.save();
+ testRootNode.getSession().save();
// deep lock parent node
n1.lock(true, true);
@@ -564,7 +564,7 @@ public class LockTest extends AbstractJC
Node testNode = testRootNode.addNode(nodeName1, testNodeType);
ensureMixinType(testNode, mixLockable);
ensureMixinType(testNode, mixVersionable);
- testRootNode.save();
+ testRootNode.getSession().save();
// lock and check-in
try {
@@ -599,7 +599,7 @@ public class LockTest extends AbstractJC
// move last node in front of first
testRootNode.orderBefore(nodeName1 + "[3]", nodeName1 + "[1]");
- testRootNode.save();
+ testRootNode.getSession().save();
// assert: first node locked
assertTrue("First child node locked",
@@ -622,7 +622,7 @@ public class LockTest extends AbstractJC
// move first node to last
testRootNode.orderBefore(nodeName1 + "[1]", null);
- testRootNode.save();
+ testRootNode.getSession().save();
// assert: third node locked
assertTrue("Third child node locked",
@@ -642,7 +642,7 @@ public class LockTest extends AbstractJC
ensureMixinType(testNode1, mixLockable);
Node testNode2 = testNode1.addNode(nodeName2, testNodeType);
ensureMixinType(testNode2, mixLockable);
- testRootNode.save();
+ testRootNode.getSession().save();
// lock child node
testNode2.lock(false, true);
@@ -727,7 +727,7 @@ public class LockTest extends AbstractJC
ensureMixinType(testNode, mixLockable);
testNode = testRootNode.addNode(nodeName1, testNodeType);
ensureMixinType(testNode, mixLockable);
- testRootNode.save();
+ testRootNode.getSession().save();
return testNode;
}
catch (ItemExistsException ex) {
Modified: jackrabbit/trunk/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/lock/SetValueLockExceptionTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/lock/SetValueLockExceptionTest.java?rev=1225207&r1=1225206&r2=1225207&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/lock/SetValueLockExceptionTest.java (original)
+++ jackrabbit/trunk/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/lock/SetValueLockExceptionTest.java Wed Dec 28 15:32:44 2011
@@ -114,7 +114,7 @@ public class SetValueLockExceptionTest e
testNode.setProperty(stringProp, stringValue);
ensureCanSetProperty(testNode, multiStringProp, PropertyType.STRING, true);
testNode.setProperty(multiStringProp, multiString);
- testRootNode.save();
+ testRootNode.getSession().save();
}
}
Modified: jackrabbit/trunk/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/observation/AddEventListenerTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/observation/AddEventListenerTest.java?rev=1225207&r1=1225206&r2=1225207&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/observation/AddEventListenerTest.java (original)
+++ jackrabbit/trunk/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/observation/AddEventListenerTest.java Wed Dec 28 15:32:44 2011
@@ -53,7 +53,7 @@ public class AddEventListenerTest extend
obsMgr.addEventListener(listener, Event.NODE_ADDED, testRoot + "/" + nodeName1, true, null, null, false);
Node n = testRootNode.addNode(nodeName1, testNodeType);
n.addNode(nodeName2, testNodeType);
- testRootNode.save();
+ testRootNode.getSession().save();
Event[] events = listener.getEvents(DEFAULT_WAIT_TIMEOUT);
obsMgr.removeEventListener(listener);
checkNodeAdded(events, new String[]{nodeName1 + "/" + nodeName2}, null);
@@ -68,7 +68,7 @@ public class AddEventListenerTest extend
obsMgr.addEventListener(listener, Event.NODE_ADDED, testRoot + "/" + nodeName1, false, null, null, false);
Node n = testRootNode.addNode(nodeName1, testNodeType);
n.addNode(nodeName2, testNodeType);
- testRootNode.save();
+ testRootNode.getSession().save();
Event[] events = listener.getEvents(DEFAULT_WAIT_TIMEOUT);
obsMgr.removeEventListener(listener);
checkNodeAdded(events, new String[]{nodeName1 + "/" + nodeName2}, null);
@@ -81,12 +81,12 @@ public class AddEventListenerTest extend
public void testIsDeepFalsePropertyAdded() throws RepositoryException {
Node n1 = testRootNode.addNode(nodeName1, testNodeType);
Node n2 = testRootNode.addNode(nodeName2, testNodeType);
- testRootNode.save();
+ testRootNode.getSession().save();
EventResult listener = new EventResult(log);
obsMgr.addEventListener(listener, Event.PROPERTY_ADDED, testRoot + "/" + nodeName1, false, null, null, false);
n1.setProperty(propertyName1, "foo");
n2.setProperty(propertyName1, "foo");
- testRootNode.save();
+ testRootNode.getSession().save();
Event[] events = listener.getEvents(DEFAULT_WAIT_TIMEOUT);
obsMgr.removeEventListener(listener);
checkPropertyAdded(events, new String[]{nodeName1 + "/" + propertyName1});
@@ -107,7 +107,7 @@ public class AddEventListenerTest extend
true); // noLocal
testRootNode.addNode(nodeName1, testNodeType);
- testRootNode.save();
+ testRootNode.getSession().save();
Event[] events = listener.getEvents(DEFAULT_WAIT_TIMEOUT);
obsMgr.removeEventListener(listener);
assertEquals("EventListener must not receive own modification when noLocal=true", 0, events.length);
@@ -125,7 +125,7 @@ public class AddEventListenerTest extend
} catch (RepositoryException e) {
throw new NotExecutableException("Repository does not support mix:referenceable");
}
- testRootNode.save();
+ testRootNode.getSession().save();
EventResult listener = new EventResult(log);
obsMgr.addEventListener(listener,
Event.PROPERTY_ADDED,
@@ -136,7 +136,7 @@ public class AddEventListenerTest extend
false);
n1.setProperty(propertyName1, "foo");
n2.setProperty(propertyName1, "foo");
- testRootNode.save();
+ testRootNode.getSession().save();
Event[] events = listener.getEvents(DEFAULT_WAIT_TIMEOUT);
obsMgr.removeEventListener(listener);
checkPropertyAdded(events, new String[]{nodeName1 + "/" + propertyName1});
@@ -150,7 +150,7 @@ public class AddEventListenerTest extend
EventResult listener = new EventResult(log);
Node n1 = testRootNode.addNode(nodeName1, testNodeType);
Node n2 = testRootNode.addNode(nodeName2, nodetype2);
- testRootNode.save();
+ testRootNode.getSession().save();
obsMgr.addEventListener(listener,
Event.NODE_ADDED,
testRoot,
@@ -191,7 +191,7 @@ public class AddEventListenerTest extend
throws RepositoryException, NotExecutableException {
Node n = testRootNode.addNode(nodeName, nodeType);
ensureMixinType(n, mixReferenceable);
- testRootNode.save();
+ testRootNode.getSession().save();
return n;
}
}
Modified: jackrabbit/trunk/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/observation/EventIteratorTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/observation/EventIteratorTest.java?rev=1225207&r1=1225206&r2=1225207&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/observation/EventIteratorTest.java (original)
+++ jackrabbit/trunk/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/observation/EventIteratorTest.java Wed Dec 28 15:32:44 2011
@@ -53,7 +53,7 @@ public class EventIteratorTest extends A
EventResult listener = new EventResult(log);
addEventListener(listener, Event.NODE_ADDED);
testRootNode.addNode(nodeName1, testNodeType);
- testRootNode.save();
+ testRootNode.getSession().save();
EventIterator events = listener.getEventIterator(DEFAULT_WAIT_TIMEOUT);
removeEventListener(listener);
assertNotNull("No events delivered within " + DEFAULT_WAIT_TIMEOUT + "ms.", events);
@@ -73,7 +73,7 @@ public class EventIteratorTest extends A
testRootNode.addNode(nodeName1, testNodeType);
testRootNode.addNode(nodeName2, testNodeType);
testRootNode.addNode(nodeName3, testNodeType);
- testRootNode.save();
+ testRootNode.getSession().save();
EventIterator events = listener.getEventIterator(DEFAULT_WAIT_TIMEOUT);
removeEventListener(listener);
assertNotNull("No events delivered within " + DEFAULT_WAIT_TIMEOUT + "ms.", events);
@@ -95,7 +95,7 @@ public class EventIteratorTest extends A
testRootNode.addNode(nodeName1, testNodeType);
testRootNode.addNode(nodeName2, testNodeType);
testRootNode.addNode(nodeName3, testNodeType);
- testRootNode.save();
+ testRootNode.getSession().save();
EventIterator events = listener.getEventIterator(DEFAULT_WAIT_TIMEOUT);
removeEventListener(listener);
assertNotNull("No events delivered within " + DEFAULT_WAIT_TIMEOUT + "ms.", events);
Modified: jackrabbit/trunk/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/observation/EventTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/observation/EventTest.java?rev=1225207&r1=1225206&r2=1225207&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/observation/EventTest.java (original)
+++ jackrabbit/trunk/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/observation/EventTest.java Wed Dec 28 15:32:44 2011
@@ -42,7 +42,7 @@ public class EventTest extends AbstractO
EventResult result = new EventResult(log);
addEventListener(result, Event.NODE_ADDED);
Node addedNode = testRootNode.addNode(nodeName1, testNodeType);
- testRootNode.save();
+ testRootNode.getSession().save();
Event[] events = result.getEvents(DEFAULT_WAIT_TIMEOUT);
removeEventListener(result);
assertEquals("Wrong number of events returned", 1, events.length);
@@ -59,7 +59,7 @@ public class EventTest extends AbstractO
EventResult result = new EventResult(log);
addEventListener(result, Event.NODE_ADDED);
testRootNode.addNode(nodeName1, testNodeType);
- testRootNode.save();
+ testRootNode.getSession().save();
Event[] events = result.getEvents(DEFAULT_WAIT_TIMEOUT);
removeEventListener(result);
assertEquals("Wrong number of events returned", 1, events.length);
@@ -75,7 +75,7 @@ public class EventTest extends AbstractO
EventResult result = new EventResult(log);
addEventListener(result, Event.NODE_ADDED);
testRootNode.addNode(nodeName1, testNodeType);
- testRootNode.save();
+ testRootNode.getSession().save();
Event[] events = result.getEvents(DEFAULT_WAIT_TIMEOUT);
removeEventListener(result);
assertEquals("Wrong number of events returned", 1, events.length);
Modified: jackrabbit/trunk/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/observation/GetDateTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/observation/GetDateTest.java?rev=1225207&r1=1225206&r2=1225207&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/observation/GetDateTest.java (original)
+++ jackrabbit/trunk/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/observation/GetDateTest.java Wed Dec 28 15:32:44 2011
@@ -39,7 +39,7 @@ public class GetDateTest extends Abstrac
Event[] events = getEvents(new Callable() {
public void call() throws RepositoryException {
testRootNode.addNode(name, testNodeType);
- testRootNode.save();
+ testRootNode.getSession().save();
}
}, Event.NODE_ADDED);
for (int i = 0; i < events.length; i++) {
Modified: jackrabbit/trunk/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/observation/GetIdentifierTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/observation/GetIdentifierTest.java?rev=1225207&r1=1225206&r2=1225207&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/observation/GetIdentifierTest.java (original)
+++ jackrabbit/trunk/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/observation/GetIdentifierTest.java Wed Dec 28 15:32:44 2011
@@ -30,7 +30,7 @@ public class GetIdentifierTest extends A
Event[] events = getEvents(new Callable(){
public void call() throws RepositoryException {
testRootNode.addNode(nodeName1, testNodeType);
- testRootNode.save();
+ testRootNode.getSession().save();
}
}, Event.NODE_ADDED);
Node n = testRootNode.getNode(nodeName1);
@@ -39,7 +39,7 @@ public class GetIdentifierTest extends A
public void testNodeMoved() throws RepositoryException {
final Node n = testRootNode.addNode(nodeName1, testNodeType);
- testRootNode.save();
+ testRootNode.getSession().save();
Event[] events = getEvents(new Callable(){
public void call() throws RepositoryException {
superuser.getWorkspace().move(n.getPath(), testRoot + "/" + nodeName2);
@@ -52,12 +52,12 @@ public class GetIdentifierTest extends A
public void testNodeRemoved() throws RepositoryException {
final Node n = testRootNode.addNode(nodeName1, testNodeType);
String path = n.getPath();
- testRootNode.save();
+ testRootNode.getSession().save();
String identifier = n.getIdentifier();
Event[] events = getEvents(new Callable(){
public void call() throws RepositoryException {
n.remove();
- testRootNode.save();
+ testRootNode.getSession().save();
}
}, Event.NODE_REMOVED);
assertEquals(identifier, getEventByPath(events, path).getIdentifier());
@@ -67,7 +67,7 @@ public class GetIdentifierTest extends A
Event[] events = getEvents(new Callable(){
public void call() throws RepositoryException {
testRootNode.addNode(nodeName1, testNodeType).setProperty(propertyName1, "test");
- testRootNode.save();
+ testRootNode.getSession().save();
}
}, Event.PROPERTY_ADDED);
Node n = testRootNode.getNode(nodeName1);
@@ -78,11 +78,11 @@ public class GetIdentifierTest extends A
public void testPropertyChanged() throws RepositoryException {
Node n = testRootNode.addNode(nodeName1, testNodeType);
final Property prop = n.setProperty(propertyName1, "test");
- testRootNode.save();
+ testRootNode.getSession().save();
Event[] events = getEvents(new Callable(){
public void call() throws RepositoryException {
prop.setValue("modified");
- testRootNode.save();
+ testRootNode.getSession().save();
}
}, Event.PROPERTY_CHANGED);
assertEquals(n.getIdentifier(), getEventByPath(events, prop.getPath()).getIdentifier());
@@ -92,11 +92,11 @@ public class GetIdentifierTest extends A
Node n = testRootNode.addNode(nodeName1, testNodeType);
final Property prop = n.setProperty(propertyName1, "test");
String propPath = prop.getPath();
- testRootNode.save();
+ testRootNode.getSession().save();
Event[] events = getEvents(new Callable(){
public void call() throws RepositoryException {
prop.remove();
- testRootNode.save();
+ testRootNode.getSession().save();
}
}, Event.PROPERTY_REMOVED);
assertEquals(n.getIdentifier(), getEventByPath(events, propPath).getIdentifier());
Modified: jackrabbit/trunk/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/observation/GetInfoTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/observation/GetInfoTest.java?rev=1225207&r1=1225206&r2=1225207&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/observation/GetInfoTest.java (original)
+++ jackrabbit/trunk/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/observation/GetInfoTest.java Wed Dec 28 15:32:44 2011
@@ -33,7 +33,7 @@ public class GetInfoTest extends Abstrac
Event[] events = getEvents(new Callable(){
public void call() throws RepositoryException {
testRootNode.addNode(nodeName1, testNodeType);
- testRootNode.save();
+ testRootNode.getSession().save();
}
}, Event.NODE_ADDED);
for (int i = 0; i < events.length; i++) {
@@ -43,11 +43,11 @@ public class GetInfoTest extends Abstrac
public void testNodeRemoved() throws RepositoryException {
final Node n = testRootNode.addNode(nodeName1, testNodeType);
- testRootNode.save();
+ testRootNode.getSession().save();
Event[] events = getEvents(new Callable(){
public void call() throws RepositoryException {
n.remove();
- testRootNode.save();
+ testRootNode.getSession().save();
}
}, Event.NODE_REMOVED);
for (int i = 0; i < events.length; i++) {
@@ -59,7 +59,7 @@ public class GetInfoTest extends Abstrac
Event[] events = getEvents(new Callable(){
public void call() throws RepositoryException {
testRootNode.addNode(nodeName1, testNodeType).setProperty(propertyName1, "test");
- testRootNode.save();
+ testRootNode.getSession().save();
}
}, Event.PROPERTY_ADDED);
for (int i = 0; i < events.length; i++) {
@@ -70,7 +70,7 @@ public class GetInfoTest extends Abstrac
public void testPropertyChanged() throws RepositoryException {
Node n = testRootNode.addNode(nodeName1, testNodeType);
final Property prop = n.setProperty(propertyName1, "test");
- testRootNode.save();
+ testRootNode.getSession().save();
Event[] events = getEvents(new Callable(){
public void call() throws RepositoryException {
prop.setValue("modified");
@@ -84,7 +84,7 @@ public class GetInfoTest extends Abstrac
public void testPropertyRemoved() throws RepositoryException {
Node n = testRootNode.addNode(nodeName1, testNodeType);
final Property prop = n.setProperty(propertyName1, "test");
- testRootNode.save();
+ testRootNode.getSession().save();
Event[] events = getEvents(new Callable(){
public void call() throws RepositoryException {
prop.remove();
Modified: jackrabbit/trunk/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/observation/GetUserDataTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/observation/GetUserDataTest.java?rev=1225207&r1=1225206&r2=1225207&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/observation/GetUserDataTest.java (original)
+++ jackrabbit/trunk/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/observation/GetUserDataTest.java Wed Dec 28 15:32:44 2011
@@ -33,14 +33,14 @@ public class GetUserDataTest extends Abs
runWithUserData(new Callable() {
public void call() throws RepositoryException {
testRootNode.addNode(nodeName1, testNodeType);
- testRootNode.save();
+ testRootNode.getSession().save();
}
}, ALL_TYPES);
}
public void testWorkspaceOperation() throws RepositoryException {
testRootNode.addNode(nodeName1);
- testRootNode.save();
+ testRootNode.getSession().save();
runWithUserData(new Callable() {
public void call() throws RepositoryException {
@@ -57,7 +57,7 @@ public class GetUserDataTest extends Abs
final Node n1 = testRootNode.addNode(nodeName1);
ensureMixinType(n1, mixVersionable);
- testRootNode.save();
+ testRootNode.getSession().save();
runWithUserData(new Callable() {
public void call() throws RepositoryException {
Modified: jackrabbit/trunk/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/observation/LockingTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/observation/LockingTest.java?rev=1225207&r1=1225206&r2=1225207&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/observation/LockingTest.java (original)
+++ jackrabbit/trunk/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/observation/LockingTest.java Wed Dec 28 15:32:44 2011
@@ -49,7 +49,7 @@ public class LockingTest extends Abstrac
public void testAddLockToNode() throws RepositoryException,
NotExecutableException {
Node lockable = createLockable(nodeName1, testNodeType);
- testRootNode.save();
+ testRootNode.getSession().save();
EventResult result = new EventResult(log);
addEventListener(result, Event.PROPERTY_ADDED);
@@ -82,7 +82,7 @@ public class LockingTest extends Abstrac
public void testRemoveLockFromNode() throws RepositoryException,
NotExecutableException {
Node lockable = createLockable(nodeName1, testNodeType);
- testRootNode.save();
+ testRootNode.getSession().save();
// lock the node
lockable.lock(false, true);
Modified: jackrabbit/trunk/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/observation/NodeAddedTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/observation/NodeAddedTest.java?rev=1225207&r1=1225206&r2=1225207&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/observation/NodeAddedTest.java (original)
+++ jackrabbit/trunk/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/observation/NodeAddedTest.java Wed Dec 28 15:32:44 2011
@@ -45,7 +45,7 @@ public class NodeAddedTest extends Abstr
EventResult result = new EventResult(log);
addEventListener(result, Event.NODE_ADDED);
testRootNode.addNode(nodeName1, testNodeType);
- testRootNode.save();
+ testRootNode.getSession().save();
Event[] events = result.getEvents(DEFAULT_WAIT_TIMEOUT);
removeEventListener(result);
checkNodeAdded(events, new String[]{nodeName1}, null);
@@ -60,7 +60,7 @@ public class NodeAddedTest extends Abstr
addEventListener(result, Event.NODE_ADDED);
testRootNode.addNode(nodeName1, testNodeType);
testRootNode.addNode(nodeName2, testNodeType);
- testRootNode.save();
+ testRootNode.getSession().save();
Event[] events = result.getEvents(DEFAULT_WAIT_TIMEOUT);
removeEventListener(result);
checkNodeAdded(events, new String[]{nodeName1, nodeName2}, null);
@@ -75,7 +75,7 @@ public class NodeAddedTest extends Abstr
addEventListener(result, Event.NODE_ADDED);
Node n1 = testRootNode.addNode(nodeName1, testNodeType);
n1.addNode(nodeName2, testNodeType);
- testRootNode.save();
+ testRootNode.getSession().save();
Event[] events = result.getEvents(DEFAULT_WAIT_TIMEOUT);
removeEventListener(result);
checkNodeAdded(events, new String[]{nodeName1, nodeName1 + "/" + nodeName2}, null);
@@ -90,7 +90,7 @@ public class NodeAddedTest extends Abstr
testRootNode.addNode(nodeName1, testNodeType);
Node n2 = testRootNode.addNode(nodeName2, testNodeType);
n2.remove();
- testRootNode.save();
+ testRootNode.getSession().save();
Event[] events = result.getEvents(DEFAULT_WAIT_TIMEOUT);
removeEventListener(result);
checkNodeAdded(events, new String[]{nodeName1}, null);
Modified: jackrabbit/trunk/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/observation/NodeMovedTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/observation/NodeMovedTest.java?rev=1225207&r1=1225206&r2=1225207&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/observation/NodeMovedTest.java (original)
+++ jackrabbit/trunk/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/observation/NodeMovedTest.java Wed Dec 28 15:32:44 2011
@@ -70,7 +70,7 @@ public class NodeMovedTest extends Abstr
Node n1 = testRootNode.addNode(nodeName1, testNodeType);
n1.addNode(nodeName2, testNodeType);
- testRootNode.save();
+ testRootNode.getSession().save();
EventResult addNodeListener = new EventResult(log);
EventResult removeNodeListener = new EventResult(log);
EventResult moveNodeListener = new EventResult(log);
@@ -78,7 +78,7 @@ public class NodeMovedTest extends Abstr
addEventListener(removeNodeListener, Event.NODE_REMOVED);
addEventListener(moveNodeListener, Event.NODE_MOVED);
superuser.move(n1.getPath(), testRoot + "/" + nodeName3);
- testRootNode.save();
+ testRootNode.getSession().save();
Event[] added = addNodeListener.getEvents(DEFAULT_WAIT_TIMEOUT);
Event[] removed = removeNodeListener.getEvents(DEFAULT_WAIT_TIMEOUT);
Event[] moved = moveNodeListener.getEvents(DEFAULT_WAIT_TIMEOUT);
@@ -109,7 +109,7 @@ public class NodeMovedTest extends Abstr
Node n1 = testRootNode.addNode(nodeName1, testNodeType);
Node n2 = n1.addNode(nodeName2, testNodeType);
- testRootNode.save();
+ testRootNode.getSession().save();
EventResult addNodeListener = new EventResult(log);
EventResult removeNodeListener = new EventResult(log);
EventResult moveNodeListener = new EventResult(log);
@@ -117,7 +117,7 @@ public class NodeMovedTest extends Abstr
addEventListener(removeNodeListener, Event.NODE_REMOVED);
addEventListener(moveNodeListener, Event.NODE_MOVED);
superuser.move(n2.getPath(), testRoot + "/" + nodeName2);
- testRootNode.save();
+ testRootNode.getSession().save();
Event[] added = addNodeListener.getEvents(DEFAULT_WAIT_TIMEOUT);
Event[] removed = removeNodeListener.getEvents(DEFAULT_WAIT_TIMEOUT);
Event[] moved = moveNodeListener.getEvents(DEFAULT_WAIT_TIMEOUT);
@@ -149,7 +149,7 @@ public class NodeMovedTest extends Abstr
Node n1 = testRootNode.addNode(nodeName1, testNodeType);
Node n2 = n1.addNode(nodeName2, testNodeType);
Node n3 = testRootNode.addNode(nodeName3, testNodeType);
- testRootNode.save();
+ testRootNode.getSession().save();
EventResult addNodeListener = new EventResult(log);
EventResult removeNodeListener = new EventResult(log);
EventResult moveNodeListener = new EventResult(log);
@@ -160,7 +160,7 @@ public class NodeMovedTest extends Abstr
superuser.move(n2.getPath(), n3.getPath() + "/" + nodeName2);
// remove n1
n1.remove();
- testRootNode.save();
+ testRootNode.getSession().save();
Event[] added = addNodeListener.getEvents(DEFAULT_WAIT_TIMEOUT);
Event[] removed = removeNodeListener.getEvents(DEFAULT_WAIT_TIMEOUT);
Event[] moved = moveNodeListener.getEvents(DEFAULT_WAIT_TIMEOUT);
Modified: jackrabbit/trunk/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/observation/NodeRemovedTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/observation/NodeRemovedTest.java?rev=1225207&r1=1225206&r2=1225207&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/observation/NodeRemovedTest.java (original)
+++ jackrabbit/trunk/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/observation/NodeRemovedTest.java Wed Dec 28 15:32:44 2011
@@ -45,9 +45,9 @@ public class NodeRemovedTest extends Abs
EventResult result = new EventResult(log);
addEventListener(result, Event.NODE_REMOVED);
Node foo = testRootNode.addNode(nodeName1, testNodeType);
- testRootNode.save();
+ testRootNode.getSession().save();
foo.remove();
- testRootNode.save();
+ testRootNode.getSession().save();
Event[] events = result.getEvents(DEFAULT_WAIT_TIMEOUT);
removeEventListener(result);
checkNodeRemoved(events, new String[]{nodeName1}, null);
@@ -62,9 +62,9 @@ public class NodeRemovedTest extends Abs
addEventListener(result, Event.NODE_REMOVED);
Node n1 = testRootNode.addNode(nodeName1, testNodeType);
n1.addNode(nodeName2, testNodeType);
- testRootNode.save();
+ testRootNode.getSession().save();
n1.remove();
- testRootNode.save();
+ testRootNode.getSession().save();
Event[] events = result.getEvents(DEFAULT_WAIT_TIMEOUT);
removeEventListener(result);
checkNodeRemoved(events, new String[]{nodeName1, nodeName1 + "/" + nodeName2}, null);
Modified: jackrabbit/trunk/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/observation/NodeReorderTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/observation/NodeReorderTest.java?rev=1225207&r1=1225206&r2=1225207&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/observation/NodeReorderTest.java (original)
+++ jackrabbit/trunk/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/observation/NodeReorderTest.java Wed Dec 28 15:32:44 2011
@@ -80,7 +80,7 @@ public class NodeReorderTest extends Abs
testRootNode.addNode(nodeName1, testNodeType);
testRootNode.addNode(nodeName2, testNodeType);
testRootNode.addNode(nodeName3, testNodeType);
- testRootNode.save();
+ testRootNode.getSession().save();
EventResult addNodeListener = new EventResult(log);
EventResult removeNodeListener = new EventResult(log);
EventResult moveNodeListener = new EventResult(log);
@@ -88,7 +88,7 @@ public class NodeReorderTest extends Abs
addEventListener(removeNodeListener, Event.NODE_REMOVED);
addEventListener(moveNodeListener, Event.NODE_MOVED);
testRootNode.orderBefore(nodeName3, nodeName2);
- testRootNode.save();
+ testRootNode.getSession().save();
Event[] added = addNodeListener.getEvents(DEFAULT_WAIT_TIMEOUT);
Event[] removed = removeNodeListener.getEvents(DEFAULT_WAIT_TIMEOUT);
Event[] moved = moveNodeListener.getEvents(DEFAULT_WAIT_TIMEOUT);
@@ -152,7 +152,7 @@ public class NodeReorderTest extends Abs
}
testRootNode.addNode(nodeName1, testNodeType);
testRootNode.addNode(nodeName1, testNodeType);
- testRootNode.save();
+ testRootNode.getSession().save();
EventResult addNodeListener = new EventResult(log);
EventResult removeNodeListener = new EventResult(log);
EventResult moveNodeListener = new EventResult(log);
@@ -161,7 +161,7 @@ public class NodeReorderTest extends Abs
addEventListener(moveNodeListener, Event.NODE_MOVED);
testRootNode.orderBefore(nodeName1 + "[3]", nodeName1 + "[2]");
//testRootNode.orderBefore(nodeName1 + "[2]", null);
- testRootNode.save();
+ testRootNode.getSession().save();
Event[] added = addNodeListener.getEvents(DEFAULT_WAIT_TIMEOUT);
Event[] removed = removeNodeListener.getEvents(DEFAULT_WAIT_TIMEOUT);
Event[] moved = moveNodeListener.getEvents(DEFAULT_WAIT_TIMEOUT);
@@ -231,7 +231,7 @@ public class NodeReorderTest extends Abs
testRootNode.addNode(nodeName1, testNodeType);
testRootNode.addNode(nodeName1, testNodeType);
testRootNode.addNode(nodeName3, testNodeType);
- testRootNode.save();
+ testRootNode.getSession().save();
EventResult addNodeListener = new EventResult(log);
EventResult removeNodeListener = new EventResult(log);
EventResult moveNodeListener = new EventResult(log);
@@ -240,7 +240,7 @@ public class NodeReorderTest extends Abs
addEventListener(moveNodeListener, Event.NODE_MOVED);
testRootNode.orderBefore(nodeName1 + "[2]", null);
testRootNode.getNode(nodeName3).remove();
- testRootNode.save();
+ testRootNode.getSession().save();
Event[] added = addNodeListener.getEvents(DEFAULT_WAIT_TIMEOUT);
Event[] removed = removeNodeListener.getEvents(DEFAULT_WAIT_TIMEOUT);
Event[] moved = moveNodeListener.getEvents(DEFAULT_WAIT_TIMEOUT);
Modified: jackrabbit/trunk/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/observation/PropertyAddedTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/observation/PropertyAddedTest.java?rev=1225207&r1=1225206&r2=1225207&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/observation/PropertyAddedTest.java (original)
+++ jackrabbit/trunk/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/observation/PropertyAddedTest.java Wed Dec 28 15:32:44 2011
@@ -48,7 +48,7 @@ public class PropertyAddedTest extends A
EventResult result = new EventResult(log);
addEventListener(result, Event.PROPERTY_ADDED);
testRootNode.addNode(nodeName1, testNodeType);
- testRootNode.save();
+ testRootNode.getSession().save();
Event[] events = result.getEvents(DEFAULT_WAIT_TIMEOUT);
removeEventListener(result);
List<String> paths = new ArrayList<String>();
@@ -66,11 +66,11 @@ public class PropertyAddedTest extends A
*/
public void testSinglePropertyAdded() throws RepositoryException {
Node foo = testRootNode.addNode(nodeName1, testNodeType);
- testRootNode.save();
+ testRootNode.getSession().save();
EventResult result = new EventResult(log);
addEventListener(result, Event.PROPERTY_ADDED);
foo.setProperty(propertyName1, "test content");
- testRootNode.save();
+ testRootNode.getSession().save();
Event[] events = result.getEvents(DEFAULT_WAIT_TIMEOUT);
removeEventListener(result);
checkPropertyAdded(events, new String[]{nodeName1 + "/" + propertyName1});
@@ -82,12 +82,12 @@ public class PropertyAddedTest extends A
*/
public void testMultiPropertyAdded() throws RepositoryException {
Node foo = testRootNode.addNode(nodeName1, testNodeType);
- testRootNode.save();
+ testRootNode.getSession().save();
EventResult result = new EventResult(log);
addEventListener(result, Event.PROPERTY_ADDED);
foo.setProperty(propertyName1, "foo");
foo.setProperty(propertyName2, "bar");
- testRootNode.save();
+ testRootNode.getSession().save();
Event[] events = result.getEvents(DEFAULT_WAIT_TIMEOUT);
removeEventListener(result);
checkPropertyAdded(events, new String[]{nodeName1 + "/" + propertyName1,
Modified: jackrabbit/trunk/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/observation/PropertyChangedTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/observation/PropertyChangedTest.java?rev=1225207&r1=1225206&r2=1225207&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/observation/PropertyChangedTest.java (original)
+++ jackrabbit/trunk/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/observation/PropertyChangedTest.java Wed Dec 28 15:32:44 2011
@@ -50,11 +50,11 @@ public class PropertyChangedTest extends
public void testSinglePropertyChanged() throws RepositoryException {
Node node = testRootNode.addNode(nodeName1, testNodeType);
node.setProperty(propertyName1, "foo");
- testRootNode.save();
+ testRootNode.getSession().save();
EventResult result = new EventResult(log);
addEventListener(result, Event.PROPERTY_CHANGED);
node.getProperty(propertyName1).setValue("foobar");
- testRootNode.save();
+ testRootNode.getSession().save();
Event[] events = result.getEvents(DEFAULT_WAIT_TIMEOUT);
removeEventListener(result);
checkPropertyChanged(events, new String[]{nodeName1 + "/" + propertyName1});
@@ -69,12 +69,12 @@ public class PropertyChangedTest extends
Node node = testRootNode.addNode(nodeName1, testNodeType);
node.setProperty(propertyName1, "foo");
node.setProperty(propertyName2, "bar");
- testRootNode.save();
+ testRootNode.getSession().save();
EventResult result = new EventResult(log);
addEventListener(result, Event.PROPERTY_CHANGED);
node.getProperty(propertyName1).setValue("foobar");
node.getProperty(propertyName2).setValue("foobar");
- testRootNode.save();
+ testRootNode.getSession().save();
Event[] events = result.getEvents(DEFAULT_WAIT_TIMEOUT);
removeEventListener(result);
checkPropertyChanged(events, new String[]{nodeName1 + "/" + propertyName1,
@@ -88,12 +88,12 @@ public class PropertyChangedTest extends
public void testSinglePropertyChangedWithAdded() throws RepositoryException {
Node node = testRootNode.addNode(nodeName1, testNodeType);
node.setProperty(propertyName1, "foo");
- testRootNode.save();
+ testRootNode.getSession().save();
EventResult result = new EventResult(log);
addEventListener(result, Event.PROPERTY_CHANGED);
node.getProperty(propertyName1).setValue("foobar");
node.setProperty(propertyName2, "bar"); // will not fire prop changed event
- testRootNode.save();
+ testRootNode.getSession().save();
Event[] events = result.getEvents(DEFAULT_WAIT_TIMEOUT);
removeEventListener(result);
checkPropertyChanged(events, new String[]{nodeName1 + "/" + propertyName1});
@@ -122,12 +122,12 @@ public class PropertyChangedTest extends
throw new NotExecutableException("Property " + propertyName1 + " is not of type UNDEFINED");
}
n.setProperty(propertyName1, v1);
- testRootNode.save();
+ testRootNode.getSession().save();
EventResult result = new EventResult(log);
addEventListener(result, Event.PROPERTY_ADDED | Event.PROPERTY_CHANGED | Event.PROPERTY_REMOVED);
n.getProperty(propertyName1).remove();
n.setProperty(propertyName1, v2);
- testRootNode.save();
+ testRootNode.getSession().save();
Event[] events = result.getEvents(DEFAULT_WAIT_TIMEOUT);
removeEventListener(result);
Modified: jackrabbit/trunk/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/observation/PropertyRemovedTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/observation/PropertyRemovedTest.java?rev=1225207&r1=1225206&r2=1225207&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/observation/PropertyRemovedTest.java (original)
+++ jackrabbit/trunk/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/observation/PropertyRemovedTest.java Wed Dec 28 15:32:44 2011
@@ -47,11 +47,11 @@ public class PropertyRemovedTest extends
Node node = testRootNode.addNode(nodeName1, testNodeType);
Property prop1 = node.setProperty(propertyName1, "foo");
node.setProperty(propertyName2, "bar");
- testRootNode.save();
+ testRootNode.getSession().save();
EventResult result = new EventResult(log);
addEventListener(result, Event.PROPERTY_REMOVED);
prop1.remove();
- testRootNode.save();
+ testRootNode.getSession().save();
Event[] events = result.getEvents(DEFAULT_WAIT_TIMEOUT);
removeEventListener(result);
checkPropertyRemoved(events, new String[]{nodeName1 + "/" + propertyName1});
@@ -65,12 +65,12 @@ public class PropertyRemovedTest extends
Node node = testRootNode.addNode(nodeName1, testNodeType);
Property prop1 = node.setProperty(propertyName1, "foo");
Property prop2 = node.setProperty(propertyName2, "bar");
- testRootNode.save();
+ testRootNode.getSession().save();
EventResult result = new EventResult(log);
addEventListener(result, Event.PROPERTY_REMOVED);
prop1.remove();
prop2.remove();
- testRootNode.save();
+ testRootNode.getSession().save();
Event[] events = result.getEvents(DEFAULT_WAIT_TIMEOUT);
removeEventListener(result);
checkPropertyRemoved(events, new String[]{nodeName1 + "/" + propertyName1,
Modified: jackrabbit/trunk/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/observation/WorkspaceOperationTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/observation/WorkspaceOperationTest.java?rev=1225207&r1=1225206&r2=1225207&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/observation/WorkspaceOperationTest.java (original)
+++ jackrabbit/trunk/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/observation/WorkspaceOperationTest.java Wed Dec 28 15:32:44 2011
@@ -45,7 +45,7 @@ public class WorkspaceOperationTest exte
public void testCopy() throws RepositoryException {
Node n1 = testRootNode.addNode(nodeName1, testNodeType);
n1.addNode(nodeName2, testNodeType);
- testRootNode.save();
+ testRootNode.getSession().save();
EventResult listener = new EventResult(log);
addEventListener(listener, Event.NODE_ADDED);
superuser.getWorkspace().copy(testRoot + "/" + nodeName1, testRoot + "/" + nodeName3);
@@ -61,13 +61,13 @@ public class WorkspaceOperationTest exte
public void testRename() throws RepositoryException {
Node n1 = testRootNode.addNode(nodeName1, testNodeType);
n1.addNode(nodeName2, testNodeType);
- testRootNode.save();
+ testRootNode.getSession().save();
EventResult addNodeListener = new EventResult(log);
EventResult removeNodeListener = new EventResult(log);
addEventListener(addNodeListener, Event.NODE_ADDED);
addEventListener(removeNodeListener, Event.NODE_REMOVED);
superuser.getWorkspace().move(n1.getPath(), testRoot + "/" + nodeName3);
- testRootNode.save();
+ testRootNode.getSession().save();
Event[] added = addNodeListener.getEvents(DEFAULT_WAIT_TIMEOUT);
Event[] removed = removeNodeListener.getEvents(DEFAULT_WAIT_TIMEOUT);
removeEventListener(addNodeListener);
@@ -84,13 +84,13 @@ public class WorkspaceOperationTest exte
Node n1 = testRootNode.addNode(nodeName1, testNodeType);
Node n3 = testRootNode.addNode(nodeName3, testNodeType);
n1.addNode(nodeName2, testNodeType);
- testRootNode.save();
+ testRootNode.getSession().save();
EventResult addNodeListener = new EventResult(log);
EventResult removeNodeListener = new EventResult(log);
addEventListener(addNodeListener, Event.NODE_ADDED);
addEventListener(removeNodeListener, Event.NODE_REMOVED);
superuser.getWorkspace().move(n1.getPath(), n3.getPath() + "/" + nodeName4);
- testRootNode.save();
+ testRootNode.getSession().save();
Event[] added = addNodeListener.getEvents(DEFAULT_WAIT_TIMEOUT);
Event[] removed = removeNodeListener.getEvents(DEFAULT_WAIT_TIMEOUT);
removeEventListener(addNodeListener);
Modified: jackrabbit/trunk/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/query/AbstractQueryLevel2Test.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/query/AbstractQueryLevel2Test.java?rev=1225207&r1=1225206&r2=1225207&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/query/AbstractQueryLevel2Test.java (original)
+++ jackrabbit/trunk/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/query/AbstractQueryLevel2Test.java Wed Dec 28 15:32:44 2011
@@ -42,7 +42,7 @@ public abstract class AbstractQueryLevel
node = testRootNode.addNode(nodeName2, testNodeType);
node.setProperty(propertyName1, "The quick brown cat jumps over the lazy dog.");
- testRootNode.save();
+ testRootNode.getSession().save();
}
/**
@@ -60,7 +60,7 @@ public abstract class AbstractQueryLevel
Node cNode = node.addNode(nodeName3, testNodeType);
cNode.setProperty(propertyName1, "c");
- testRootNode.save();
+ testRootNode.getSession().save();
}
/**
@@ -91,7 +91,7 @@ public abstract class AbstractQueryLevel
Node cNode = node.addNode(nodeName3, testNodeType);
cNode.setProperty(propertyName1, "existence");
- testRootNode.save();
+ testRootNode.getSession().save();
}
/**
Modified: jackrabbit/trunk/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/query/ElementTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/query/ElementTest.java?rev=1225207&r1=1225206&r2=1225207&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/query/ElementTest.java (original)
+++ jackrabbit/trunk/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/query/ElementTest.java Wed Dec 28 15:32:44 2011
@@ -57,7 +57,7 @@ public class ElementTest extends Abstrac
Node n1 = testRootNode.addNode(nodeName1, testNodeType);
Node n2 = testRootNode.addNode(nodeName2, simpleNodeType);
Node n3 = testRootNode.addNode(nodeName3, testNodeType);
- testRootNode.save();
+ testRootNode.getSession().save();
String query = "/" + jcrRoot + testRoot + "/element()";
executeXPathQuery(superuser, query, new Node[]{n1, n2, n3});
@@ -71,7 +71,7 @@ public class ElementTest extends Abstrac
Node n1 = testRootNode.addNode(nodeName1, testNodeType);
Node n2 = testRootNode.addNode(nodeName2, simpleNodeType);
Node n3 = testRootNode.addNode(nodeName3, testNodeType);
- testRootNode.save();
+ testRootNode.getSession().save();
String query = "/" + jcrRoot + testRoot + "/element(*)";
executeXPathQuery(superuser, query, new Node[]{n1, n2, n3});
@@ -86,7 +86,7 @@ public class ElementTest extends Abstrac
Node n1 = testRootNode.addNode(nodeName1, testNodeType);
Node n2 = testRootNode.addNode(nodeName2, simpleNodeType);
Node n3 = testRootNode.addNode(nodeName3, testNodeType);
- testRootNode.save();
+ testRootNode.getSession().save();
String query = "/" + jcrRoot + testRoot + "/element(*, " + ntBase + ")";
executeXPathQuery(superuser, query, new Node[]{n1, n2, n3});
@@ -101,7 +101,7 @@ public class ElementTest extends Abstrac
Node n1 = testRootNode.addNode(nodeName1, testNodeType);
testRootNode.addNode(nodeName2, simpleNodeType);
Node n3 = testRootNode.addNode(nodeName3, testNodeType);
- testRootNode.save();
+ testRootNode.getSession().save();
String query = "/" + jcrRoot + testRoot + "/element(*, " + testNodeType + ")";
executeXPathQuery(superuser, query, new Node[]{n1, n3});
@@ -115,7 +115,7 @@ public class ElementTest extends Abstrac
Node n1 = testRootNode.addNode(nodeName1, testNodeType);
testRootNode.addNode(nodeName2, simpleNodeType);
testRootNode.addNode(nodeName3, testNodeType);
- testRootNode.save();
+ testRootNode.getSession().save();
String query = "/" + jcrRoot + testRoot + "/element(" + nodeName1 + ")";
executeXPathQuery(superuser, query, new Node[]{n1});
@@ -130,7 +130,7 @@ public class ElementTest extends Abstrac
Node n1 = testRootNode.addNode(nodeName1, testNodeType);
testRootNode.addNode(nodeName2, simpleNodeType);
testRootNode.addNode(nodeName3, testNodeType);
- testRootNode.save();
+ testRootNode.getSession().save();
String query = "/" + jcrRoot + testRoot + "/element(" + nodeName1 + ", " + ntBase + ")";
executeXPathQuery(superuser, query, new Node[]{n1});
@@ -145,7 +145,7 @@ public class ElementTest extends Abstrac
Node n1 = testRootNode.addNode(nodeName1, testNodeType);
testRootNode.addNode(nodeName2, simpleNodeType);
testRootNode.addNode(nodeName3, testNodeType);
- testRootNode.save();
+ testRootNode.getSession().save();
String query = "/" + jcrRoot + testRoot + "/element(" + nodeName1 + ", " + testNodeType + ")";
executeXPathQuery(superuser, query, new Node[]{n1});
@@ -165,7 +165,7 @@ public class ElementTest extends Abstrac
Node n2 = testRootNode.addNode(nodeName1, testNodeType);
testRootNode.addNode(nodeName2, simpleNodeType);
testRootNode.addNode(nodeName3, testNodeType);
- testRootNode.save();
+ testRootNode.getSession().save();
String query = "/" + jcrRoot + testRoot + "/element(" + nodeName1 + ", " + testNodeType + ")";
executeXPathQuery(superuser, query, new Node[]{n1, n2});
Modified: jackrabbit/trunk/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/query/OrderByMultiTypeTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/query/OrderByMultiTypeTest.java?rev=1225207&r1=1225206&r2=1225207&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/query/OrderByMultiTypeTest.java (original)
+++ jackrabbit/trunk/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/query/OrderByMultiTypeTest.java Wed Dec 28 15:32:44 2011
@@ -54,7 +54,7 @@ public class OrderByMultiTypeTest extend
n3.setProperty(propertyName1, "ccc");
n3.setProperty(propertyName2, 2);
- testRootNode.save();
+ testRootNode.getSession().save();
// both ascending
String sql = "SELECT " + propertyName2 + " FROM " + testNodeType + " WHERE " +
Modified: jackrabbit/trunk/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/query/QueryResultNodeIteratorTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/query/QueryResultNodeIteratorTest.java?rev=1225207&r1=1225206&r2=1225207&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/query/QueryResultNodeIteratorTest.java (original)
+++ jackrabbit/trunk/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/query/QueryResultNodeIteratorTest.java Wed Dec 28 15:32:44 2011
@@ -42,7 +42,7 @@ public class QueryResultNodeIteratorTest
testRootNode.addNode(nodeName1, testNodeType);
testRootNode.addNode(nodeName2, testNodeType);
testRootNode.addNode(nodeName3, testNodeType);
- testRootNode.save();
+ testRootNode.getSession().save();
}
/**
Modified: jackrabbit/trunk/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/query/SQLJoinTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/query/SQLJoinTest.java?rev=1225207&r1=1225206&r2=1225207&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/query/SQLJoinTest.java (original)
+++ jackrabbit/trunk/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/query/SQLJoinTest.java Wed Dec 28 15:32:44 2011
@@ -54,7 +54,7 @@ public class SQLJoinTest extends Abstrac
}
Node n2 = testRootNode.addNode(nodeName2, testNodeType);
- testRootNode.save();
+ testRootNode.getSession().save();
assertFalse("Node at " + n2.getPath() + " should not have mixin " + testMixin, n2.isNodeType(testMixin));
@@ -87,7 +87,7 @@ public class SQLJoinTest extends Abstrac
}
Node n2 = testRootNode.addNode(nodeName2, testNodeType);
- testRootNode.save();
+ testRootNode.getSession().save();
assertFalse("Node at " + n2.getPath() + " should not have mixin " + testMixin, n2.isNodeType(testMixin));
@@ -113,7 +113,7 @@ public class SQLJoinTest extends Abstrac
String nodetype = testNodeTypeNoChildren == null ? ntBase : testNodeTypeNoChildren;
Node n2 = testRootNode.addNode(nodeName2, nodetype);
ensureMixinType(n2, mixReferenceable);
- testRootNode.save();
+ testRootNode.getSession().save();
StringBuffer query = new StringBuffer("SELECT * FROM ");
query.append(testNodeType).append(", ").append(ntBase);
@@ -144,7 +144,7 @@ public class SQLJoinTest extends Abstrac
testRootNode.addNode(nodeName1, testNodeType);
Node n2 = testRootNode.addNode(nodeName2, testNodeType);
ensureMixinType(n2, mixReferenceable);
- testRootNode.save();
+ testRootNode.getSession().save();
StringBuffer query = new StringBuffer("SELECT * FROM ");
query.append(testNodeType).append(", ").append(mixReferenceable);