jackrabbit-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From clomb...@apache.org
Subject svn commit: r548496 [5/5] - in /jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src: dtd/ main/java/org/apache/jackrabbit/ocm/exception/ main/java/org/apache/jackrabbit/ocm/manager/ main/java/org/apache/jackrabbit/ocm/manager/beanconverter/...
Date Mon, 18 Jun 2007 21:46:48 GMT
Copied: jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/test/java/org/apache/jackrabbit/ocm/manager/query/ObjectContentManagerScopeQueryTest.java (from r548484, jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/test/java/org/apache/jackrabbit/ocm/manager/query/PersistenceManagerScopeQueryTest.java)
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/test/java/org/apache/jackrabbit/ocm/manager/query/ObjectContentManagerScopeQueryTest.java?view=diff&rev=548496&p1=jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/test/java/org/apache/jackrabbit/ocm/manager/query/PersistenceManagerScopeQueryTest.java&r1=548484&p2=jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/test/java/org/apache/jackrabbit/ocm/manager/query/ObjectContentManagerScopeQueryTest.java&r2=548496
==============================================================================
--- jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/test/java/org/apache/jackrabbit/ocm/manager/query/PersistenceManagerScopeQueryTest.java (original)
+++ jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/test/java/org/apache/jackrabbit/ocm/manager/query/ObjectContentManagerScopeQueryTest.java Mon Jun 18 14:46:42 2007
@@ -32,7 +32,7 @@
 import org.apache.jackrabbit.ocm.TestBase;
 import org.apache.jackrabbit.ocm.exception.JcrMappingException;
 import org.apache.jackrabbit.ocm.manager.ObjectContentManager;
-import org.apache.jackrabbit.ocm.manager.impl.PersistenceManagerImpl;
+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;
@@ -45,15 +45,15 @@
  *
  * @author <a href="mailto:christophe.lombart@sword-technologies.com">Christophe Lombart</a>
  */
-public class PersistenceManagerScopeQueryTest extends TestBase
+public class ObjectContentManagerScopeQueryTest extends TestBase
 {
-    private final static Log log = LogFactory.getLog(PersistenceManagerScopeQueryTest.class);
+    private final static Log log = LogFactory.getLog(ObjectContentManagerScopeQueryTest.class);
 
     /**
      * <p>Defines the test case name for junit.</p>
      * @param testName The test case name.
      */
-    public PersistenceManagerScopeQueryTest(String testName)  throws Exception
+    public ObjectContentManagerScopeQueryTest(String testName)  throws Exception
     {
         super(testName);
     }
@@ -62,7 +62,7 @@
     {
         // All methods starting with "test" will be executed in the test suite.
         return new RepositoryLifecycleTestSetup(
-                new TestSuite(PersistenceManagerScopeQueryTest.class));
+                new TestSuite(ObjectContentManagerScopeQueryTest.class));
     }
 
     /**
@@ -77,11 +77,11 @@
     
     public void tearDown() throws Exception
     {
-        if (getPersistenceManager().objectExists("/test"))
+        if (getObjectContentManager().objectExists("/test"))
         {
-            getPersistenceManager().remove("/test");            
+            getObjectContentManager().remove("/test");            
         }    
-        getPersistenceManager().save();
+        getObjectContentManager().save();
         super.tearDown();
     }	
     
@@ -96,14 +96,14 @@
     	{
     		
               	      
-    	      ObjectContentManager persistenceManager = this.getPersistenceManager();
+    	      ObjectContentManager ocm = this.getObjectContentManager();
     	      // Search on subtree (test/node1)
     	      QueryManager queryManager = this.getQueryManager();
     	      Filter filter = queryManager.createFilter(Paragraph.class);    
     	      filter.setScope("/test/node1//");
     	      Query query = queryManager.createQuery(filter);    	      
-    	      persistenceManager = this.getPersistenceManager();
-    	      Collection result = persistenceManager.getObjects(query);
+    	      ocm = this.getObjectContentManager();
+    	      Collection result = ocm.getObjects(query);
     	      assertTrue("Invalid number of objects - should be = 8", result.size() == 8);
     	      
     	      
@@ -111,8 +111,8 @@
     	      filter = queryManager.createFilter(Paragraph.class);    
     	      filter.setScope("/test//");
     	      query = queryManager.createQuery(filter);    	      
-    	      persistenceManager = this.getPersistenceManager();
-    	      result = persistenceManager.getObjects(query);
+    	      ocm = this.getObjectContentManager();
+    	      result = ocm.getObjects(query);
     	      assertTrue("Invalid number of objects - should be = 16", result.size() == 16);
     	      
     	      // Test on children 
@@ -120,8 +120,8 @@
     	      filter = queryManager.createFilter(Paragraph.class);    
     	      filter.setScope("/test/");
     	      query = queryManager.createQuery(filter);    	      
-    	      persistenceManager = this.getPersistenceManager();
-    	      result = persistenceManager.getObjects(query);
+    	      ocm = this.getObjectContentManager();
+    	      result = ocm.getObjects(query);
     	      assertTrue("Invalid number of objects - should be = 0", result.size() == 0);
     	      
               // Search on scope and properties
@@ -130,8 +130,8 @@
     	      filter.setScope("/test//");
     	      filter.addEqualTo("text", "Para 1");
     	      query = queryManager.createQuery(filter);    	      
-    	      persistenceManager = this.getPersistenceManager();
-    	      result = persistenceManager.getObjects(query);
+    	      ocm = this.getObjectContentManager();
+    	      result = ocm.getObjects(query);
     	      assertTrue("Invalid number of objects - should be = 3", result.size() == 3);
 
     	      
@@ -140,16 +140,16 @@
     	      filter.setScope("/test//");
     	      filter.addContains("text", "another");
     	      query = queryManager.createQuery(filter);    	      
-    	      persistenceManager = this.getPersistenceManager();
-    	      result = persistenceManager.getObjects(query);
+    	      ocm = this.getObjectContentManager();
+    	      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);    	      
-    	      persistenceManager = this.getPersistenceManager();
-    	      result = persistenceManager.getObjects(query);
+    	      ocm = this.getObjectContentManager();
+    	      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));
     	      assertTrue ("Invalid object in the collection" , this.contains(result, "/test/node1/page2", Page.class));
@@ -169,11 +169,11 @@
         
     	try
 		{
-    		ObjectContentManager persistenceManager = getPersistenceManager();
+    		ObjectContentManager ocm = getObjectContentManager();
         	
-			PersistenceManagerImpl persistenceManagerImpl = (PersistenceManagerImpl) persistenceManager;
+			ObjectContentManagerImpl ocmImpl = (ObjectContentManagerImpl) ocm;
 			
-			Session session = persistenceManagerImpl.getSession();
+			Session session = ocmImpl.getSession();
 			Node root = session.getRootNode();
 			root.addNode("test");
 			root.addNode("test/node1");
@@ -193,7 +193,7 @@
 			paragraphs.add(new Paragraph("Another Para "));
 			page.setParagraphs(paragraphs);
 			
-			persistenceManager.insert(page);
+			ocm.insert(page);
 						
 			
 			page = new Page();
@@ -208,7 +208,7 @@
 			paragraphs.add(new Paragraph("Another Para"));
 			page.setParagraphs(paragraphs);
 			
-			persistenceManager.insert(page);
+			ocm.insert(page);
 			
 			page = new Page();
 			page.setPath("/test/node2/page1");
@@ -222,7 +222,7 @@
 			paragraphs.add(new Paragraph("Another Para"));
 			page.setParagraphs(paragraphs);
 			
-			persistenceManager.insert( page);
+			ocm.insert( page);
 
 			page = new Page();
 			page.setPath("/test/node2/page2");
@@ -236,8 +236,8 @@
 			paragraphs.add(new Paragraph("Another Para"));
 			page.setParagraphs(paragraphs);
 			
-			persistenceManager.insert(page);
-			persistenceManager.save();
+			ocm.insert(page);
+			ocm.save();
 
 			
 		}

Copied: jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/test/java/org/apache/jackrabbit/ocm/manager/query/ObjectContentManagerSimpleQueryTest.java (from r548484, jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/test/java/org/apache/jackrabbit/ocm/manager/query/PersistenceManagerSimpleQueryTest.java)
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/test/java/org/apache/jackrabbit/ocm/manager/query/ObjectContentManagerSimpleQueryTest.java?view=diff&rev=548496&p1=jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/test/java/org/apache/jackrabbit/ocm/manager/query/PersistenceManagerSimpleQueryTest.java&r1=548484&p2=jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/test/java/org/apache/jackrabbit/ocm/manager/query/ObjectContentManagerSimpleQueryTest.java&r2=548496
==============================================================================
--- jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/test/java/org/apache/jackrabbit/ocm/manager/query/PersistenceManagerSimpleQueryTest.java (original)
+++ jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/test/java/org/apache/jackrabbit/ocm/manager/query/ObjectContentManagerSimpleQueryTest.java Mon Jun 18 14:46:42 2007
@@ -40,15 +40,15 @@
  *
  * @author <a href="mailto:christophe.lombart@sword-technologies.com">Christophe Lombart</a>
  */
-public class PersistenceManagerSimpleQueryTest extends TestBase
+public class ObjectContentManagerSimpleQueryTest extends TestBase
 {
-    private final static Log log = LogFactory.getLog(PersistenceManagerSimpleQueryTest.class);
+    private final static Log log = LogFactory.getLog(ObjectContentManagerSimpleQueryTest.class);
 
     /**
      * <p>Defines the test case name for junit.</p>
      * @param testName The test case name.
      */
-    public PersistenceManagerSimpleQueryTest(String testName)  throws Exception
+    public ObjectContentManagerSimpleQueryTest(String testName)  throws Exception
     {
         super(testName);
     }
@@ -57,7 +57,7 @@
     {
         // All methods starting with "test" will be executed in the test suite.
         return new RepositoryLifecycleTestSetup(
-                new TestSuite(PersistenceManagerSimpleQueryTest.class));
+                new TestSuite(ObjectContentManagerSimpleQueryTest.class));
     }
 
     /**
@@ -74,8 +74,8 @@
      */
     public void tearDown() throws Exception
     {
-    	getPersistenceManager().remove("/test");
-    	getPersistenceManager().save();
+    	getObjectContentManager().remove("/test");
+    	getObjectContentManager().save();
     	
         super.tearDown();
     }
@@ -98,8 +98,8 @@
     	      
     	      Query query = queryManager.createQuery(filter);
     	      
-    	      ObjectContentManager persistenceManager = this.getPersistenceManager();
-    	      Paragraph paragraph = (Paragraph) persistenceManager.getObject(query);
+    	      ObjectContentManager ocm = this.getObjectContentManager();
+    	      Paragraph paragraph = (Paragraph) ocm.getObject(query);
     	      assertNotNull("Object is null", paragraph);    	      
     	      assertTrue("Invalid paragraph found" , paragraph.getText().equals("Para 1"));
             
@@ -130,8 +130,8 @@
     	      
     	      Query query = queryManager.createQuery(filter);
     	      
-    	      ObjectContentManager persistenceManager = this.getPersistenceManager();
-    	      Collection result = persistenceManager.getObjects(query);
+    	      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();
     	      assertTrue("Invalid paragraph found" , paragraph.getText().equals("Para 1"));
@@ -162,8 +162,8 @@
     	      
     	      Query query = queryManager.createQuery(filter);
     	      
-    	      ObjectContentManager persistenceManager = this.getPersistenceManager();
-    	      Collection result = persistenceManager.getObjects(query);
+    	      ObjectContentManager ocm = this.getObjectContentManager();
+    	      Collection result = ocm.getObjects(query);
     	      assertEquals("Invalid number of objects - should be = 3", 3, result.size());
 
     	      Paragraph[] paragraphs = (Paragraph[]) result.toArray(new Paragraph[result.size()]);
@@ -205,8 +205,8 @@
     	      
     	      Query query = queryManager.createQuery(filter1);
     	      
-    	      ObjectContentManager persistenceManager = this.getPersistenceManager();
-    	      Collection result = persistenceManager.getObjects(query);
+    	      ObjectContentManager ocm = this.getObjectContentManager();
+    	      Collection result = ocm.getObjects(query);
     	      assertEquals("Invalid number of objects - should be = 2", 2, result.size());
     	      
     	      Paragraph[] paragraphs = (Paragraph[]) result.toArray(new Paragraph[result.size()]);
@@ -237,8 +237,8 @@
     	      Query query = queryManager.createQuery(filter);
     	      query.addOrderByDescending("text");
     	      
-    	      ObjectContentManager persistenceManager = this.getPersistenceManager();
-    	      Collection result = persistenceManager.getObjects(query);
+    	      ObjectContentManager ocm = this.getObjectContentManager();
+    	      Collection result = ocm.getObjects(query);
     	      assertEquals("Invalid number of objects - should be = 3", 3, result.size());
 
     	      Paragraph[] paragraphs = (Paragraph[]) result.toArray(new Paragraph[result.size()]);
@@ -258,7 +258,7 @@
     
     private void importData() throws JcrMappingException 
     {
-    	ObjectContentManager persistenceManager = getPersistenceManager();
+    	ObjectContentManager ocm = getObjectContentManager();
 
         Page page = new Page();
         page.setPath("/test");
@@ -272,8 +272,8 @@
         paragraphs.add(new Paragraph("Another Para "));
         page.setParagraphs(paragraphs);
         
-        persistenceManager.insert(page);  
-        persistenceManager.save();
+        ocm.insert(page);  
+        ocm.save();
                 
 
     }

Modified: jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/test/java/org/apache/jackrabbit/ocm/manager/uuid/AllTests.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/test/java/org/apache/jackrabbit/ocm/manager/uuid/AllTests.java?view=diff&rev=548496&r1=548495&r2=548496
==============================================================================
--- jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/test/java/org/apache/jackrabbit/ocm/manager/uuid/AllTests.java (original)
+++ jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/test/java/org/apache/jackrabbit/ocm/manager/uuid/AllTests.java Mon Jun 18 14:46:42 2007
@@ -34,9 +34,9 @@
     }
 
     public static Test buildSuite() {
-        TestSuite suite= new TestSuite("Test for org.apache.jackrabbit.ocm.jcr.persistence.uuid");
+        TestSuite suite= new TestSuite("Test for org.apache.jackrabbit.ocm.jcr.manager.uuid");
         //$JUnit-BEGIN$
-        suite.addTestSuite(PersistenceManagerUuidTest.class);
+        suite.addTestSuite(ObjectContentManagerUuidTest.class);
         
         //$JUnit-END$
 

Copied: jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/test/java/org/apache/jackrabbit/ocm/manager/uuid/ObjectContentManagerUuidTest.java (from r548484, jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/test/java/org/apache/jackrabbit/ocm/manager/uuid/PersistenceManagerUuidTest.java)
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/test/java/org/apache/jackrabbit/ocm/manager/uuid/ObjectContentManagerUuidTest.java?view=diff&rev=548496&p1=jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/test/java/org/apache/jackrabbit/ocm/manager/uuid/PersistenceManagerUuidTest.java&r1=548484&p2=jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/test/java/org/apache/jackrabbit/ocm/manager/uuid/ObjectContentManagerUuidTest.java&r2=548496
==============================================================================
--- jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/test/java/org/apache/jackrabbit/ocm/manager/uuid/PersistenceManagerUuidTest.java (original)
+++ jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/test/java/org/apache/jackrabbit/ocm/manager/uuid/ObjectContentManagerUuidTest.java Mon Jun 18 14:46:42 2007
@@ -38,15 +38,15 @@
  *
  * @author <a href="mailto:christophe.lombart@sword-technologies.com">Christophe Lombart</a>
  */
-public class PersistenceManagerUuidTest extends TestBase
+public class ObjectContentManagerUuidTest extends TestBase
 {
-    private final static Log log = LogFactory.getLog(PersistenceManagerUuidTest.class);
+    private final static Log log = LogFactory.getLog(ObjectContentManagerUuidTest.class);
 
     /**
      * <p>Defines the test case name for junit.</p>
      * @param testName The test case name.
      */
-    public PersistenceManagerUuidTest(String testName)  throws Exception
+    public ObjectContentManagerUuidTest(String testName)  throws Exception
     {
         super(testName);
     }
@@ -55,7 +55,7 @@
     {
         // All methods starting with "test" will be executed in the test suite.
         return new RepositoryLifecycleTestSetup(
-                new TestSuite(PersistenceManagerUuidTest.class));
+                new TestSuite(ObjectContentManagerUuidTest.class));
     }
 
 
@@ -64,28 +64,28 @@
      */
     public void tearDown() throws Exception
     {
-    	if (getPersistenceManager().objectExists("/testB"))
+    	if (getObjectContentManager().objectExists("/testB"))
     	{
-    	   getPersistenceManager().remove("/testB");
-    	   getPersistenceManager().save();
+    	   getObjectContentManager().remove("/testB");
+    	   getObjectContentManager().save();
     	}
     	
-    	if (getPersistenceManager().objectExists("/testB2"))
+    	if (getObjectContentManager().objectExists("/testB2"))
     	{
-    	   getPersistenceManager().remove("/testB2");
-    	   getPersistenceManager().save();
+    	   getObjectContentManager().remove("/testB2");
+    	   getObjectContentManager().save();
     	}
     	
-    	if (getPersistenceManager().objectExists("/test"))
+    	if (getObjectContentManager().objectExists("/test"))
     	{
-    	   getPersistenceManager().remove("/test");
-    	   getPersistenceManager().save();
+    	   getObjectContentManager().remove("/test");
+    	   getObjectContentManager().save();
     	}
     	
-    	if (getPersistenceManager().objectExists("/descendant"))
+    	if (getObjectContentManager().objectExists("/descendant"))
     	{
-    	   getPersistenceManager().remove("/descendant");
-    	   getPersistenceManager().save();
+    	   getObjectContentManager().remove("/descendant");
+    	   getObjectContentManager().save();
     	}
     	
         super.tearDown();
@@ -100,7 +100,7 @@
     {
         try
         {
-        	ObjectContentManager persistenceManager = getPersistenceManager();
+        	ObjectContentManager ocm = getObjectContentManager();
 
 
             // --------------------------------------------------------------------------------
@@ -109,13 +109,13 @@
             A a = new A();
             a.setPath("/test");
             a.setStringData("testdata");
-            persistenceManager.insert(a);
-            persistenceManager.save();           
+            ocm.insert(a);
+            ocm.save();           
 
             // --------------------------------------------------------------------------------
             // Get the object
             // --------------------------------------------------------------------------------           
-            a = (A) persistenceManager.getObject( "/test");
+            a = (A) ocm.getObject( "/test");
             assertNotNull("a is null", a);
             String uuidA = a.getUuid();
             assertNotNull("uuid is null", uuidA);
@@ -125,20 +125,20 @@
             // Update the object
             // --------------------------------------------------------------------------------
             a.setStringData("testdata2");
-            persistenceManager.update(a);
-            persistenceManager.save();
+            ocm.update(a);
+            ocm.save();
 
             // --------------------------------------------------------------------------------
             // Get the object
             // --------------------------------------------------------------------------------           
-            a = (A) persistenceManager.getObject("/test");
+            a = (A) ocm.getObject("/test");
             assertNotNull("a is null", a);
             assertTrue("The uuid has been modified", uuidA.equals(a.getUuid()));
             
             // --------------------------------------------------------------------------------
             // Get the object with the uuid
             // --------------------------------------------------------------------------------           
-            a = (A) persistenceManager.getObjectByUuid(uuidA);
+            a = (A) ocm.getObjectByUuid(uuidA);
             assertNotNull("a is null", a);
             assertTrue("Invalid object found with the uuid ", "testdata2".equals(a.getStringData()));
             
@@ -147,7 +147,7 @@
             // --------------------------------------------------------------------------------           
             try 
             {
-                a = (A) persistenceManager.getObjectByUuid("1234");
+                a = (A) ocm.getObjectByUuid("1234");
                 fail("Exception not throw");
             }
             catch(Exception e)
@@ -176,7 +176,7 @@
     {
         try
         {
-        	ObjectContentManager persistenceManager = getPersistenceManager();
+        	ObjectContentManager ocm = getObjectContentManager();
 
             // --------------------------------------------------------------------------------
             // Create and store an object A in the repository
@@ -184,13 +184,13 @@
             A a = new A();
             a.setPath("/test");
             a.setStringData("testdata");
-            persistenceManager.insert(a);
-            persistenceManager.save();           
+            ocm.insert(a);
+            ocm.save();           
 
             // --------------------------------------------------------------------------------
             // Get the object
             // --------------------------------------------------------------------------------           
-            a = (A) persistenceManager.getObject( "/test");
+            a = (A) ocm.getObject( "/test");
             assertNotNull("a is null", a);
             String uuidA = a.getUuid();
             assertNotNull("uuid is null", uuidA);
@@ -202,13 +202,13 @@
             B b = new B();
             b.setReference2A(uuidA);
             b.setPath("/testB");
-            persistenceManager.insert(b);
-            persistenceManager.save();
+            ocm.insert(b);
+            ocm.save();
             
             // --------------------------------------------------------------------------------
             // Retrieve the object B with an invalid reference 
             // --------------------------------------------------------------------------------            
-            b = (B) persistenceManager.getObject("/testB");
+            b = (B) ocm.getObject("/testB");
             assertNotNull("b is null", b);
             assertTrue("Invalid uuid property", b.getReference2A().equals(uuidA));
             
@@ -218,7 +218,7 @@
             b.setReference2A("1245");
             try
             {
-            	persistenceManager.update(b);            	
+            	ocm.update(b);            	
             	fail("Exception not throw");
             }
             catch(Exception e)
@@ -249,7 +249,7 @@
     {
         try
         {
-        	ObjectContentManager persistenceManager = getPersistenceManager();
+        	ObjectContentManager ocm = getObjectContentManager();
 
             // --------------------------------------------------------------------------------
             // Create and store an object A in the repository
@@ -257,13 +257,13 @@
             A a = new A();
             a.setPath("/test");
             a.setStringData("testdata");
-            persistenceManager.insert(a);
-            persistenceManager.save();           
+            ocm.insert(a);
+            ocm.save();           
 
             // --------------------------------------------------------------------------------
             // Get the object a
             // --------------------------------------------------------------------------------           
-            a = (A) persistenceManager.getObject( "/test");
+            a = (A) ocm.getObject( "/test");
             assertNotNull("a is null", a);
             String uuidA = a.getUuid();
             assertNotNull("uuid is null", uuidA);
@@ -275,13 +275,13 @@
             B2 b = new B2();
             b.setA(a);
             b.setPath("/testB2");
-            persistenceManager.insert(b);
-            persistenceManager.save();
+            ocm.insert(b);
+            ocm.save();
             
             // --------------------------------------------------------------------------------
             // Retrieve object B
             // --------------------------------------------------------------------------------
-            b = (B2) persistenceManager.getObject("/testB2");
+            b = (B2) ocm.getObject("/testB2");
             a = b.getA();
             assertNotNull("a is null", a);
             assertTrue("Invalid object a", a.getStringData().equals("testdata"));
@@ -291,13 +291,13 @@
             // Update object B with an null value
             // --------------------------------------------------------------------------------
             b.setA(null);
-            persistenceManager.update(b);
-            persistenceManager.save();
+            ocm.update(b);
+            ocm.save();
             
             // --------------------------------------------------------------------------------
             // Retrieve object B
             // --------------------------------------------------------------------------------
-            b = (B2) persistenceManager.getObject("/testB2");
+            b = (B2) ocm.getObject("/testB2");
             a = b.getA();
             assertNull("a is not null", a);
             
@@ -320,7 +320,7 @@
     {
         try
         {
-        	ObjectContentManager persistenceManager = getPersistenceManager();
+        	ObjectContentManager ocm = getObjectContentManager();
 
             // --------------------------------------------------------------------------------
             // Create and store an object A in the repository
@@ -328,20 +328,20 @@
             A a1 = new A();
             a1.setPath("/a1");
             a1.setStringData("testdata1");
-            persistenceManager.insert(a1);
+            ocm.insert(a1);
             
             A a2 = new A();
             a2.setPath("/a2");
             a2.setStringData("testdata2");
-            persistenceManager.insert(a2);            
-            persistenceManager.save();           
+            ocm.insert(a2);            
+            ocm.save();           
 
             // --------------------------------------------------------------------------------
             // Get the objects
             // --------------------------------------------------------------------------------           
-            a1 = (A) persistenceManager.getObject( "/a1");
+            a1 = (A) ocm.getObject( "/a1");
             assertNotNull("a1 is null", a1);
-            a2 = (A) persistenceManager.getObject( "/a2");
+            a2 = (A) ocm.getObject( "/a2");
             assertNotNull("a2 is null", a2);
             ArrayList references = new ArrayList();
             references.add(a1.getUuid());
@@ -353,13 +353,13 @@
             B b = new B();
             b.setPath("/testB");
             b.setMultiReferences(references);
-            persistenceManager.insert(b);
-            persistenceManager.save();
+            ocm.insert(b);
+            ocm.save();
             
             // --------------------------------------------------------------------------------
             // Retrieve object B
             // --------------------------------------------------------------------------------
-            b = (B) persistenceManager.getObject("/testB");
+            b = (B) ocm.getObject("/testB");
             Collection allref = b.getMultiReferences();
             assertNotNull("collection is null", allref);
             assertTrue("Invalid number of items in the collection", allref.size() == 2);
@@ -371,7 +371,7 @@
             b.setMultiReferences(allref);
             try
             {
-            	persistenceManager.update(b);            	
+            	ocm.update(b);            	
             	fail("Exception not throw");
             }
             catch(Exception e)
@@ -385,13 +385,13 @@
             // Update object B with an null value
             // --------------------------------------------------------------------------------
             b.setMultiReferences(null);
-            persistenceManager.update(b);
-            persistenceManager.save();
+            ocm.update(b);
+            ocm.save();
             
             // --------------------------------------------------------------------------------
             // Retrieve object B
             // --------------------------------------------------------------------------------
-            b = (B) persistenceManager.getObject("/testB");            
+            b = (B) ocm.getObject("/testB");            
             assertNull("a is not null", b.getMultiReferences());
             
             
@@ -413,7 +413,7 @@
     {
         try
         {
-        	ObjectContentManager persistenceManager = getPersistenceManager();
+        	ObjectContentManager ocm = getObjectContentManager();
 
             // --------------------------------------------------------------------------------
             // Create and store an object A in the repository
@@ -421,20 +421,20 @@
             A a1 = new A();
             a1.setPath("/a1");
             a1.setStringData("testdata1");
-            persistenceManager.insert(a1);
+            ocm.insert(a1);
             
             A a2 = new A();
             a2.setPath("/a2");
             a2.setStringData("testdata2");
-            persistenceManager.insert(a2);            
-            persistenceManager.save();           
+            ocm.insert(a2);            
+            ocm.save();           
 
             // --------------------------------------------------------------------------------
             // Get the objects
             // --------------------------------------------------------------------------------           
-            a1 = (A) persistenceManager.getObject( "/a1");
+            a1 = (A) ocm.getObject( "/a1");
             assertNotNull("a1 is null", a1);
-            a2 = (A) persistenceManager.getObject( "/a2");
+            a2 = (A) ocm.getObject( "/a2");
             assertNotNull("a2 is null", a2);
             ArrayList references = new ArrayList();
             references.add(a1);
@@ -446,13 +446,13 @@
             B2 b = new B2();
             b.setPath("/testB2");
             b.setMultiReferences(references);
-            persistenceManager.insert(b);
-            persistenceManager.save();
+            ocm.insert(b);
+            ocm.save();
             
             // --------------------------------------------------------------------------------
             // Retrieve object B
             // --------------------------------------------------------------------------------
-            b = (B2) persistenceManager.getObject("/testB2");
+            b = (B2) ocm.getObject("/testB2");
             Collection allref = b.getMultiReferences();
             assertNotNull("collection is null", allref);
             assertTrue("Invalid number of items in the collection", allref.size() == 2);
@@ -463,13 +463,13 @@
             // Update object B with an null value
             // --------------------------------------------------------------------------------
             b.setMultiReferences(null);
-            persistenceManager.update(b);
-            persistenceManager.save();
+            ocm.update(b);
+            ocm.save();
             
             // --------------------------------------------------------------------------------
             // Retrieve object B
             // --------------------------------------------------------------------------------
-            b = (B2) persistenceManager.getObject("/testB2");            
+            b = (B2) ocm.getObject("/testB2");            
             assertNull("a is not null", b.getMultiReferences());
             
             
@@ -491,7 +491,7 @@
     {
         try
         {
-        	ObjectContentManager persistenceManager = getPersistenceManager();
+        	ObjectContentManager ocm = getObjectContentManager();
 
 
             // --------------------------------------------------------------------------------
@@ -500,13 +500,13 @@
             Descendant a = new Descendant();
             a.setPath("/descendant");
             a.setStringData("testdata");
-            persistenceManager.insert(a);
-            persistenceManager.save();           
+            ocm.insert(a);
+            ocm.save();           
 
             // --------------------------------------------------------------------------------
             // Get the object
             // --------------------------------------------------------------------------------           
-            a = (Descendant) persistenceManager.getObject( "/descendant");
+            a = (Descendant) ocm.getObject( "/descendant");
             assertNotNull("a is null", a);
             String uuidA = a.getUuid();
             assertNotNull("uuid is null", uuidA);
@@ -516,20 +516,20 @@
             // Update the object
             // --------------------------------------------------------------------------------
             a.setStringData("testdata2");
-            persistenceManager.update(a);
-            persistenceManager.save();
+            ocm.update(a);
+            ocm.save();
 
             // --------------------------------------------------------------------------------
             // Get the object
             // --------------------------------------------------------------------------------           
-            a = (Descendant) persistenceManager.getObject("/descendant");
+            a = (Descendant) ocm.getObject("/descendant");
             assertNotNull("a is null", a);
             assertTrue("The uuid has been modified", uuidA.equals(a.getUuid()));
             
             // --------------------------------------------------------------------------------
             // Get the object with the uuid
             // --------------------------------------------------------------------------------           
-            a = (Descendant) persistenceManager.getObjectByUuid(uuidA);
+            a = (Descendant) ocm.getObjectByUuid(uuidA);
             assertNotNull("a is null", a);
             assertTrue("Invalid object found with the uuid ", "testdata2".equals(a.getStringData()));
             

Modified: jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/test/java/org/apache/jackrabbit/ocm/manager/version/AllTests.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/test/java/org/apache/jackrabbit/ocm/manager/version/AllTests.java?view=diff&rev=548496&r1=548495&r2=548496
==============================================================================
--- jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/test/java/org/apache/jackrabbit/ocm/manager/version/AllTests.java (original)
+++ jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/test/java/org/apache/jackrabbit/ocm/manager/version/AllTests.java Mon Jun 18 14:46:42 2007
@@ -34,9 +34,9 @@
     }
 
     public static Test buildSuite() {
-        TestSuite suite= new TestSuite("Test for org.apache.jackrabbit.ocm.persistence.version");
+        TestSuite suite= new TestSuite("Test for org.apache.jackrabbit.ocm.manager.version");
         //$JUnit-BEGIN$
-        suite.addTestSuite(PersistenceManagerBasicVersionningTest.class);
+        suite.addTestSuite(ObjectContentManagerBasicVersionningTest.class);
        
         
         //$JUnit-END$

Copied: jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/test/java/org/apache/jackrabbit/ocm/manager/version/ObjectContentManagerBasicVersionningTest.java (from r548484, jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/test/java/org/apache/jackrabbit/ocm/manager/version/PersistenceManagerBasicVersionningTest.java)
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/test/java/org/apache/jackrabbit/ocm/manager/version/ObjectContentManagerBasicVersionningTest.java?view=diff&rev=548496&p1=jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/test/java/org/apache/jackrabbit/ocm/manager/version/PersistenceManagerBasicVersionningTest.java&r1=548484&p2=jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/test/java/org/apache/jackrabbit/ocm/manager/version/ObjectContentManagerBasicVersionningTest.java&r2=548496
==============================================================================
--- jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/test/java/org/apache/jackrabbit/ocm/manager/version/PersistenceManagerBasicVersionningTest.java (original)
+++ jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/test/java/org/apache/jackrabbit/ocm/manager/version/ObjectContentManagerBasicVersionningTest.java Mon Jun 18 14:46:42 2007
@@ -21,16 +21,16 @@
  *
  * @author <a href="mailto:christophe.lombart@sword-technologies.com">Christophe Lombart</a>
  */
-public class PersistenceManagerBasicVersionningTest extends TestBase
+public class ObjectContentManagerBasicVersionningTest extends TestBase
 {
-	private final static Log log = LogFactory.getLog(PersistenceManagerBasicVersionningTest.class);
+	private final static Log log = LogFactory.getLog(ObjectContentManagerBasicVersionningTest.class);
 	private Date date = new Date();
 	
 	/**
 	 * <p>Defines the test case name for junit.</p>
 	 * @param testName The test case name.
 	 */
-	public PersistenceManagerBasicVersionningTest(String testName) throws Exception
+	public ObjectContentManagerBasicVersionningTest(String testName) throws Exception
 	{
 		super(testName);
 		
@@ -40,21 +40,21 @@
 	{
 		// All methods starting with "test" will be executed in the test suite.
 		return new RepositoryLifecycleTestSetup(
-                new TestSuite(PersistenceManagerBasicVersionningTest.class));
+                new TestSuite(ObjectContentManagerBasicVersionningTest.class));
 	}
 
     public void tearDown() throws Exception
     {
-    	ObjectContentManager persistenceManager = getPersistenceManager();
-	    persistenceManager.remove("/page");
-    	persistenceManager.save();
+    	ObjectContentManager ocm = getObjectContentManager();
+	    ocm.remove("/page");
+    	ocm.save();
        
         super.tearDown();
     }	
 
 	public void testSimpleVersion()
 	{
-		     ObjectContentManager persistenceManager = getPersistenceManager();
+		     ObjectContentManager ocm = getObjectContentManager();
              try
              {
             	 
@@ -63,23 +63,23 @@
             	 page.setTitle("Page Title");            	 
             	 page.addParagraph(new Paragraph("para1"));
             	 page.addParagraph(new Paragraph("para2"));
-            	 persistenceManager.insert(page);
-            	 persistenceManager.save();
+            	 ocm.insert(page);
+            	 ocm.save();
             	 
                  
             	 page.addParagraph(new Paragraph("para3"));
-            	 persistenceManager.checkout("/page");
-            	 persistenceManager.update(page);
-            	 persistenceManager.save();
-            	 persistenceManager.checkin("/page");
+            	 ocm.checkout("/page");
+            	 ocm.update(page);
+            	 ocm.save();
+            	 ocm.checkin("/page");
             	 
             	 page.addParagraph(new Paragraph("para4"));
-            	 persistenceManager.checkout("/page");
-            	 persistenceManager.update(page);
-            	 persistenceManager.save();
-            	 persistenceManager.checkin("/page");            	 
+            	 ocm.checkout("/page");
+            	 ocm.update(page);
+            	 ocm.save();
+            	 ocm.checkin("/page");            	 
 
-            	 VersionIterator versionIterator = persistenceManager.getAllVersions("/page");
+            	 VersionIterator versionIterator = ocm.getAllVersions("/page");
             	 assertNotNull("VersionIterator is null", versionIterator);
             	 assertTrue("Invalid number of versions found", versionIterator.getSize() == 3);
             	 
@@ -90,21 +90,21 @@
             		 
             	 }
             	 
-            	 Version baseVersion = persistenceManager.getBaseVersion("/page");
+            	 Version baseVersion = ocm.getBaseVersion("/page");
             	 System.out.println("Base version : " + baseVersion.getName());
 
-            	 Version rootVersion = persistenceManager.getRootVersion("/page");
+            	 Version rootVersion = ocm.getRootVersion("/page");
             	 System.out.println("Root version : " + rootVersion.getName());
             	 //this.exportDocument("/home/christophe/export.xml", "/jcr:system/jcr:versionStorage", true, false);
             	             	
                  //Get the latest version 
-            	 page = (Page) persistenceManager.getObject( "/page");
+            	 page = (Page) ocm.getObject( "/page");
             	 assertNotNull("Last version is nulll", page);
             	 assertTrue("Invalid number of paragraph found in the last  version", page.getParagraphs().size() == 4);
 
             	 
             	 //Get the object matching to the first version 
-                 Page  page1 = (Page) persistenceManager.getObject( "/page", "1.0");
+                 Page  page1 = (Page) ocm.getObject( "/page", "1.0");
             	 assertNotNull("version 1.0 object is null", page1);
             	 assertTrue("Invalid number of paragraph found in the root version", page1.getParagraphs().size() == 3);
 
@@ -120,7 +120,7 @@
 	
 	public void testVersionLabels()
 	{
-		     ObjectContentManager persistenceManager = getPersistenceManager();
+		     ObjectContentManager ocm = getObjectContentManager();
              try
              {
             	 
@@ -129,26 +129,26 @@
             	 page.setTitle("Page Title");            	 
             	 page.addParagraph(new Paragraph("para1"));
             	 page.addParagraph(new Paragraph("para2"));
-            	 persistenceManager.insert(page);
-            	 persistenceManager.save();
+            	 ocm.insert(page);
+            	 ocm.save();
             	 
                  
             	 page.addParagraph(new Paragraph("para3"));
-            	 persistenceManager.checkout("/page");
-            	 persistenceManager.update(page);
-            	 persistenceManager.save();
-            	 persistenceManager.checkin("/page", new String[] {"A", "B"});
+            	 ocm.checkout("/page");
+            	 ocm.update(page);
+            	 ocm.save();
+            	 ocm.checkin("/page", new String[] {"A", "B"});
             	 
             	 page.addParagraph(new Paragraph("para4"));
-            	 persistenceManager.checkout("/page");
-            	 persistenceManager.update(page);
-            	 persistenceManager.save();
-            	 persistenceManager.checkin("/page", new String[] {"C", "D"});         	 
+            	 ocm.checkout("/page");
+            	 ocm.update(page);
+            	 ocm.save();
+            	 ocm.checkin("/page", new String[] {"C", "D"});         	 
 
-            	 String[] allLabels = persistenceManager.getAllVersionLabels("/page");
+            	 String[] allLabels = ocm.getAllVersionLabels("/page");
             	 assertTrue("Incorrect number of labels", allLabels.length == 4);
 
-            	 String[] versionLabels = persistenceManager.getVersionLabels("/page", "1.1");
+            	 String[] versionLabels = ocm.getVersionLabels("/page", "1.1");
             	 assertTrue("Incorrect number of labels", versionLabels.length == 2);
             	 assertTrue("Incorrect label", versionLabels[0].equals("C") || versionLabels[0].equals("D"));
             	 assertTrue("Incorrect label", versionLabels[1].equals("C") || versionLabels[0].equals("D"));

Modified: jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/test/test-config/jcrmapping-atomic.xml
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/test/test-config/jcrmapping-atomic.xml?view=diff&rev=548496&r1=548495&r2=548496
==============================================================================
--- jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/test/test-config/jcrmapping-atomic.xml (original)
+++ jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/test/test-config/jcrmapping-atomic.xml Mon Jun 18 14:46:42 2007
@@ -17,10 +17,10 @@
 		<field-descriptor fieldName="doublePrimitive" jcrName="doublePrimitive" />
 		<field-descriptor fieldName="inputStream" jcrName="inputStream" />
 		<field-descriptor fieldName="timestamp" jcrName="timestamp" />
-		<field-descriptor fieldName="int2boolean" jcrName="int2boolean" converter="org.apache.jackrabbit.ocm.persistence.atomic.Int2BooleanTypeConverterImpl" />
-		<field-descriptor fieldName="namedProperty" jcrName="namedProperty" converter="org.apache.jackrabbit.ocm.persistence.atomictypeconverter.impl.NameTypeConverterImpl" />
-		<field-descriptor fieldName="pathProperty" jcrName="pathProperty" converter="org.apache.jackrabbit.ocm.persistence.atomictypeconverter.impl.PathTypeConverterImpl" />
-		<field-descriptor fieldName="undefinedProperty" jcrName="undefinedProperty" converter="org.apache.jackrabbit.ocm.persistence.atomictypeconverter.impl.UndefinedTypeConverterImpl" />
+		<field-descriptor fieldName="int2boolean" jcrName="int2boolean" converter="org.apache.jackrabbit.ocm.manager.atomic.Int2BooleanTypeConverterImpl" />
+		<field-descriptor fieldName="namedProperty" jcrName="namedProperty" converter="org.apache.jackrabbit.ocm.manager.atomictypeconverter.impl.NameTypeConverterImpl" />
+		<field-descriptor fieldName="pathProperty" jcrName="pathProperty" converter="org.apache.jackrabbit.ocm.manager.atomictypeconverter.impl.PathTypeConverterImpl" />
+		<field-descriptor fieldName="undefinedProperty" jcrName="undefinedProperty" converter="org.apache.jackrabbit.ocm.manager.atomictypeconverter.impl.UndefinedTypeConverterImpl" />
 	</class-descriptor>
 
     <class-descriptor
@@ -29,11 +29,11 @@
 		<field-descriptor fieldName="name" jcrName="name" />
 		<collection-descriptor fieldName="multiValues" jcrName="multiValue" proxy="false" 
 		                       elementClassName="java.lang.String" 
-		                       collectionConverter="org.apache.jackrabbit.ocm.persistence.collectionconverter.impl.MultiValueCollectionConverterImpl" />
+		                       collectionConverter="org.apache.jackrabbit.ocm.manager.collectionconverter.impl.MultiValueCollectionConverterImpl" />
 
 		<collection-descriptor fieldName="nullMultiValues" jcrName="nullMultiValue" proxy="false" 
 		                       elementClassName="java.lang.String" 
-		                       collectionConverter="org.apache.jackrabbit.ocm.persistence.collectionconverter.impl.MultiValueCollectionConverterImpl" />
+		                       collectionConverter="org.apache.jackrabbit.ocm.manager.collectionconverter.impl.MultiValueCollectionConverterImpl" />
 		                       
 
 	</class-descriptor> 

Modified: jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/test/test-config/jcrmapping-auto.xml
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/test/test-config/jcrmapping-auto.xml?view=diff&rev=548496&r1=548495&r2=548496
==============================================================================
--- jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/test/test-config/jcrmapping-auto.xml (original)
+++ jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/test/test-config/jcrmapping-auto.xml Mon Jun 18 14:46:42 2007
@@ -28,7 +28,7 @@
 		<field-descriptor fieldName="path" path="true" />
 		<field-descriptor fieldName="name" jcrName="ocm:name"  id="true" />
 		<bean-descriptor  fieldName="parentFolder"  					 
-						  converter="org.apache.jackrabbit.ocm.persistence.beanconverter.impl.ParentBeanConverterImpl" />
+						  converter="org.apache.jackrabbit.ocm.manager.beanconverter.impl.ParentBeanConverterImpl" />
 
 	</class-descriptor>     
 
@@ -37,7 +37,7 @@
 		<implement-descriptor interfaceName="org.apache.jackrabbit.ocm.testmodel.interfaces.Folder" />	  		                                    
 		<collection-descriptor fieldName="children" proxy="true" autoUpdate="false" autoInsert="false" autoRetrieve="false" 
 		                       elementClassName="org.apache.jackrabbit.ocm.testmodel.inheritance.impl.CmsObjectImpl" 
-		                       collectionConverter="org.apache.jackrabbit.ocm.persistence.collectionconverter.impl.NTCollectionConverterImpl" />
+		                       collectionConverter="org.apache.jackrabbit.ocm.manager.collectionconverter.impl.NTCollectionConverterImpl" />
 	</class-descriptor >	
 
 	<class-descriptor className="org.apache.jackrabbit.ocm.testmodel.inheritance.impl.ContentImpl" jcrNodeType="ocm:contentimpl" abstract="true"

Modified: jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/test/test-config/jcrmapping-avoidrecursiveloop.xml
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/test/test-config/jcrmapping-avoidrecursiveloop.xml?view=diff&rev=548496&r1=548495&r2=548496
==============================================================================
--- jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/test/test-config/jcrmapping-avoidrecursiveloop.xml (original)
+++ jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/test/test-config/jcrmapping-avoidrecursiveloop.xml Mon Jun 18 14:46:42 2007
@@ -17,7 +17,7 @@
 	<class-descriptor className="org.apache.jackrabbit.ocm.testmodel.crossreference.B"  jcrNodeType="nt:unstructured" >
 		<field-descriptor fieldName="b1" jcrName="b1"  />		
         <field-descriptor fieldName="b2" jcrName="b2"  />
-        <bean-descriptor fieldName="a" jcrName="a" proxy="false" converter="org.apache.jackrabbit.ocm.persistence.beanconverter.impl.ReferenceBeanConverterImpl" />
+        <bean-descriptor fieldName="a" jcrName="a" proxy="false" converter="org.apache.jackrabbit.ocm.manager.beanconverter.impl.ReferenceBeanConverterImpl" />
 	</class-descriptor>
 
 </jackrabbit-ocm>

Modified: jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/test/test-config/jcrmapping-beandescriptor.xml
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/test/test-config/jcrmapping-beandescriptor.xml?view=diff&rev=548496&r1=548495&r2=548496
==============================================================================
--- jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/test/test-config/jcrmapping-beandescriptor.xml (original)
+++ jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/test/test-config/jcrmapping-beandescriptor.xml Mon Jun 18 14:46:42 2007
@@ -7,7 +7,7 @@
 		<field-descriptor fieldName="d1" jcrName="d1" jcrType="String" jcrAutoCreated="false" jcrMandatory="false"
         jcrOnParentVersion="IGNORE" jcrProtected="false" jcrMultiple="false" />
 		
-		<bean-descriptor fieldName="b1" jcrName="b1" converter="org.apache.jackrabbit.ocm.persistence.beanconverter.impl.InlineBeanConverterImpl" />
+		<bean-descriptor fieldName="b1" jcrName="b1" converter="org.apache.jackrabbit.ocm.manager.beanconverter.impl.InlineBeanConverterImpl" />
 
 	</class-descriptor>
 	
@@ -24,7 +24,7 @@
 		
 		<bean-descriptor  fieldName="b1" 
 						  jcrName="b1"
-						  converter="org.apache.jackrabbit.ocm.persistence.beanconverter.FakeBeanConverter" />
+						  converter="org.apache.jackrabbit.ocm.manager.beanconverter.FakeBeanConverter" />
 
 	</class-descriptor>
 	

Modified: jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/test/test-config/jcrmapping-inheritance.xml
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/test/test-config/jcrmapping-inheritance.xml?view=diff&rev=548496&r1=548495&r2=548496
==============================================================================
--- jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/test/test-config/jcrmapping-inheritance.xml (original)
+++ jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/test/test-config/jcrmapping-inheritance.xml Mon Jun 18 14:46:42 2007
@@ -62,7 +62,7 @@
 		<field-descriptor fieldName="path" path="true" />
 		<field-descriptor fieldName="name" jcrName="ocm:name"  id="true" />
 		<bean-descriptor  fieldName="parentFolder"  					 
-						  converter="org.apache.jackrabbit.ocm.persistence.beanconverter.impl.ParentBeanConverterImpl" />
+						  converter="org.apache.jackrabbit.ocm.manager.beanconverter.impl.ParentBeanConverterImpl" />
 
 	</class-descriptor>     
 
@@ -71,7 +71,7 @@
 		<implement-descriptor interfaceName="org.apache.jackrabbit.ocm.testmodel.interfaces.Folder" />	  		                                    
 		<collection-descriptor fieldName="children" proxy="true" autoUpdate="false" 
 		                       elementClassName="org.apache.jackrabbit.ocm.testmodel.inheritance.impl.CmsObjectImpl" 
-		                       collectionConverter="org.apache.jackrabbit.ocm.persistence.collectionconverter.impl.NTCollectionConverterImpl" />
+		                       collectionConverter="org.apache.jackrabbit.ocm.manager.collectionconverter.impl.NTCollectionConverterImpl" />
 	</class-descriptor >	
 
 	<class-descriptor className="org.apache.jackrabbit.ocm.testmodel.inheritance.impl.ContentImpl" jcrNodeType="ocm:contentimpl" abstract="true"

Modified: jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/test/test-config/jcrmapping-jcrnodetypes.xml
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/test/test-config/jcrmapping-jcrnodetypes.xml?view=diff&rev=548496&r1=548495&r2=548496
==============================================================================
--- jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/test/test-config/jcrmapping-jcrnodetypes.xml (original)
+++ jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/test/test-config/jcrmapping-jcrnodetypes.xml Mon Jun 18 14:46:42 2007
@@ -13,7 +13,7 @@
 		<field-descriptor fieldName="path" path="true" />
 		<collection-descriptor fieldName="children" proxy="false" autoUpdate="false" 
 		                       elementClassName="org.apache.jackrabbit.ocm.testmodel.HierarchyNode" 
-		                       collectionConverter="org.apache.jackrabbit.ocm.persistence.collectionconverter.impl.NTCollectionConverterImpl" />
+		                       collectionConverter="org.apache.jackrabbit.ocm.manager.collectionconverter.impl.NTCollectionConverterImpl" />
 
 	</class-descriptor>	
 	

Modified: jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/test/test-config/jcrmapping-sibling.xml
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/test/test-config/jcrmapping-sibling.xml?view=diff&rev=548496&r1=548495&r2=548496
==============================================================================
--- jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/test/test-config/jcrmapping-sibling.xml (original)
+++ jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/test/test-config/jcrmapping-sibling.xml Mon Jun 18 14:46:42 2007
@@ -8,7 +8,7 @@
 		<field-descriptor fieldName="title" jcrName="ocm:title" />
 		<collection-descriptor fieldName="paragraphs" proxy="false" 
 		                       elementClassName="org.apache.jackrabbit.ocm.testmodel.Paragraph" 
-		                       collectionConverter="org.apache.jackrabbit.ocm.persistence.collectionconverter.impl.NTCollectionConverterImpl" />
+		                       collectionConverter="org.apache.jackrabbit.ocm.manager.collectionconverter.impl.NTCollectionConverterImpl" />
 	</class-descriptor>
 
 	<class-descriptor className="org.apache.jackrabbit.ocm.testmodel.Paragraph" jcrNodeType="ocm:paragraph" discriminator="false" >

Modified: jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/test/test-config/jcrmapping-testdigester.xml
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/test/test-config/jcrmapping-testdigester.xml?view=diff&rev=548496&r1=548495&r2=548496
==============================================================================
--- jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/test/test-config/jcrmapping-testdigester.xml (original)
+++ jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/test/test-config/jcrmapping-testdigester.xml Mon Jun 18 14:46:42 2007
@@ -24,7 +24,7 @@
 			* proxy="true" => use lazy laoding for this attribute b when retrieving A
 		-->
 		<bean-descriptor fieldName="b" jcrName="b" proxy="false"
-			converter="org.apache.jackrabbit.ocm.persistence.beanconverter.impl.InlineBeanConverterImpl"
+			converter="org.apache.jackrabbit.ocm.manager.beanconverter.impl.InlineBeanConverterImpl"
 			jcrNodeType="nt:unstructured" jcrAutoCreated="false"
 			jcrMandatory="false" jcrOnParentVersion="IGNORE" jcrProtected="false"
 			jcrSameNameSiblings="false" />
@@ -79,12 +79,12 @@
 		<field-descriptor fieldName="text" jcrName="text" />
 		<collection-descriptor fieldName="hashMap" proxy="false"
 			elementClassName="org.apache.jackrabbit.ocm.testmodel.collection.Element"
-			collectionConverter="org.apache.jackrabbit.ocm.persistence.collectionconverter.impl.NTCollectionConverterImpl"
+			collectionConverter="org.apache.jackrabbit.ocm.manager.collectionconverter.impl.NTCollectionConverterImpl"
 			collectionClassName="org.apache.jackrabbit.ocm.testmodel.collection.HashMapElement" />
 
 		<collection-descriptor fieldName="list" proxy="false"
 			elementClassName="org.apache.jackrabbit.ocm.testmodel.collection.Element"
-			collectionConverter="org.apache.jackrabbit.ocm.persistence.collectionconverter.impl.NTCollectionConverterImpl"
+			collectionConverter="org.apache.jackrabbit.ocm.manager.collectionconverter.impl.NTCollectionConverterImpl"
 			collectionClassName="org.apache.jackrabbit.ocm.testmodel.collection.ArrayListElement" />
 
 	</class-descriptor>

Modified: jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/test/test-config/jcrmapping-uuid.xml
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/test/test-config/jcrmapping-uuid.xml?view=diff&rev=548496&r1=548495&r2=548496
==============================================================================
--- jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/test/test-config/jcrmapping-uuid.xml (original)
+++ jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/test/test-config/jcrmapping-uuid.xml Mon Jun 18 14:46:42 2007
@@ -12,18 +12,18 @@
 	<class-descriptor
 		className="org.apache.jackrabbit.ocm.testmodel.uuid.B" jcrNodeType="nt:unstructured"  >
 		<field-descriptor fieldName="path" path="true" />
-		<field-descriptor fieldName="reference2A" jcrName="reference2A" converter="org.apache.jackrabbit.ocm.persistence.atomictypeconverter.impl.ReferenceTypeConverterImpl" /> 
+		<field-descriptor fieldName="reference2A" jcrName="reference2A" converter="org.apache.jackrabbit.ocm.manager.atomictypeconverter.impl.ReferenceTypeConverterImpl" /> 
 		<collection-descriptor fieldName="multiReferences" jcrName="multiReferences" proxy="false" 		                      
-		                       collectionConverter="org.apache.jackrabbit.ocm.persistence.collectionconverter.impl.ReferenceCollectionConverterImpl" />
+		                       collectionConverter="org.apache.jackrabbit.ocm.manager.collectionconverter.impl.ReferenceCollectionConverterImpl" />
 		
 	</class-descriptor>
 
 	<class-descriptor
 		className="org.apache.jackrabbit.ocm.testmodel.uuid.B2" jcrNodeType="nt:unstructured"  >
 		<field-descriptor fieldName="path" path="true" />
-		<bean-descriptor fieldName="a" jcrName="a" converter="org.apache.jackrabbit.ocm.persistence.beanconverter.impl.ReferenceBeanConverterImpl" />
+		<bean-descriptor fieldName="a" jcrName="a" converter="org.apache.jackrabbit.ocm.manager.beanconverter.impl.ReferenceBeanConverterImpl" />
 		<collection-descriptor fieldName="multiReferences" jcrName="multiReferences" proxy="false" 		                      
-		                       collectionConverter="org.apache.jackrabbit.ocm.persistence.collectionconverter.impl.BeanReferenceCollectionConverterImpl" />
+		                       collectionConverter="org.apache.jackrabbit.ocm.manager.collectionconverter.impl.BeanReferenceCollectionConverterImpl" />
 		
 	</class-descriptor>	
 			

Modified: jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/test/test-config/jcrmapping.xml
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/test/test-config/jcrmapping.xml?view=diff&rev=548496&r1=548495&r2=548496
==============================================================================
--- jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/test/test-config/jcrmapping.xml (original)
+++ jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/test/test-config/jcrmapping.xml Mon Jun 18 14:46:42 2007
@@ -72,13 +72,13 @@
 		<field-descriptor fieldName="title" jcrName="ocm:title" />
 		<collection-descriptor fieldName="paragraphs" proxy="false" 
 		                       elementClassName="org.apache.jackrabbit.ocm.testmodel.Paragraph" 
-		                       collectionConverter="org.apache.jackrabbit.ocm.persistence.collectionconverter.impl.NTCollectionConverterImpl" />
+		                       collectionConverter="org.apache.jackrabbit.ocm.manager.collectionconverter.impl.NTCollectionConverterImpl" />
 	</class-descriptor>
 
 	<class-descriptor className="org.apache.jackrabbit.ocm.testmodel.Paragraph" jcrNodeType="ocm:paragraph" discriminator="false" >
 		<field-descriptor fieldName="path" path="true" />
 		<field-descriptor fieldName="text" jcrName="ocm:text"/>
-    	<bean-descriptor fieldName="page" jcrName="page" proxy="true" converter="org.apache.jackrabbit.ocm.persistence.beanconverter.impl.ParentBeanConverterImpl" />		
+    	<bean-descriptor fieldName="page" jcrName="page" proxy="true" converter="org.apache.jackrabbit.ocm.manager.beanconverter.impl.ParentBeanConverterImpl" />		
 	</class-descriptor>
 
 
@@ -114,8 +114,8 @@
         <collection-descriptor fieldName="elements" proxy="false" 
                                jcrName="value*"
                                elementClassName="java.lang.String"
-                               collectionConverter="org.apache.jackrabbit.ocm.persistence.collectionconverter.impl.ResidualPropertiesCollectionConverterImpl" 
-                               collectionClassName="org.apache.jackrabbit.ocm.persistence.collectionconverter.impl.ManagedHashMap" />
+                               collectionConverter="org.apache.jackrabbit.ocm.manager.collectionconverter.impl.ResidualPropertiesCollectionConverterImpl" 
+                               collectionClassName="org.apache.jackrabbit.ocm.manager.collectionconverter.impl.ManagedHashMap" />
                                
     </class-descriptor>
 
@@ -124,8 +124,8 @@
         <collection-descriptor fieldName="elements" proxy="false" 
                                jcrName="value*"
                                elementClassName="java.lang.Object"
-                               collectionConverter="org.apache.jackrabbit.ocm.persistence.collectionconverter.impl.ResidualNodesCollectionConverterImpl" 
-                               collectionClassName="org.apache.jackrabbit.ocm.persistence.collectionconverter.impl.ManagedHashMap" />
+                               collectionConverter="org.apache.jackrabbit.ocm.manager.collectionconverter.impl.ResidualNodesCollectionConverterImpl" 
+                               collectionClassName="org.apache.jackrabbit.ocm.manager.collectionconverter.impl.ManagedHashMap" />
                                
     </class-descriptor>
 </jackrabbit-ocm>



Mime
View raw message