Modified: jackrabbit/commons/ocm/trunk/src/test/java/org/apache/jackrabbit/ocm/manager/query/AnnotationMultiValueQueryTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/commons/ocm/trunk/src/test/java/org/apache/jackrabbit/ocm/manager/query/AnnotationMultiValueQueryTest.java?rev=1349031&r1=1349030&r2=1349031&view=diff
==============================================================================
--- jackrabbit/commons/ocm/trunk/src/test/java/org/apache/jackrabbit/ocm/manager/query/AnnotationMultiValueQueryTest.java (original)
+++ jackrabbit/commons/ocm/trunk/src/test/java/org/apache/jackrabbit/ocm/manager/query/AnnotationMultiValueQueryTest.java Mon Jun 11 21:43:27 2012
@@ -24,33 +24,20 @@ import javax.jcr.Session;
 import junit.framework.Test;
 import junit.framework.TestSuite;
 
-import org.apache.jackrabbit.ocm.AnnotationTestBase;
+import org.apache.jackrabbit.ocm.AnnotationRepositoryTestBase;
 import org.apache.jackrabbit.ocm.manager.ObjectContentManager;
-import org.apache.jackrabbit.ocm.manager.impl.ObjectContentManagerImpl;
 import org.apache.jackrabbit.ocm.query.Filter;
 import org.apache.jackrabbit.ocm.query.Query;
 import org.apache.jackrabbit.ocm.query.QueryManager;
 import org.apache.jackrabbit.ocm.testmodel.MultiValue;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 
 /**
  * Test NTCollectionConverterImpl
  *
  * @author <a href="mailto:christophe.lombart@sword-technologies.com">Christophe Lombart</a>
  */
-public class AnnotationMultiValueQueryTest extends AnnotationTestBase
+public class AnnotationMultiValueQueryTest extends AnnotationRepositoryTestBase
 {
-    private final static Logger log = LoggerFactory.getLogger(AnnotationMultiValueQueryTest.class);
-
-    /**
-     * <p>Defines the test case name for junit.</p>
-     * @param testName The test case name.
-     */
-    public AnnotationMultiValueQueryTest(String testName)  throws Exception
-    {
-        super(testName);
-    }
 
     public static Test suite()
     {
@@ -74,7 +61,7 @@ public class AnnotationMultiValueQueryTe
         try
         {
         	
-  	      QueryManager queryManager = this.getQueryManager();
+  	      QueryManager queryManager = getObjectContentManager().getQueryManager();
 	      Filter filter = queryManager.createFilter(MultiValue.class);
 	      filter.addEqualTo("multiValues", "Value1");
 	      Query query = queryManager.createQuery(filter);    	
@@ -82,7 +69,6 @@ public class AnnotationMultiValueQueryTe
 	      Collection result = ocm.getObjects(query);
 	      assertTrue("Invalid number of objects - should be = 3", result.size() == 3);
 
-  	      queryManager = this.getQueryManager();
 	      filter = queryManager.createFilter(MultiValue.class);
 	      filter.addEqualTo("multiValues", "Value9");
 	      query = queryManager.createQuery(filter);    	
@@ -108,9 +94,7 @@ public class AnnotationMultiValueQueryTe
         {
         	ObjectContentManager ocm = getObjectContentManager();
 
-			ObjectContentManagerImpl ocmImpl = (ObjectContentManagerImpl) ocm;
-			
-			Session session = ocmImpl.getSession();
+			Session session = ocm.getSession();
 			Node root = session.getRootNode();
 			root.addNode("test");
 

Modified: jackrabbit/commons/ocm/trunk/src/test/java/org/apache/jackrabbit/ocm/manager/query/AnnotationScopeQueryTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/commons/ocm/trunk/src/test/java/org/apache/jackrabbit/ocm/manager/query/AnnotationScopeQueryTest.java?rev=1349031&r1=1349030&r2=1349031&view=diff
==============================================================================
--- jackrabbit/commons/ocm/trunk/src/test/java/org/apache/jackrabbit/ocm/manager/query/AnnotationScopeQueryTest.java (original)
+++ jackrabbit/commons/ocm/trunk/src/test/java/org/apache/jackrabbit/ocm/manager/query/AnnotationScopeQueryTest.java Mon Jun 11 21:43:27 2012
@@ -25,17 +25,14 @@ import javax.jcr.Session;
 import junit.framework.Test;
 import junit.framework.TestSuite;
 
-import org.apache.jackrabbit.ocm.AnnotationTestBase;
+import org.apache.jackrabbit.ocm.AnnotationRepositoryTestBase;
 import org.apache.jackrabbit.ocm.exception.JcrMappingException;
 import org.apache.jackrabbit.ocm.manager.ObjectContentManager;
-import org.apache.jackrabbit.ocm.manager.impl.ObjectContentManagerImpl;
 import org.apache.jackrabbit.ocm.query.Filter;
 import org.apache.jackrabbit.ocm.query.Query;
 import org.apache.jackrabbit.ocm.query.QueryManager;
 import org.apache.jackrabbit.ocm.testmodel.Page;
 import org.apache.jackrabbit.ocm.testmodel.Paragraph;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 
 
 /**
@@ -43,18 +40,8 @@ import org.slf4j.LoggerFactory;
  *
  * @author <a href="mailto:christophe.lombart@sword-technologies.com">Christophe Lombart</a>
  */
-public class AnnotationScopeQueryTest extends AnnotationTestBase
+public class AnnotationScopeQueryTest extends AnnotationRepositoryTestBase
 {
-    private final static Logger log = LoggerFactory.getLogger(AnnotationScopeQueryTest.class);
-
-    /**
-     * <p>Defines the test case name for junit.</p>
-     * @param testName The test case name.
-     */
-    public AnnotationScopeQueryTest(String testName)  throws Exception
-    {
-        super(testName);
-    }
 
     public static Test suite()
     {
@@ -86,59 +73,48 @@ public class AnnotationScopeQueryTest ex
     	{
     		
               	
-    	      ObjectContentManager ocm = this.getObjectContentManager();
+    	      ObjectContentManager ocm = getObjectContentManager();
     	      // Search on subtree (test/node1)
-    	      QueryManager queryManager = this.getQueryManager();
+    	      QueryManager queryManager = ocm.getQueryManager();
     	      Filter filter = queryManager.createFilter(Paragraph.class);
     	      filter.setScope("/test/node1//");
-    	      Query query = queryManager.createQuery(filter);    	
-    	      ocm = this.getObjectContentManager();
+    	      Query query = queryManager.createQuery(filter);
     	      Collection result = ocm.getObjects(query);
     	      assertTrue("Invalid number of objects - should be = 8", result.size() == 8);
     	
-    	
-    	      queryManager = this.getQueryManager();
+
     	      filter = queryManager.createFilter(Paragraph.class);
     	      filter.setScope("/test//");
-    	      query = queryManager.createQuery(filter);    	
-    	      ocm = this.getObjectContentManager();
+    	      query = queryManager.createQuery(filter);
     	      result = ocm.getObjects(query);
     	      assertTrue("Invalid number of objects - should be = 16", result.size() == 16);
     	
     	      // Test on children
-    	      queryManager = this.getQueryManager();
     	      filter = queryManager.createFilter(Paragraph.class);
     	      filter.setScope("/test/");
-    	      query = queryManager.createQuery(filter);    	
-    	      ocm = this.getObjectContentManager();
+    	      query = queryManager.createQuery(filter);
     	      result = ocm.getObjects(query);
     	      assertTrue("Invalid number of objects - should be = 0", result.size() == 0);
     	
               // Search on scope and properties
-    	      queryManager = this.getQueryManager();
     	      filter = queryManager.createFilter(Paragraph.class);
     	      filter.setScope("/test//");
     	      filter.addEqualTo("text", "Para 1");
-    	      query = queryManager.createQuery(filter);    	
-    	      ocm = this.getObjectContentManager();
+    	      query = queryManager.createQuery(filter);
     	      result = ocm.getObjects(query);
     	      assertTrue("Invalid number of objects - should be = 3", result.size() == 3);
 
-    	
-    	      queryManager = this.getQueryManager();
+
     	      filter = queryManager.createFilter(Paragraph.class);
     	      filter.setScope("/test//");
     	      filter.addContains("text", "another");
-    	      query = queryManager.createQuery(filter);    	
-    	      ocm = this.getObjectContentManager();
+    	      query = queryManager.createQuery(filter);
     	      result = ocm.getObjects(query);
     	      assertTrue("Invalid number of objects - should be = 4", result.size() == 4);
-    	
-    	      queryManager = this.getQueryManager();
+
     	      filter = queryManager.createFilter(Page.class);
     	      filter.setScope("/test/node1/");    	
-    	      query = queryManager.createQuery(filter);    	
-    	      ocm = this.getObjectContentManager();
+    	      query = queryManager.createQuery(filter);
     	      result = ocm.getObjects(query);
     	      assertTrue("Invalid number of objects - should be = 2", result.size() == 2);
     	      assertTrue ("Invalid object in the collection" , this.contains(result, "/test/node1/page1", Page.class));
@@ -160,10 +136,8 @@ public class AnnotationScopeQueryTest ex
     	try
 		{
     		ObjectContentManager ocm = getObjectContentManager();
-        	
-			ObjectContentManagerImpl ocmImpl = (ObjectContentManagerImpl) ocm;
-			
-			Session session = ocmImpl.getSession();
+
+			Session session = ocm.getSession();
 			Node root = session.getRootNode();
 			root.addNode("test");
 			root.addNode("test/node1");

Modified: jackrabbit/commons/ocm/trunk/src/test/java/org/apache/jackrabbit/ocm/manager/query/AnnotationSimpleQueryTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/commons/ocm/trunk/src/test/java/org/apache/jackrabbit/ocm/manager/query/AnnotationSimpleQueryTest.java?rev=1349031&r1=1349030&r2=1349031&view=diff
==============================================================================
--- jackrabbit/commons/ocm/trunk/src/test/java/org/apache/jackrabbit/ocm/manager/query/AnnotationSimpleQueryTest.java (original)
+++ jackrabbit/commons/ocm/trunk/src/test/java/org/apache/jackrabbit/ocm/manager/query/AnnotationSimpleQueryTest.java Mon Jun 11 21:43:27 2012
@@ -22,7 +22,7 @@ import java.util.Collection;
 import junit.framework.Test;
 import junit.framework.TestSuite;
 
-import org.apache.jackrabbit.ocm.AnnotationTestBase;
+import org.apache.jackrabbit.ocm.AnnotationRepositoryTestBase;
 import org.apache.jackrabbit.ocm.exception.JcrMappingException;
 import org.apache.jackrabbit.ocm.manager.ObjectContentManager;
 import org.apache.jackrabbit.ocm.query.Filter;
@@ -30,8 +30,6 @@ import org.apache.jackrabbit.ocm.query.Q
 import org.apache.jackrabbit.ocm.query.QueryManager;
 import org.apache.jackrabbit.ocm.testmodel.Page;
 import org.apache.jackrabbit.ocm.testmodel.Paragraph;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 
 
 /**
@@ -39,18 +37,8 @@ import org.slf4j.LoggerFactory;
  *
  * @author <a href="mailto:christophe.lombart@sword-technologies.com">Christophe Lombart</a>
  */
-public class AnnotationSimpleQueryTest extends AnnotationTestBase
+public class AnnotationSimpleQueryTest extends AnnotationRepositoryTestBase
 {
-    private final static Logger log = LoggerFactory.getLogger(AnnotationSimpleQueryTest.class);
-
-    /**
-     * <p>Defines the test case name for junit.</p>
-     * @param testName The test case name.
-     */
-    public AnnotationSimpleQueryTest(String testName)  throws Exception
-    {
-        super(testName);
-    }
 
     public static Test suite()
     {
@@ -79,7 +67,7 @@ public class AnnotationSimpleQueryTest e
     	{
     		    		      		
     		  // Build the Query Object
-    	      QueryManager queryManager = this.getQueryManager();
+    	      QueryManager queryManager = getObjectContentManager().getQueryManager();
     	      Filter filter = queryManager.createFilter(Paragraph.class);
     	      filter.addEqualTo("text", "Para 1");    	          	
     	
@@ -111,7 +99,7 @@ public class AnnotationSimpleQueryTest e
     	{
     		    		      		
     		  // Build the Query Object
-    	      QueryManager queryManager = this.getQueryManager();
+    	      QueryManager queryManager = getObjectContentManager().getQueryManager();
     	      Filter filter = queryManager.createFilter(Paragraph.class);
     	      filter.addEqualTo("text", "Para 1");    	          	
     	      filter.setScope("/test/");
@@ -143,7 +131,7 @@ public class AnnotationSimpleQueryTest e
     	{
     		
     		  // Build the Query Object
-    	      QueryManager queryManager = this.getQueryManager();
+    	      QueryManager queryManager = getObjectContentManager().getQueryManager();
     	      Filter filter = queryManager.createFilter(Paragraph.class);
     	      filter.addLike("text", "Para%");    	          	
     	      filter.setScope("/test/");
@@ -181,7 +169,7 @@ public class AnnotationSimpleQueryTest e
     	{
     		
     		  // Build the Query Object
-    	      QueryManager queryManager = this.getQueryManager();
+    	      QueryManager queryManager = getObjectContentManager().getQueryManager();
     	      Filter filter1 = queryManager.createFilter(Paragraph.class);
     	      filter1.addEqualTo("text", "Para 1");    	
     	      filter1.setScope("/test/");
@@ -217,7 +205,7 @@ public class AnnotationSimpleQueryTest e
     	{
     		
     		  // Build the Query Object
-    	      QueryManager queryManager = this.getQueryManager();
+    	      QueryManager queryManager = getObjectContentManager().getQueryManager();
     	      Filter filter = queryManager.createFilter(Paragraph.class);
     	      filter.addLike("text", "Para%");    	          	
     	      filter.setScope("/test/");

Modified: jackrabbit/commons/ocm/trunk/src/test/java/org/apache/jackrabbit/ocm/manager/query/DigesterAtomicQueryTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/commons/ocm/trunk/src/test/java/org/apache/jackrabbit/ocm/manager/query/DigesterAtomicQueryTest.java?rev=1349031&r1=1349030&r2=1349031&view=diff
==============================================================================
--- jackrabbit/commons/ocm/trunk/src/test/java/org/apache/jackrabbit/ocm/manager/query/DigesterAtomicQueryTest.java (original)
+++ jackrabbit/commons/ocm/trunk/src/test/java/org/apache/jackrabbit/ocm/manager/query/DigesterAtomicQueryTest.java Mon Jun 11 21:43:27 2012
@@ -25,7 +25,7 @@ import java.util.Date;
 import junit.framework.Test;
 import junit.framework.TestSuite;
 
-import org.apache.jackrabbit.ocm.DigesterTestBase;
+import org.apache.jackrabbit.ocm.DigesterRepositoryTestBase;
 import org.apache.jackrabbit.ocm.manager.ObjectContentManager;
 import org.apache.jackrabbit.ocm.query.Filter;
 import org.apache.jackrabbit.ocm.query.Query;
@@ -39,20 +39,11 @@ import org.slf4j.LoggerFactory;
  *
  * @author <a href="mailto:christophe.lombart@sword-technologies.com">Christophe Lombart</a>
  */
-public class DigesterAtomicQueryTest extends DigesterTestBase
+public class DigesterAtomicQueryTest extends DigesterRepositoryTestBase
 {
 	private final static Logger log = LoggerFactory.getLogger(DigesterAtomicQueryTest.class);
 	private Date date = new Date();
 
-	/**
-	 * <p>Defines the test case name for junit.</p>
-	 * @param testName The test case name.
-	 */
-	public DigesterAtomicQueryTest(String testName) throws Exception
-	{
-		super(testName);
-
-	}
 
 	public static Test suite()
 	{
@@ -72,10 +63,10 @@ public class DigesterAtomicQueryTest ext
 		try
 		{
 
-			ObjectContentManager ocm = this.getObjectContentManager();
+			ObjectContentManager ocm = getObjectContentManager();
 
 			// Test Boolean value
-			QueryManager queryManager = this.getQueryManager();
+			QueryManager queryManager = ocm.getQueryManager();
 			Filter filter = queryManager.createFilter(Atomic.class);
 			filter.addEqualTo("booleanObject", new Boolean(true));
 			Query query = queryManager.createQuery(filter);
@@ -187,10 +178,10 @@ public class DigesterAtomicQueryTest ext
 
 	public void testQueryAtomicFieldsWithConverter()
 	{
-		ObjectContentManager ocm = this.getObjectContentManager();
+		ObjectContentManager ocm = getObjectContentManager();
 
 		// Test Boolean value
-		QueryManager queryManager = this.getQueryManager();
+		QueryManager queryManager = ocm.getQueryManager();
 		Filter filter = queryManager.createFilter(Atomic.class);
 		filter.addEqualTo("int2boolean", new Boolean(true));
 		Query query = queryManager.createQuery(filter);

Modified: jackrabbit/commons/ocm/trunk/src/test/java/org/apache/jackrabbit/ocm/manager/query/DigesterIteratorQueryTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/commons/ocm/trunk/src/test/java/org/apache/jackrabbit/ocm/manager/query/DigesterIteratorQueryTest.java?rev=1349031&r1=1349030&r2=1349031&view=diff
==============================================================================
--- jackrabbit/commons/ocm/trunk/src/test/java/org/apache/jackrabbit/ocm/manager/query/DigesterIteratorQueryTest.java (original)
+++ jackrabbit/commons/ocm/trunk/src/test/java/org/apache/jackrabbit/ocm/manager/query/DigesterIteratorQueryTest.java Mon Jun 11 21:43:27 2012
@@ -26,7 +26,7 @@ import javax.jcr.Session;
 import junit.framework.Test;
 import junit.framework.TestSuite;
 
-import org.apache.jackrabbit.ocm.DigesterTestBase;
+import org.apache.jackrabbit.ocm.DigesterRepositoryTestBase;
 import org.apache.jackrabbit.ocm.exception.JcrMappingException;
 import org.apache.jackrabbit.ocm.manager.ObjectContentManager;
 import org.apache.jackrabbit.ocm.manager.impl.ObjectContentManagerImpl;
@@ -44,19 +44,10 @@ import org.slf4j.LoggerFactory;
  *
  * @author <a href="mailto:christophe.lombart@sword-technologies.com">Christophe Lombart</a>
  */
-public class DigesterIteratorQueryTest extends DigesterTestBase
+public class DigesterIteratorQueryTest extends DigesterRepositoryTestBase
 {
     private final static Logger log = LoggerFactory.getLogger(DigesterIteratorQueryTest.class);
 
-    /**
-     * <p>Defines the test case name for junit.</p>
-     * @param testName The test case name.
-     */
-    public DigesterIteratorQueryTest(String testName)  throws Exception
-    {
-        super(testName);
-    }
-
     public static Test suite()
     {
         // All methods starting with "test" will be executed in the test suite.
@@ -85,7 +76,7 @@ public class DigesterIteratorQueryTest e
     	{
     		
     		  // No scope    		
-    	      QueryManager queryManager = this.getQueryManager();
+    	      QueryManager queryManager = getObjectContentManager().getQueryManager();
     	      Filter filter = queryManager.createFilter(Page.class);        	
     	      Query query = queryManager.createQuery(filter);    	
     	      ObjectContentManager ocm = this.getObjectContentManager();

Modified: jackrabbit/commons/ocm/trunk/src/test/java/org/apache/jackrabbit/ocm/manager/query/DigesterMultiValueQueryTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/commons/ocm/trunk/src/test/java/org/apache/jackrabbit/ocm/manager/query/DigesterMultiValueQueryTest.java?rev=1349031&r1=1349030&r2=1349031&view=diff
==============================================================================
--- jackrabbit/commons/ocm/trunk/src/test/java/org/apache/jackrabbit/ocm/manager/query/DigesterMultiValueQueryTest.java (original)
+++ jackrabbit/commons/ocm/trunk/src/test/java/org/apache/jackrabbit/ocm/manager/query/DigesterMultiValueQueryTest.java Mon Jun 11 21:43:27 2012
@@ -24,33 +24,21 @@ import javax.jcr.Session;
 import junit.framework.Test;
 import junit.framework.TestSuite;
 
-import org.apache.jackrabbit.ocm.DigesterTestBase;
+import org.apache.jackrabbit.ocm.DigesterRepositoryTestBase;
 import org.apache.jackrabbit.ocm.manager.ObjectContentManager;
-import org.apache.jackrabbit.ocm.manager.impl.ObjectContentManagerImpl;
 import org.apache.jackrabbit.ocm.query.Filter;
 import org.apache.jackrabbit.ocm.query.Query;
 import org.apache.jackrabbit.ocm.query.QueryManager;
 import org.apache.jackrabbit.ocm.testmodel.MultiValue;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 
 /**
  * Test NTCollectionConverterImpl
  *
  * @author <a href="mailto:christophe.lombart@sword-technologies.com">Christophe Lombart</a>
  */
-public class DigesterMultiValueQueryTest extends DigesterTestBase
+public class DigesterMultiValueQueryTest extends DigesterRepositoryTestBase
 {
-    private final static Logger log = LoggerFactory.getLogger(DigesterMultiValueQueryTest.class);
 
-    /**
-     * <p>Defines the test case name for junit.</p>
-     * @param testName The test case name.
-     */
-    public DigesterMultiValueQueryTest(String testName)  throws Exception
-    {
-        super(testName);
-    }
 
     public static Test suite()
     {
@@ -73,20 +61,18 @@ public class DigesterMultiValueQueryTest
     {
         try
         {
-        	
-  	      QueryManager queryManager = this.getQueryManager();
+          ObjectContentManager ocm = getObjectContentManager();
+  	      QueryManager queryManager = ocm.getQueryManager();
 	      Filter filter = queryManager.createFilter(MultiValue.class);
 	      filter.addEqualTo("multiValues", "Value1");
 	      Query query = queryManager.createQuery(filter);    	
-	      ObjectContentManager ocm = this.getObjectContentManager();
+
 	      Collection result = ocm.getObjects(query);
 	      assertTrue("Invalid number of objects - should be = 3", result.size() == 3);
 
-  	      queryManager = this.getQueryManager();
 	      filter = queryManager.createFilter(MultiValue.class);
 	      filter.addEqualTo("multiValues", "Value9");
-	      query = queryManager.createQuery(filter);    	
-	      ocm = this.getObjectContentManager();
+	      query = queryManager.createQuery(filter);
 	      result = ocm.getObjects(query);
 	      assertTrue("Invalid number of objects - should be = 1", result.size() == 1);
 	      MultiValue multiValue = (MultiValue)result.iterator().next();
@@ -107,10 +93,7 @@ public class DigesterMultiValueQueryTest
         try
         {
         	ObjectContentManager ocm = getObjectContentManager();
-
-			ObjectContentManagerImpl ocmImpl = (ObjectContentManagerImpl) ocm;
-			
-			Session session = ocmImpl.getSession();
+        	Session session = ocm.getSession();
 			Node root = session.getRootNode();
 			root.addNode("test");
 

Modified: jackrabbit/commons/ocm/trunk/src/test/java/org/apache/jackrabbit/ocm/manager/query/DigesterScopeQueryTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/commons/ocm/trunk/src/test/java/org/apache/jackrabbit/ocm/manager/query/DigesterScopeQueryTest.java?rev=1349031&r1=1349030&r2=1349031&view=diff
==============================================================================
--- jackrabbit/commons/ocm/trunk/src/test/java/org/apache/jackrabbit/ocm/manager/query/DigesterScopeQueryTest.java (original)
+++ jackrabbit/commons/ocm/trunk/src/test/java/org/apache/jackrabbit/ocm/manager/query/DigesterScopeQueryTest.java Mon Jun 11 21:43:27 2012
@@ -25,17 +25,14 @@ import javax.jcr.Session;
 import junit.framework.Test;
 import junit.framework.TestSuite;
 
-import org.apache.jackrabbit.ocm.DigesterTestBase;
+import org.apache.jackrabbit.ocm.DigesterRepositoryTestBase;
 import org.apache.jackrabbit.ocm.exception.JcrMappingException;
 import org.apache.jackrabbit.ocm.manager.ObjectContentManager;
-import org.apache.jackrabbit.ocm.manager.impl.ObjectContentManagerImpl;
 import org.apache.jackrabbit.ocm.query.Filter;
 import org.apache.jackrabbit.ocm.query.Query;
 import org.apache.jackrabbit.ocm.query.QueryManager;
 import org.apache.jackrabbit.ocm.testmodel.Page;
 import org.apache.jackrabbit.ocm.testmodel.Paragraph;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 
 
 /**
@@ -43,18 +40,8 @@ import org.slf4j.LoggerFactory;
  *
  * @author <a href="mailto:christophe.lombart@sword-technologies.com">Christophe Lombart</a>
  */
-public class DigesterScopeQueryTest extends DigesterTestBase
+public class DigesterScopeQueryTest extends DigesterRepositoryTestBase
 {
-    private final static Logger log = LoggerFactory.getLogger(DigesterScopeQueryTest.class);
-
-    /**
-     * <p>Defines the test case name for junit.</p>
-     * @param testName The test case name.
-     */
-    public DigesterScopeQueryTest(String testName)  throws Exception
-    {
-        super(testName);
-    }
 
     public static Test suite()
     {
@@ -88,57 +75,46 @@ public class DigesterScopeQueryTest exte
               	
     	      ObjectContentManager ocm = this.getObjectContentManager();
     	      // Search on subtree (test/node1)
-    	      QueryManager queryManager = this.getQueryManager();
+    	      QueryManager queryManager = ocm.getQueryManager();
     	      Filter filter = queryManager.createFilter(Paragraph.class);
     	      filter.setScope("/test/node1//");
-    	      Query query = queryManager.createQuery(filter);    	
-    	      ocm = this.getObjectContentManager();
+    	      Query query = queryManager.createQuery(filter);
     	      Collection result = ocm.getObjects(query);
     	      assertTrue("Invalid number of objects - should be = 8", result.size() == 8);
     	
-    	
-    	      queryManager = this.getQueryManager();
+
     	      filter = queryManager.createFilter(Paragraph.class);
     	      filter.setScope("/test//");
-    	      query = queryManager.createQuery(filter);    	
-    	      ocm = this.getObjectContentManager();
+    	      query = queryManager.createQuery(filter);
     	      result = ocm.getObjects(query);
     	      assertTrue("Invalid number of objects - should be = 16", result.size() == 16);
     	
     	      // Test on children
-    	      queryManager = this.getQueryManager();
     	      filter = queryManager.createFilter(Paragraph.class);
     	      filter.setScope("/test/");
-    	      query = queryManager.createQuery(filter);    	
-    	      ocm = this.getObjectContentManager();
+    	      query = queryManager.createQuery(filter);
     	      result = ocm.getObjects(query);
     	      assertTrue("Invalid number of objects - should be = 0", result.size() == 0);
     	
               // Search on scope and properties
-    	      queryManager = this.getQueryManager();
     	      filter = queryManager.createFilter(Paragraph.class);
     	      filter.setScope("/test//");
     	      filter.addEqualTo("text", "Para 1");
-    	      query = queryManager.createQuery(filter);    	
-    	      ocm = this.getObjectContentManager();
+    	      query = queryManager.createQuery(filter);
     	      result = ocm.getObjects(query);
     	      assertTrue("Invalid number of objects - should be = 3", result.size() == 3);
 
-    	
-    	      queryManager = this.getQueryManager();
+
     	      filter = queryManager.createFilter(Paragraph.class);
     	      filter.setScope("/test//");
     	      filter.addContains("text", "another");
-    	      query = queryManager.createQuery(filter);    	
-    	      ocm = this.getObjectContentManager();
+    	      query = queryManager.createQuery(filter);
     	      result = ocm.getObjects(query);
     	      assertTrue("Invalid number of objects - should be = 4", result.size() == 4);
-    	
-    	      queryManager = this.getQueryManager();
+
     	      filter = queryManager.createFilter(Page.class);
     	      filter.setScope("/test/node1/");    	
-    	      query = queryManager.createQuery(filter);    	
-    	      ocm = this.getObjectContentManager();
+    	      query = queryManager.createQuery(filter);
     	      result = ocm.getObjects(query);
     	      assertTrue("Invalid number of objects - should be = 2", result.size() == 2);
     	      assertTrue ("Invalid object in the collection" , this.contains(result, "/test/node1/page1", Page.class));
@@ -160,10 +136,8 @@ public class DigesterScopeQueryTest exte
     	try
 		{
     		ObjectContentManager ocm = getObjectContentManager();
-        	
-			ObjectContentManagerImpl ocmImpl = (ObjectContentManagerImpl) ocm;
-			
-			Session session = ocmImpl.getSession();
+
+			Session session = ocm.getSession();
 			Node root = session.getRootNode();
 			root.addNode("test");
 			root.addNode("test/node1");

Modified: jackrabbit/commons/ocm/trunk/src/test/java/org/apache/jackrabbit/ocm/manager/query/DigesterSimpleQueryTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/commons/ocm/trunk/src/test/java/org/apache/jackrabbit/ocm/manager/query/DigesterSimpleQueryTest.java?rev=1349031&r1=1349030&r2=1349031&view=diff
==============================================================================
--- jackrabbit/commons/ocm/trunk/src/test/java/org/apache/jackrabbit/ocm/manager/query/DigesterSimpleQueryTest.java (original)
+++ jackrabbit/commons/ocm/trunk/src/test/java/org/apache/jackrabbit/ocm/manager/query/DigesterSimpleQueryTest.java Mon Jun 11 21:43:27 2012
@@ -24,7 +24,7 @@ import javax.jcr.Node;
 import junit.framework.Test;
 import junit.framework.TestSuite;
 
-import org.apache.jackrabbit.ocm.DigesterTestBase;
+import org.apache.jackrabbit.ocm.DigesterRepositoryTestBase;
 import org.apache.jackrabbit.ocm.exception.JcrMappingException;
 import org.apache.jackrabbit.ocm.manager.ObjectContentManager;
 import org.apache.jackrabbit.ocm.query.Filter;
@@ -33,8 +33,6 @@ import org.apache.jackrabbit.ocm.query.Q
 import org.apache.jackrabbit.ocm.query.impl.QueryImpl;
 import org.apache.jackrabbit.ocm.testmodel.Page;
 import org.apache.jackrabbit.ocm.testmodel.Paragraph;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 
 /**
  * Test QueryManagerImpl Query methods
@@ -42,20 +40,8 @@ import org.slf4j.LoggerFactory;
  * @author <a href="mailto:christophe.lombart@sword-technologies.com">Christophe
  *         Lombart</a>
  */
-public class DigesterSimpleQueryTest extends DigesterTestBase {
-    private final static Logger log = LoggerFactory.getLogger(DigesterSimpleQueryTest.class);
+public class DigesterSimpleQueryTest extends DigesterRepositoryTestBase {
 
-    /**
-     * <p>
-     * Defines the test case name for junit.
-     * </p>
-     *
-     * @param testName
-     *            The test case name.
-     */
-    public DigesterSimpleQueryTest(String testName) throws Exception {
-        super(testName);
-    }
 
     public static Test suite() {
         // All methods starting with "test" will be executed in the test suite.
@@ -78,15 +64,13 @@ public class DigesterSimpleQueryTest ext
 
         try {
 
+            ObjectContentManager ocm = this.getObjectContentManager();
             // Build the Query Object
-            QueryManager queryManager = this.getQueryManager();
+            QueryManager queryManager = ocm.getQueryManager();
             Filter filter = queryManager.createFilter(Paragraph.class);
             filter.addEqualTo("text", "Para 1");
 
             Query query = queryManager.createQuery(filter);
-            
-
-            ObjectContentManager ocm = this.getObjectContentManager();
             Paragraph paragraph = (Paragraph) ocm.getObject(query);
             assertNotNull("Object is null", paragraph);
             assertTrue("Invalid paragraph found", paragraph.getText().equals("Para 1"));
@@ -106,15 +90,15 @@ public class DigesterSimpleQueryTest ext
 
         try {
 
+            ObjectContentManager ocm = this.getObjectContentManager();
             // Build the Query Object
-            QueryManager queryManager = this.getQueryManager();
+            QueryManager queryManager = ocm.getQueryManager();
             Filter filter = queryManager.createFilter(Paragraph.class);
             filter.addEqualTo("text", "Para 1");
             filter.setScope("/test/");
 
             Query query = queryManager.createQuery(filter);
 
-            ObjectContentManager ocm = this.getObjectContentManager();
             Collection result = ocm.getObjects(query);
             assertEquals("Invalid number of objects - should be = 1", 1, result.size());
             Paragraph paragraph = (Paragraph) result.iterator().next();
@@ -134,15 +118,15 @@ public class DigesterSimpleQueryTest ext
 
         try {
 
+            ObjectContentManager ocm = this.getObjectContentManager();
             // Build the Query Object
-            QueryManager queryManager = this.getQueryManager();
+            QueryManager queryManager = ocm.getQueryManager();
             Filter filter = queryManager.createFilter(Paragraph.class);
             filter.addLike("text", "Para%");
             filter.setScope("/test/");
 
             Query query = queryManager.createQuery(filter);
 
-            ObjectContentManager ocm = this.getObjectContentManager();
             Collection result = ocm.getObjects(query);
             assertEquals("Invalid number of objects - should be = 3", 3, result.size());
 
@@ -166,8 +150,9 @@ public class DigesterSimpleQueryTest ext
 
         try {
 
+            ObjectContentManager ocm = this.getObjectContentManager();
             // Build the Query Object
-            QueryManager queryManager = this.getQueryManager();
+            QueryManager queryManager = ocm.getQueryManager();
             Filter filter1 = queryManager.createFilter(Paragraph.class);
             filter1.addEqualTo("text", "Para 1");
             filter1.setScope("/test/");
@@ -179,7 +164,6 @@ public class DigesterSimpleQueryTest ext
 
             Query query = queryManager.createQuery(filter1);
 
-            ObjectContentManager ocm = this.getObjectContentManager();
             Collection result = ocm.getObjects(query);
             assertEquals("Invalid number of objects - should be = 2", 2, result.size());
 
@@ -202,15 +186,15 @@ public class DigesterSimpleQueryTest ext
 
         try {
 
+            ObjectContentManager ocm = this.getObjectContentManager();
             // Build the Query Object
-            QueryManager queryManager = this.getQueryManager();
+            QueryManager queryManager = ocm.getQueryManager();
             Filter filter1 = queryManager.createFilter(Paragraph.class);
             filter1.addOrFilter("text", new String[]{"Para 1","Para 2"});
             filter1.setScope("/test/");
 
             Query query = queryManager.createQuery(filter1);
 
-            ObjectContentManager ocm = this.getObjectContentManager();
             Collection result = ocm.getObjects(query);
             assertEquals("Invalid number of objects - should be = 2", 2, result.size());
 
@@ -233,15 +217,15 @@ public class DigesterSimpleQueryTest ext
 
         try {
 
+            ObjectContentManager ocm = this.getObjectContentManager();
             // Build the Query Object
-            QueryManager queryManager = this.getQueryManager();
+            QueryManager queryManager = ocm.getQueryManager();
             Filter filter1 = queryManager.createFilter(Paragraph.class);
             filter1.addOrFilter("text", new String[]{"Para 1","Another Para "}).addLike("text", "Para%");
             filter1.setScope("/test/");
 
             Query query = queryManager.createQuery(filter1);
 
-            ObjectContentManager ocm = this.getObjectContentManager();
             Collection result = ocm.getObjects(query);
             assertEquals("Invalid number of objects - should be = 1", 1, result.size());
 
@@ -261,8 +245,9 @@ public class DigesterSimpleQueryTest ext
 
         try {
 
+            ObjectContentManager ocm = this.getObjectContentManager();
             // Build the Query Object
-            QueryManager queryManager = this.getQueryManager();
+            QueryManager queryManager = ocm.getQueryManager();
             Filter filter = queryManager.createFilter(Paragraph.class);
             filter.addLike("text", "Para%");
             filter.setScope("/test/");
@@ -270,7 +255,6 @@ public class DigesterSimpleQueryTest ext
             Query query = queryManager.createQuery(filter);
             query.addOrderByDescending("text");
 
-            ObjectContentManager ocm = this.getObjectContentManager();
             Collection result = ocm.getObjects(query);
             assertEquals("Invalid number of objects - should be = 3", 3, result.size());
 
@@ -292,8 +276,9 @@ public class DigesterSimpleQueryTest ext
 
             try {
 
+                ObjectContentManager ocm = this.getObjectContentManager();
                 // Build the Query Object
-                QueryManager queryManager = this.getQueryManager();
+                QueryManager queryManager = ocm.getQueryManager();
                 Filter filter = queryManager.createFilter(Paragraph.class);
                 filter.addLike("text", "Para%");
                 filter.setScope("/test/");
@@ -302,8 +287,7 @@ public class DigesterSimpleQueryTest ext
                 query.addOrderByDescending("text");
 
                 String strQueryBuilderStringWithDescending = ((QueryImpl)query).getOrderByExpression();
-                
-                ObjectContentManager ocm = this.getObjectContentManager();
+
                 Collection result = ocm.getObjects(query);
                 assertEquals("Invalid number of objects - should be = 3", 3, result.size());
 

Modified: jackrabbit/commons/ocm/trunk/src/test/java/org/apache/jackrabbit/ocm/manager/simplemapping/AnnotationSimpleTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/commons/ocm/trunk/src/test/java/org/apache/jackrabbit/ocm/manager/simplemapping/AnnotationSimpleTest.java?rev=1349031&r1=1349030&r2=1349031&view=diff
==============================================================================
--- jackrabbit/commons/ocm/trunk/src/test/java/org/apache/jackrabbit/ocm/manager/simplemapping/AnnotationSimpleTest.java (original)
+++ jackrabbit/commons/ocm/trunk/src/test/java/org/apache/jackrabbit/ocm/manager/simplemapping/AnnotationSimpleTest.java Mon Jun 11 21:43:27 2012
@@ -22,33 +22,21 @@ import java.util.Collection;
 import junit.framework.Test;
 import junit.framework.TestSuite;
 
-import org.apache.jackrabbit.ocm.AnnotationTestBase;
+import org.apache.jackrabbit.ocm.AnnotationRepositoryTestBase;
 import org.apache.jackrabbit.ocm.manager.ObjectContentManager;
 import org.apache.jackrabbit.ocm.query.Filter;
 import org.apache.jackrabbit.ocm.query.Query;
 import org.apache.jackrabbit.ocm.query.QueryManager;
 import org.apache.jackrabbit.ocm.testmodel.SimpleAnnotedClass;
 import org.apache.jackrabbit.ocm.testmodel.SimpleInterface;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 
 /**
  * Test atomic persistence fields
  *
  * @author <a href="mailto:christophe.lombart@sword-technologies.com">Christophe Lombart</a>
  */
-public class AnnotationSimpleTest extends AnnotationTestBase
+public class AnnotationSimpleTest extends AnnotationRepositoryTestBase
 {
-    private final static Logger log = LoggerFactory.getLogger(AnnotationSimpleTest.class);
-
-    /**
-     * <p>Defines the test case name for junit.</p>
-     * @param testName The test case name.
-     */
-    public AnnotationSimpleTest(String testName) throws Exception
-    {
-        super(testName);
-    }
 
     public static Test suite()
     {

Modified: jackrabbit/commons/ocm/trunk/src/test/java/org/apache/jackrabbit/ocm/manager/uuid/AnnotationUuidTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/commons/ocm/trunk/src/test/java/org/apache/jackrabbit/ocm/manager/uuid/AnnotationUuidTest.java?rev=1349031&r1=1349030&r2=1349031&view=diff
==============================================================================
--- jackrabbit/commons/ocm/trunk/src/test/java/org/apache/jackrabbit/ocm/manager/uuid/AnnotationUuidTest.java (original)
+++ jackrabbit/commons/ocm/trunk/src/test/java/org/apache/jackrabbit/ocm/manager/uuid/AnnotationUuidTest.java Mon Jun 11 21:43:27 2012
@@ -22,7 +22,7 @@ import java.util.Collection;
 import junit.framework.Test;
 import junit.framework.TestSuite;
 
-import org.apache.jackrabbit.ocm.AnnotationTestBase;
+import org.apache.jackrabbit.ocm.AnnotationRepositoryTestBase;
 import org.apache.jackrabbit.ocm.manager.ObjectContentManager;
 import org.apache.jackrabbit.ocm.testmodel.uuid.A;
 import org.apache.jackrabbit.ocm.testmodel.uuid.B;
@@ -37,19 +37,10 @@ import org.slf4j.LoggerFactory;
  *
  * @author <a href="mailto:christophe.lombart@sword-technologies.com">Christophe Lombart</a>
  */
-public class AnnotationUuidTest extends AnnotationTestBase
+public class AnnotationUuidTest extends AnnotationRepositoryTestBase
 {
     private final static Logger log = LoggerFactory.getLogger(AnnotationUuidTest.class);
 
-    /**
-     * <p>Defines the test case name for junit.</p>
-     * @param testName The test case name.
-     */
-    public AnnotationUuidTest(String testName)  throws Exception
-    {
-        super(testName);
-    }
-
     public static Test suite()
     {
         // All methods starting with "test" will be executed in the test suite.

Modified: jackrabbit/commons/ocm/trunk/src/test/java/org/apache/jackrabbit/ocm/manager/uuid/DigesterUuidTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/commons/ocm/trunk/src/test/java/org/apache/jackrabbit/ocm/manager/uuid/DigesterUuidTest.java?rev=1349031&r1=1349030&r2=1349031&view=diff
==============================================================================
--- jackrabbit/commons/ocm/trunk/src/test/java/org/apache/jackrabbit/ocm/manager/uuid/DigesterUuidTest.java (original)
+++ jackrabbit/commons/ocm/trunk/src/test/java/org/apache/jackrabbit/ocm/manager/uuid/DigesterUuidTest.java Mon Jun 11 21:43:27 2012
@@ -22,7 +22,7 @@ import java.util.Collection;
 import junit.framework.Test;
 import junit.framework.TestSuite;
 
-import org.apache.jackrabbit.ocm.DigesterTestBase;
+import org.apache.jackrabbit.ocm.DigesterRepositoryTestBase;
 import org.apache.jackrabbit.ocm.manager.ObjectContentManager;
 import org.apache.jackrabbit.ocm.testmodel.uuid.A;
 import org.apache.jackrabbit.ocm.testmodel.uuid.B;
@@ -37,18 +37,10 @@ import org.slf4j.LoggerFactory;
  *
  * @author <a href="mailto:christophe.lombart@sword-technologies.com">Christophe Lombart</a>
  */
-public class DigesterUuidTest extends DigesterTestBase
+public class DigesterUuidTest extends DigesterRepositoryTestBase
 {
     private final static Logger log = LoggerFactory.getLogger(DigesterUuidTest.class);
 
-    /**
-     * <p>Defines the test case name for junit.</p>
-     * @param testName The test case name.
-     */
-    public DigesterUuidTest(String testName)  throws Exception
-    {
-        super(testName);
-    }
 
     public static Test suite()
     {

Modified: jackrabbit/commons/ocm/trunk/src/test/java/org/apache/jackrabbit/ocm/manager/version/AnnotationBasicVersionningTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/commons/ocm/trunk/src/test/java/org/apache/jackrabbit/ocm/manager/version/AnnotationBasicVersionningTest.java?rev=1349031&r1=1349030&r2=1349031&view=diff
==============================================================================
--- jackrabbit/commons/ocm/trunk/src/test/java/org/apache/jackrabbit/ocm/manager/version/AnnotationBasicVersionningTest.java (original)
+++ jackrabbit/commons/ocm/trunk/src/test/java/org/apache/jackrabbit/ocm/manager/version/AnnotationBasicVersionningTest.java Mon Jun 11 21:43:27 2012
@@ -22,7 +22,7 @@ import java.util.Date;
 import junit.framework.Test;
 import junit.framework.TestSuite;
 
-import org.apache.jackrabbit.ocm.AnnotationTestBase;
+import org.apache.jackrabbit.ocm.AnnotationRepositoryTestBase;
 import org.apache.jackrabbit.ocm.manager.ObjectContentManager;
 import org.apache.jackrabbit.ocm.testmodel.Page;
 import org.apache.jackrabbit.ocm.testmodel.Paragraph;
@@ -40,19 +40,10 @@ import org.slf4j.LoggerFactory;
  *
  * @author <a href="mailto:christophe.lombart@sword-technologies.com">Christophe Lombart</a>
  */
-public class AnnotationBasicVersionningTest extends AnnotationTestBase
+public class AnnotationBasicVersionningTest extends AnnotationRepositoryTestBase
 {
 	private final static Logger log = LoggerFactory.getLogger(AnnotationBasicVersionningTest.class);
 
-	/**
-	 * <p>Defines the test case name for junit.</p>
-	 * @param testName The test case name.
-	 */
-	public AnnotationBasicVersionningTest(String testName) throws Exception
-	{
-		super(testName);
-
-	}
 
 	public static Test suite()
 	{

Modified: jackrabbit/commons/ocm/trunk/src/test/java/org/apache/jackrabbit/ocm/manager/version/DigesterBasicVersionningTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/commons/ocm/trunk/src/test/java/org/apache/jackrabbit/ocm/manager/version/DigesterBasicVersionningTest.java?rev=1349031&r1=1349030&r2=1349031&view=diff
==============================================================================
--- jackrabbit/commons/ocm/trunk/src/test/java/org/apache/jackrabbit/ocm/manager/version/DigesterBasicVersionningTest.java (original)
+++ jackrabbit/commons/ocm/trunk/src/test/java/org/apache/jackrabbit/ocm/manager/version/DigesterBasicVersionningTest.java Mon Jun 11 21:43:27 2012
@@ -20,7 +20,7 @@ package org.apache.jackrabbit.ocm.manage
 import junit.framework.Test;
 import junit.framework.TestSuite;
 
-import org.apache.jackrabbit.ocm.DigesterTestBase;
+import org.apache.jackrabbit.ocm.DigesterRepositoryTestBase;
 import org.apache.jackrabbit.ocm.manager.ObjectContentManager;
 import org.apache.jackrabbit.ocm.testmodel.Page;
 import org.apache.jackrabbit.ocm.testmodel.Paragraph;
@@ -34,20 +34,9 @@ import org.slf4j.LoggerFactory;
  *
  * @author <a href="mailto:christophe.lombart@sword-technologies.com">Christophe Lombart</a>
  */
-public class DigesterBasicVersionningTest extends DigesterTestBase
+public class DigesterBasicVersionningTest extends DigesterRepositoryTestBase
 {
 	private final static Logger log = LoggerFactory.getLogger(DigesterBasicVersionningTest.class);
-	
-	
-	/**
-	 * <p>Defines the test case name for junit.</p>
-	 * @param testName The test case name.
-	 */
-	public DigesterBasicVersionningTest(String testName) throws Exception
-	{
-		super(testName);
-		
-	}
 
 	public static Test suite()
 	{

Modified: jackrabbit/commons/ocm/trunk/src/test/java/org/apache/jackrabbit/ocm/nodemanagement/impl/jackrabbit/NodeTypeManagerImplTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/commons/ocm/trunk/src/test/java/org/apache/jackrabbit/ocm/nodemanagement/impl/jackrabbit/NodeTypeManagerImplTest.java?rev=1349031&r1=1349030&r2=1349031&view=diff
==============================================================================
--- jackrabbit/commons/ocm/trunk/src/test/java/org/apache/jackrabbit/ocm/nodemanagement/impl/jackrabbit/NodeTypeManagerImplTest.java (original)
+++ jackrabbit/commons/ocm/trunk/src/test/java/org/apache/jackrabbit/ocm/nodemanagement/impl/jackrabbit/NodeTypeManagerImplTest.java Mon Jun 11 21:43:27 2012
@@ -17,19 +17,24 @@
 package org.apache.jackrabbit.ocm.nodemanagement.impl.jackrabbit;
 
 import java.io.FileInputStream;
+import java.io.IOException;
 
 import javax.jcr.PropertyType;
+import javax.jcr.RepositoryException;
+import javax.jcr.Session;
 import javax.jcr.nodetype.NodeDefinition;
 import javax.jcr.nodetype.NodeType;
 import javax.jcr.nodetype.PropertyDefinition;
 import junit.framework.Test;
 import junit.framework.TestSuite;
 
+import org.apache.jackrabbit.core.nodetype.InvalidNodeTypeDefException;
+import org.apache.jackrabbit.ocm.AbstractRepositoryTestBase;
+import org.apache.jackrabbit.ocm.manager.ObjectContentManager;
 import org.apache.jackrabbit.ocm.mapper.model.BeanDescriptor;
 import org.apache.jackrabbit.ocm.mapper.model.ClassDescriptor;
 import org.apache.jackrabbit.ocm.mapper.model.CollectionDescriptor;
 import org.apache.jackrabbit.ocm.mapper.model.FieldDescriptor;
-import org.apache.jackrabbit.ocm.nodemanagement.TestBase;
 import org.apache.jackrabbit.ocm.nodemanagement.exception.NamespaceCreationException;
 import org.apache.jackrabbit.ocm.nodemanagement.exception.NodeTypeCreationException;
 import org.slf4j.Logger;
@@ -40,7 +45,7 @@ import org.slf4j.LoggerFactory;
  *
  * @author <a href="mailto:okiessler@apache.org">Oliver Kiessler</a>
  */
-public class NodeTypeManagerImplTest extends TestBase {
+public class NodeTypeManagerImplTest extends AbstractRepositoryTestBase {
 
     /**
      * Logger instance.
@@ -50,7 +55,7 @@ public class NodeTypeManagerImplTest ext
 
     /** Class to test.
      */
-    private NodeTypeManagerImpl jackrabbitNodeTypeManagerImpl
+    private NodeTypeManagerImpl nodeTypeManagerImpl
                 = new NodeTypeManagerImpl();
 
     /** Returns testsuite.
@@ -62,20 +67,35 @@ public class NodeTypeManagerImplTest ext
         return suite;
     }
 
+    @Override
+    protected ObjectContentManager createObjectContentManager(Session session) throws RepositoryException {
+        // no ObjectContentManager needed for this test
+        return null;
+    }
+
+    @Override
+    protected void registerNodeTypes(Session session)
+            throws InvalidNodeTypeDefException, javax.jcr.RepositoryException, IOException {
+         // do not register any node types at startup hence override the one from AbstractRepositoryTestBase
+        return;
+    }
+
     public void testCreateNamespace() throws Exception
     {
-        getJackrabbitNodeTypeManagerImpl().createNamespace(session,
-                "test", "http://www.test.com/test-uri");
 
-        assertEquals(session.getWorkspace().getNamespaceRegistry().getPrefix("http://www.test.com/test-uri"), "test");
-        assertEquals(session.getWorkspace().getNamespaceRegistry().getURI("test"), "http://www.test.com/test-uri");
+        Session session = getSession();
+        nodeTypeManagerImpl.createNamespace(session,
+                "ocmtest", "http://www.test.com/test-uri");
+
+        assertEquals(session.getWorkspace().getNamespaceRegistry().getPrefix("http://www.test.com/test-uri"), "ocmtest");
+        assertEquals(session.getWorkspace().getNamespaceRegistry().getURI("ocmtest"), "http://www.test.com/test-uri");
 
         boolean failed = false;
 
         try
         {
-            getJackrabbitNodeTypeManagerImpl().createNamespace(session,
-                    "test", "http://www.test.com/test-uri");
+            nodeTypeManagerImpl.createNamespace(session,
+                    "ocmtest", "http://www.test.com/test-uri");
         } catch (NamespaceCreationException nce) {
             // expected
             failed = true;
@@ -87,10 +107,10 @@ public class NodeTypeManagerImplTest ext
 
     public void testCreateNodeTypesFromConfiguration() throws Exception
     {
-        getJackrabbitNodeTypeManagerImpl().createNodeTypesFromConfiguration(session,
-                new FileInputStream("./src/test/config/jackrabbit/nodetypes_test1.xml"));
+        nodeTypeManagerImpl.createNodeTypesFromConfiguration(getSession(),
+                new FileInputStream("./src/test/test-config/nodetypes/nodetypes_test1.xml"));
 
-        NodeType test1 = session.getWorkspace().getNodeTypeManager().getNodeType("ocm:test1");
+        NodeType test1 = getSession().getWorkspace().getNodeTypeManager().getNodeType("ocm:test1");
         assertNotNull(test1);
         assertFalse(test1.isMixin());
         assertFalse(test1.hasOrderableChildNodes());
@@ -125,9 +145,9 @@ public class NodeTypeManagerImplTest ext
         field1.setJcrMultiple(false);
         classDescriptor.addFieldDescriptor(field2);
 
-        getJackrabbitNodeTypeManagerImpl().createSingleNodeType(session, classDescriptor);
+        nodeTypeManagerImpl.createSingleNodeType(getSession(), classDescriptor);
 
-        NodeType testNodeType = session.getWorkspace().getNodeTypeManager().getNodeType("ocm:test2");
+        NodeType testNodeType = getSession().getWorkspace().getNodeTypeManager().getNodeType("ocm:test2");
         assertNotNull(testNodeType);
         assertFalse(testNodeType.isMixin());
         assertEquals(testNodeType.getName(), "ocm:test2");
@@ -143,11 +163,11 @@ public class NodeTypeManagerImplTest ext
         assertTrue(containsProperty("jcr:mixinTypes", testNodeType.getPropertyDefinitions()));
 
         PropertyDefinition propDef1 = getPropertyDefinition(testNodeType.getPropertyDefinitions(), "ocm:a");
-        log.info(getJackrabbitNodeTypeManagerImpl().showPropertyDefinition(propDef1));
+        log.info(nodeTypeManagerImpl.showPropertyDefinition(propDef1));
         // TODO test all properties
 
         PropertyDefinition propDef2 = getPropertyDefinition(testNodeType.getPropertyDefinitions(), "ocm:b");
-        log.info(getJackrabbitNodeTypeManagerImpl().showPropertyDefinition(propDef2));
+        log.info(nodeTypeManagerImpl.showPropertyDefinition(propDef2));
         // TODO test all properties
     }
 
@@ -164,9 +184,9 @@ public class NodeTypeManagerImplTest ext
         field1.setJcrType("String");
         classDescriptor.addFieldDescriptor(field1);
 
-        getJackrabbitNodeTypeManagerImpl().createSingleNodeType(session, classDescriptor);
+        nodeTypeManagerImpl.createSingleNodeType(getSession(), classDescriptor);
 
-        NodeType test3 = session.getWorkspace().getNodeTypeManager().getNodeType("test3");
+        NodeType test3 = getSession().getWorkspace().getNodeTypeManager().getNodeType("test3");
         assertNotNull(test3);
         assertFalse(test3.isMixin());
         assertEquals(test3.getName(), "test3");
@@ -186,9 +206,9 @@ public class NodeTypeManagerImplTest ext
         field1.setJcrType("String");
         classDescriptor.addFieldDescriptor(field1);
 
-        getJackrabbitNodeTypeManagerImpl().createSingleNodeType(session, classDescriptor);
+        nodeTypeManagerImpl.createSingleNodeType(getSession(), classDescriptor);
 
-        NodeType test4 = session.getWorkspace().getNodeTypeManager().getNodeType("test.Test4Class");
+        NodeType test4 = getSession().getWorkspace().getNodeTypeManager().getNodeType("test.Test4Class");
         assertNotNull(test4);
         assertFalse(test4.isMixin());
         assertEquals(test4.getName(), "test.Test4Class");
@@ -207,9 +227,9 @@ public class NodeTypeManagerImplTest ext
         field1.setFieldName("abc");
         classDescriptor.addFieldDescriptor(field1);
 
-        getJackrabbitNodeTypeManagerImpl().createSingleNodeType(session, classDescriptor);
+        nodeTypeManagerImpl.createSingleNodeType(getSession(), classDescriptor);
 
-        NodeType test5 = session.getWorkspace().getNodeTypeManager().getNodeType("ocm:test5");
+        NodeType test5 = getSession().getWorkspace().getNodeTypeManager().getNodeType("ocm:test5");
         assertNotNull(test5);
         assertFalse(test5.isMixin());
         assertEquals(test5.getName(), "ocm:test5");
@@ -237,7 +257,7 @@ public class NodeTypeManagerImplTest ext
 
         try
         {
-            getJackrabbitNodeTypeManagerImpl().createSingleNodeType(session, classDescriptor);
+            nodeTypeManagerImpl.createSingleNodeType(getSession(), classDescriptor);
         }
         catch (NodeTypeCreationException nce)
         {
@@ -262,9 +282,9 @@ public class NodeTypeManagerImplTest ext
 
         classDescriptor.addCollectionDescriptor(collection1);
 
-        getJackrabbitNodeTypeManagerImpl().createSingleNodeType(session, classDescriptor);
+        nodeTypeManagerImpl.createSingleNodeType(getSession(), classDescriptor);
 
-        NodeType test9 = session.getWorkspace().getNodeTypeManager().getNodeType("ocm:test9");
+        NodeType test9 = getSession().getWorkspace().getNodeTypeManager().getNodeType("ocm:test9");
         assertNotNull(test9);
         // not check node type definition, assuming other tests have done that
 
@@ -287,9 +307,9 @@ public class NodeTypeManagerImplTest ext
         bean1.setJcrType("String");
         classDescriptor.addBeanDescriptor(bean1);
 
-        getJackrabbitNodeTypeManagerImpl().createSingleNodeType(session, classDescriptor);
+        nodeTypeManagerImpl.createSingleNodeType(getSession(), classDescriptor);
 
-        NodeType test10 = session.getWorkspace().getNodeTypeManager().getNodeType("ocm:test10");
+        NodeType test10 = getSession().getWorkspace().getNodeTypeManager().getNodeType("ocm:test10");
         assertNotNull(test10);
         // not check node type definition, assuming other tests have done that
 
@@ -313,9 +333,9 @@ public class NodeTypeManagerImplTest ext
         collection1.setJcrType("String");
         classDescriptor.addCollectionDescriptor(collection1);
 
-        getJackrabbitNodeTypeManagerImpl().createSingleNodeType(session, classDescriptor);
+        nodeTypeManagerImpl.createSingleNodeType(getSession(), classDescriptor);
 
-        NodeType test13 = session.getWorkspace().getNodeTypeManager().getNodeType("ocm:test13");
+        NodeType test13 = getSession().getWorkspace().getNodeTypeManager().getNodeType("ocm:test13");
         assertNotNull(test13);
         // not check node type definition, assuming other tests have done that
 
@@ -338,9 +358,9 @@ public class NodeTypeManagerImplTest ext
         bean1.setJcrType("String");
         classDescriptor.addBeanDescriptor(bean1);
 
-        getJackrabbitNodeTypeManagerImpl().createSingleNodeType(session, classDescriptor);
+        nodeTypeManagerImpl.createSingleNodeType(getSession(), classDescriptor);
 
-        NodeType test14 = session.getWorkspace().getNodeTypeManager().getNodeType("ocm:test14");
+        NodeType test14 = getSession().getWorkspace().getNodeTypeManager().getNodeType("ocm:test14");
         assertNotNull(test14);
         // not check node type definition, assuming other tests have done that
 
@@ -364,9 +384,9 @@ public class NodeTypeManagerImplTest ext
         collection1.setJcrType("nt:unstructured");
         classDescriptor.addCollectionDescriptor(collection1);
 
-        getJackrabbitNodeTypeManagerImpl().createSingleNodeType(session, classDescriptor);
+        nodeTypeManagerImpl.createSingleNodeType(getSession(), classDescriptor);
 
-        NodeType test11 = session.getWorkspace().getNodeTypeManager().getNodeType("ocm:test11");
+        NodeType test11 = getSession().getWorkspace().getNodeTypeManager().getNodeType("ocm:test11");
         assertNotNull(test11);
         // not check node type definition, assuming other tests have done that
 
@@ -391,9 +411,9 @@ public class NodeTypeManagerImplTest ext
         bean1.setJcrType("nt:unstructured");
         classDescriptor.addBeanDescriptor(bean1);
 
-        getJackrabbitNodeTypeManagerImpl().createSingleNodeType(session, classDescriptor);
+        nodeTypeManagerImpl.createSingleNodeType(getSession(), classDescriptor);
 
-        NodeType test12 = session.getWorkspace().getNodeTypeManager().getNodeType("ocm:test12");
+        NodeType test12 = getSession().getWorkspace().getNodeTypeManager().getNodeType("ocm:test12");
         assertNotNull(test12);
         // not check node type definition, assuming other tests have done that
 
@@ -445,12 +465,12 @@ public class NodeTypeManagerImplTest ext
         classDescriptorArray[0] = classDescriptor;
         classDescriptorArray[1] = classDescriptor2;
 
-        getJackrabbitNodeTypeManagerImpl().createNodeTypes(session, classDescriptorArray);
+        nodeTypeManagerImpl.createNodeTypes(getSession(), classDescriptorArray);
 
-        NodeType test6 = session.getWorkspace().getNodeTypeManager().getNodeType("ocm:test6");
+        NodeType test6 = getSession().getWorkspace().getNodeTypeManager().getNodeType("ocm:test6");
         assertNotNull(test6);
 
-        NodeType test7 = session.getWorkspace().getNodeTypeManager().getNodeType("ocm:test7");
+        NodeType test7 = getSession().getWorkspace().getNodeTypeManager().getNodeType("ocm:test7");
         assertNotNull(test7);
     }
 
@@ -467,9 +487,9 @@ public class NodeTypeManagerImplTest ext
         field1.setJcrType("String");
         classDescriptor.addFieldDescriptor(field1);
 
-        getJackrabbitNodeTypeManagerImpl().createSingleNodeType(session, classDescriptor);
+        nodeTypeManagerImpl.createSingleNodeType(getSession(), classDescriptor);
 
-        NodeType test8 = session.getWorkspace().getNodeTypeManager().getNodeType("ocm:test8");
+        NodeType test8 = getSession().getWorkspace().getNodeTypeManager().getNodeType("ocm:test8");
         assertNotNull(test8);
         // not implemented yet in jackrabbit
         // getJackrabbitNodeTypeManagerImpl().removeSingleNodeType(session, "ocm:test8");
@@ -572,7 +592,7 @@ public class NodeTypeManagerImplTest ext
     /** Returns true if a given super type is found in an arry of super types.
      *
      * @param superType Name of super type to find
-     * @param propDefs Properties of a node type
+     * @param nodeTypes
      * @return true/false
      */
     protected boolean containsSuperType(String superType,
@@ -592,21 +612,28 @@ public class NodeTypeManagerImplTest ext
         return found;
     }
 
-    /** Getter for property jackrabbitNodeTypeManagerImpl.
+    /** Returns true if a property was found in an array of property defintions.
      *
-     * @return jackrabbitNodeTypeManagerImpl
+     * @param definitions PropertyDefinition[]
+     * @param propertyName Name of property to find
+     * @return true/false
      */
-    public NodeTypeManagerImpl getJackrabbitNodeTypeManagerImpl()
+    public boolean containsPropertyDefintion(PropertyDefinition[] definitions,
+                                             String propertyName)
     {
-        return jackrabbitNodeTypeManagerImpl;
-    }
+        boolean found = false;
 
-    /** Setter for property jackrabbitNodeTypeManagerImpl.
-     *
-     * @param object jackrabbitNodeTypeManagerImpl
-     */
-    public void setJackrabbitNodeTypeManagerImpl(NodeTypeManagerImpl object)
-    {
-        this.jackrabbitNodeTypeManagerImpl = object;
+        if (definitions != null && definitions.length > 0)
+        {
+            for (int i = 0; i < definitions.length; i++)
+            {
+                if (definitions[i].getName().equals(propertyName))
+                {
+                    found = true;
+                }
+            }
+        }
+
+        return found;
     }
 }

Modified: jackrabbit/commons/ocm/trunk/src/test/java/org/apache/jackrabbit/ocm/querymanager/AnnotationQueryManagerTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/commons/ocm/trunk/src/test/java/org/apache/jackrabbit/ocm/querymanager/AnnotationQueryManagerTest.java?rev=1349031&r1=1349030&r2=1349031&view=diff
==============================================================================
--- jackrabbit/commons/ocm/trunk/src/test/java/org/apache/jackrabbit/ocm/querymanager/AnnotationQueryManagerTest.java (original)
+++ jackrabbit/commons/ocm/trunk/src/test/java/org/apache/jackrabbit/ocm/querymanager/AnnotationQueryManagerTest.java Mon Jun 11 21:43:27 2012
@@ -19,13 +19,11 @@ package org.apache.jackrabbit.ocm.querym
 import junit.framework.Test;
 import junit.framework.TestSuite;
 
-import org.apache.jackrabbit.ocm.AnnotationTestBase;
+import org.apache.jackrabbit.ocm.AnnotationRepositoryTestBase;
 import org.apache.jackrabbit.ocm.query.Filter;
 import org.apache.jackrabbit.ocm.query.Query;
 import org.apache.jackrabbit.ocm.query.QueryManager;
 import org.apache.jackrabbit.ocm.testmodel.C;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 
 
 /**
@@ -33,18 +31,8 @@ import org.slf4j.LoggerFactory;
  *
  * @author <a href="mailto:christophe.lombart@gmail.com">Christophe Lombart</a>
  */
-public class AnnotationQueryManagerTest extends AnnotationTestBase
+public class AnnotationQueryManagerTest extends AnnotationRepositoryTestBase
 {
-    private final static Logger log = LoggerFactory.getLogger(AnnotationQueryManagerTest.class);
-
-    /**
-     * <p>Defines the test case name for junit.</p>
-     * @param testName The test case name.
-     */
-    public AnnotationQueryManagerTest(String testName)  throws Exception
-    {
-        super(testName);
-    }
 
     public static Test suite()
     {
@@ -56,7 +44,7 @@ public class AnnotationQueryManagerTest 
     {
     	try
     	{
-    	      QueryManager queryManager = this.getQueryManager();
+    	      QueryManager queryManager = getObjectContentManager().getQueryManager();
     	      Filter filter = queryManager.createFilter(C.class);
     	      filter.addEqualTo("name", "a test value")
                     .addEqualTo("id", new Integer(1));
@@ -80,7 +68,7 @@ public class AnnotationQueryManagerTest 
 
     	try
     	{
-    	      QueryManager queryManager = this.getQueryManager();
+    	      QueryManager queryManager = getObjectContentManager().getQueryManager();
     	      Filter filter = queryManager.createFilter(C.class);
     	      filter.addEqualTo("name", "a test value")
     	            .addEqualTo("id", new Integer(1));

Modified: jackrabbit/commons/ocm/trunk/src/test/java/org/apache/jackrabbit/ocm/querymanager/DigesterQueryManagerTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/commons/ocm/trunk/src/test/java/org/apache/jackrabbit/ocm/querymanager/DigesterQueryManagerTest.java?rev=1349031&r1=1349030&r2=1349031&view=diff
==============================================================================
--- jackrabbit/commons/ocm/trunk/src/test/java/org/apache/jackrabbit/ocm/querymanager/DigesterQueryManagerTest.java (original)
+++ jackrabbit/commons/ocm/trunk/src/test/java/org/apache/jackrabbit/ocm/querymanager/DigesterQueryManagerTest.java Mon Jun 11 21:43:27 2012
@@ -19,13 +19,11 @@ package org.apache.jackrabbit.ocm.querym
 import junit.framework.Test;
 import junit.framework.TestSuite;
 
-import org.apache.jackrabbit.ocm.DigesterTestBase;
+import org.apache.jackrabbit.ocm.DigesterRepositoryTestBase;
 import org.apache.jackrabbit.ocm.query.Filter;
 import org.apache.jackrabbit.ocm.query.Query;
 import org.apache.jackrabbit.ocm.query.QueryManager;
 import org.apache.jackrabbit.ocm.testmodel.C;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 
 
 /**
@@ -33,18 +31,8 @@ import org.slf4j.LoggerFactory;
  *
  * @author <a href="mailto:christophe.lombart@gmail.com">Christophe Lombart</a>
  */
-public class DigesterQueryManagerTest extends DigesterTestBase
+public class DigesterQueryManagerTest extends DigesterRepositoryTestBase
 {
-    private final static Logger log = LoggerFactory.getLogger(DigesterQueryManagerTest.class);
-
-    /**
-     * <p>Defines the test case name for junit.</p>
-     * @param testName The test case name.
-     */
-    public DigesterQueryManagerTest(String testName)  throws Exception
-    {
-        super(testName);
-    }
 
     public static Test suite()
     {
@@ -56,7 +44,7 @@ public class DigesterQueryManagerTest ex
     {
     	try
     	{
-    	      QueryManager queryManager = this.getQueryManager();
+    	      QueryManager queryManager = getObjectContentManager().getQueryManager();
     	      Filter filter = queryManager.createFilter(C.class);
     	      filter.addEqualTo("name", "a test value")
                     .addEqualTo("id", new Integer(1));
@@ -80,7 +68,7 @@ public class DigesterQueryManagerTest ex
 
     	try
     	{
-    	      QueryManager queryManager = this.getQueryManager();
+    	      QueryManager queryManager = getObjectContentManager().getQueryManager();
     	      Filter filter = queryManager.createFilter(C.class);
     	      filter.addEqualTo("name", "a test value")
     	            .addEqualTo("id", new Integer(1));

Added: jackrabbit/commons/ocm/trunk/src/test/repository/repository.xml
URL: http://svn.apache.org/viewvc/jackrabbit/commons/ocm/trunk/src/test/repository/repository.xml?rev=1349031&view=auto
==============================================================================
--- jackrabbit/commons/ocm/trunk/src/test/repository/repository.xml (added)
+++ jackrabbit/commons/ocm/trunk/src/test/repository/repository.xml Mon Jun 11 21:43:27 2012
@@ -0,0 +1,49 @@
+<?xml version="1.0"?>
+<!--
+   Licensed to the Apache Software Foundation (ASF) under one or more
+   contributor license agreements.  See the NOTICE file distributed with
+   this work for additional information regarding copyright ownership.
+   The ASF licenses this file to You under the Apache License, Version 2.0
+   (the "License"); you may not use this file except in compliance with
+   the License.  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+  -->
+<!DOCTYPE Repository PUBLIC "-//The Apache Software Foundation//DTD Jackrabbit 1.6//EN" "http://jackrabbit.apache.org/dtd/repository-1.6.dtd">
+<Repository>
+  <FileSystem class="org.apache.jackrabbit.core.fs.mem.MemoryFileSystem"/>
+
+  <DataStore class="org.apache.jackrabbit.core.data.FileDataStore"/>
+
+  <Security appName="Jackrabbit">
+    <SecurityManager class="org.apache.jackrabbit.core.security.simple.SimpleSecurityManager" workspaceName="security"/>
+    <AccessManager class="org.apache.jackrabbit.core.security.simple.SimpleAccessManager"/>
+    <LoginModule class="org.apache.jackrabbit.core.security.simple.SimpleLoginModule"/>
+  </Security>
+
+  <Workspaces rootPath="${rep.home}/workspaces" defaultWorkspace="default" maxIdleTime="2"/>
+
+  <Workspace name="${wsp.name}">
+    <FileSystem class="org.apache.jackrabbit.core.fs.mem.MemoryFileSystem"/>
+    <PersistenceManager class="org.apache.jackrabbit.core.persistence.mem.InMemBundlePersistenceManager"/>
+    <!--
+        Search index and the file system it uses.
+        class: FQN of class implementing the QueryHandler interface
+    -->
+    <SearchIndex class="org.apache.jackrabbit.core.query.lucene.SearchIndex">
+      <param name="path" value="${wsp.home}/index"/>
+    </SearchIndex>
+  </Workspace>
+
+  <Versioning rootPath="${rep.home}/version">
+    <FileSystem class="org.apache.jackrabbit.core.fs.mem.MemoryFileSystem"/>
+    <PersistenceManager class="org.apache.jackrabbit.core.persistence.mem.InMemBundlePersistenceManager"/>
+  </Versioning>
+
+</Repository>

Copied: jackrabbit/commons/ocm/trunk/src/test/resources/repositoryStubImpl.properties (from r1348091, rave/sandbox/content-services/rave-jcr-integration/test/src/test/resources/repositoryStubImpl.properties)
URL: http://svn.apache.org/viewvc/jackrabbit/commons/ocm/trunk/src/test/resources/repositoryStubImpl.properties?p2=jackrabbit/commons/ocm/trunk/src/test/resources/repositoryStubImpl.properties&p1=rave/sandbox/content-services/rave-jcr-integration/test/src/test/resources/repositoryStubImpl.properties&r1=1348091&r2=1349031&rev=1349031&view=diff
==============================================================================
--- rave/sandbox/content-services/rave-jcr-integration/test/src/test/resources/repositoryStubImpl.properties (original)
+++ jackrabbit/commons/ocm/trunk/src/test/resources/repositoryStubImpl.properties Mon Jun 11 21:43:27 2012
@@ -14,4 +14,4 @@
 #  limitations under the License.
 
 # Stub implementation class
-javax.jcr.tck.repository_stub_impl=org.apache.rave.jcr.jackrabbit.RaveRepositoryStub
+javax.jcr.tck.repository_stub_impl=org.apache.jackrabbit.core.JackrabbitRepositoryStub

Modified: jackrabbit/commons/ocm/trunk/src/test/test-config/nodetypes/custom_nodetypes.xml
URL: http://svn.apache.org/viewvc/jackrabbit/commons/ocm/trunk/src/test/test-config/nodetypes/custom_nodetypes.xml?rev=1349031&r1=1349030&r2=1349031&view=diff
==============================================================================
--- jackrabbit/commons/ocm/trunk/src/test/test-config/nodetypes/custom_nodetypes.xml (original)
+++ jackrabbit/commons/ocm/trunk/src/test/test-config/nodetypes/custom_nodetypes.xml Mon Jun 11 21:43:27 2012
@@ -16,13 +16,10 @@
   limitations under the License.
 -->
 <nodeTypes xmlns:nt="http://www.jcp.org/jcr/nt/1.0"
-	xmlns:jcr="http://www.jcp.org/jcr/1.0" xmlns:rep="internal"
-	xmlns:sv="http://www.jcp.org/jcr/sv/1.0"
-	xmlns:test="http://www.apache.org/jackrabbit/test"
-	xmlns:mix="http://www.jcp.org/jcr/mix/1.0"
-	xmlns:ocm="http://jackrabbit.apache.org/ocm">
+           xmlns:mix="http://www.jcp.org/jcr/mix/1.0"
+           xmlns:ocm="http://jackrabbit.apache.org/ocm">
 	
-   <nodeType name="ocm:discriminator" isMixin="true">
+  <nodeType name="ocm:discriminator" isMixin="true">
     <supertypes>
       <supertype>nt:base</supertype>
     </supertypes>

Copied: jackrabbit/commons/ocm/trunk/src/test/test-config/nodetypes/nodetypes_test1.xml (from r1348119, jackrabbit/commons/ocm/trunk/src/test/config/jackrabbit/nodetypes_test1.xml)
URL: http://svn.apache.org/viewvc/jackrabbit/commons/ocm/trunk/src/test/test-config/nodetypes/nodetypes_test1.xml?p2=jackrabbit/commons/ocm/trunk/src/test/test-config/nodetypes/nodetypes_test1.xml&p1=jackrabbit/commons/ocm/trunk/src/test/config/jackrabbit/nodetypes_test1.xml&r1=1348119&r2=1349031&rev=1349031&view=diff
==============================================================================
--- jackrabbit/commons/ocm/trunk/src/test/config/jackrabbit/nodetypes_test1.xml (original)
+++ jackrabbit/commons/ocm/trunk/src/test/test-config/nodetypes/nodetypes_test1.xml Mon Jun 11 21:43:27 2012
@@ -18,11 +18,8 @@
  */
  -->
 <nodeTypes
-    xmlns:rep="internal"
-    xmlns:nt="http://www.jcp.org/jcr/nt/1.0"
-    xmlns:mix="http://www.jcp.org/jcr/mix/1.0"
-    xmlns:jcr="http://www.jcp.org/jcr/1.0"
-    xmlns:ocm="http://jackrabbit.apache.org/ocm">           
+  xmlns:nt="http://www.jcp.org/jcr/nt/1.0"
+  xmlns:ocm="http://jackrabbit.apache.org/ocm">
 
   <nodeType name="ocm:test1" isMixin="false" hasOrderableChildNodes="false" primaryItemName="test1">
         <supertypes>