jackrabbit-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mreut...@apache.org
Subject svn commit: r791180 [3/3] - in /jackrabbit/trunk: jackrabbit-core/src/main/java/org/apache/jackrabbit/core/ jackrabbit-core/src/test/java/org/apache/jackrabbit/api/security/principal/ jackrabbit-core/src/test/java/org/apache/jackrabbit/api/security/use...
Date Sat, 04 Jul 2009 21:40:42 GMT
Modified: jackrabbit/trunk/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/nodetype/PredefinedNodeTypeTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/nodetype/PredefinedNodeTypeTest.java?rev=791180&r1=791179&r2=791180&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/nodetype/PredefinedNodeTypeTest.java (original)
+++ jackrabbit/trunk/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/nodetype/PredefinedNodeTypeTest.java Sat Jul  4 21:40:37 2009
@@ -67,7 +67,7 @@
         isReadOnly = true;
         super.setUp();
 
-        session = helper.getReadOnlySession();
+        session = getHelper().getReadOnlySession();
         manager = session.getWorkspace().getNodeTypeManager();
     }
 

Modified: jackrabbit/trunk/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/nodetype/PropertyDefTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/nodetype/PropertyDefTest.java?rev=791180&r1=791179&r2=791180&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/nodetype/PropertyDefTest.java (original)
+++ jackrabbit/trunk/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/nodetype/PropertyDefTest.java Sat Jul  4 21:40:37 2009
@@ -87,7 +87,7 @@
         isReadOnly = true;
         super.setUp();
 
-        session = helper.getReadOnlySession();
+        session = getHelper().getReadOnlySession();
         manager = session.getWorkspace().getNodeTypeManager();
         // re-fetch testRootNode with read-only session
         testRootNode = (Node) session.getItem(testRoot);

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=791180&r1=791179&r2=791180&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 Sat Jul  4 21:40:37 2009
@@ -158,7 +158,7 @@
                 null,
                 new String[]{testNodeType},
                 false);
-        Session s = helper.getSuperuserSession();
+        Session s = getHelper().getSuperuserSession();
         try {
             Node n = (Node) s.getItem(n1.getPath());
             n.addNode(nodeName3, ntBase);

Modified: jackrabbit/trunk/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/observation/EventJournalTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/observation/EventJournalTest.java?rev=791180&r1=791179&r2=791180&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/observation/EventJournalTest.java (original)
+++ jackrabbit/trunk/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/observation/EventJournalTest.java Sat Jul  4 21:40:37 2009
@@ -81,7 +81,7 @@
         journal.skipTo(System.currentTimeMillis());
         assertFalse(journal.hasNext());
 
-        Session session = helper.getSuperuserSession(workspaceName);
+        Session session = getHelper().getSuperuserSession(workspaceName);
         try {
             Node rootNode = session.getRootNode();
             if (rootNode.hasNode(nodeName1)) {

Modified: jackrabbit/trunk/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/query/DerefQueryLevel1Test.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/query/DerefQueryLevel1Test.java?rev=791180&r1=791179&r2=791180&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/query/DerefQueryLevel1Test.java (original)
+++ jackrabbit/trunk/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/query/DerefQueryLevel1Test.java Sat Jul  4 21:40:37 2009
@@ -47,7 +47,7 @@
     protected void setUp() throws Exception {
         isReadOnly = true;
         super.setUp();
-        session = helper.getReadOnlySession();
+        session = getHelper().getReadOnlySession();
         testRootNode = session.getRootNode().getNode(testPath);
     }
 

Modified: jackrabbit/trunk/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/query/GetLanguageTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/query/GetLanguageTest.java?rev=791180&r1=791179&r2=791180&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/query/GetLanguageTest.java (original)
+++ jackrabbit/trunk/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/query/GetLanguageTest.java Sat Jul  4 21:40:37 2009
@@ -42,7 +42,7 @@
     protected void setUp() throws Exception {
         isReadOnly = true;
         super.setUp();
-        session = helper.getReadOnlySession();
+        session = getHelper().getReadOnlySession();
         testRootNode = session.getRootNode().getNode(testPath);
     }
 

Modified: jackrabbit/trunk/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/query/GetPersistentQueryPathLevel1Test.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/query/GetPersistentQueryPathLevel1Test.java?rev=791180&r1=791179&r2=791180&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/query/GetPersistentQueryPathLevel1Test.java (original)
+++ jackrabbit/trunk/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/query/GetPersistentQueryPathLevel1Test.java Sat Jul  4 21:40:37 2009
@@ -40,7 +40,7 @@
     protected void setUp() throws Exception {
         isReadOnly = true;
         super.setUp();
-        session = helper.getReadOnlySession();
+        session = getHelper().getReadOnlySession();
         testRootNode = session.getRootNode().getNode(testPath);
     }
 

Modified: jackrabbit/trunk/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/query/GetPropertyNamesTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/query/GetPropertyNamesTest.java?rev=791180&r1=791179&r2=791180&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/query/GetPropertyNamesTest.java (original)
+++ jackrabbit/trunk/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/query/GetPropertyNamesTest.java Sat Jul  4 21:40:37 2009
@@ -45,7 +45,7 @@
     protected void setUp() throws Exception {
         isReadOnly = true;
         super.setUp();
-        session = helper.getReadOnlySession();
+        session = getHelper().getReadOnlySession();
         testRootNode = session.getRootNode().getNode(testPath);
     }
 

Modified: jackrabbit/trunk/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/query/GetStatementTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/query/GetStatementTest.java?rev=791180&r1=791179&r2=791180&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/query/GetStatementTest.java (original)
+++ jackrabbit/trunk/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/query/GetStatementTest.java Sat Jul  4 21:40:37 2009
@@ -39,7 +39,7 @@
     protected void setUp() throws Exception {
         isReadOnly = true;
         super.setUp();
-        session = helper.getReadOnlySession();
+        session = getHelper().getReadOnlySession();
         testRootNode = session.getRootNode().getNode(testPath);
     }
 

Modified: jackrabbit/trunk/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/query/GetSupportedQueryLanguagesTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/query/GetSupportedQueryLanguagesTest.java?rev=791180&r1=791179&r2=791180&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/query/GetSupportedQueryLanguagesTest.java (original)
+++ jackrabbit/trunk/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/query/GetSupportedQueryLanguagesTest.java Sat Jul  4 21:40:37 2009
@@ -43,7 +43,7 @@
     protected void setUp() throws Exception {
         isReadOnly = true;
         super.setUp();
-        session = helper.getReadOnlySession();
+        session = getHelper().getReadOnlySession();
         testRootNode = session.getRootNode().getNode(testPath);
     }
 

Modified: jackrabbit/trunk/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/query/PredicatesTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/query/PredicatesTest.java?rev=791180&r1=791179&r2=791180&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/query/PredicatesTest.java (original)
+++ jackrabbit/trunk/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/query/PredicatesTest.java Sat Jul  4 21:40:37 2009
@@ -55,7 +55,7 @@
     protected void setUp() throws Exception {
         isReadOnly = true;
         super.setUp();
-        session = helper.getReadOnlySession();
+        session = getHelper().getReadOnlySession();
         testRootNode = session.getRootNode().getNode(testPath);
 
         nodeTypeName = session.getRootNode().getPrimaryNodeType().getName();

Modified: jackrabbit/trunk/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/query/SQLJcrPathTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/query/SQLJcrPathTest.java?rev=791180&r1=791179&r2=791180&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/query/SQLJcrPathTest.java (original)
+++ jackrabbit/trunk/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/query/SQLJcrPathTest.java Sat Jul  4 21:40:37 2009
@@ -43,7 +43,7 @@
     protected void setUp() throws Exception {
         isReadOnly = true;
         super.setUp();
-        session = helper.getReadOnlySession();
+        session = getHelper().getReadOnlySession();
         testRootNode = session.getRootNode().getNode(testPath);
     }
 

Modified: jackrabbit/trunk/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/query/SQLPathTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/query/SQLPathTest.java?rev=791180&r1=791179&r2=791180&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/query/SQLPathTest.java (original)
+++ jackrabbit/trunk/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/query/SQLPathTest.java Sat Jul  4 21:40:37 2009
@@ -41,7 +41,7 @@
     protected void setUp() throws Exception {
         isReadOnly = true;
         super.setUp();
-        session = helper.getReadOnlySession();
+        session = getHelper().getReadOnlySession();
         // check precondition for this test
         if (testRootNode.hasNodes()) {
             for (NodeIterator it = testRootNode.getNodes(); it.hasNext();) {

Modified: jackrabbit/trunk/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/query/SaveTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/query/SaveTest.java?rev=791180&r1=791179&r2=791180&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/query/SaveTest.java (original)
+++ jackrabbit/trunk/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/query/SaveTest.java Sat Jul  4 21:40:37 2009
@@ -189,7 +189,7 @@
         testRootNode.save();
         lockable.lock(false, true);
 
-        Session readWrite = helper.getReadWriteSession();
+        Session readWrite = getHelper().getReadWriteSession();
         try {
             Query query = readWrite.getWorkspace().getQueryManager().createQuery(statement, Query.XPATH);
             query.storeAsNode(testRoot + "/" + nodeName1 + "/" + nodeName2);

Modified: jackrabbit/trunk/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/query/SimpleSelectionTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/query/SimpleSelectionTest.java?rev=791180&r1=791179&r2=791180&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/query/SimpleSelectionTest.java (original)
+++ jackrabbit/trunk/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/query/SimpleSelectionTest.java Sat Jul  4 21:40:37 2009
@@ -45,7 +45,7 @@
     protected void setUp() throws Exception {
         isReadOnly = true;
         super.setUp();
-        session = helper.getReadOnlySession();
+        session = getHelper().getReadOnlySession();
         testRootNode = session.getRootNode().getNode(testPath);
     }
 

Modified: jackrabbit/trunk/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/query/XPathJcrPathTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/query/XPathJcrPathTest.java?rev=791180&r1=791179&r2=791180&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/query/XPathJcrPathTest.java (original)
+++ jackrabbit/trunk/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/query/XPathJcrPathTest.java Sat Jul  4 21:40:37 2009
@@ -43,7 +43,7 @@
     protected void setUp() throws Exception {
         isReadOnly = true;
         super.setUp();
-        session = helper.getReadOnlySession();
+        session = getHelper().getReadOnlySession();
         testRootNode = session.getRootNode().getNode(testPath);
     }
 

Modified: jackrabbit/trunk/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/retention/HoldEffectTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/retention/HoldEffectTest.java?rev=791180&r1=791179&r2=791180&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/retention/HoldEffectTest.java (original)
+++ jackrabbit/trunk/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/retention/HoldEffectTest.java Sat Jul  4 21:40:37 2009
@@ -44,7 +44,7 @@
         childP = testRootNode.setProperty(propertyName1, v);
         superuser.save();
 
-        otherS = helper.getSuperuserSession();
+        otherS = getHelper().getSuperuserSession();
     }
 
     protected void tearDown() throws Exception {

Modified: jackrabbit/trunk/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/retention/HoldTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/retention/HoldTest.java?rev=791180&r1=791179&r2=791180&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/retention/HoldTest.java (original)
+++ jackrabbit/trunk/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/retention/HoldTest.java Sat Jul  4 21:40:37 2009
@@ -230,7 +230,7 @@
     }
 
     public void testReadOnlySession() throws NotExecutableException, RepositoryException {
-        javax.jcr.Session s = helper.getReadOnlySession();
+        javax.jcr.Session s = getHelper().getReadOnlySession();
         try {
             RetentionManager rmgr = getRetentionManager(s);
             try {
@@ -256,7 +256,7 @@
         List holdsBefore = Arrays.asList(retentionMgr.getHolds(child.getPath()));
 
         // get another session.
-        javax.jcr.Session otherS = helper.getSuperuserSession();
+        javax.jcr.Session otherS = getHelper().getSuperuserSession();
         try {
             RetentionManager rmgr = getRetentionManager(otherS);            
             rmgr.addHold(child.getPath(), getHoldName(), false);
@@ -284,7 +284,7 @@
         Hold h = retentionMgr.addHold(child.getPath(), getHoldName(), false);
         testRootNode.save();
 
-        javax.jcr.Session otherS = helper.getSuperuserSession();
+        javax.jcr.Session otherS = getHelper().getSuperuserSession();
         try {
             RetentionManager rmgr = getRetentionManager(otherS);
             Hold[] holds = rmgr.getHolds(child.getPath());
@@ -324,7 +324,7 @@
         child.checkin();
 
         // get another session.
-        javax.jcr.Session otherS = helper.getSuperuserSession();
+        javax.jcr.Session otherS = getHelper().getSuperuserSession();
         try {
             RetentionManager rmgr = getRetentionManager(otherS);
             rmgr.addHold(child.getPath(), getHoldName(), false);
@@ -356,7 +356,7 @@
         // checkin on the parent node make the hold-containing node checked-in.
         vn.checkin();
 
-        javax.jcr.Session otherS = helper.getSuperuserSession();
+        javax.jcr.Session otherS = getHelper().getSuperuserSession();
         try {
             RetentionManager rmgr = getRetentionManager(otherS);
             Hold[] holds = rmgr.getHolds(n.getPath());

Modified: jackrabbit/trunk/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/retention/RetentionPolicyEffectTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/retention/RetentionPolicyEffectTest.java?rev=791180&r1=791179&r2=791180&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/retention/RetentionPolicyEffectTest.java (original)
+++ jackrabbit/trunk/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/retention/RetentionPolicyEffectTest.java Sat Jul  4 21:40:37 2009
@@ -43,7 +43,7 @@
         childP = testRootNode.setProperty(propertyName1, v);
         superuser.save();
 
-        otherS = helper.getSuperuserSession();
+        otherS = getHelper().getSuperuserSession();
     }
 
     protected void tearDown() throws Exception {

Modified: jackrabbit/trunk/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/retention/RetentionPolicyTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/retention/RetentionPolicyTest.java?rev=791180&r1=791179&r2=791180&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/retention/RetentionPolicyTest.java (original)
+++ jackrabbit/trunk/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/retention/RetentionPolicyTest.java Sat Jul  4 21:40:37 2009
@@ -234,7 +234,7 @@
     }
 
     public void testReadOnlySession() throws NotExecutableException, RepositoryException {
-        Session s = helper.getReadOnlySession();
+        Session s = getHelper().getReadOnlySession();
         try {
             RetentionManager rmgr = getRetentionManager(s);
             try {
@@ -258,7 +258,7 @@
         String childPath = getLockedChildNode().getPath();
 
         // get another session.
-        Session otherS = helper.getSuperuserSession();
+        Session otherS = getHelper().getSuperuserSession();
         try {
             RetentionManager rmgr = getRetentionManager(otherS);
             rmgr.setRetentionPolicy(childPath, getApplicableRetentionPolicy());
@@ -282,7 +282,7 @@
         retentionMgr.setRetentionPolicy(childPath, getApplicableRetentionPolicy());
         testRootNode.save();
 
-        Session otherS = helper.getSuperuserSession();
+        Session otherS = getHelper().getSuperuserSession();
         try {
             RetentionManager rmgr = getRetentionManager(otherS);
             rmgr.removeRetentionPolicy(childPath);
@@ -318,7 +318,7 @@
         String childPath = child.getPath();
 
         // get another session.
-        Session otherS = helper.getSuperuserSession();
+        Session otherS = getHelper().getSuperuserSession();
         try {
             RetentionManager rmgr = getRetentionManager(otherS);
             rmgr.setRetentionPolicy(childPath, getApplicableRetentionPolicy());
@@ -347,7 +347,7 @@
         superuser.save();
         child.checkin();
 
-        Session otherS = helper.getSuperuserSession();
+        Session otherS = getHelper().getSuperuserSession();
         try {
             RetentionManager rmgr = getRetentionManager(otherS);
             rmgr.removeRetentionPolicy(child.getPath());
@@ -402,7 +402,7 @@
         Node childN = testRootNode.addNode(nodeName2);
         superuser.save();
 
-        Session otherS = helper.getSuperuserSession();
+        Session otherS = getHelper().getSuperuserSession();
         try {
             retentionMgr.setRetentionPolicy(testNodePath, getApplicableRetentionPolicy());
             superuser.save();

Modified: jackrabbit/trunk/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/security/AccessControlListTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/security/AccessControlListTest.java?rev=791180&r1=791179&r2=791180&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/security/AccessControlListTest.java (original)
+++ jackrabbit/trunk/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/security/AccessControlListTest.java Sat Jul  4 21:40:37 2009
@@ -70,7 +70,7 @@
                 throw new NotExecutableException("No supported privileges at absPath " + path);
             }
 
-            testPrincipal = helper.getKnownPrincipal(superuser);
+            testPrincipal = getHelper().getKnownPrincipal(superuser);
             
             // remember existing entries for test-principal -> later restore.
             privilegesToRestore = currentPrivileges(getList(acMgr, path), testPrincipal);
@@ -313,7 +313,7 @@
     public void testAddAccessControlEntryInvalidPrincipal() throws NotExecutableException, RepositoryException {
         checkCanModifyAc(path);
         try {
-            Principal invalidPrincipal = helper.getUnknownPrincipal(superuser);
+            Principal invalidPrincipal = getHelper().getUnknownPrincipal(superuser);
             AccessControlList acl = getList(acMgr, path);
             acl.addAccessControlEntry(invalidPrincipal, privs);
             fail("Adding an entry with an unknown principal must throw AccessControlException.");

Modified: jackrabbit/trunk/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/security/AccessControlPolicyTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/security/AccessControlPolicyTest.java?rev=791180&r1=791179&r2=791180&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/security/AccessControlPolicyTest.java (original)
+++ jackrabbit/trunk/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/security/AccessControlPolicyTest.java Sat Jul  4 21:40:37 2009
@@ -273,7 +273,7 @@
 
         Session s2 = null;
         try {
-            s2 = helper.getSuperuserSession();
+            s2 = getHelper().getSuperuserSession();
             List plcs = Arrays.asList(getAccessControlManager(s2).getPolicies(path));
             // TODO: check again if policies can be compared with equals!
             assertTrue("Policy must be visible to another superuser session.", plcs.contains(policy));

Modified: jackrabbit/trunk/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/security/RSessionAccessControlDiscoveryTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/security/RSessionAccessControlDiscoveryTest.java?rev=791180&r1=791179&r2=791180&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/security/RSessionAccessControlDiscoveryTest.java (original)
+++ jackrabbit/trunk/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/security/RSessionAccessControlDiscoveryTest.java Sat Jul  4 21:40:37 2009
@@ -40,7 +40,7 @@
     protected void setUp() throws Exception {
         super.setUp();
 
-        readOnlySession = helper.getReadOnlySession();
+        readOnlySession = getHelper().getReadOnlySession();
         testAcMgr = getAccessControlManager(readOnlySession);
         testPath = testRootNode.getPath();
     }

Modified: jackrabbit/trunk/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/security/RSessionAccessControlPolicyTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/security/RSessionAccessControlPolicyTest.java?rev=791180&r1=791179&r2=791180&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/security/RSessionAccessControlPolicyTest.java (original)
+++ jackrabbit/trunk/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/security/RSessionAccessControlPolicyTest.java Sat Jul  4 21:40:37 2009
@@ -45,7 +45,7 @@
         superuser.save();
         path = n.getPath();
 
-        readOnlySession = helper.getReadOnlySession();
+        readOnlySession = getHelper().getReadOnlySession();
         testAcMgr = getAccessControlManager(readOnlySession);
     }
 

Modified: jackrabbit/trunk/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/security/RSessionAccessControlTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/security/RSessionAccessControlTest.java?rev=791180&r1=791179&r2=791180&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/security/RSessionAccessControlTest.java (original)
+++ jackrabbit/trunk/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/security/RSessionAccessControlTest.java Sat Jul  4 21:40:37 2009
@@ -46,7 +46,7 @@
         testPropertyPath = p.getPath();
         testRootNode.save();
 
-        readOnlySession = helper.getReadOnlySession();
+        readOnlySession = getHelper().getReadOnlySession();
     }
 
     protected void tearDown() throws Exception {

Modified: jackrabbit/trunk/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/version/AbstractMergeTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/version/AbstractMergeTest.java?rev=791180&r1=791179&r2=791180&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/version/AbstractMergeTest.java (original)
+++ jackrabbit/trunk/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/version/AbstractMergeTest.java Sat Jul  4 21:40:37 2009
@@ -96,7 +96,7 @@
         }
 
         // initialise a new session on second workspace as superuser
-        superuserW2 = helper.getSuperuserSession(workspaceName);
+        superuserW2 = getHelper().getSuperuserSession(workspaceName);
 
         workspace = superuser.getWorkspace();
         workspaceW2 = superuserW2.getWorkspace();

Modified: jackrabbit/trunk/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/version/MergeNodeTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/version/MergeNodeTest.java?rev=791180&r1=791179&r2=791180&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/version/MergeNodeTest.java (original)
+++ jackrabbit/trunk/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/version/MergeNodeTest.java Sat Jul  4 21:40:37 2009
@@ -486,7 +486,7 @@
         // remove first slash of path to get rel path to root
         String pathRelToRoot = nodeToMerge.getPath().substring(1);
         // access node through another session to lock it
-        Session session2 = helper.getSuperuserSession();
+        Session session2 = getHelper().getSuperuserSession();
         try {
             Node node2 = session2.getRootNode().getNode(pathRelToRoot);
             node2.lock(false, false);
@@ -525,7 +525,7 @@
         // remove first slash of path to get rel path to root
         String pathRelToRoot = nodeToMerge.getPath().substring(1);
         // access node through another session to lock it
-        Session session2 = helper.getSuperuserSession();
+        Session session2 = getHelper().getSuperuserSession();
         try {
             Node node2 = session2.getRootNode().getNode(pathRelToRoot);
             node2.getSession().getWorkspace().getLockManager().lock(node2.getPath(), false, false, 60, "");

Modified: jackrabbit/trunk/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/version/VersionStorageTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/version/VersionStorageTest.java?rev=791180&r1=791179&r2=791180&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/version/VersionStorageTest.java (original)
+++ jackrabbit/trunk/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/version/VersionStorageTest.java Sat Jul  4 21:40:37 2009
@@ -63,7 +63,7 @@
      */
     public void testVersionStorageIdenticalAcrossAllWorkspaces() throws RepositoryException {
         // The superuser session for the second workspace
-        Session superuserW2 = helper.getSuperuserSession(workspaceName);
+        Session superuserW2 = getHelper().getSuperuserSession(workspaceName);
 
         try {
             // check path to version storage

Modified: jackrabbit/trunk/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/version/WorkspaceRestoreTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/version/WorkspaceRestoreTest.java?rev=791180&r1=791179&r2=791180&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/version/WorkspaceRestoreTest.java (original)
+++ jackrabbit/trunk/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/version/WorkspaceRestoreTest.java Sat Jul  4 21:40:37 2009
@@ -73,7 +73,7 @@
             fail("Failed to create a second versionable node: " + e.getMessage());
         }
         try {
-            wSuperuser = helper.getSuperuserSession(workspaceName);
+            wSuperuser = getHelper().getSuperuserSession(workspaceName);
         } catch (RepositoryException e) {
             fail("Failed to retrieve superuser session for second workspace '" + workspaceName + "': " + e.getMessage());
         }

Modified: jackrabbit/trunk/jackrabbit-jcr2spi/src/test/java/org/apache/jackrabbit/jcr2spi/ExternalModificationTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-jcr2spi/src/test/java/org/apache/jackrabbit/jcr2spi/ExternalModificationTest.java?rev=791180&r1=791179&r2=791180&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-jcr2spi/src/test/java/org/apache/jackrabbit/jcr2spi/ExternalModificationTest.java (original)
+++ jackrabbit/trunk/jackrabbit-jcr2spi/src/test/java/org/apache/jackrabbit/jcr2spi/ExternalModificationTest.java Sat Jul  4 21:40:37 2009
@@ -47,7 +47,7 @@
         refNode.addMixin(mixReferenceable);
         testRootNode.save();
 
-        testSession = helper.getReadWriteSession();
+        testSession = getHelper().getReadWriteSession();
     }
 
     protected void tearDown() throws Exception {

Modified: jackrabbit/trunk/jackrabbit-jcr2spi/src/test/java/org/apache/jackrabbit/jcr2spi/GetPropertyTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-jcr2spi/src/test/java/org/apache/jackrabbit/jcr2spi/GetPropertyTest.java?rev=791180&r1=791179&r2=791180&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-jcr2spi/src/test/java/org/apache/jackrabbit/jcr2spi/GetPropertyTest.java (original)
+++ jackrabbit/trunk/jackrabbit-jcr2spi/src/test/java/org/apache/jackrabbit/jcr2spi/GetPropertyTest.java Sat Jul  4 21:40:37 2009
@@ -56,7 +56,7 @@
 
         testRootNode.save();
 
-        readOnly = helper.getReadOnlySession();
+        readOnly = getHelper().getReadOnlySession();
     }
 
     protected void tearDown() throws Exception {
@@ -190,7 +190,7 @@
         Property p3 = sib3.setProperty(propertyName1, "sib3-prop");
         testRootNode.save();
 
-        Session s = helper.getReadWriteSession();
+        Session s = getHelper().getReadWriteSession();
         try {
             Node sibNode = (Node) s.getItem(sib2.getPath());
             sibNode.remove();
@@ -229,7 +229,7 @@
     }
 
     public void testGetPropertyOfRemovedAncestor() throws RepositoryException {
-        Session rw = helper.getReadWriteSession();
+        Session rw = getHelper().getReadWriteSession();
         try {
             // add modification to a property.
             Property p = (Property) rw.getItem(prop1Path);

Modified: jackrabbit/trunk/jackrabbit-jcr2spi/src/test/java/org/apache/jackrabbit/jcr2spi/HierarchyNodeTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-jcr2spi/src/test/java/org/apache/jackrabbit/jcr2spi/HierarchyNodeTest.java?rev=791180&r1=791179&r2=791180&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-jcr2spi/src/test/java/org/apache/jackrabbit/jcr2spi/HierarchyNodeTest.java (original)
+++ jackrabbit/trunk/jackrabbit-jcr2spi/src/test/java/org/apache/jackrabbit/jcr2spi/HierarchyNodeTest.java Sat Jul  4 21:40:37 2009
@@ -86,7 +86,7 @@
     }
 
     public void testGetProperties() throws RepositoryException {
-        Session readSession = helper.getReadOnlySession();
+        Session readSession = getHelper().getReadOnlySession();
         try {
             dump((Node) readSession.getItem(fileNode.getPath()));
         } finally {

Modified: jackrabbit/trunk/jackrabbit-jcr2spi/src/test/java/org/apache/jackrabbit/jcr2spi/IsSameTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-jcr2spi/src/test/java/org/apache/jackrabbit/jcr2spi/IsSameTest.java?rev=791180&r1=791179&r2=791180&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-jcr2spi/src/test/java/org/apache/jackrabbit/jcr2spi/IsSameTest.java (original)
+++ jackrabbit/trunk/jackrabbit-jcr2spi/src/test/java/org/apache/jackrabbit/jcr2spi/IsSameTest.java Sat Jul  4 21:40:37 2009
@@ -40,7 +40,7 @@
         testRootNode.save();
 
         // access same property through different session
-        Session otherSession = helper.getReadOnlySession();
+        Session otherSession = getHelper().getReadOnlySession();
         try {
             Property otherProperty = (Property) otherSession.getItem(p.getPath());
             assertTrue(p.isSame(otherProperty));
@@ -59,7 +59,7 @@
         p.setValue("someOtherValue");
 
         // access same property through different session
-        Session otherSession = helper.getReadOnlySession();
+        Session otherSession = getHelper().getReadOnlySession();
         try {
             Property otherProperty = (Property) otherSession.getItem(p.getPath());
             assertTrue(p.isSame(otherProperty));
@@ -78,7 +78,7 @@
         testRootNode.save();
 
         // access same property through different session
-        Session otherSession = helper.getReadOnlySession();
+        Session otherSession = getHelper().getReadOnlySession();
         try {
             Property otherProperty = (Property) otherSession.getItem(jcrData.getPath());
             assertTrue(jcrData.isSame(otherProperty));
@@ -97,7 +97,7 @@
         testRootNode.save();
 
         // access same property through different session
-        Session otherSession = helper.getReadOnlySession();
+        Session otherSession = getHelper().getReadOnlySession();
         try {
             Property otherProperty = (Property) otherSession.getItem(jcrData.getPath());
             assertTrue(n.getProperty("jcr:data").isSame(otherProperty));
@@ -116,7 +116,7 @@
         testRootNode.save();
 
         // access nt:resource node through different session
-        Session otherSession = helper.getReadOnlySession();
+        Session otherSession = getHelper().getReadOnlySession();
         try {
             Node otherNode = (Node) otherSession.getItem(n.getPath());
             assertTrue(n.isSame(otherNode));
@@ -135,7 +135,7 @@
         testRootNode.save();
 
         // access nt:resource node through different session
-        Session otherSession = helper.getReadOnlySession();
+        Session otherSession = getHelper().getReadOnlySession();
         try {
             Node otherNode = (Node) otherSession.getItem(n.getPath());
             assertTrue(otherNode.isSame(n));
@@ -169,7 +169,7 @@
         String destPath = testRootNode.getPath() + "/" + nodeName2;
         testRootNode.getSession().move(srcPath, destPath);
 
-        Session otherSession = helper.getReadOnlySession();
+        Session otherSession = getHelper().getReadOnlySession();
         try {
             Node otherNode = (Node) otherSession.getItem(srcPath);
             assertTrue(n.isSame(otherNode));
@@ -189,7 +189,7 @@
         String srcPath = n.getPath();
         String destPath = testRootNode.getPath() + "/" + nodeName2;
 
-        Session otherSession = helper.getReadOnlySession();
+        Session otherSession = getHelper().getReadOnlySession();
         try {
             Node otherNode = (Node) otherSession.getItem(srcPath);
 
@@ -212,7 +212,7 @@
         String srcPath = n.getPath();
         String destPath = testRootNode.getPath() + "/" + nodeName2;
 
-        Session otherSession = helper.getReadOnlySession();
+        Session otherSession = getHelper().getReadOnlySession();
         try {
             Node otherNode = (Node) otherSession.getItem(srcPath);
 
@@ -244,7 +244,7 @@
         n.addMixin(mixReferenceable);
         testRootNode.save();
 
-        Session otherSession = helper.getReadOnlySession();
+        Session otherSession = getHelper().getReadOnlySession();
         try {
             Node otherNode3 = (Node) otherSession.getItem(n3.getPath());
 
@@ -297,7 +297,7 @@
         Node n = testRootNode.addNode(nodeName1, testNodeType);
         Property p = n.setProperty(propertyName1, "anyValue");
 
-        Session s2 = helper.getReadWriteSession();
+        Session s2 = getHelper().getReadWriteSession();
         try {
             Node trn = (Node) s2.getItem(testRootNode.getPath());
             Node n2 = trn.addNode(nodeName1, testNodeType);

Modified: jackrabbit/trunk/jackrabbit-jcr2spi/src/test/java/org/apache/jackrabbit/jcr2spi/LoginTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-jcr2spi/src/test/java/org/apache/jackrabbit/jcr2spi/LoginTest.java?rev=791180&r1=791179&r2=791180&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-jcr2spi/src/test/java/org/apache/jackrabbit/jcr2spi/LoginTest.java (original)
+++ jackrabbit/trunk/jackrabbit-jcr2spi/src/test/java/org/apache/jackrabbit/jcr2spi/LoginTest.java Sat Jul  4 21:40:37 2009
@@ -29,7 +29,7 @@
     private static Logger log = LoggerFactory.getLogger(LoginTest.class);
 
     public void testNullLogin() throws RepositoryException {
-        Session s = helper.getRepository().login();
+        Session s = getHelper().getRepository().login();
         try {
             assertNotNull(s.getWorkspace().getName());
         } finally {
@@ -38,7 +38,7 @@
     }
 
     public void testNullWorkspaceLogin() throws RepositoryException {
-        Session s = helper.getRepository().login((String) null);
+        Session s = getHelper().getRepository().login((String) null);
         try {
             assertNotNull(s.getWorkspace().getName());
         } finally {
@@ -47,7 +47,7 @@
     }
 
     public void testNullCredentialsNullWorkspaceLogin() throws RepositoryException {
-        Session s = helper.getRepository().login(null, null);
+        Session s = getHelper().getRepository().login(null, null);
         try {
             assertNotNull(s.getWorkspace().getName());
         } finally {

Modified: jackrabbit/trunk/jackrabbit-jcr2spi/src/test/java/org/apache/jackrabbit/jcr2spi/MixinModificationTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-jcr2spi/src/test/java/org/apache/jackrabbit/jcr2spi/MixinModificationTest.java?rev=791180&r1=791179&r2=791180&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-jcr2spi/src/test/java/org/apache/jackrabbit/jcr2spi/MixinModificationTest.java (original)
+++ jackrabbit/trunk/jackrabbit-jcr2spi/src/test/java/org/apache/jackrabbit/jcr2spi/MixinModificationTest.java Sat Jul  4 21:40:37 2009
@@ -96,7 +96,7 @@
             throw new NotExecutableException();
         }
 
-        Session testSession = helper.getReadWriteSession();
+        Session testSession = getHelper().getReadWriteSession();
         try {
             Node n = (Node) testSession.getItem(nPath);
             String uuid = n.getUUID();

Modified: jackrabbit/trunk/jackrabbit-jcr2spi/src/test/java/org/apache/jackrabbit/jcr2spi/MoveCombinedTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-jcr2spi/src/test/java/org/apache/jackrabbit/jcr2spi/MoveCombinedTest.java?rev=791180&r1=791179&r2=791180&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-jcr2spi/src/test/java/org/apache/jackrabbit/jcr2spi/MoveCombinedTest.java (original)
+++ jackrabbit/trunk/jackrabbit-jcr2spi/src/test/java/org/apache/jackrabbit/jcr2spi/MoveCombinedTest.java Sat Jul  4 21:40:37 2009
@@ -33,7 +33,7 @@
 
     protected void setUp() throws Exception {
         super.setUp();
-        testSession = helper.getReadOnlySession();
+        testSession = getHelper().getReadOnlySession();
     }
 
     protected void tearDown() throws Exception {

Modified: jackrabbit/trunk/jackrabbit-jcr2spi/src/test/java/org/apache/jackrabbit/jcr2spi/MoveMultipleTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-jcr2spi/src/test/java/org/apache/jackrabbit/jcr2spi/MoveMultipleTest.java?rev=791180&r1=791179&r2=791180&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-jcr2spi/src/test/java/org/apache/jackrabbit/jcr2spi/MoveMultipleTest.java (original)
+++ jackrabbit/trunk/jackrabbit-jcr2spi/src/test/java/org/apache/jackrabbit/jcr2spi/MoveMultipleTest.java Sat Jul  4 21:40:37 2009
@@ -246,7 +246,7 @@
         Node childNode = moveNode.addNode(nodeName2, testNodeType);
         testRootNode.save();
 
-        Session otherSession = helper.getReadWriteSession();
+        Session otherSession = getHelper().getReadWriteSession();
         try {
             otherSession.move(originalPath, destinationPath);
             Node mv = (Node) otherSession.getItem(destinationPath);

Modified: jackrabbit/trunk/jackrabbit-jcr2spi/src/test/java/org/apache/jackrabbit/jcr2spi/MoveTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-jcr2spi/src/test/java/org/apache/jackrabbit/jcr2spi/MoveTest.java?rev=791180&r1=791179&r2=791180&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-jcr2spi/src/test/java/org/apache/jackrabbit/jcr2spi/MoveTest.java (original)
+++ jackrabbit/trunk/jackrabbit-jcr2spi/src/test/java/org/apache/jackrabbit/jcr2spi/MoveTest.java Sat Jul  4 21:40:37 2009
@@ -250,7 +250,7 @@
         }
 
         // TODO: fix 2.0 behaviour according to the OPTION_NODE_AND_PROPERTY_WITH_SAME_NAME_SUPPORTED descriptor
-        if ("1.0".equals(helper.getRepository().getDescriptor(Repository.SPEC_VERSION_DESC))) {
+        if ("1.0".equals(getHelper().getRepository().getDescriptor(Repository.SPEC_VERSION_DESC))) {
             try {
                 // move the node
                 doMove(moveNode.getPath(), destProperty.getPath());

Modified: jackrabbit/trunk/jackrabbit-jcr2spi/src/test/java/org/apache/jackrabbit/jcr2spi/MoveToNewTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-jcr2spi/src/test/java/org/apache/jackrabbit/jcr2spi/MoveToNewTest.java?rev=791180&r1=791179&r2=791180&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-jcr2spi/src/test/java/org/apache/jackrabbit/jcr2spi/MoveToNewTest.java (original)
+++ jackrabbit/trunk/jackrabbit-jcr2spi/src/test/java/org/apache/jackrabbit/jcr2spi/MoveToNewTest.java Sat Jul  4 21:40:37 2009
@@ -183,7 +183,7 @@
 
         testRootNode.save();
 
-        Session readOnly = helper.getReadOnlySession();
+        Session readOnly = getHelper().getReadOnlySession();
         try {
             Node trn = (Node) readOnly.getItem(testRootNode.getPath());
             NodeIterator it = trn.getNodes(nodeName1);

Modified: jackrabbit/trunk/jackrabbit-jcr2spi/src/test/java/org/apache/jackrabbit/jcr2spi/NodeOrderTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-jcr2spi/src/test/java/org/apache/jackrabbit/jcr2spi/NodeOrderTest.java?rev=791180&r1=791179&r2=791180&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-jcr2spi/src/test/java/org/apache/jackrabbit/jcr2spi/NodeOrderTest.java (original)
+++ jackrabbit/trunk/jackrabbit-jcr2spi/src/test/java/org/apache/jackrabbit/jcr2spi/NodeOrderTest.java Sat Jul  4 21:40:37 2009
@@ -85,7 +85,7 @@
      * <code>Session</code>.
      */
     public void testOrder2() throws RepositoryException {
-        Session another = helper.getReadOnlySession();
+        Session another = getHelper().getReadOnlySession();
         try {
             NodeIterator it = ((Node) another.getItem(testRootNode.getPath())).getNodes();
             checkOrder(it, children);
@@ -99,7 +99,7 @@
      * <code>Session</code> after having accessed some of the nodes individually.
      */
     public void testOrderAfterIndividualAccess() throws RepositoryException {
-        Session another = helper.getReadOnlySession();
+        Session another = getHelper().getReadOnlySession();
         try {
             Node n2 = (Node) another.getItem(children[2].getPath());
             Node n0 = (Node) another.getItem(children[0].getPath());
@@ -115,7 +115,7 @@
      * <code>Session</code> after having accessed some of the nodes individually.
      */
     public void testOrderAfterIndividualAccess2() throws RepositoryException {
-        Session another = helper.getReadOnlySession();
+        Session another = getHelper().getReadOnlySession();
         try {
             Node n2 = (Node) another.getItem(children[3].getPath());
             Node n3 = (Node) another.getItem(children[1].getPath());

Modified: jackrabbit/trunk/jackrabbit-jcr2spi/src/test/java/org/apache/jackrabbit/jcr2spi/RefreshMovedTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-jcr2spi/src/test/java/org/apache/jackrabbit/jcr2spi/RefreshMovedTest.java?rev=791180&r1=791179&r2=791180&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-jcr2spi/src/test/java/org/apache/jackrabbit/jcr2spi/RefreshMovedTest.java (original)
+++ jackrabbit/trunk/jackrabbit-jcr2spi/src/test/java/org/apache/jackrabbit/jcr2spi/RefreshMovedTest.java Sat Jul  4 21:40:37 2009
@@ -79,7 +79,7 @@
      * @throws RepositoryException
      */
     public void testRefreshOtherSession() throws RepositoryException {
-        Session readSession = helper.getReadOnlySession();
+        Session readSession = getHelper().getReadOnlySession();
         try {
             Node anotherNode = (Node) readSession.getItem(srcPath);
             // workspace move

Modified: jackrabbit/trunk/jackrabbit-jcr2spi/src/test/java/org/apache/jackrabbit/jcr2spi/RemoveNodeTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-jcr2spi/src/test/java/org/apache/jackrabbit/jcr2spi/RemoveNodeTest.java?rev=791180&r1=791179&r2=791180&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-jcr2spi/src/test/java/org/apache/jackrabbit/jcr2spi/RemoveNodeTest.java (original)
+++ jackrabbit/trunk/jackrabbit-jcr2spi/src/test/java/org/apache/jackrabbit/jcr2spi/RemoveNodeTest.java Sat Jul  4 21:40:37 2009
@@ -127,7 +127,7 @@
         superuser.save();
 
         // get the node with session 2
-        Session otherSession = helper.getReadWriteSession();
+        Session otherSession = getHelper().getReadWriteSession();
         try {
             Node childNode2 = (Node) otherSession.getItem(childNode.getPath());
 

Modified: jackrabbit/trunk/jackrabbit-jcr2spi/src/test/java/org/apache/jackrabbit/jcr2spi/ReorderTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-jcr2spi/src/test/java/org/apache/jackrabbit/jcr2spi/ReorderTest.java?rev=791180&r1=791179&r2=791180&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-jcr2spi/src/test/java/org/apache/jackrabbit/jcr2spi/ReorderTest.java (original)
+++ jackrabbit/trunk/jackrabbit-jcr2spi/src/test/java/org/apache/jackrabbit/jcr2spi/ReorderTest.java Sat Jul  4 21:40:37 2009
@@ -134,7 +134,7 @@
         testRootNode.orderBefore(getRelPath(child3), getRelPath(child1));
         testRootNode.save();
 
-        Session otherSession = helper.getReadOnlySession();
+        Session otherSession = getHelper().getReadOnlySession();
         try {
             testOrder((Node) otherSession.getItem(testRootNode.getPath()), new Node[] {child3, child1, child2, child4});
         } finally {

Modified: jackrabbit/trunk/jackrabbit-jcr2spi/src/test/java/org/apache/jackrabbit/jcr2spi/SNSIndexTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-jcr2spi/src/test/java/org/apache/jackrabbit/jcr2spi/SNSIndexTest.java?rev=791180&r1=791179&r2=791180&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-jcr2spi/src/test/java/org/apache/jackrabbit/jcr2spi/SNSIndexTest.java (original)
+++ jackrabbit/trunk/jackrabbit-jcr2spi/src/test/java/org/apache/jackrabbit/jcr2spi/SNSIndexTest.java Sat Jul  4 21:40:37 2009
@@ -86,7 +86,7 @@
      * by another session.
      */
     public void testIndexByOtherSession() throws RepositoryException {
-        Session otherSession = helper.getReadOnlySession();
+        Session otherSession = getHelper().getReadOnlySession();
         try {
             for (int index = Path.INDEX_DEFAULT; index < 4; index++) {
                 Node sns = (Node) otherSession.getItem(buildPath(index));
@@ -123,7 +123,7 @@
      * without loading SNSs with lower index before
      */
     public void testNodeEntriesFilledCorrectly() throws RepositoryException {
-        Session otherSession = helper.getReadOnlySession();
+        Session otherSession = getHelper().getReadOnlySession();
         try {
             Node sns = (Node) otherSession.getItem(buildPath(3));
             checkIndex(sns, 3);
@@ -168,7 +168,7 @@
      * Test if accessing the created nodes by name really returns all nodes.
      */
     public void testGetNodesByNameByOtherSession() throws RepositoryException {
-        Session otherSession = helper.getReadOnlySession();
+        Session otherSession = getHelper().getReadOnlySession();
         try {
             NodeIterator it = ((Node) otherSession.getItem(parent.getPath())).getNodes(snsName);
             long size = it.getSize();

Modified: jackrabbit/trunk/jackrabbit-jcr2spi/src/test/java/org/apache/jackrabbit/jcr2spi/UpdateTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-jcr2spi/src/test/java/org/apache/jackrabbit/jcr2spi/UpdateTest.java?rev=791180&r1=791179&r2=791180&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-jcr2spi/src/test/java/org/apache/jackrabbit/jcr2spi/UpdateTest.java (original)
+++ jackrabbit/trunk/jackrabbit-jcr2spi/src/test/java/org/apache/jackrabbit/jcr2spi/UpdateTest.java Sat Jul  4 21:40:37 2009
@@ -67,7 +67,7 @@
         testRootNode.save();
 
         String srcWorkspace = null;
-        String wspName = helper.getProperty("org.apache.jackrabbit.jcr2spi.workspace2.name");
+        String wspName = getHelper().getProperty("org.apache.jackrabbit.jcr2spi.workspace2.name");
         if (wspName == null) {
             throw new NotExecutableException("Cannot run update. Missing config param.");
         }
@@ -153,7 +153,7 @@
 
         String srcWorkspace = getAnotherWorkspace();
         // get the root node in the second workspace
-        Session session2 = helper.getSuperuserSession(srcWorkspace);
+        Session session2 = getHelper().getSuperuserSession(srcWorkspace);
         try {
             // make sure the source-session has the corresponding node.
             Node testRootW2 = (Node) session2.getItem(testRootNode.getCorrespondingNodePath(srcWorkspace));
@@ -178,7 +178,7 @@
     public void testUpdateAddsMissingSubtree() throws RepositoryException, NotExecutableException {
         String srcWorkspace = getAnotherWorkspace();
         // get the root node in the second workspace
-        Session session2 = helper.getSuperuserSession(srcWorkspace);
+        Session session2 = getHelper().getSuperuserSession(srcWorkspace);
         try {
             // make sure the source-session has the corresponding node.
             Node testRootW2 = (Node) session2.getItem(testRootNode.getCorrespondingNodePath(srcWorkspace));
@@ -209,7 +209,7 @@
     }
 
     private String getAnotherWorkspace() throws NotExecutableException, RepositoryException {
-        String srcWorkspace = helper.getProperty("org.apache.jackrabbit.jcr2spi.workspace2.name");;
+        String srcWorkspace = getHelper().getProperty("org.apache.jackrabbit.jcr2spi.workspace2.name");;
         if (srcWorkspace == null || srcWorkspace.equals(currentWorkspace)) {
             throw new NotExecutableException("no alternative workspace configured");
         }

Modified: jackrabbit/trunk/jackrabbit-jcr2spi/src/test/java/org/apache/jackrabbit/jcr2spi/WorkspaceMoveTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-jcr2spi/src/test/java/org/apache/jackrabbit/jcr2spi/WorkspaceMoveTest.java?rev=791180&r1=791179&r2=791180&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-jcr2spi/src/test/java/org/apache/jackrabbit/jcr2spi/WorkspaceMoveTest.java (original)
+++ jackrabbit/trunk/jackrabbit-jcr2spi/src/test/java/org/apache/jackrabbit/jcr2spi/WorkspaceMoveTest.java Sat Jul  4 21:40:37 2009
@@ -58,7 +58,7 @@
         }
 
         // TODO: fix 2.0 behaviour according to the OPTION_NODE_AND_PROPERTY_WITH_SAME_NAME_SUPPORTED descriptor
-        if ("1.0".equals(helper.getRepository().getDescriptor(Repository.SPEC_VERSION_DESC))) {
+        if ("1.0".equals(getHelper().getRepository().getDescriptor(Repository.SPEC_VERSION_DESC))) {
             try {
                 // move the node
                 doMove(moveNode.getPath(), destProperty.getPath());
@@ -85,7 +85,7 @@
         // TODO: fix 2.0 behaviour according to the OPTION_NODE_AND_PROPERTY_WITH_SAME_NAME_SUPPORTED descriptor        
         // workspace-move the node (must succeed)
         doMove(moveNode.getPath(), destProperty.getPath());
-         if ("1.0".equals(helper.getRepository().getDescriptor(Repository.SPEC_VERSION_DESC))) {
+         if ("1.0".equals(getHelper().getRepository().getDescriptor(Repository.SPEC_VERSION_DESC))) {
              try {
                  // saving transient new property must fail
                  destParentNode.save();

Modified: jackrabbit/trunk/jackrabbit-jcr2spi/src/test/java/org/apache/jackrabbit/jcr2spi/lock/AbstractLockTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-jcr2spi/src/test/java/org/apache/jackrabbit/jcr2spi/lock/AbstractLockTest.java?rev=791180&r1=791179&r2=791180&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-jcr2spi/src/test/java/org/apache/jackrabbit/jcr2spi/lock/AbstractLockTest.java (original)
+++ jackrabbit/trunk/jackrabbit-jcr2spi/src/test/java/org/apache/jackrabbit/jcr2spi/lock/AbstractLockTest.java Sat Jul  4 21:40:37 2009
@@ -46,7 +46,7 @@
     protected void setUp() throws Exception {
         super.setUp();
 
-        otherSession = helper.getSuperuserSession();
+        otherSession = getHelper().getSuperuserSession();
 
         lockedNode = testRootNode.addNode(nodeName1, testNodeType);
         lockedNode.addMixin(mixLockable);

Modified: jackrabbit/trunk/jackrabbit-jcr2spi/src/test/java/org/apache/jackrabbit/jcr2spi/lock/DeepLockTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-jcr2spi/src/test/java/org/apache/jackrabbit/jcr2spi/lock/DeepLockTest.java?rev=791180&r1=791179&r2=791180&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-jcr2spi/src/test/java/org/apache/jackrabbit/jcr2spi/lock/DeepLockTest.java (original)
+++ jackrabbit/trunk/jackrabbit-jcr2spi/src/test/java/org/apache/jackrabbit/jcr2spi/lock/DeepLockTest.java Sat Jul  4 21:40:37 2009
@@ -145,7 +145,7 @@
     }
 
     public void testRemoveLockedChild() throws RepositoryException {
-        Session otherSession = helper.getReadWriteSession();
+        Session otherSession = getHelper().getReadWriteSession();
         try {
             Node child = (Node) otherSession.getItem(childNode.getPath());
             child.remove();

Modified: jackrabbit/trunk/jackrabbit-jcr2spi/src/test/java/org/apache/jackrabbit/jcr2spi/name/NamespaceRegistryTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-jcr2spi/src/test/java/org/apache/jackrabbit/jcr2spi/name/NamespaceRegistryTest.java?rev=791180&r1=791179&r2=791180&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-jcr2spi/src/test/java/org/apache/jackrabbit/jcr2spi/name/NamespaceRegistryTest.java (original)
+++ jackrabbit/trunk/jackrabbit-jcr2spi/src/test/java/org/apache/jackrabbit/jcr2spi/name/NamespaceRegistryTest.java Sat Jul  4 21:40:37 2009
@@ -72,7 +72,7 @@
      * @throws RepositoryException
      */
     public void testRegisteredNamespaceVisibility() throws RepositoryException {
-        Session otherSession = helper.getReadOnlySession();
+        Session otherSession = getHelper().getReadOnlySession();
         try {
             NamespaceRegistry other = otherSession.getWorkspace().getNamespaceRegistry();
 
@@ -111,7 +111,7 @@
      * @throws RepositoryException
      */
     public void testReRegisteredNamespace2() throws RepositoryException {
-        Session otherSession = helper.getReadOnlySession();
+        Session otherSession = getHelper().getReadOnlySession();
         try {
             NamespaceRegistry other = otherSession.getWorkspace().getNamespaceRegistry();
 
@@ -135,7 +135,7 @@
      * @throws RepositoryException
      */
     public void testReRegisteredNamespaceVisibility() throws RepositoryException {
-        Session otherSession = helper.getReadOnlySession();
+        Session otherSession = getHelper().getReadOnlySession();
         try {
             NamespaceRegistry other = otherSession.getWorkspace().getNamespaceRegistry();
 
@@ -169,7 +169,7 @@
         String prefix = getUnusedPrefix();
         String uri = getUnusedURI();
 
-        Session otherSession = helper.getReadOnlySession();
+        Session otherSession = getHelper().getReadOnlySession();
         try {
             NamespaceRegistry other = otherSession.getWorkspace().getNamespaceRegistry();
 

Modified: jackrabbit/trunk/jackrabbit-spi2jcr/src/test/java/org/apache/jackrabbit/spi2jcr/ServiceStubImpl.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-spi2jcr/src/test/java/org/apache/jackrabbit/spi2jcr/ServiceStubImpl.java?rev=791180&r1=791179&r2=791180&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-spi2jcr/src/test/java/org/apache/jackrabbit/spi2jcr/ServiceStubImpl.java (original)
+++ jackrabbit/trunk/jackrabbit-spi2jcr/src/test/java/org/apache/jackrabbit/spi2jcr/ServiceStubImpl.java Sat Jul  4 21:40:37 2009
@@ -17,6 +17,7 @@
 package org.apache.jackrabbit.spi2jcr;
 
 import java.util.Properties;
+import java.util.Collections;
 
 import javax.jcr.Credentials;
 import javax.jcr.Repository;
@@ -25,7 +26,8 @@
 
 import org.apache.jackrabbit.spi.RepositoryService;
 import org.apache.jackrabbit.spi.RepositoryServiceStub;
-import org.apache.jackrabbit.test.AbstractJCRTest;
+import org.apache.jackrabbit.test.RepositoryStubException;
+import org.apache.jackrabbit.test.RepositoryStub;
 
 /** <code>ServiceStubImpl</code>... */
 public class ServiceStubImpl extends RepositoryServiceStub {
@@ -45,7 +47,12 @@
 
     public RepositoryService getRepositoryService() throws RepositoryException {
         if (service == null) {
-            Repository repository = AbstractJCRTest.helper.getRepository();
+            Repository repository;
+            try {
+                repository = RepositoryStub.getInstance(Collections.EMPTY_MAP).getRepository();
+            } catch (RepositoryStubException e) {
+                throw new RepositoryException(e);
+            }
             service = new RepositoryServiceImpl(repository, new BatchReadConfig());
         }
         return service;

Modified: jackrabbit/trunk/jackrabbit-spi2jcr/src/test/resources/repositoryStubImpl.properties
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-spi2jcr/src/test/resources/repositoryStubImpl.properties?rev=791180&r1=791179&r2=791180&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-spi2jcr/src/test/resources/repositoryStubImpl.properties (original)
+++ jackrabbit/trunk/jackrabbit-spi2jcr/src/test/resources/repositoryStubImpl.properties Sat Jul  4 21:40:37 2009
@@ -22,6 +22,9 @@
 # Use this stub implementation for testing Jackrabbit-Core without intermediate SPI
 # javax.jcr.tck.repository_stub_impl=org.apache.jackrabbit.spi2jcr.DefaultRepositoryStub
 
+# the repository home
+org.apache.jackrabbit.repository.home=target/repository
+
 # the repository configuration
 org.apache.jackrabbit.repository.config=target/test-classes/repository.xml
 



Mime
View raw message