jackrabbit-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From resc...@apache.org
Subject svn commit: r1342615 - in /jackrabbit/branches/2.4: ./ jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/security/ jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/version/ jackrabbit-jcr-tests/src/main/java/org/apache/...
Date Fri, 25 May 2012 13:26:48 GMT
Author: reschke
Date: Fri May 25 13:26:47 2012
New Revision: 1342615

URL: http://svn.apache.org/viewvc?rev=1342615&view=rev
Log:
JCR-3300: backport various changes that make the TCK check the relevant repository descriptors
(to 2.4)

Modified:
    jackrabbit/branches/2.4/   (props changed)
    jackrabbit/branches/2.4/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/security/RSessionAccessControlTest.java
    jackrabbit/branches/2.4/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/version/AbstractMergeTest.java
    jackrabbit/branches/2.4/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/version/AbstractVersionTest.java
    jackrabbit/branches/2.4/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/version/CopyTest.java
    jackrabbit/branches/2.4/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/version/GetReferencesNodeTest.java
    jackrabbit/branches/2.4/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/version/simple/AbstractVersionTest.java

Propchange: jackrabbit/branches/2.4/
------------------------------------------------------------------------------
  Merged /jackrabbit/trunk:r1334998,1335017,1335030

Modified: jackrabbit/branches/2.4/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/security/RSessionAccessControlTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/branches/2.4/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/security/RSessionAccessControlTest.java?rev=1342615&r1=1342614&r2=1342615&view=diff
==============================================================================
--- jackrabbit/branches/2.4/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/security/RSessionAccessControlTest.java
(original)
+++ jackrabbit/branches/2.4/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/security/RSessionAccessControlTest.java
Fri May 25 13:26:47 2012
@@ -23,13 +23,12 @@ import javax.jcr.RepositoryException;
 import javax.jcr.Session;
 import javax.jcr.Value;
 
-import org.apache.jackrabbit.test.AbstractJCRTest;
 import org.apache.jackrabbit.test.RepositoryStub;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 /** <code>RSessionAccessControlTest</code>... */
-public class RSessionAccessControlTest extends AbstractJCRTest {
+public class RSessionAccessControlTest extends AbstractAccessControlTest {
 
     private static Logger log = LoggerFactory.getLogger(RSessionAccessControlTest.class);
 

Modified: jackrabbit/branches/2.4/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/version/AbstractMergeTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/branches/2.4/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/version/AbstractMergeTest.java?rev=1342615&r1=1342614&r2=1342615&view=diff
==============================================================================
--- jackrabbit/branches/2.4/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/version/AbstractMergeTest.java
(original)
+++ jackrabbit/branches/2.4/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/version/AbstractMergeTest.java
Fri May 25 13:26:47 2012
@@ -17,6 +17,7 @@
 package org.apache.jackrabbit.test.api.version;
 
 import javax.jcr.Node;
+import javax.jcr.Repository;
 import javax.jcr.RepositoryException;
 import javax.jcr.Session;
 import javax.jcr.Workspace;
@@ -71,6 +72,8 @@ public abstract class AbstractMergeTest 
     protected void setUp() throws Exception {
         super.setUp();
 
+        super.checkSupportedOption(Repository.OPTION_VERSIONING_SUPPORTED);
+
         NodeTypeManager ntm = superuser.getWorkspace().getNodeTypeManager();
 
         // versionable node type

Modified: jackrabbit/branches/2.4/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/version/AbstractVersionTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/branches/2.4/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/version/AbstractVersionTest.java?rev=1342615&r1=1342614&r2=1342615&view=diff
==============================================================================
--- jackrabbit/branches/2.4/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/version/AbstractVersionTest.java
(original)
+++ jackrabbit/branches/2.4/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/version/AbstractVersionTest.java
Fri May 25 13:26:47 2012
@@ -23,6 +23,7 @@ import javax.jcr.nodetype.NodeTypeManage
 import javax.jcr.nodetype.NoSuchNodeTypeException;
 import javax.jcr.nodetype.NodeType;
 import javax.jcr.Node;
+import javax.jcr.Repository;
 import javax.jcr.RepositoryException;
 import javax.jcr.version.VersionHistory;
 
@@ -43,6 +44,8 @@ public class AbstractVersionTest extends
     protected void setUp() throws Exception {
         super.setUp();
 
+        super.checkSupportedOption(Repository.OPTION_VERSIONING_SUPPORTED);
+
         NodeTypeManager ntMgr = superuser.getWorkspace().getNodeTypeManager();
 
         // assert that this repository support versioning

Modified: jackrabbit/branches/2.4/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/version/CopyTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/branches/2.4/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/version/CopyTest.java?rev=1342615&r1=1342614&r2=1342615&view=diff
==============================================================================
--- jackrabbit/branches/2.4/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/version/CopyTest.java
(original)
+++ jackrabbit/branches/2.4/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/version/CopyTest.java
Fri May 25 13:26:47 2012
@@ -23,8 +23,6 @@ import javax.jcr.version.VersionHistory;
 import javax.jcr.version.VersionManager;
 import javax.jcr.version.Version;
 
-import org.apache.jackrabbit.test.api.version.simple.AbstractVersionTest;
-
 /**
  * <code>CopyTest</code> checks if full versionable nodes are copied correctly:
  *

Modified: jackrabbit/branches/2.4/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/version/GetReferencesNodeTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/branches/2.4/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/version/GetReferencesNodeTest.java?rev=1342615&r1=1342614&r2=1342615&view=diff
==============================================================================
--- jackrabbit/branches/2.4/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/version/GetReferencesNodeTest.java
(original)
+++ jackrabbit/branches/2.4/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/version/GetReferencesNodeTest.java
Fri May 25 13:26:47 2012
@@ -19,6 +19,7 @@ package org.apache.jackrabbit.test.api.v
 import javax.jcr.Node;
 import javax.jcr.PropertyIterator;
 import javax.jcr.PropertyType;
+import javax.jcr.Repository;
 import javax.jcr.RepositoryException;
 
 import org.apache.jackrabbit.test.AbstractJCRTest;
@@ -51,6 +52,8 @@ public class GetReferencesNodeTest exten
     protected void setUp() throws Exception {
         super.setUp();
 
+        super.checkSupportedOption(Repository.OPTION_VERSIONING_SUPPORTED);
+
         versionableNodeType = getProperty(PROP_VERSIONABLE_NODE_TYPE);
         if (versionableNodeType == null) {
             fail("Property '" + PROP_VERSIONABLE_NODE_TYPE + "' is not defined.");

Modified: jackrabbit/branches/2.4/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/version/simple/AbstractVersionTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/branches/2.4/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/version/simple/AbstractVersionTest.java?rev=1342615&r1=1342614&r2=1342615&view=diff
==============================================================================
--- jackrabbit/branches/2.4/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/version/simple/AbstractVersionTest.java
(original)
+++ jackrabbit/branches/2.4/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/version/simple/AbstractVersionTest.java
Fri May 25 13:26:47 2012
@@ -17,6 +17,7 @@
 package org.apache.jackrabbit.test.api.version.simple;
 
 import javax.jcr.Node;
+import javax.jcr.Repository;
 import javax.jcr.RepositoryException;
 import javax.jcr.nodetype.NoSuchNodeTypeException;
 import javax.jcr.nodetype.NodeType;
@@ -43,6 +44,8 @@ public class AbstractVersionTest extends
     protected void setUp() throws Exception {
         super.setUp();
 
+        super.checkSupportedOption(Repository.OPTION_SIMPLE_VERSIONING_SUPPORTED);
+
         NodeTypeManager ntMgr = superuser.getWorkspace().getNodeTypeManager();
 
         // assert that this repository support versioning



Mime
View raw message