jackrabbit-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From kn...@apache.org
Subject svn commit: r777313 [3/5] - in /jackrabbit/sandbox/JCR-1456: jackrabbit-core/src/main/java/org/apache/jackrabbit/core/ jackrabbit-core/src/main/java/org/apache/jackrabbit/core/config/ jackrabbit-core/src/main/java/org/apache/jackrabbit/core/lock/ jackr...
Date Thu, 21 May 2009 23:11:42 GMT
Modified: jackrabbit/sandbox/JCR-1456/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/SessionUUIDTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/sandbox/JCR-1456/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/SessionUUIDTest.java?rev=777313&r1=777312&r2=777313&view=diff
==============================================================================
--- jackrabbit/sandbox/JCR-1456/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/SessionUUIDTest.java (original)
+++ jackrabbit/sandbox/JCR-1456/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/SessionUUIDTest.java Thu May 21 23:11:22 2009
@@ -92,8 +92,8 @@
 
     /**
      * Moves a referencable node using {@link javax.jcr.Session#move(String, String)} with one session and
-     * saves afterward changes made with a second session to the moved node using {@link Session#save()}.<br/>
-     * <br/>
+     * saves afterward changes made with a second session to the moved node using {@link Session#save()}.
+     * <p>
      * Procedure:
      * <ul>
      * <li>Creates node 1 and node 2 with session 1</li>

Modified: jackrabbit/sandbox/JCR-1456/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/SetValueBinaryTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/sandbox/JCR-1456/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/SetValueBinaryTest.java?rev=777313&r1=777312&r2=777313&view=diff
==============================================================================
--- jackrabbit/sandbox/JCR-1456/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/SetValueBinaryTest.java (original)
+++ jackrabbit/sandbox/JCR-1456/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/SetValueBinaryTest.java Thu May 21 23:11:22 2009
@@ -29,11 +29,13 @@
 
 /**
  * Tests the various {@link Property#setValue(Value)} methods.
- * <p/>
- * Configuration requirements:<br/> The node at {@link #testRoot} must allow a
+ * <p>
+ * Configuration requirements:
+ * <p>
+ * The node at {@link #testRoot} must allow a
  * child node of type {@link #testNodeType} with name {@link #nodeName1}. The
  * node type {@link #testNodeType} must define a single value binary property
- * with name {@link #propertyName1}. <br>As a special case, if the specified node
+ * with name {@link #propertyName1}. As a special case, if the specified node
  * type automatically adds a jcr:content child node of type nt:resource, and
  * <code>propertyName1</code> is specified as "jcr:data", that binary property
  * is used instead.

Modified: jackrabbit/sandbox/JCR-1456/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/SetValueBooleanTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/sandbox/JCR-1456/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/SetValueBooleanTest.java?rev=777313&r1=777312&r2=777313&view=diff
==============================================================================
--- jackrabbit/sandbox/JCR-1456/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/SetValueBooleanTest.java (original)
+++ jackrabbit/sandbox/JCR-1456/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/SetValueBooleanTest.java Thu May 21 23:11:22 2009
@@ -26,8 +26,10 @@
 
 /**
  * Tests the various {@link Property#setValue(Value)} methods.
- * <p/>
- * Configuration requirements:<br/> The node at {@link #testRoot} must allow a
+ * <p>
+ * Configuration requirements:
+ * <p>
+ * The node at {@link #testRoot} must allow a
  * child node of type {@link #testNodeType} with name {@link #nodeName1}. The
  * node type {@link #testNodeType} must define a single value boolean property
  * with name {@link #propertyName1}.

Modified: jackrabbit/sandbox/JCR-1456/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/SetValueDateTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/sandbox/JCR-1456/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/SetValueDateTest.java?rev=777313&r1=777312&r2=777313&view=diff
==============================================================================
--- jackrabbit/sandbox/JCR-1456/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/SetValueDateTest.java (original)
+++ jackrabbit/sandbox/JCR-1456/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/SetValueDateTest.java Thu May 21 23:11:22 2009
@@ -28,8 +28,10 @@
 
 /**
  * Tests the various {@link Property#setValue(Value)} methods.
- * <p/>
- * Configuration requirements:<br/> The node at {@link #testRoot} must allow a
+ * <p>
+ * Configuration requirements:
+ * <p>
+ * The node at {@link #testRoot} must allow a
  * child node of type {@link #testNodeType} with name {@link #nodeName1}. The
  * node type {@link #testNodeType} must define a single value date property
  * with name {@link #propertyName1}.

Modified: jackrabbit/sandbox/JCR-1456/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/SetValueDoubleTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/sandbox/JCR-1456/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/SetValueDoubleTest.java?rev=777313&r1=777312&r2=777313&view=diff
==============================================================================
--- jackrabbit/sandbox/JCR-1456/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/SetValueDoubleTest.java (original)
+++ jackrabbit/sandbox/JCR-1456/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/SetValueDoubleTest.java Thu May 21 23:11:22 2009
@@ -26,8 +26,10 @@
 
 /**
  * Tests the various {@link Property#setValue(Value)} methods.
- * <p/>
- * Configuration requirements:<br/> The node at {@link #testRoot} must allow a
+ * <p>
+ * Configuration requirements:
+ * <p>
+ * The node at {@link #testRoot} must allow a
  * child node of type {@link #testNodeType} with name {@link #nodeName1}. The
  * node type {@link #testNodeType} must define a single value double property
  * with name {@link #propertyName1}.

Modified: jackrabbit/sandbox/JCR-1456/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/SetValueLongTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/sandbox/JCR-1456/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/SetValueLongTest.java?rev=777313&r1=777312&r2=777313&view=diff
==============================================================================
--- jackrabbit/sandbox/JCR-1456/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/SetValueLongTest.java (original)
+++ jackrabbit/sandbox/JCR-1456/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/SetValueLongTest.java Thu May 21 23:11:22 2009
@@ -26,8 +26,10 @@
 
 /**
  * Tests the various {@link Property#setValue(Value)} methods.
- * <p/>
- * Configuration requirements:<br/> The node at {@link #testRoot} must allow a
+ * <p>
+ * Configuration requirements:
+ * <p>
+ * The node at {@link #testRoot} must allow a
  * child node of type {@link #testNodeType} with name {@link #nodeName1}. The
  * node type {@link #testNodeType} must define a single value long property
  * with name {@link #propertyName1}.

Modified: jackrabbit/sandbox/JCR-1456/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/SetValueReferenceTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/sandbox/JCR-1456/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/SetValueReferenceTest.java?rev=777313&r1=777312&r2=777313&view=diff
==============================================================================
--- jackrabbit/sandbox/JCR-1456/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/SetValueReferenceTest.java (original)
+++ jackrabbit/sandbox/JCR-1456/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/SetValueReferenceTest.java Thu May 21 23:11:22 2009
@@ -27,8 +27,10 @@
 
 /**
  * Tests the various {@link Property#setValue(Value)} methods.
- * <p/>
- * Configuration requirements:<br/> The node at {@link #testRoot} must allow a
+ * <p>
+ * Configuration requirements:
+ * <p>
+ * The node at {@link #testRoot} must allow a
  * child node of type {@link #testNodeType} with name {@link #nodeName1}. The
  * node type {@link #testNodeType} must define a single value reference property
  * with name {@link #propertyName1}. The node type {@link #testNodeType} must

Modified: jackrabbit/sandbox/JCR-1456/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/SetValueStringTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/sandbox/JCR-1456/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/SetValueStringTest.java?rev=777313&r1=777312&r2=777313&view=diff
==============================================================================
--- jackrabbit/sandbox/JCR-1456/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/SetValueStringTest.java (original)
+++ jackrabbit/sandbox/JCR-1456/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/SetValueStringTest.java Thu May 21 23:11:22 2009
@@ -30,8 +30,9 @@
 
 /**
  * Tests the various {@link Property#setValue(Value)} methods.
- * <p/>
- * Configuration requirements:<br/>
+ * <p>
+ * Configuration requirements:
+ * <p>
  * The node at {@link #testRoot} must allow a child node of type
  * {@link #testNodeType} with name {@link #nodeName1}. The node type
  * {@link #testNodeType} must define a single value string property with

Modified: jackrabbit/sandbox/JCR-1456/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/StringPropertyTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/sandbox/JCR-1456/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/StringPropertyTest.java?rev=777313&r1=777312&r2=777313&view=diff
==============================================================================
--- jackrabbit/sandbox/JCR-1456/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/StringPropertyTest.java (original)
+++ jackrabbit/sandbox/JCR-1456/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/StringPropertyTest.java Thu May 21 23:11:22 2009
@@ -30,34 +30,34 @@
  * conversions to other Properties (except Name and Path property). If no String
  * property is found or only a multivalue String property with an empty array, a
  * NotExecutableException is thrown on setUp. More precisely, the tests are:
- * <p/>
+ * <p>
  * - Value.getString() should return a string equals to Property.getString(),
  * and in case of a multivalue property the failure of Property.getString() is
  * checked.
- * <p/>
+ * <p>
  * - Value.getBoolean() Conversion to Boolean property.
- * <p/>
+ * <p>
  * - Value.getDate() Conversion to Date property is only valid when the String
  * follows the required Date pattern (6.2.5.1 of jsr170 specification).
- * <p/>
+ * <p>
  * - Value.getDouble() Conversion to Double are only valid when the String
  * follows the correct patterns as required by the according Java classes.
- * <p/>
+ * <p>
  * - Value.getLong() Conversion to Double are only valid when the String follows
  * the correct patterns as required by the according Java classes.
- * <p/>
+ * <p>
  * - Value.getStream() Conversion to a Binary property follows the rules of
  * Value.getStream() as explained in chapter 6.2.7 of the jsr170 specification.
  * The required encoding is utf-8.
- * <p/>
+ * <p>
  * - Property.getNode() Conversion to a Reference property is tested with
  * Property.getNode. The String should match the UUID pattern but this doesn't
  * guarantee to be a reference (which especially requires integrity).
- * <p/>
+ * <p>
  * - Property.getLength() .
- * <p/>
+ * <p>
  * - Property.getLengths() .
- * <p/>
+ * <p>
  * - Property.getType() is compared to Value.getType() .
  *
  * @test

Modified: jackrabbit/sandbox/JCR-1456/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/TreeComparator.java
URL: http://svn.apache.org/viewvc/jackrabbit/sandbox/JCR-1456/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/TreeComparator.java?rev=777313&r1=777312&r2=777313&view=diff
==============================================================================
--- jackrabbit/sandbox/JCR-1456/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/TreeComparator.java (original)
+++ jackrabbit/sandbox/JCR-1456/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/TreeComparator.java Thu May 21 23:11:22 2009
@@ -39,7 +39,7 @@
  * <code>TreeComparator</code> compares two trees. This allows re-use for
  * different tests, and it allows to test a function on any tree, not just a
  * simple example node.
- * <p/>
+ * <p>
  * TreeComparator also creates an example tree that contains as many features as
  * possible.
  */
@@ -120,7 +120,7 @@
     /**
      * Creates a simple example tree. Use this tree for general repository
      * functions, such as serialization, namespaces and versioning.
-     * <p/>
+     * <p>
      * The beauty of this is that the tree contains exactly the features that
      * are supported by the repository. Any repository exceptions that occur are
      * displayed on "out", but are otherwise ignored.

Modified: jackrabbit/sandbox/JCR-1456/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/nodetype/NodeDefTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/sandbox/JCR-1456/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/nodetype/NodeDefTest.java?rev=777313&r1=777312&r2=777313&view=diff
==============================================================================
--- jackrabbit/sandbox/JCR-1456/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/nodetype/NodeDefTest.java (original)
+++ jackrabbit/sandbox/JCR-1456/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/nodetype/NodeDefTest.java Thu May 21 23:11:22 2009
@@ -146,7 +146,7 @@
     /**
      * This test checks if item definitions with mandatory constraints are
      * respected.
-     * <p/>
+     * <p>
      * If the default workspace does not contain a node with a node type
      * definition that specifies a mandatory child node a {@link
      * org.apache.jackrabbit.test.NotExecutableException} is thrown.

Modified: jackrabbit/sandbox/JCR-1456/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/observation/AddEventListenerTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/sandbox/JCR-1456/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/observation/AddEventListenerTest.java?rev=777313&r1=777312&r2=777313&view=diff
==============================================================================
--- jackrabbit/sandbox/JCR-1456/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/observation/AddEventListenerTest.java (original)
+++ jackrabbit/sandbox/JCR-1456/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/observation/AddEventListenerTest.java Thu May 21 23:11:22 2009
@@ -25,13 +25,14 @@
 
 /**
  * Tests the options for addEventListener().
- * <p/>
- * Configuration requirements are:<br/>
+ * <p>
+ * Configuration requirements:
+ * <p>
  * The {@link #testRoot} must allow child nodes of type {@link #testNodeType}.
  * The child nodes that are created will be named {@link #nodeName1} and
  * {@link #nodeName2}. Furthermore {@link #testNodeType} must allow to add
  * child nodes of the same type ({@link #testNodeType}).
- * <p/>
+ * <p>
  * Certain test require that {@link #testNodeType} is mix:referenceable or
  * allows to add that mixin. If the repository does not support mix:referenceable
  * a {@link org.apache.jackrabbit.test.NotExecutableException} is thrown

Modified: jackrabbit/sandbox/JCR-1456/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/observation/EventIteratorTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/sandbox/JCR-1456/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/observation/EventIteratorTest.java?rev=777313&r1=777312&r2=777313&view=diff
==============================================================================
--- jackrabbit/sandbox/JCR-1456/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/observation/EventIteratorTest.java (original)
+++ jackrabbit/sandbox/JCR-1456/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/observation/EventIteratorTest.java Thu May 21 23:11:22 2009
@@ -30,8 +30,9 @@
  * <li>{@link javax.jcr.observation.EventIterator#getPosition()}</li>
  * <li>{@link javax.jcr.observation.EventIterator#skip(long)}</li>
  * </ul>
- * <p/>
- * Configuration requirements are:<br/>
+ * <p>
+ * Configuration requirements:
+ * <p>
  * The {@link #testRoot} must allow child nodes of type {@link #testNodeType}.
  * The child nodes that are created will be named {@link #nodeName1},
  * {@link #nodeName2} and {@link #nodeName3}.

Modified: jackrabbit/sandbox/JCR-1456/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/observation/EventResult.java
URL: http://svn.apache.org/viewvc/jackrabbit/sandbox/JCR-1456/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/observation/EventResult.java?rev=777313&r1=777312&r2=777313&view=diff
==============================================================================
--- jackrabbit/sandbox/JCR-1456/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/observation/EventResult.java (original)
+++ jackrabbit/sandbox/JCR-1456/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/observation/EventResult.java Thu May 21 23:11:22 2009
@@ -29,7 +29,7 @@
 /**
  * Utility class for <code>Event</code> retrieval with an
  * <code>EventListener</code>.
- * <p/>
+ * <p>
  * The {@link #getEventIterator(long)} and {@link #getEvents(long)} methods
  * will block until an event is delivered and then return the events. Note, that
  * only one of the methods can be called for an expected event delivery. Calling
@@ -70,7 +70,7 @@
     /**
      * Gets the events from the EventListener. Waits at most <code>wait</code>
      * milliseconds for the events.
-     * <p/>
+     * <p>
      * If the events are not delivered within <code>wait</code> time an empty
      * array is returned and a log message is written.
      *
@@ -89,7 +89,7 @@
     /**
      * Gets the events from the EventListener. Waits at most <code>wait</code>
      * milliseconds for the events.
-     * <p/>
+     * <p>
      * If the events are not delivered within <code>wait</code> time
      * <code>null</code> is returned and a log message is written.
      * @param wait time in milliseconds to wait at most for

Modified: jackrabbit/sandbox/JCR-1456/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/observation/EventTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/sandbox/JCR-1456/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/observation/EventTest.java?rev=777313&r1=777312&r2=777313&view=diff
==============================================================================
--- jackrabbit/sandbox/JCR-1456/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/observation/EventTest.java (original)
+++ jackrabbit/sandbox/JCR-1456/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/observation/EventTest.java Thu May 21 23:11:22 2009
@@ -22,8 +22,9 @@
 
 /**
  * Tests methods on the {@link javax.jcr.observation.Event} interface.
- * <p/>
- * Configuration requirements are:<br/>
+ * <p>
+ * Configuration requirements:
+ * <p>
  * The {@link #testRoot} must allow child nodes of type {@link #testNodeType}.
  * The child node that is created will be named {@link #nodeName1}.
  *

Modified: jackrabbit/sandbox/JCR-1456/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/observation/LockingTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/sandbox/JCR-1456/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/observation/LockingTest.java?rev=777313&r1=777312&r2=777313&view=diff
==============================================================================
--- jackrabbit/sandbox/JCR-1456/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/observation/LockingTest.java (original)
+++ jackrabbit/sandbox/JCR-1456/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/observation/LockingTest.java Thu May 21 23:11:22 2009
@@ -25,8 +25,9 @@
 /**
  * Tests if locking a node triggers property added events for jcr:lockOwner
  * and jcr:lockIsDeep.
- * <p/>
- * Configuration requirements are:<br/>
+ * <p>
+ * Configuration requirements:
+ * <p>
  * The {@link #testRoot} must allow child nodes of type {@link #testNodeType}.
  * The child node that is created will be named {@link #nodeName1}. The node
  * type {@link #testNodeType} must either have mix:lockable as one of its

Modified: jackrabbit/sandbox/JCR-1456/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/observation/NodeAddedTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/sandbox/JCR-1456/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/observation/NodeAddedTest.java?rev=777313&r1=777312&r2=777313&view=diff
==============================================================================
--- jackrabbit/sandbox/JCR-1456/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/observation/NodeAddedTest.java (original)
+++ jackrabbit/sandbox/JCR-1456/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/observation/NodeAddedTest.java Thu May 21 23:11:22 2009
@@ -22,8 +22,9 @@
 
 /**
  * Test cases for {@link javax.jcr.observation.Event#NODE_ADDED} events.
- * <p/>
- * Configuration requirements are:<br/>
+ * <p>
+ * Configuration requirements:
+ * <p>
  * The {@link #testRoot} must allow child nodes of type {@link #testNodeType}.
  * The child nodes that are created will be named {@link #nodeName1} and
  * {@link #nodeName2}. Furthermore {@link #testNodeType} must allow to add

Modified: jackrabbit/sandbox/JCR-1456/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/observation/NodeMovedTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/sandbox/JCR-1456/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/observation/NodeMovedTest.java?rev=777313&r1=777312&r2=777313&view=diff
==============================================================================
--- jackrabbit/sandbox/JCR-1456/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/observation/NodeMovedTest.java (original)
+++ jackrabbit/sandbox/JCR-1456/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/observation/NodeMovedTest.java Thu May 21 23:11:22 2009
@@ -28,8 +28,9 @@
 /**
  * Tests if {@link javax.jcr.Session#move} operations trigger the appropriate
  * observation events.
- * <p/>
- * Configuration requirements are:<br/>
+ * <p>
+ * Configuration requirements:
+ * <p>
  * The {@link #testRoot} must allow child nodes of type {@link #testNodeType}.
  * The child nodes that are created will be named {@link #nodeName1},
  * {@link #nodeName2}, {@link #nodeName3} and {@link #nodeName4}. Furthermore

Modified: jackrabbit/sandbox/JCR-1456/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/observation/NodeRemovedTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/sandbox/JCR-1456/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/observation/NodeRemovedTest.java?rev=777313&r1=777312&r2=777313&view=diff
==============================================================================
--- jackrabbit/sandbox/JCR-1456/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/observation/NodeRemovedTest.java (original)
+++ jackrabbit/sandbox/JCR-1456/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/observation/NodeRemovedTest.java Thu May 21 23:11:22 2009
@@ -22,8 +22,9 @@
 
 /**
  * Test cases for {@link javax.jcr.observation.Event#NODE_REMOVED} events.
- * <p/>
- * Configuration requirements are:<br/>
+ * <p>
+ * Configuration requirements:
+ * <p>
  * The {@link #testRoot} must allow child nodes of type {@link #testNodeType}.
  * The child nodes that are created will be named {@link #nodeName1} and
  * {@link #nodeName2}. Furthermore {@link #testNodeType} must allow to add

Modified: jackrabbit/sandbox/JCR-1456/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/observation/NodeReorderTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/sandbox/JCR-1456/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/observation/NodeReorderTest.java?rev=777313&r1=777312&r2=777313&view=diff
==============================================================================
--- jackrabbit/sandbox/JCR-1456/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/observation/NodeReorderTest.java (original)
+++ jackrabbit/sandbox/JCR-1456/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/observation/NodeReorderTest.java Thu May 21 23:11:22 2009
@@ -29,7 +29,7 @@
 /**
  * Tests if {@link javax.jcr.Node#orderBefore(String, String)} operations trigger
  * the appropriate observation events.
- * <p/>
+ * <p>
  * @tck.config testroot must allow orderable child nodes of type
  * <code>nodetype</code>, otherwise the test cases throw a
  * {@link NotExecutableException}. Some tests are only executed if the node

Modified: jackrabbit/sandbox/JCR-1456/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/observation/PropertyAddedTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/sandbox/JCR-1456/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/observation/PropertyAddedTest.java?rev=777313&r1=777312&r2=777313&view=diff
==============================================================================
--- jackrabbit/sandbox/JCR-1456/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/observation/PropertyAddedTest.java (original)
+++ jackrabbit/sandbox/JCR-1456/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/observation/PropertyAddedTest.java Thu May 21 23:11:22 2009
@@ -24,8 +24,9 @@
 
 /**
  * Test cases for {@link javax.jcr.observation.Event#PROPERTY_ADDED} events.
- * <p/>
- * Configuration requirements are:<br/>
+ * <p>
+ * Configuration requirements:
+ * <p>
  * The {@link #testRoot} must allow child nodes of type {@link #testNodeType}.
  * The child nodes that are created will be named {@link #nodeName1} and
  * {@link #nodeName2}.

Modified: jackrabbit/sandbox/JCR-1456/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/observation/PropertyChangedTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/sandbox/JCR-1456/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/observation/PropertyChangedTest.java?rev=777313&r1=777312&r2=777313&view=diff
==============================================================================
--- jackrabbit/sandbox/JCR-1456/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/observation/PropertyChangedTest.java (original)
+++ jackrabbit/sandbox/JCR-1456/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/observation/PropertyChangedTest.java Thu May 21 23:11:22 2009
@@ -27,8 +27,9 @@
 
 /**
  * Test cases for {@link javax.jcr.observation.Event#PROPERTY_CHANGED} events.
- * <p/>
- * Configuration requirements are:<br/>
+ * <p>
+ * Configuration requirements:
+ * <p>
  * The {@link #testRoot} must allow child nodes of type {@link #testNodeType}.
  * The child nodes that are created will be named {@link #nodeName1} and
  * {@link #nodeName2}.
@@ -106,7 +107,7 @@
      * </ul>
      * is triggered if a property is transiently removed and set again with
      * the same name but different type and then saved.
-     * <p/>
+     * <p>
      * If the node type {@link #testNodeType} does not suppport a property with
      * name {@link #propertyName1} of type {@link PropertyType#UNDEFINED} a
      * {@link NotExecutableException} is thrown.

Modified: jackrabbit/sandbox/JCR-1456/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/observation/PropertyRemovedTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/sandbox/JCR-1456/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/observation/PropertyRemovedTest.java?rev=777313&r1=777312&r2=777313&view=diff
==============================================================================
--- jackrabbit/sandbox/JCR-1456/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/observation/PropertyRemovedTest.java (original)
+++ jackrabbit/sandbox/JCR-1456/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/observation/PropertyRemovedTest.java Thu May 21 23:11:22 2009
@@ -23,8 +23,9 @@
 
 /**
  * Test cases for {@link javax.jcr.observation.Event#PROPERTY_REMOVED} events.
- * <p/>
- * Configuration requirements are:<br/>
+ * <p>
+ * Configuration requirements:
+ * <p>
  * The {@link #testRoot} must allow child nodes of type {@link #testNodeType}.
  * The child nodes that are created will be named {@link #nodeName1} and
  * {@link #nodeName2}.

Modified: jackrabbit/sandbox/JCR-1456/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/observation/WorkspaceOperationTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/sandbox/JCR-1456/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/observation/WorkspaceOperationTest.java?rev=777313&r1=777312&r2=777313&view=diff
==============================================================================
--- jackrabbit/sandbox/JCR-1456/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/observation/WorkspaceOperationTest.java (original)
+++ jackrabbit/sandbox/JCR-1456/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/observation/WorkspaceOperationTest.java Thu May 21 23:11:22 2009
@@ -22,9 +22,9 @@
 
 /**
  * Tests if workspace operations trigger the appropriate observation events.
- *
- * <p/>
- * Configuration requirements are:<br/>
+ * <p>
+ * Configuration requirements:
+ * <p>
  * The {@link #testRoot} must allow child nodes of type {@link #testNodeType}.
  * The child nodes that are created will be named {@link #nodeName1},
  * {@link #nodeName2}, {@link #nodeName3} and {@link #nodeName4}. Furthermore

Modified: jackrabbit/sandbox/JCR-1456/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/query/AbstractQueryLevel2Test.java
URL: http://svn.apache.org/viewvc/jackrabbit/sandbox/JCR-1456/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/query/AbstractQueryLevel2Test.java?rev=777313&r1=777312&r2=777313&view=diff
==============================================================================
--- jackrabbit/sandbox/JCR-1456/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/query/AbstractQueryLevel2Test.java (original)
+++ jackrabbit/sandbox/JCR-1456/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/query/AbstractQueryLevel2Test.java Thu May 21 23:11:22 2009
@@ -69,7 +69,7 @@
      * the node type must allow a String property with name {@link
      * #propertyName1} and a multi valued String property with name {@link
      * #propertyName2}.
-     * <p/>
+     * <p>
      * If the node type does not support multi values for {@link #propertyName2}
      * a {@link org.apache.jackrabbit.test.NotExecutableException} is thrown.
      */

Modified: jackrabbit/sandbox/JCR-1456/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/query/SQLOrderByTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/sandbox/JCR-1456/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/query/SQLOrderByTest.java?rev=777313&r1=777312&r2=777313&view=diff
==============================================================================
--- jackrabbit/sandbox/JCR-1456/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/query/SQLOrderByTest.java (original)
+++ jackrabbit/sandbox/JCR-1456/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/query/SQLOrderByTest.java Thu May 21 23:11:22 2009
@@ -22,7 +22,7 @@
 /**
  * This test searches for all nodes of a specific node type and orders them by
  * the property with name configured as {@link #propertyName1}.
- * <p/>
+ * <p>
  * The default workspace must at least contain two nodes of type {@link #testNodeType}
  * with String properties named {@link #propertyName1} containing distinct
  * values.
@@ -57,7 +57,7 @@
 
     /**
      * Test if sort order <i>ascending</i> is respected.
-     * <p/>
+     * <p>
      * For configuration description see {@link SQLOrderByTest}.
      */
     public void testOrderByAscending() throws Exception {
@@ -67,7 +67,7 @@
 
     /**
      * Test if sort order <i>descending</i> is respected.
-     * <p/>
+     * <p>
      * For configuration description see {@link SQLOrderByTest}.
      */
     public void testOrderByDescending() throws Exception {
@@ -78,7 +78,7 @@
     /**
      * Test if default sort order is respected and is <i>ascending</i> if the
      * order by modifier is missing.
-     * <p/>
+     * <p>
      * For configuration description see {@link SQLOrderByTest}.
      */
     public void testOrderByDefault() throws Exception {

Modified: jackrabbit/sandbox/JCR-1456/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/query/SQLQueryLevel2Test.java
URL: http://svn.apache.org/viewvc/jackrabbit/sandbox/JCR-1456/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/query/SQLQueryLevel2Test.java?rev=777313&r1=777312&r2=777313&view=diff
==============================================================================
--- jackrabbit/sandbox/JCR-1456/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/query/SQLQueryLevel2Test.java (original)
+++ jackrabbit/sandbox/JCR-1456/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/query/SQLQueryLevel2Test.java Thu May 21 23:11:22 2009
@@ -35,7 +35,7 @@
     /**
      * Test if the optional jcr:score property for full-text search is
      * supported.
-     * <p/>
+     * <p>
      * For configuration description see {@link #setUpFullTextTest()}.
      */
     public void testScoreColumn() throws Exception {
@@ -48,7 +48,7 @@
 
     /**
      * Test full-text search of the repository.
-     * <p/>
+     * <p>
      * For configuration description see {@link #setUpFullTextTest()}.
      */
     public void testFullTextSearch() throws Exception {
@@ -74,7 +74,7 @@
 
     /**
      * Test range evaluation of a Query.
-     * <p/>
+     * <p>
      * For configuration description see {@link #setUpRangeTest()}.
      */
     public void testRange() throws Exception {
@@ -90,7 +90,7 @@
 
     /**
      * Test multi-value support of search.
-     * <p/>
+     * <p>
      * For configuration description see {@link #setUpMultiValueTest()}.
      */
     public void testMultiValueSearch() throws Exception {
@@ -107,7 +107,7 @@
     /**
      * Test if the optional jcr:path pseudo property is contained in the query
      * result.
-     * <p/>
+     * <p>
      * For configuration description see {@link #setUpFullTextTest()}.
      */
     public void testPathColumn() throws Exception {

Modified: jackrabbit/sandbox/JCR-1456/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/query/SaveTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/sandbox/JCR-1456/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/query/SaveTest.java?rev=777313&r1=777312&r2=777313&view=diff
==============================================================================
--- jackrabbit/sandbox/JCR-1456/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/query/SaveTest.java (original)
+++ jackrabbit/sandbox/JCR-1456/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/query/SaveTest.java Thu May 21 23:11:22 2009
@@ -114,7 +114,7 @@
     /**
      * Tests if a {@link javax.jcr.version.VersionException} is thrown when a
      * query is stored under a checked in node.
-     * <p/>
+     * <p>
      * The tests creates a node under <code>testRoot</code> with name
      * <code>nodeName1</code> and adds a mix:versionable mixin if the node is
      * not already versionable.
@@ -154,7 +154,7 @@
     /**
      * Tests if a {@link javax.jcr.nodetype.ConstraintViolationException} is
      * thrown if a query is stored under a node which does not allow child nodes.
-     * <p/>
+     * <p>
      * The test creates a node <code>nodeName1</code> of type <code>testNodeType</code>
      * under <code>testRoot</code>. Then the test tries to store a query as
      * <code>nodeName2</code> under <code>nodeName1</code>.
@@ -175,7 +175,7 @@
     /**
      * Tests if a {@link javax.jcr.lock.LockException} is thrown if a query is
      * stored under a node locked by another <code>Session</code>.
-     * <p/>
+     * <p>
      * The test creates a node <code>nodeName1</code> of type <code>testNodeType</code>
      * under <code>testRoot</code> and locks the node with the superuser session.
      * Then the test tries to store a query as <code>nodeName2</code> under

Modified: jackrabbit/sandbox/JCR-1456/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/query/XPathDocOrderTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/sandbox/JCR-1456/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/query/XPathDocOrderTest.java?rev=777313&r1=777312&r2=777313&view=diff
==============================================================================
--- jackrabbit/sandbox/JCR-1456/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/query/XPathDocOrderTest.java (original)
+++ jackrabbit/sandbox/JCR-1456/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/query/XPathDocOrderTest.java Thu May 21 23:11:22 2009
@@ -29,10 +29,10 @@
  * check the repository descriptor {@link javax.jcr.Repository#QUERY_XPATH_DOC_ORDER}
  * first and throw a {@link org.apache.jackrabbit.test.NotExecutableException}
  * if the descriptor is not present.
- * <p/>
+ * <p>
  * This is a level 1 test, therefore does not write content to the workspace.
  * The tests require the following content in the default workspace:
- * <p/>
+ * <p>
  * At least three nodes under the {@link #testRoot}.
  *
  * @test
@@ -49,7 +49,7 @@
 
     /**
      * Tests the <code>position()</code> function.
-     * <p/>
+     * <p>
      * For configuration description see {@link XPathDocOrderTest}.
      */
     public void testDocOrderPositionFunction() throws Exception {
@@ -66,7 +66,7 @@
     /**
      * Tests if position index and document order on child axis returns the
      * correct node.
-     * <p/>
+     * <p>
      * For configuration description see {@link XPathDocOrderTest}.
      */
     public void testDocOrderPositionIndex() throws Exception {
@@ -82,7 +82,7 @@
 
     /**
      * Tests the <code>last()</code> function.
-     * <p/>
+     * <p>
      * For configuration description see {@link XPathDocOrderTest}.
      */
     public void testDocOrderLastFunction() throws Exception {
@@ -98,7 +98,7 @@
 
     /**
      * Tests the <code>first()</code> function.
-     * <p/>
+     * <p>
      * For configuration description see {@link XPathDocOrderTest}.
      */
     public void testDocOrderFirstFunction() throws Exception {

Modified: jackrabbit/sandbox/JCR-1456/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/query/XPathOrderByTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/sandbox/JCR-1456/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/query/XPathOrderByTest.java?rev=777313&r1=777312&r2=777313&view=diff
==============================================================================
--- jackrabbit/sandbox/JCR-1456/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/query/XPathOrderByTest.java (original)
+++ jackrabbit/sandbox/JCR-1456/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/query/XPathOrderByTest.java Thu May 21 23:11:22 2009
@@ -21,7 +21,7 @@
 /**
  * This test searches for all nodes of a specific node type and orders them by
  * the property with name configured as {@link #propertyName1}.
- * <p/>
+ * <p>
  * The default workspace must at least contain two nodes of type {@link #testNodeType}
  * with String properties named {@link #propertyName1} containing
  * distinct values.
@@ -55,7 +55,7 @@
 
     /**
      * Test if sort order <i>ascending</i> is respected.
-     * <p/>
+     * <p>
      * For configuration description see {@link XPathOrderByTest}.
      */
     public void testOrderByAscending() throws Exception {
@@ -65,7 +65,7 @@
 
     /**
      * Test if sort order <i>descending</i> is respected.
-     * <p/>
+     * <p>
      * For configuration description see {@link XPathOrderByTest}.
      */
     public void testOrderByDescending() throws Exception {
@@ -75,7 +75,7 @@
 
     /**
      * Test if default sort order is <i>ascending</i>
-     * <p/>
+     * <p>
      * For configuration description see {@link XPathOrderByTest}.
      */
     public void testOrderBy() throws Exception {

Modified: jackrabbit/sandbox/JCR-1456/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/query/XPathPosIndexTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/sandbox/JCR-1456/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/query/XPathPosIndexTest.java?rev=777313&r1=777312&r2=777313&view=diff
==============================================================================
--- jackrabbit/sandbox/JCR-1456/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/query/XPathPosIndexTest.java (original)
+++ jackrabbit/sandbox/JCR-1456/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/query/XPathPosIndexTest.java Thu May 21 23:11:22 2009
@@ -29,10 +29,10 @@
  * check the repository descriptor {@link javax.jcr.Repository#QUERY_XPATH_POS_INDEX}
  * first and throw a {@link org.apache.jackrabbit.test.NotExecutableException}
  * if the descriptor is not present.
- * <p/>
+ * <p>
  * This is a level 1 test, therefore does not write content to the workspace.
  * The tests require the following content in the default workspace:
- * <p/>
+ * <p>
  * At least three nodes with the name {@link #nodeName1} under the
  * {@link #testRoot}.
  *
@@ -50,7 +50,7 @@
 
     /**
      * Test if the indexed notation is supported.
-     * <p/>
+     * <p>
      * For configuration description see {@link XPathPosIndexTest}.
      */
     public void testDocOrderIndexedNotation() throws Exception {

Modified: jackrabbit/sandbox/JCR-1456/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/query/XPathQueryLevel2Test.java
URL: http://svn.apache.org/viewvc/jackrabbit/sandbox/JCR-1456/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/query/XPathQueryLevel2Test.java?rev=777313&r1=777312&r2=777313&view=diff
==============================================================================
--- jackrabbit/sandbox/JCR-1456/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/query/XPathQueryLevel2Test.java (original)
+++ jackrabbit/sandbox/JCR-1456/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/query/XPathQueryLevel2Test.java Thu May 21 23:11:22 2009
@@ -35,7 +35,7 @@
     /**
      * Test if the optional jcr:score property for full-text search is
      * supported.
-     * <p/>
+     * <p>
      * For configuration description see {@link #setUpFullTextTest()}.
      */
     public void testScoreColumn() throws Exception {
@@ -48,7 +48,7 @@
 
     /**
      * Test full-text search of the repository.<br>
-     * <p/>
+     * <p>
      * For configuration description see {@link #setUpFullTextTest()}.
      */
     public void testFullTextSearch() throws Exception {
@@ -73,7 +73,7 @@
 
     /**
      * Test range evauluation of Query.<br>
-     * <p/>
+     * <p>
      * For configuration description see {@link #setUpRangeTest()}.
      */
     public void testRange() throws Exception {
@@ -89,7 +89,7 @@
 
     /**
      * Test multi-value support of search.<br>
-     * <p/>
+     * <p>
      * For configuration description see {@link #setUpMultiValueTest()}.
      */
     public void testMultiValueSearch() throws Exception {
@@ -105,7 +105,7 @@
 
     /**
      * Test if the jcr:path pseudo property is contained in result.
-     * <p/>
+     * <p>
      * For configuration description see {@link #setUpFullTextTest()}.
      */
     public void testPathColumn() throws Exception {

Modified: jackrabbit/sandbox/JCR-1456/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/version/AbstractOnParentVersionTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/sandbox/JCR-1456/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/version/AbstractOnParentVersionTest.java?rev=777313&r1=777312&r2=777313&view=diff
==============================================================================
--- jackrabbit/sandbox/JCR-1456/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/version/AbstractOnParentVersionTest.java (original)
+++ jackrabbit/sandbox/JCR-1456/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/version/AbstractOnParentVersionTest.java Thu May 21 23:11:22 2009
@@ -62,7 +62,8 @@
      * Add a child node to the versionable node created in the setup with the
      * name and nodetype name defined in the corresponding configuration. After
      * creation of the child node, an assertion is made for the proper onParentVersion
-     * behaviour.<p/>
+     * behaviour.
+     * <p>
      * NOTE: the child node is removed together with the versionable node after
      * each test.
      *

Modified: jackrabbit/sandbox/JCR-1456/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/version/AbstractVersionTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/sandbox/JCR-1456/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/version/AbstractVersionTest.java?rev=777313&r1=777312&r2=777313&view=diff
==============================================================================
--- jackrabbit/sandbox/JCR-1456/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/version/AbstractVersionTest.java (original)
+++ jackrabbit/sandbox/JCR-1456/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/version/AbstractVersionTest.java Thu May 21 23:11:22 2009
@@ -83,7 +83,7 @@
         }
         try {
             nonVersionableNode = testRootNode.addNode(nodeName3, nonVersionableNodeType.getName());
-            testRootNode.save();
+            testRootNode.getSession().save();
         } catch (RepositoryException e) {
             fail("Failed to create non-versionable test node." + e.getMessage());
         }
@@ -98,7 +98,7 @@
         // remove versionable nodes
         try {
             versionableNode.remove();
-            testRootNode.save();
+            testRootNode.getSession().save();
         } catch (Exception e) {
             log.println("Exception in tearDown: " + e.toString());
         } finally {

Modified: jackrabbit/sandbox/JCR-1456/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/version/CheckinTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/sandbox/JCR-1456/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/version/CheckinTest.java?rev=777313&r1=777312&r2=777313&view=diff
==============================================================================
--- jackrabbit/sandbox/JCR-1456/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/version/CheckinTest.java (original)
+++ jackrabbit/sandbox/JCR-1456/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/version/CheckinTest.java Thu May 21 23:11:22 2009
@@ -17,6 +17,7 @@
 package org.apache.jackrabbit.test.api.version;
 
 import javax.jcr.version.Version;
+import javax.jcr.version.VersionManager;
 import javax.jcr.RepositoryException;
 import javax.jcr.Value;
 import javax.jcr.InvalidItemStateException;
@@ -36,7 +37,9 @@
     protected void setUp() throws Exception {
         super.setUp();
 
-        versionableNode.checkout();
+        VersionManager versionManager = versionableNode.getSession().getWorkspace().getVersionManager();
+        String path = versionableNode.getPath();
+        versionManager.checkout(path);
     }
 
     /**
@@ -50,6 +53,19 @@
     }
 
     /**
+     * Test if VersionManager.isCheckedOut(P) returns false if P is the
+     * absolute path of a checked-in versionable node.
+     *
+     * @throws javax.jcr.RepositoryException
+     */
+    public void testIsCheckedOutJcr2() throws RepositoryException {
+        VersionManager versionManager = versionableNode.getSession().getWorkspace().getVersionManager();
+        String path = versionableNode.getPath();
+        versionManager.checkin(path);
+        assertTrue("VersionManager.isCheckedOut(P) must return false if the path P resolves to a checked-in node.", versionManager.isCheckedOut(path) == false);
+    }
+
+    /**
      * Test if the node's jcr:predecessors property contains an empty value array
      * after checkin.
      *
@@ -64,6 +80,22 @@
     }
 
     /**
+     * Test if the node's jcr:predecessors property contains an empty value array
+     * after checkin.
+     *
+     * @throws RepositoryException
+     */
+    public void testCheckinRemovesPredecessorPropertyJcr2() throws RepositoryException {
+
+        VersionManager versionManager = versionableNode.getSession().getWorkspace().getVersionManager();
+        String path = versionableNode.getPath();
+        versionManager.checkin(path);
+        Value[] predecessorsValue = versionableNode.getProperty(jcrPredecessors).getValues();
+
+        assertTrue("Checkin must set the node's jcr:predecessors property to the empty array", predecessorsValue.length == 0);
+    }
+
+    /**
      * Test if the nodes jcr:predecessors property is copied to the new version
      * on Node.checkin().
      *
@@ -80,6 +112,24 @@
     }
 
     /**
+     * Test if the nodes jcr:predecessors property is copied to the new version
+     * on checkin.
+     *
+     * @throws RepositoryException
+     */
+    public void testPredecessorIsCopiedToNewVersionJcr2() throws RepositoryException {
+
+        Value[] nPredecessorsValue = versionableNode.getProperty(jcrPredecessors).getValues();
+
+        VersionManager versionManager = versionableNode.getSession().getWorkspace().getVersionManager();
+        String path = versionableNode.getPath();
+        Version v = versionManager.checkin(path);
+        Value[] vPredecessorsValue = v.getProperty(jcrPredecessors).getValues();
+
+        assertEquals("The versionable checked-out node's jcr:predecessors property is copied to the new version on checkin.", Arrays.asList(nPredecessorsValue), Arrays.asList(vPredecessorsValue));
+    }
+
+    /**
      * Test if Node.checkin() on a checked-in node has no effect.
      *
      * @throws RepositoryException
@@ -97,6 +147,26 @@
     }
 
     /**
+     * Test if VersionManager.checkin(P) has no effect if the path P resolves
+     * to a checked-in node.
+     *
+     * @throws RepositoryException
+     */
+    public void testMultipleCheckinHasNoEffectJcr2() throws RepositoryException {
+
+        VersionManager versionManager = versionableNode.getSession().getWorkspace().getVersionManager();
+        String path = versionableNode.getPath();
+        Version v = versionManager.checkin(path);
+        try {
+            Version v2 = versionManager.checkin(path);
+
+            assertTrue("Calling VersionManager.checkin(P) must not have an if the path P resolves to a node that is already checked-in.", v.isSame(v2));
+        } catch (RepositoryException e) {
+            fail("Calling VersionManager.checkin(P) must not throw an exception if the path P resolves to a node that is already checked-in.");
+        }
+    }
+
+    /**
      * Test if versionable node N's jcr:baseVersion property is set to refer to
      * the new version after checkin.
      *
@@ -110,6 +180,21 @@
     }
 
     /**
+     * Test if versionable node N's jcr:baseVersion property is set to refer to
+     * the new version after checkin.
+     *
+     * @throws RepositoryException
+     */
+    public void testBaseVersionAfterCheckinJcr2() throws RepositoryException {
+        VersionManager versionManager = versionableNode.getSession().getWorkspace().getVersionManager();
+        String path = versionableNode.getPath();
+        Version v = versionManager.checkin(path);
+        Value baseVersionRef = versionableNode.getProperty(jcrBaseVersion).getValue();
+
+        assertEquals("Checked-in node's jcr:baseVersion property is set to refer to the version created on checkin.", superuser.getValueFactory().createValue(v), baseVersionRef);
+    }
+
+    /**
      * Test if Node.checkin() throws InvalidItemStateException if the node
      * has unsaved changes pending.
      *
@@ -128,6 +213,26 @@
     }
 
     /**
+     * Test if VersionManager.checkin(P) throws InvalidItemStateException if
+     * the path P resolves to a node that has unsaved changes pending.
+     *
+     * @throws RepositoryException
+     */
+    public void testCheckinWithPendingChangesJcr2() throws RepositoryException {
+        try {
+            // modify node without calling save()
+            versionableNode.setProperty(propertyName1, propertyValue);
+            VersionManager versionManager = versionableNode.getSession().getWorkspace().getVersionManager();
+            String path = versionableNode.getPath();
+            versionManager.checkin(path);
+
+            fail("InvalidItemStateException must be thrown on attempt to checkin a node having any unsaved changes pending.");
+        } catch (InvalidItemStateException e) {
+            // ok
+        }
+    }
+
+    /**
      * Test if Node.isCheckedOut() returns false after Node.checkin().
      *
      * @throws RepositoryException
@@ -140,6 +245,20 @@
     }
 
     /**
+     * Test if VersionManager.isCheckedOut(P) returns false after calling VersionManager.checkin(P).
+     *
+     * @throws RepositoryException
+     */
+    public void testIsNotCheckedOutJcr2() throws RepositoryException {
+        VersionManager versionManager = versionableNode.getSession().getWorkspace().getVersionManager();
+        String path = versionableNode.getPath();
+        versionManager.checkin(path);
+        boolean isCheckedOut = versionManager.isCheckedOut(path);
+
+        assertFalse("VersionManager.isCheckedOut(P) must return false after VersionManager.checkin(P).", isCheckedOut);
+    }
+
+    /**
      * Test if Node.checkin() adds another version to the VersionHistory
      *
      * @throws RepositoryException
@@ -154,6 +273,22 @@
     }
 
     /**
+     * Test if VersionManager.checkin(String) adds another version to the VersionHistory
+     *
+     * @throws RepositoryException
+     */
+    public void testCheckinCreatesNewVersionJcr2() throws RepositoryException {
+
+        VersionManager versionManager = versionableNode.getSession().getWorkspace().getVersionManager();
+        String path = versionableNode.getPath();
+        long initialNumberOfVersions = getNumberOfVersions(versionManager.getVersionHistory(path));
+        versionManager.checkin(path);
+        long numberOfVersions = getNumberOfVersions(versionManager.getVersionHistory(path));
+
+        assertTrue("Checkin must create a new Version in the VersionHistory.", numberOfVersions == initialNumberOfVersions + 1);
+    }
+
+    /**
      * Test calling Node.checkin() on a non-versionable node.
      *
      * @throws RepositoryException
@@ -166,4 +301,21 @@
             //success
         }
     }
+
+    /**
+     * Test calling VersionManager.checkin(P) with the path P resolving to
+     * a non-versionable node.
+     *
+     * @throws RepositoryException
+     */
+    public void testCheckinNonVersionableNodeJcr2() throws RepositoryException {
+        try {
+            VersionManager versionManager = nonVersionableNode.getSession().getWorkspace().getVersionManager();
+            String path = nonVersionableNode.getPath();
+            versionManager.checkin(path);
+            fail("VersionManager.checkin(P) must throw UnsupportedRepositoryOperationException if the path P resolves to a non-versionable node.");
+        } catch (UnsupportedRepositoryOperationException e) {
+            //success
+        }
+    }
 }
\ No newline at end of file

Modified: jackrabbit/sandbox/JCR-1456/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/version/CheckoutTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/sandbox/JCR-1456/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/version/CheckoutTest.java?rev=777313&r1=777312&r2=777313&view=diff
==============================================================================
--- jackrabbit/sandbox/JCR-1456/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/version/CheckoutTest.java (original)
+++ jackrabbit/sandbox/JCR-1456/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/version/CheckoutTest.java Thu May 21 23:11:22 2009
@@ -21,6 +21,7 @@
 import javax.jcr.ItemNotFoundException;
 import javax.jcr.UnsupportedRepositoryOperationException;
 import javax.jcr.Value;
+import javax.jcr.version.VersionManager;
 
 /**
  * <code>CheckoutTest</code> covers tests related to {@link
@@ -36,10 +37,15 @@
     protected void setUp() throws Exception {
         super.setUp();
 
+        VersionManager versionManager = versionableNode.getSession().getWorkspace().getVersionManager();
+        String path = versionableNode.getPath();
+        if (!versionManager.isCheckedOut(path)) {
+            fail("A versionable node must be checked-out after persistent creation.");
+        }
         if (!versionableNode.isCheckedOut()) {
             fail("A versionable node must be checked-out after persistent creation.");
         }
-        versionableNode.checkin();
+        versionManager.checkin(path);
     }
 
     /**
@@ -52,6 +58,17 @@
     }
 
     /**
+     * Test if VersionManager.isCheckedOut(P) returns true if P is the
+     * absolute path of a versionable node that has been checked out before.
+     */
+    public void testIsCheckedOutJcr2() throws RepositoryException {
+        VersionManager versionManager = versionableNode.getSession().getWorkspace().getVersionManager();
+        String path = versionableNode.getPath();
+        versionManager.checkout(path);
+        assertTrue("After successfully calling VersionManager.checkout(P) with P denoting the absolute path of a versionable node, VersionManager.isCheckedOut(P) must return true.", versionManager.isCheckedOut(path));
+    }
+
+    /**
      * Test calling Node.isCheckedOut() on a non-versionable.
      */
     public void testIsCheckedOutNonVersionableNode() throws RepositoryException {
@@ -78,12 +95,57 @@
     }
 
     /**
+     * Test calling VersionManager.isCheckedOut(P) with P denoting the
+     * absolute path of a non-versionable node.
+     */
+    public void testIsCheckedOutNonVersionableNodeJcr2() throws RepositoryException {
+        VersionManager versionManager = nonVersionableNode.getSession().getWorkspace().getVersionManager();
+        String path = nonVersionableNode.getPath();
+        boolean isCheckedOut = versionManager.isCheckedOut(path);
+        Node vParent = null;
+        try {
+            vParent = nonVersionableNode.getParent();
+            while (!vParent.isNodeType(mixVersionable)) {
+                vParent = vParent.getParent();
+            }
+        } catch (ItemNotFoundException e) {
+            // root reached.
+        }
+
+        if (vParent != null && vParent.isNodeType(mixVersionable)) {
+            String parentPath = vParent.getPath();
+            if (versionManager.isCheckedOut(parentPath)) {
+                assertTrue("VersionManager.isCheckedOut(P) must return true if P denotes the absolute path of a non-versionable node whose nearest versionable ancestor is checked-out.", isCheckedOut);
+            } else {
+                assertFalse("VersionManager.isCheckedOut(P) must return false if P denotes the absolute path of a non-versionable node whose nearest versionable ancestor is checked-in.", isCheckedOut);
+            }
+        } else {
+            assertTrue("VersionManager.isCheckedOut(P) must return true if P denotes the absolute path of a non-versionable node that has no versionable ancestor", isCheckedOut);
+        }
+    }
+
+    /**
      * Test calling Node.checkout() on a non-versionable node.
      */
     public void testCheckoutNonVersionableNode() throws RepositoryException {
         try {
             nonVersionableNode.checkout();
-            fail("Node.checkout() on a non versionable node must throw UnsupportedRepositoryOperationException");
+            fail("Node.checkout() on a non-versionable node must throw UnsupportedRepositoryOperationException");
+        } catch (UnsupportedRepositoryOperationException e) {
+            //success
+        }
+    }
+
+    /**
+     * Test calling VersionManager.checkout(P) with P denoting the absolute
+     * path of a non-versionable node.
+     */
+    public void testCheckoutNonVersionableNodeJcr2() throws RepositoryException {
+        VersionManager versionManager = nonVersionableNode.getSession().getWorkspace().getVersionManager();
+        String path = nonVersionableNode.getPath();
+        try {
+            versionManager.checkout(path);
+            fail("VersionManager.checkout(P) with P denoting the absolute path of a non-versionable node must throw UnsupportedRepositoryOperationException");
         } catch (UnsupportedRepositoryOperationException e) {
             //success
         }
@@ -99,6 +161,18 @@
     }
 
     /**
+     * Test if VersionManager.checkout(P) doesn't throw any exception if P
+     * denotes the absolute path of a versionable node that has been checked
+     * out before.
+     */
+    public void testCheckoutTwiceDoesNotThrowJcr2() throws RepositoryException {
+        VersionManager versionManager = versionableNode.getSession().getWorkspace().getVersionManager();
+        String path = versionableNode.getPath();
+        versionManager.checkout(path);
+        versionManager.checkout(path);
+    }
+
+    /**
      * Test if Node.checkout() copies the node's jcr:baseVersion to node's
      * jcr:predecessors property (no save required).
      */
@@ -121,4 +195,31 @@
             fail("After calling Node.checkout() the current value of node's jcr:baseVersion must be copied to node's jcr:predecessors property");
         }
     }
+
+    /**
+     * Test if VersionManager.checkout(P), with P denoting the absolute path
+     * of a versionable node, copies the node's jcr:baseVersion to the node's
+     * jcr:predecessors property (no save required).
+     */
+    public void testCheckoutCopiesBaseValueToPredecessorPropertyJcr2() throws RepositoryException {
+        VersionManager versionManager = versionableNode.getSession().getWorkspace().getVersionManager();
+        String path = versionableNode.getPath();
+        Value baseVersionValue = versionableNode.getProperty(jcrBaseVersion).getValue();
+        versionManager.checkout(path);
+        Value[] predecessorsValues = versionableNode.getProperty(jcrPredecessors).getValues();
+
+        // loop over all values of jcr:predecessors property as it's not sure
+        // on which position jcr:baseVersion is copied.
+        boolean foundBaseVersionProp = false;
+        int i = 0;
+        while (i < predecessorsValues.length && !foundBaseVersionProp) {
+            if (predecessorsValues[i].equals(baseVersionValue)) {
+                foundBaseVersionProp = true;
+            }
+            i++;
+        }
+        if (!foundBaseVersionProp) {
+            fail("After calling Node.checkout() the current value of node's jcr:baseVersion must be copied to node's jcr:predecessors property");
+        }
+    }
 }
\ No newline at end of file

Modified: jackrabbit/sandbox/JCR-1456/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/version/FrozenNodeTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/sandbox/JCR-1456/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/version/FrozenNodeTest.java?rev=777313&r1=777312&r2=777313&view=diff
==============================================================================
--- jackrabbit/sandbox/JCR-1456/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/version/FrozenNodeTest.java (original)
+++ jackrabbit/sandbox/JCR-1456/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/version/FrozenNodeTest.java Thu May 21 23:11:22 2009
@@ -19,6 +19,7 @@
 import javax.jcr.Node;
 import javax.jcr.RepositoryException;
 import javax.jcr.version.Version;
+import javax.jcr.version.VersionManager;
 
 /**
  * <code>CheckinTest</code> covers tests related to {@link javax.jcr.Node#checkin()}.
@@ -33,18 +34,22 @@
     protected void setUp() throws Exception {
         super.setUp();
 
-        versionableNode.checkout();
+        VersionManager versionManager = versionableNode.getSession().getWorkspace().getVersionManager();
+        String path = versionableNode.getPath();
+        versionManager.checkout(path);
     }
 
     /**
      * @throws RepositoryException
      */
     public void testFrozenNodeUUUID() throws RepositoryException {
-        Version v = versionableNode.checkin();
-        Node n = v.getNode(jcrFrozenNode);
+        VersionManager versionManager = versionableNode.getSession().getWorkspace().getVersionManager();
+        String path = versionableNode.getPath();
+        Version v = versionManager.checkin(path);
+        Node n = v.getFrozenNode();
         String puuid = n.getProperty(jcrUUID).getValue().getString();
-        String nuuid = n.getUUID();
-        assertEquals("jcr:uuid needs to be equal to the getUUID() return value.", nuuid, puuid);
+        String nuuid = n.getIdentifier();
+        assertEquals("jcr:uuid needs to be equal to the getIdentifier() return value.", nuuid, puuid);
     }
 
     /**
@@ -52,23 +57,30 @@
      */
     public void testFrozenChildNodeUUUID() throws RepositoryException {
         versionableNode.addNode("child");
-        versionableNode.save();
-        Version v = versionableNode.checkin();
-        Node n = v.getNode(jcrFrozenNode).getNode("child");
+        versionableNode.getSession().save();
+        VersionManager versionManager = versionableNode.getSession().getWorkspace().getVersionManager();
+        String path = versionableNode.getPath();
+        Version v = versionManager.checkin(path);
+        Node n = v.getFrozenNode().getNode("child");
         String puuid = n.getProperty(jcrUUID).getValue().getString();
-        String nuuid = n.getUUID();
-        assertEquals("jcr:uuid needs to be equal to the getUUID() return value.", nuuid, puuid);
+        String nuuid = n.getIdentifier();
+        assertEquals("jcr:uuid needs to be equal to the getIdentifier() return value.", nuuid, puuid);
     }
 
     /**
      * @throws RepositoryException
      */
     public void testFrozenUUUID() throws RepositoryException {
-        Version v = versionableNode.checkin();
-        Node n = v.getNode(jcrFrozenNode);
+        // make versionable node referenceable
+        versionableNode.addMixin(mixReferenceable);
+        versionableNode.getSession().save();
+        VersionManager versionManager = versionableNode.getSession().getWorkspace().getVersionManager();
+        String path = versionableNode.getPath();
+        Version v = versionManager.checkin(path);
+        Node n = v.getFrozenNode();
         String fuuid = n.getProperty(jcrFrozenUuid).getValue().getString();
-        String ruuid = versionableNode.getUUID();
-        assertEquals("jcr:frozenUuid needs to be equal to the getUUID() return value.", ruuid, fuuid);
+        String ruuid = versionableNode.getIdentifier();
+        assertEquals("jcr:frozenUuid needs to be equal to the getIdentifier() return value.", ruuid, fuuid);
     }
 
     /**
@@ -76,12 +88,15 @@
      */
     public void testFrozenChildUUUID() throws RepositoryException {
         Node n1 = versionableNode.addNode("child");
-        versionableNode.save();
-        Version v = versionableNode.checkin();
-        Node n = v.getNode(jcrFrozenNode).getNode("child");
+        n1.addMixin(mixReferenceable);
+        versionableNode.getSession().save();
+        VersionManager versionManager = versionableNode.getSession().getWorkspace().getVersionManager();
+        String path = versionableNode.getPath();
+        Version v = versionManager.checkin(path);
+        Node n = v.getFrozenNode().getNode("child");
         String fuuid = n.getProperty(jcrFrozenUuid).getValue().getString();
-        String ruuid = n1.getUUID();
-        assertEquals("jcr:frozenUuid needs to be equal to the getUUID() return value.", ruuid, fuuid);
+        String ruuid = n1.getIdentifier();
+        assertEquals("jcr:frozenUuid needs to be equal to the getIdentifier() return value.", ruuid, fuuid);
     }
 
 
@@ -89,8 +104,10 @@
      * @throws RepositoryException
      */
     public void testFrozenNodeNodeType() throws RepositoryException {
-        Version v = versionableNode.checkin();
-        Node n = v.getNode(jcrFrozenNode);
+        VersionManager versionManager = versionableNode.getSession().getWorkspace().getVersionManager();
+        String path = versionableNode.getPath();
+        Version v = versionManager.checkin(path);
+        Node n = v.getFrozenNode();
         String puuid = n.getProperty(jcrPrimaryType).getValue().getString();
         String nuuid = n.getPrimaryNodeType().getName();
         assertEquals("jcr:primaryType needs to be equal to the getPrimaryNodeType() return value.", nuuid, puuid);
@@ -101,9 +118,11 @@
      */
     public void testFrozenChildNodeNodeType() throws RepositoryException {
         versionableNode.addNode("child");
-        versionableNode.save();
-        Version v = versionableNode.checkin();
-        Node n = v.getNode(jcrFrozenNode).getNode("child");
+        versionableNode.getSession().save();
+        VersionManager versionManager = versionableNode.getSession().getWorkspace().getVersionManager();
+        String path = versionableNode.getPath();
+        Version v = versionManager.checkin(path);
+        Node n = v.getFrozenNode().getNode("child");
         String puuid = n.getProperty(jcrPrimaryType).getValue().getString();
         String nuuid = n.getPrimaryNodeType().getName();
         assertEquals("jcr:primaryType needs to be equal to the getPrimaryNodeType() return value.", nuuid, puuid);
@@ -113,8 +132,10 @@
      * @throws RepositoryException
      */
     public void testFrozenNodeType() throws RepositoryException {
-        Version v = versionableNode.checkin();
-        Node n = v.getNode(jcrFrozenNode);
+        VersionManager versionManager = versionableNode.getSession().getWorkspace().getVersionManager();
+        String path = versionableNode.getPath();
+        Version v = versionManager.checkin(path);
+        Node n = v.getFrozenNode();
         String fuuid = n.getProperty("jcr:frozenPrimaryType").getValue().getString();
         String ruuid = versionableNode.getPrimaryNodeType().getName();
         assertEquals("jcr:frozenPrimaryType needs to be equal to the getPrimaryNodeType() return value.", ruuid, fuuid);
@@ -125,9 +146,11 @@
      */
     public void testFrozenChildNodeType() throws RepositoryException {
         Node n1 = versionableNode.addNode("child");
-        versionableNode.save();
-        Version v = versionableNode.checkin();
-        Node n = v.getNode(jcrFrozenNode).getNode("child");
+        versionableNode.getSession().save();
+        VersionManager versionManager = versionableNode.getSession().getWorkspace().getVersionManager();
+        String path = versionableNode.getPath();
+        Version v = versionManager.checkin(path);
+        Node n = v.getFrozenNode().getNode("child");
         String fuuid = n.getProperty("jcr:frozenPrimaryType").getValue().getString();
         String ruuid = n1.getPrimaryNodeType().getName();
         assertEquals("jcr:frozenPrimaryType needs to be equal to the getPrimaryNodeType() return value.", ruuid, fuuid);



Mime
View raw message