jackrabbit-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From clomb...@apache.org
Subject svn commit: r548484 [3/4] - in /jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src: main/java/org/apache/jackrabbit/ocm/manager/ main/java/org/apache/jackrabbit/ocm/manager/atomictypeconverter/ main/java/org/apache/jackrabbit/ocm/manager/a...
Date Mon, 18 Jun 2007 20:43:54 GMT
Modified: jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/main/java/org/apache/jackrabbit/ocm/manager/objectconverter/impl/ObjectConverterImpl.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/main/java/org/apache/jackrabbit/ocm/manager/objectconverter/impl/ObjectConverterImpl.java?view=diff&rev=548484&r1=547884&r2=548484
==============================================================================
--- jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/main/java/org/apache/jackrabbit/ocm/manager/objectconverter/impl/ObjectConverterImpl.java (original)
+++ jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/main/java/org/apache/jackrabbit/ocm/manager/objectconverter/impl/ObjectConverterImpl.java Mon Jun 18 13:43:33 2007
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.jackrabbit.ocm.persistence.objectconverter.impl;
+package org.apache.jackrabbit.ocm.manager.objectconverter.impl;
 
 import java.util.HashMap;
 import java.util.Iterator;
@@ -32,23 +32,23 @@
 import org.apache.commons.logging.LogFactory;
 import org.apache.jackrabbit.ocm.exception.JcrMappingException;
 import org.apache.jackrabbit.ocm.exception.PersistenceException;
+import org.apache.jackrabbit.ocm.manager.ManagerConstant;
+import org.apache.jackrabbit.ocm.manager.atomictypeconverter.AtomicTypeConverterProvider;
+import org.apache.jackrabbit.ocm.manager.beanconverter.BeanConverter;
+import org.apache.jackrabbit.ocm.manager.cache.ObjectCache;
+import org.apache.jackrabbit.ocm.manager.cache.impl.RequestObjectCacheImpl;
+import org.apache.jackrabbit.ocm.manager.collectionconverter.CollectionConverter;
+import org.apache.jackrabbit.ocm.manager.collectionconverter.ManageableCollection;
+import org.apache.jackrabbit.ocm.manager.collectionconverter.ManageableCollectionUtil;
+import org.apache.jackrabbit.ocm.manager.collectionconverter.impl.DefaultCollectionConverterImpl;
+import org.apache.jackrabbit.ocm.manager.impl.PersistenceUtil;
+import org.apache.jackrabbit.ocm.manager.objectconverter.ObjectConverter;
+import org.apache.jackrabbit.ocm.manager.objectconverter.ProxyManager;
 import org.apache.jackrabbit.ocm.mapper.Mapper;
 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.persistence.PersistenceConstant;
-import org.apache.jackrabbit.ocm.persistence.atomictypeconverter.AtomicTypeConverterProvider;
-import org.apache.jackrabbit.ocm.persistence.beanconverter.BeanConverter;
-import org.apache.jackrabbit.ocm.persistence.cache.ObjectCache;
-import org.apache.jackrabbit.ocm.persistence.cache.impl.RequestObjectCacheImpl;
-import org.apache.jackrabbit.ocm.persistence.collectionconverter.CollectionConverter;
-import org.apache.jackrabbit.ocm.persistence.collectionconverter.ManageableCollection;
-import org.apache.jackrabbit.ocm.persistence.collectionconverter.ManageableCollectionUtil;
-import org.apache.jackrabbit.ocm.persistence.collectionconverter.impl.DefaultCollectionConverterImpl;
-import org.apache.jackrabbit.ocm.persistence.impl.PersistenceUtil;
-import org.apache.jackrabbit.ocm.persistence.objectconverter.ObjectConverter;
-import org.apache.jackrabbit.ocm.persistence.objectconverter.ProxyManager;
 import org.apache.jackrabbit.ocm.reflection.ReflectionUtils;
 import org.apache.jackrabbit.ocm.repository.RepositoryUtil;
 
@@ -134,7 +134,7 @@
 	}
 
 	/**
-	 * @see org.apache.jackrabbit.ocm.persistence.objectconverter.ObjectConverter#insert(javax.jcr.Session,
+	 * @see org.apache.jackrabbit.ocm.manager.objectconverter.ObjectConverter#insert(javax.jcr.Session,
 	 *      java.lang.Object)
 	 */
 	public void insert(Session session, Object object) {
@@ -155,7 +155,7 @@
 
 	/**
 	 * 
-	 * @see org.apache.jackrabbit.ocm.persistence.objectconverter.ObjectConverter#insert(javax.jcr.Session,
+	 * @see org.apache.jackrabbit.ocm.manager.objectconverter.ObjectConverter#insert(javax.jcr.Session,
 	 *      javax.jcr.Node, java.lang.String, java.lang.Object)
 	 */
 	public void insert(Session session, Node parentNode, String nodeName, Object object) {
@@ -163,7 +163,7 @@
 
 		String jcrNodeType = classDescriptor.getJcrNodeType();
 		if ((jcrNodeType == null) || jcrNodeType.equals("")) {
-			jcrNodeType = PersistenceConstant.NT_UNSTRUCTURED;
+			jcrNodeType = ManagerConstant.NT_UNSTRUCTURED;
 		}
 
 		Node objectNode = null;
@@ -202,9 +202,9 @@
 
 			// If required, add the discriminator node type 
 			if (classDescriptor.hasDiscriminator()) {
-				mixinTypeName = PersistenceConstant.DISCRIMINATOR_NODE_TYPE;
+				mixinTypeName = ManagerConstant.DISCRIMINATOR_NODE_TYPE;
 				objectNode.addMixin(mixinTypeName);
-				objectNode.setProperty(PersistenceConstant.DISCRIMINATOR_PROPERTY_NAME, ReflectionUtils.getBeanClass(object)
+				objectNode.setProperty(ManagerConstant.DISCRIMINATOR_PROPERTY_NAME, ReflectionUtils.getBeanClass(object)
 						.getName());
 			}
 					
@@ -222,7 +222,7 @@
 	}
 
 	/**
-	 * @see org.apache.jackrabbit.ocm.persistence.objectconverter.ObjectConverter#update(javax.jcr.Session,
+	 * @see org.apache.jackrabbit.ocm.manager.objectconverter.ObjectConverter#update(javax.jcr.Session,
 	 *      java.lang.Object)
 	 */
 	public void update(Session session, Object object) {
@@ -242,7 +242,7 @@
 
 	/**
 	 * 
-	 * @see org.apache.jackrabbit.ocm.persistence.objectconverter.ObjectConverter#update(javax.jcr.Session,
+	 * @see org.apache.jackrabbit.ocm.manager.objectconverter.ObjectConverter#update(javax.jcr.Session,
 	 *      javax.jcr.Node, java.lang.String, java.lang.Object)
 	 */
 	public void update(Session session, Node parentNode, String nodeName, Object object) {
@@ -266,7 +266,7 @@
 	}
 
 	/**
-	 * @see org.apache.jackrabbit.ocm.persistence.objectconverter.ObjectConverter#getObject(javax.jcr.Session,
+	 * @see org.apache.jackrabbit.ocm.manager.objectconverter.ObjectConverter#getObject(javax.jcr.Session,
 	 *      java.lang.Class, java.lang.String)
 	 */
 	public Object getObject(Session session, String path) {
@@ -282,13 +282,13 @@
 			
 			ClassDescriptor classDescriptor = null;
 			Node node = (Node) session.getItem(path);
-			if (node.hasProperty(PersistenceConstant.DISCRIMINATOR_PROPERTY_NAME)) {
-				String className = node.getProperty(PersistenceConstant.DISCRIMINATOR_PROPERTY_NAME).getValue().getString();
+			if (node.hasProperty(ManagerConstant.DISCRIMINATOR_PROPERTY_NAME)) {
+				String className = node.getProperty(ManagerConstant.DISCRIMINATOR_PROPERTY_NAME).getValue().getString();
 				classDescriptor = mapper.getClassDescriptorByClass(ReflectionUtils.forName(className));
 			} else {
 				String nodeType = node.getPrimaryNodeType().getName();
-				if (nodeType.equals(PersistenceConstant.FROZEN_NODE_TYPE)) {
-					nodeType = node.getProperty(PersistenceConstant.FROZEN_PRIMARY_TYPE_PROPERTY).getString();
+				if (nodeType.equals(ManagerConstant.FROZEN_NODE_TYPE)) {
+					nodeType = node.getProperty(ManagerConstant.FROZEN_PRIMARY_TYPE_PROPERTY).getString();
 				}
 				classDescriptor = mapper.getClassDescriptorByNodeType(nodeType);
 			}
@@ -323,7 +323,7 @@
 
 
 	/**
-	 * @see org.apache.jackrabbit.ocm.persistence.objectconverter.ObjectConverter#getObject(javax.jcr.Session,
+	 * @see org.apache.jackrabbit.ocm.manager.objectconverter.ObjectConverter#getObject(javax.jcr.Session,
 	 *      java.lang.Class, java.lang.String)
 	 */
 	public Object getObject(Session session, Class clazz, String path) 
@@ -349,12 +349,12 @@
 
 			Object object = null;
 			if (classDescriptor.usesNodeTypePerHierarchyStrategy()) {
-				if (!node.hasProperty(PersistenceConstant.DISCRIMINATOR_PROPERTY_NAME)) {
+				if (!node.hasProperty(ManagerConstant.DISCRIMINATOR_PROPERTY_NAME)) {
 					throw new PersistenceException("Cannot fetch object of type '" + clazz.getName()
 							+ "' using NODETYPE_PER_HIERARCHY. Discriminator property is not present.");
 				}
 
-				String className = node.getProperty(PersistenceConstant.DISCRIMINATOR_PROPERTY_NAME).getValue().getString();
+				String className = node.getProperty(ManagerConstant.DISCRIMINATOR_PROPERTY_NAME).getValue().getString();
 				classDescriptor = getClassDescriptor(ReflectionUtils.forName(className));
 				object = ReflectionUtils.newInstance(className);
 			} else {
@@ -506,9 +506,9 @@
 
 			boolean compatible = checkCompatibleNodeTypes(nodeType, classDescriptor);
 
-			if (!compatible && checkVersionNode && PersistenceConstant.FROZEN_NODE_TYPE.equals(nodeType.getName())) {
+			if (!compatible && checkVersionNode && ManagerConstant.FROZEN_NODE_TYPE.equals(nodeType.getName())) {
 				NodeTypeManager ntMgr = session.getWorkspace().getNodeTypeManager();
-				nodeType = ntMgr.getNodeType(node.getProperty(PersistenceConstant.FROZEN_PRIMARY_TYPE_PROPERTY).getString());
+				nodeType = ntMgr.getNodeType(node.getProperty(ManagerConstant.FROZEN_PRIMARY_TYPE_PROPERTY).getString());
 
 				compatible = checkCompatibleNodeTypes(nodeType, classDescriptor);
 			}
@@ -555,7 +555,7 @@
 	}
 
 	/**
-	 * @see org.apache.jackrabbit.ocm.persistence.objectconverter.ObjectConverter#getPath(javax.jcr.Session,
+	 * @see org.apache.jackrabbit.ocm.manager.objectconverter.ObjectConverter#getPath(javax.jcr.Session,
 	 *      java.lang.Object)
 	 * @throws JcrMappingException
 	 */

Modified: jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/main/java/org/apache/jackrabbit/ocm/manager/objectconverter/impl/ProxyManagerImpl.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/main/java/org/apache/jackrabbit/ocm/manager/objectconverter/impl/ProxyManagerImpl.java?view=diff&rev=548484&r1=547884&r2=548484
==============================================================================
--- jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/main/java/org/apache/jackrabbit/ocm/manager/objectconverter/impl/ProxyManagerImpl.java (original)
+++ jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/main/java/org/apache/jackrabbit/ocm/manager/objectconverter/impl/ProxyManagerImpl.java Mon Jun 18 13:43:33 2007
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.jackrabbit.ocm.persistence.objectconverter.impl;
+package org.apache.jackrabbit.ocm.manager.objectconverter.impl;
 
 import javax.jcr.Node;
 import javax.jcr.RepositoryException;
@@ -26,12 +26,12 @@
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
+import org.apache.jackrabbit.ocm.manager.collectionconverter.CollectionConverter;
+import org.apache.jackrabbit.ocm.manager.collectionconverter.ManageableCollection;
+import org.apache.jackrabbit.ocm.manager.collectionconverter.ManageableCollectionUtil;
+import org.apache.jackrabbit.ocm.manager.objectconverter.ObjectConverter;
+import org.apache.jackrabbit.ocm.manager.objectconverter.ProxyManager;
 import org.apache.jackrabbit.ocm.mapper.model.CollectionDescriptor;
-import org.apache.jackrabbit.ocm.persistence.collectionconverter.CollectionConverter;
-import org.apache.jackrabbit.ocm.persistence.collectionconverter.ManageableCollection;
-import org.apache.jackrabbit.ocm.persistence.collectionconverter.ManageableCollectionUtil;
-import org.apache.jackrabbit.ocm.persistence.objectconverter.ObjectConverter;
-import org.apache.jackrabbit.ocm.persistence.objectconverter.ProxyManager;
 
 public class ProxyManagerImpl implements ProxyManager 
 {
@@ -42,7 +42,7 @@
 
 	/**
 	 * 
-	 * @see org.apache.jackrabbit.ocm.persistence.objectconverter.ProxyManager#createBeanProxy(javax.jcr.Session, org.apache.jackrabbit.ocm.persistence.objectconverter.ObjectConverter, java.lang.Class, java.lang.String)
+	 * @see org.apache.jackrabbit.ocm.manager.objectconverter.ProxyManager#createBeanProxy(javax.jcr.Session, org.apache.jackrabbit.ocm.manager.objectconverter.ObjectConverter, java.lang.Class, java.lang.String)
 	 */
 	public  Object createBeanProxy(Session session, ObjectConverter objectConverter, Class beanClass, String path) 
 	{
@@ -61,7 +61,7 @@
 
 	/**
 	 * 
-	 * @see org.apache.jackrabbit.ocm.persistence.objectconverter.ProxyManager#createCollectionProxy(javax.jcr.Session, org.apache.jackrabbit.ocm.persistence.collectionconverter.CollectionConverter, javax.jcr.Node, org.apache.jackrabbit.ocm.mapper.model.CollectionDescriptor, java.lang.Class)
+	 * @see org.apache.jackrabbit.ocm.manager.objectconverter.ProxyManager#createCollectionProxy(javax.jcr.Session, org.apache.jackrabbit.ocm.manager.collectionconverter.CollectionConverter, javax.jcr.Node, org.apache.jackrabbit.ocm.mapper.model.CollectionDescriptor, java.lang.Class)
 	 */
 	public  Object createCollectionProxy(Session session, CollectionConverter collectionConverter, Node parentNode,  CollectionDescriptor collectionDescriptor, Class collectionFieldClass) 
 	{	

Modified: jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/main/java/org/apache/jackrabbit/ocm/manager/objectconverter/impl/SimpleFieldsHelper.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/main/java/org/apache/jackrabbit/ocm/manager/objectconverter/impl/SimpleFieldsHelper.java?view=diff&rev=548484&r1=547884&r2=548484
==============================================================================
--- jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/main/java/org/apache/jackrabbit/ocm/manager/objectconverter/impl/SimpleFieldsHelper.java (original)
+++ jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/main/java/org/apache/jackrabbit/ocm/manager/objectconverter/impl/SimpleFieldsHelper.java Mon Jun 18 13:43:33 2007
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.jackrabbit.ocm.persistence.objectconverter.impl;
+package org.apache.jackrabbit.ocm.manager.objectconverter.impl;
 
 import java.util.Iterator;
 
@@ -35,12 +35,12 @@
 import org.apache.commons.logging.LogFactory;
 import org.apache.jackrabbit.ocm.exception.JcrMappingException;
 import org.apache.jackrabbit.ocm.exception.PersistenceException;
+import org.apache.jackrabbit.ocm.manager.ManagerConstant;
+import org.apache.jackrabbit.ocm.manager.atomictypeconverter.AtomicTypeConverter;
+import org.apache.jackrabbit.ocm.manager.atomictypeconverter.AtomicTypeConverterProvider;
+import org.apache.jackrabbit.ocm.manager.atomictypeconverter.impl.NullTypeConverterImpl;
 import org.apache.jackrabbit.ocm.mapper.model.ClassDescriptor;
 import org.apache.jackrabbit.ocm.mapper.model.FieldDescriptor;
-import org.apache.jackrabbit.ocm.persistence.PersistenceConstant;
-import org.apache.jackrabbit.ocm.persistence.atomictypeconverter.AtomicTypeConverter;
-import org.apache.jackrabbit.ocm.persistence.atomictypeconverter.AtomicTypeConverterProvider;
-import org.apache.jackrabbit.ocm.persistence.atomictypeconverter.impl.NullTypeConverterImpl;
 import org.apache.jackrabbit.ocm.reflection.ReflectionUtils;
 
 /**
@@ -84,7 +84,7 @@
 
 			if (classDescriptor.usesNodeTypePerHierarchyStrategy() && classDescriptor.hasDiscriminator()) 
 			{
-				if (!node.hasProperty(PersistenceConstant.DISCRIMINATOR_PROPERTY_NAME)) 
+				if (!node.hasProperty(ManagerConstant.DISCRIMINATOR_PROPERTY_NAME)) 
 				{
 					throw new PersistenceException("Class '"
 							+ classDescriptor.getClassName()

Modified: jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/main/java/org/apache/jackrabbit/ocm/mapper/model/BeanDescriptor.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/main/java/org/apache/jackrabbit/ocm/mapper/model/BeanDescriptor.java?view=diff&rev=548484&r1=548483&r2=548484
==============================================================================
--- jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/main/java/org/apache/jackrabbit/ocm/mapper/model/BeanDescriptor.java (original)
+++ jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/main/java/org/apache/jackrabbit/ocm/mapper/model/BeanDescriptor.java Mon Jun 18 13:43:33 2007
@@ -17,8 +17,8 @@
 package org.apache.jackrabbit.ocm.mapper.model;
 
 
-import org.apache.jackrabbit.ocm.persistence.beanconverter.BeanConverter;
-import org.apache.jackrabbit.ocm.persistence.objectconverter.impl.ObjectConverterImpl;
+import org.apache.jackrabbit.ocm.manager.beanconverter.BeanConverter;
+import org.apache.jackrabbit.ocm.manager.objectconverter.impl.ObjectConverterImpl;
 import org.apache.jackrabbit.ocm.reflection.ReflectionUtils;
 
 /**

Modified: jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/main/java/org/apache/jackrabbit/ocm/mapper/model/CollectionDescriptor.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/main/java/org/apache/jackrabbit/ocm/mapper/model/CollectionDescriptor.java?view=diff&rev=548484&r1=548483&r2=548484
==============================================================================
--- jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/main/java/org/apache/jackrabbit/ocm/mapper/model/CollectionDescriptor.java (original)
+++ jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/main/java/org/apache/jackrabbit/ocm/mapper/model/CollectionDescriptor.java Mon Jun 18 13:43:33 2007
@@ -156,7 +156,7 @@
     
     /**
      * Set the collection class name. 
-     * This collection class has to implement {@link org.apache.jackrabbit.ocm.persistence.collectionconverter.ManageableCollection}
+     * This collection class has to implement {@link org.apache.jackrabbit.ocm.manager.collectionconverter.ManageableCollection}
      * @param collectionClassName The collection class name to set
      */
     public void setCollectionClassName(String collectionClassName)

Modified: jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/main/java/org/apache/jackrabbit/ocm/mapper/model/MappingDescriptor.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/main/java/org/apache/jackrabbit/ocm/mapper/model/MappingDescriptor.java?view=diff&rev=548484&r1=548483&r2=548484
==============================================================================
--- jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/main/java/org/apache/jackrabbit/ocm/mapper/model/MappingDescriptor.java (original)
+++ jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/main/java/org/apache/jackrabbit/ocm/mapper/model/MappingDescriptor.java Mon Jun 18 13:43:33 2007
@@ -22,9 +22,9 @@
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
+import org.apache.jackrabbit.ocm.manager.ManagerConstant;
 import org.apache.jackrabbit.ocm.mapper.Mapper;
 import org.apache.jackrabbit.ocm.mapper.impl.DigesterMapperImpl;
-import org.apache.jackrabbit.ocm.persistence.PersistenceConstant;
 
 /**
  * This class match to the complete xml mapping files.
@@ -66,7 +66,7 @@
         classDescriptorsByClassName.put(classDescriptor.getClassName(), classDescriptor);
         
         if (null != classDescriptor.getJcrNodeType() && !  "".equals(classDescriptor.getJcrNodeType()) && 
-        		 ! PersistenceConstant.NT_UNSTRUCTURED.equals(classDescriptor.getJcrNodeType()))
+        		 ! ManagerConstant.NT_UNSTRUCTURED.equals(classDescriptor.getJcrNodeType()))
         	 {
              classDescriptorsByNodeType.put(classDescriptor.getJcrNodeType(), classDescriptor);	
         	 }

Modified: jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/main/java/org/apache/jackrabbit/ocm/query/impl/FilterImpl.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/main/java/org/apache/jackrabbit/ocm/query/impl/FilterImpl.java?view=diff&rev=548484&r1=548483&r2=548484
==============================================================================
--- jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/main/java/org/apache/jackrabbit/ocm/query/impl/FilterImpl.java (original)
+++ jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/main/java/org/apache/jackrabbit/ocm/query/impl/FilterImpl.java Mon Jun 18 13:43:33 2007
@@ -24,8 +24,8 @@
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
+import org.apache.jackrabbit.ocm.manager.atomictypeconverter.AtomicTypeConverter;
 import org.apache.jackrabbit.ocm.mapper.model.ClassDescriptor;
-import org.apache.jackrabbit.ocm.persistence.atomictypeconverter.AtomicTypeConverter;
 import org.apache.jackrabbit.ocm.query.Filter;
 
 /**

Modified: jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/main/java/org/apache/jackrabbit/ocm/query/impl/QueryManagerImpl.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/main/java/org/apache/jackrabbit/ocm/query/impl/QueryManagerImpl.java?view=diff&rev=548484&r1=548483&r2=548484
==============================================================================
--- jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/main/java/org/apache/jackrabbit/ocm/query/impl/QueryManagerImpl.java (original)
+++ jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/main/java/org/apache/jackrabbit/ocm/query/impl/QueryManagerImpl.java Mon Jun 18 13:43:33 2007
@@ -22,10 +22,10 @@
 
 import javax.jcr.ValueFactory;
 
+import org.apache.jackrabbit.ocm.manager.ManagerConstant;
 import org.apache.jackrabbit.ocm.mapper.Mapper;
 import org.apache.jackrabbit.ocm.mapper.model.ClassDescriptor;
 import org.apache.jackrabbit.ocm.mapper.model.FieldDescriptor;
-import org.apache.jackrabbit.ocm.persistence.PersistenceConstant;
 import org.apache.jackrabbit.ocm.query.Filter;
 import org.apache.jackrabbit.ocm.query.Query;
 import org.apache.jackrabbit.ocm.query.QueryManager;
@@ -94,7 +94,7 @@
     private Filter buildDiscriminatorFilter(Query query, ClassDescriptor classDescriptor) {
         Filter discriminatorFilter = this.createFilter(query.getFilter().getFilterClass());
         if (!classDescriptor.isAbstract() && (! classDescriptor.isInterface()) ) {        
-            discriminatorFilter.addJCRExpression("@" + PersistenceConstant.DISCRIMINATOR_PROPERTY_NAME + "='" +    classDescriptor.getClassName() + "'");
+            discriminatorFilter.addJCRExpression("@" + ManagerConstant.DISCRIMINATOR_PROPERTY_NAME + "='" +    classDescriptor.getClassName() + "'");
         }
 
         if (classDescriptor.hasDescendants()) {
@@ -119,7 +119,7 @@
         String jcrNodeType = classDescriptor.getJcrNodeType();
         if (jcrNodeType == null || jcrNodeType.equals(""))
         	{
-           return PersistenceConstant.NT_UNSTRUCTURED;	
+           return ManagerConstant.NT_UNSTRUCTURED;	
         	}
         else
         {

Modified: jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/test/java/org/apache/jackrabbit/ocm/AllTests.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/test/java/org/apache/jackrabbit/ocm/AllTests.java?view=diff&rev=548484&r1=548483&r2=548484
==============================================================================
--- jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/test/java/org/apache/jackrabbit/ocm/AllTests.java (original)
+++ jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/test/java/org/apache/jackrabbit/ocm/AllTests.java Mon Jun 18 13:43:33 2007
@@ -38,19 +38,19 @@
     public static Test buildSuite() throws Exception {
         TestSuite suite= new TestSuite("Jackrabbit OCM Tests");
         suite.addTest(org.apache.jackrabbit.ocm.mapper.AllTests.buildSuite());     
-        suite.addTest(org.apache.jackrabbit.ocm.persistence.atomic.AllTests.buildSuite());
-        suite.addTest(org.apache.jackrabbit.ocm.persistence.auto.AllTests.buildSuite());
-        suite.addTest(org.apache.jackrabbit.ocm.persistence.basic.AllTests.buildSuite());
-        suite.addTest(org.apache.jackrabbit.ocm.persistence.beanconverter.AllTests.buildSuite());
-        suite.addTest(org.apache.jackrabbit.ocm.persistence.collectionconverter.AllTests.buildSuite());
-        suite.addTest(org.apache.jackrabbit.ocm.persistence.inheritance.AllTests.buildSuite());
-        suite.addTest(org.apache.jackrabbit.ocm.persistence.interfaces.AllTests.buildSuite());
-        suite.addTest(org.apache.jackrabbit.ocm.persistence.jcrnodetype.AllTests.buildSuite());        
-        suite.addTest(org.apache.jackrabbit.ocm.persistence.lock.AllTests.buildSuite());        
-        suite.addTest(org.apache.jackrabbit.ocm.persistence.proxy.AllTests.buildSuite());
-        suite.addTest(org.apache.jackrabbit.ocm.persistence.query.AllTests.buildSuite());
-        suite.addTest(org.apache.jackrabbit.ocm.persistence.uuid.AllTests.buildSuite());        
-        suite.addTest(org.apache.jackrabbit.ocm.persistence.version.AllTests.buildSuite());        
+        suite.addTest(org.apache.jackrabbit.ocm.manager.atomic.AllTests.buildSuite());
+        suite.addTest(org.apache.jackrabbit.ocm.manager.auto.AllTests.buildSuite());
+        suite.addTest(org.apache.jackrabbit.ocm.manager.basic.AllTests.buildSuite());
+        suite.addTest(org.apache.jackrabbit.ocm.manager.beanconverter.AllTests.buildSuite());
+        suite.addTest(org.apache.jackrabbit.ocm.manager.collectionconverter.AllTests.buildSuite());
+        suite.addTest(org.apache.jackrabbit.ocm.manager.inheritance.AllTests.buildSuite());
+        suite.addTest(org.apache.jackrabbit.ocm.manager.interfaces.AllTests.buildSuite());
+        suite.addTest(org.apache.jackrabbit.ocm.manager.jcrnodetype.AllTests.buildSuite());        
+        suite.addTest(org.apache.jackrabbit.ocm.manager.lock.AllTests.buildSuite());        
+        suite.addTest(org.apache.jackrabbit.ocm.manager.proxy.AllTests.buildSuite());
+        suite.addTest(org.apache.jackrabbit.ocm.manager.query.AllTests.buildSuite());
+        suite.addTest(org.apache.jackrabbit.ocm.manager.uuid.AllTests.buildSuite());        
+        suite.addTest(org.apache.jackrabbit.ocm.manager.version.AllTests.buildSuite());        
         suite.addTest(org.apache.jackrabbit.ocm.querymanager.AllTests.buildSuite());
         suite.addTest(org.apache.jackrabbit.ocm.repository.AllTests.buildSuite());
         

Modified: jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/test/java/org/apache/jackrabbit/ocm/TestBase.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/test/java/org/apache/jackrabbit/ocm/TestBase.java?view=diff&rev=548484&r1=548483&r2=548484
==============================================================================
--- jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/test/java/org/apache/jackrabbit/ocm/TestBase.java (original)
+++ jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/test/java/org/apache/jackrabbit/ocm/TestBase.java Mon Jun 18 13:43:33 2007
@@ -50,25 +50,25 @@
 import org.apache.jackrabbit.core.nodetype.NodeTypeManagerImpl;
 import org.apache.jackrabbit.core.nodetype.NodeTypeRegistry;
 import org.apache.jackrabbit.core.nodetype.xml.NodeTypeReader;
+import org.apache.jackrabbit.ocm.manager.ObjectContentManager;
+import org.apache.jackrabbit.ocm.manager.atomictypeconverter.AtomicTypeConverterProvider;
+import org.apache.jackrabbit.ocm.manager.atomictypeconverter.impl.BinaryTypeConverterImpl;
+import org.apache.jackrabbit.ocm.manager.atomictypeconverter.impl.BooleanTypeConverterImpl;
+import org.apache.jackrabbit.ocm.manager.atomictypeconverter.impl.ByteArrayTypeConverterImpl;
+import org.apache.jackrabbit.ocm.manager.atomictypeconverter.impl.CalendarTypeConverterImpl;
+import org.apache.jackrabbit.ocm.manager.atomictypeconverter.impl.DefaultAtomicTypeConverterProvider;
+import org.apache.jackrabbit.ocm.manager.atomictypeconverter.impl.DoubleTypeConverterImpl;
+import org.apache.jackrabbit.ocm.manager.atomictypeconverter.impl.IntTypeConverterImpl;
+import org.apache.jackrabbit.ocm.manager.atomictypeconverter.impl.LongTypeConverterImpl;
+import org.apache.jackrabbit.ocm.manager.atomictypeconverter.impl.StringTypeConverterImpl;
+import org.apache.jackrabbit.ocm.manager.atomictypeconverter.impl.TimestampTypeConverterImpl;
+import org.apache.jackrabbit.ocm.manager.atomictypeconverter.impl.UtilDateTypeConverterImpl;
+import org.apache.jackrabbit.ocm.manager.impl.PersistenceManagerImpl;
+import org.apache.jackrabbit.ocm.manager.inheritance.PersistenceManagerInheritanceHierarchyTest;
+import org.apache.jackrabbit.ocm.manager.objectconverter.ObjectConverter;
+import org.apache.jackrabbit.ocm.manager.objectconverter.impl.ObjectConverterImpl;
 import org.apache.jackrabbit.ocm.mapper.Mapper;
 import org.apache.jackrabbit.ocm.mapper.impl.DigesterMapperImpl;
-import org.apache.jackrabbit.ocm.persistence.PersistenceManager;
-import org.apache.jackrabbit.ocm.persistence.atomictypeconverter.AtomicTypeConverterProvider;
-import org.apache.jackrabbit.ocm.persistence.atomictypeconverter.impl.BinaryTypeConverterImpl;
-import org.apache.jackrabbit.ocm.persistence.atomictypeconverter.impl.BooleanTypeConverterImpl;
-import org.apache.jackrabbit.ocm.persistence.atomictypeconverter.impl.ByteArrayTypeConverterImpl;
-import org.apache.jackrabbit.ocm.persistence.atomictypeconverter.impl.CalendarTypeConverterImpl;
-import org.apache.jackrabbit.ocm.persistence.atomictypeconverter.impl.DefaultAtomicTypeConverterProvider;
-import org.apache.jackrabbit.ocm.persistence.atomictypeconverter.impl.DoubleTypeConverterImpl;
-import org.apache.jackrabbit.ocm.persistence.atomictypeconverter.impl.IntTypeConverterImpl;
-import org.apache.jackrabbit.ocm.persistence.atomictypeconverter.impl.LongTypeConverterImpl;
-import org.apache.jackrabbit.ocm.persistence.atomictypeconverter.impl.StringTypeConverterImpl;
-import org.apache.jackrabbit.ocm.persistence.atomictypeconverter.impl.TimestampTypeConverterImpl;
-import org.apache.jackrabbit.ocm.persistence.atomictypeconverter.impl.UtilDateTypeConverterImpl;
-import org.apache.jackrabbit.ocm.persistence.impl.PersistenceManagerImpl;
-import org.apache.jackrabbit.ocm.persistence.inheritance.PersistenceManagerInheritanceHierarchyTest;
-import org.apache.jackrabbit.ocm.persistence.objectconverter.ObjectConverter;
-import org.apache.jackrabbit.ocm.persistence.objectconverter.impl.ObjectConverterImpl;
 import org.apache.jackrabbit.ocm.query.QueryManager;
 import org.apache.jackrabbit.ocm.query.impl.QueryManagerImpl;
 import org.apache.jackrabbit.ocm.reflection.ReflectionUtils;
@@ -91,7 +91,7 @@
 	
 	protected Session session;
 
-	protected PersistenceManager persistenceManager;
+	protected ObjectContentManager persistenceManager;
 
 	protected Mapper mapper;
     
@@ -146,7 +146,7 @@
 	 * 
 	 * @return jcrSession
 	 */
-	public PersistenceManager getPersistenceManager()
+	public ObjectContentManager getPersistenceManager()
 	{
 		try
 		{
@@ -211,7 +211,7 @@
 	 * @param persistenceManager
 	 *            The persistence manager
 	 */
-	public void setPersistenceManager(PersistenceManager persistenceManager)
+	public void setPersistenceManager(ObjectContentManager persistenceManager)
 	{
 		this.persistenceManager = persistenceManager;
 	}

Modified: jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/test/java/org/apache/jackrabbit/ocm/manager/atomic/AllTests.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/test/java/org/apache/jackrabbit/ocm/manager/atomic/AllTests.java?view=diff&rev=548484&r1=547884&r2=548484
==============================================================================
--- jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/test/java/org/apache/jackrabbit/ocm/manager/atomic/AllTests.java (original)
+++ jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/test/java/org/apache/jackrabbit/ocm/manager/atomic/AllTests.java Mon Jun 18 13:43:33 2007
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.jackrabbit.ocm.persistence.atomic;
+package org.apache.jackrabbit.ocm.manager.atomic;
 
 import junit.framework.Test;
 import junit.framework.TestSuite;

Modified: jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/test/java/org/apache/jackrabbit/ocm/manager/atomic/AtomicTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/test/java/org/apache/jackrabbit/ocm/manager/atomic/AtomicTest.java?view=diff&rev=548484&r1=547884&r2=548484
==============================================================================
--- jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/test/java/org/apache/jackrabbit/ocm/manager/atomic/AtomicTest.java (original)
+++ jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/test/java/org/apache/jackrabbit/ocm/manager/atomic/AtomicTest.java Mon Jun 18 13:43:33 2007
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.jackrabbit.ocm.persistence.atomic;
+package org.apache.jackrabbit.ocm.manager.atomic;
 
 import java.io.ByteArrayInputStream;
 import java.sql.Timestamp;
@@ -28,7 +28,7 @@
 import org.apache.commons.logging.LogFactory;
 import org.apache.jackrabbit.ocm.RepositoryLifecycleTestSetup;
 import org.apache.jackrabbit.ocm.TestBase;
-import org.apache.jackrabbit.ocm.persistence.PersistenceManager;
+import org.apache.jackrabbit.ocm.manager.ObjectContentManager;
 import org.apache.jackrabbit.ocm.testmodel.Atomic;
 
 /**
@@ -67,7 +67,7 @@
     {
         try
         {
-        	PersistenceManager persistenceManager = getPersistenceManager();
+        	ObjectContentManager persistenceManager = getPersistenceManager();
         	Date date = new Date();
         	Calendar calendar = Calendar.getInstance();
             // --------------------------------------------------------------------------------

Modified: jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/test/java/org/apache/jackrabbit/ocm/manager/atomic/Int2BooleanTypeConverterImpl.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/test/java/org/apache/jackrabbit/ocm/manager/atomic/Int2BooleanTypeConverterImpl.java?view=diff&rev=548484&r1=547884&r2=548484
==============================================================================
--- jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/test/java/org/apache/jackrabbit/ocm/manager/atomic/Int2BooleanTypeConverterImpl.java (original)
+++ jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/test/java/org/apache/jackrabbit/ocm/manager/atomic/Int2BooleanTypeConverterImpl.java Mon Jun 18 13:43:33 2007
@@ -15,13 +15,13 @@
  * limitations under the License.
  */
 
-package org.apache.jackrabbit.ocm.persistence.atomic;
+package org.apache.jackrabbit.ocm.manager.atomic;
 
 import javax.jcr.Value;
 import javax.jcr.ValueFactory;
 
 import org.apache.jackrabbit.ocm.exception.IncorrectAtomicTypeException;
-import org.apache.jackrabbit.ocm.persistence.atomictypeconverter.AtomicTypeConverter;
+import org.apache.jackrabbit.ocm.manager.atomictypeconverter.AtomicTypeConverter;
 
 /**
  * This is a simple converter which convert a boolean field value into a jcr long property (int type is not defined in the jcr spec).
@@ -33,7 +33,7 @@
 {
 	/**
 	 * 
-	 * @see org.apache.jackrabbit.ocm.persistence.atomictypeconverter.AtomicTypeConverter#getValue(java.lang.Object)
+	 * @see org.apache.jackrabbit.ocm.manager.atomictypeconverter.AtomicTypeConverter#getValue(java.lang.Object)
 	 */
 	public Value getValue(ValueFactory valueFactory, Object propValue)
 	{
@@ -54,7 +54,7 @@
 
     /**
      * 
-     * @see org.apache.jackrabbit.ocm.persistence.atomictypeconverter.AtomicTypeConverter#getObject(javax.jcr.Value)
+     * @see org.apache.jackrabbit.ocm.manager.atomictypeconverter.AtomicTypeConverter#getObject(javax.jcr.Value)
      */
 	public Object getObject(Value value)
     {
@@ -78,7 +78,7 @@
 	
 	/**
 	 * 
-	 * @see org.apache.jackrabbit.ocm.persistence.atomictypeconverter.AtomicTypeConverter#getStringValue(java.lang.Object)
+	 * @see org.apache.jackrabbit.ocm.manager.atomictypeconverter.AtomicTypeConverter#getStringValue(java.lang.Object)
 	 */
 	public String getXPathQueryValue(ValueFactory valueFactory, Object object)
 	{

Modified: jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/test/java/org/apache/jackrabbit/ocm/manager/atomic/NullAtomicTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/test/java/org/apache/jackrabbit/ocm/manager/atomic/NullAtomicTest.java?view=diff&rev=548484&r1=547884&r2=548484
==============================================================================
--- jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/test/java/org/apache/jackrabbit/ocm/manager/atomic/NullAtomicTest.java (original)
+++ jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/test/java/org/apache/jackrabbit/ocm/manager/atomic/NullAtomicTest.java Mon Jun 18 13:43:33 2007
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.jackrabbit.ocm.persistence.atomic;
+package org.apache.jackrabbit.ocm.manager.atomic;
 
 import java.io.ByteArrayInputStream;
 import java.util.Calendar;
@@ -27,7 +27,7 @@
 import org.apache.commons.logging.LogFactory;
 import org.apache.jackrabbit.ocm.RepositoryLifecycleTestSetup;
 import org.apache.jackrabbit.ocm.TestBase;
-import org.apache.jackrabbit.ocm.persistence.PersistenceManager;
+import org.apache.jackrabbit.ocm.manager.ObjectContentManager;
 import org.apache.jackrabbit.ocm.testmodel.Atomic;
 
 /**
@@ -67,7 +67,7 @@
         try
         {
 
-        	PersistenceManager persistenceManager = getPersistenceManager();
+        	ObjectContentManager persistenceManager = getPersistenceManager();
      
             // --------------------------------------------------------------------------------
             // Create and store an object graph in the repository

Modified: jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/test/java/org/apache/jackrabbit/ocm/manager/auto/AllTests.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/test/java/org/apache/jackrabbit/ocm/manager/auto/AllTests.java?view=diff&rev=548484&r1=547884&r2=548484
==============================================================================
--- jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/test/java/org/apache/jackrabbit/ocm/manager/auto/AllTests.java (original)
+++ jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/test/java/org/apache/jackrabbit/ocm/manager/auto/AllTests.java Mon Jun 18 13:43:33 2007
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.jackrabbit.ocm.persistence.auto;
+package org.apache.jackrabbit.ocm.manager.auto;
 
 import org.apache.jackrabbit.ocm.RepositoryLifecycleTestSetup;
 

Modified: jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/test/java/org/apache/jackrabbit/ocm/manager/auto/PersistenceManagerAutoTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/test/java/org/apache/jackrabbit/ocm/manager/auto/PersistenceManagerAutoTest.java?view=diff&rev=548484&r1=547884&r2=548484
==============================================================================
--- jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/test/java/org/apache/jackrabbit/ocm/manager/auto/PersistenceManagerAutoTest.java (original)
+++ jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/test/java/org/apache/jackrabbit/ocm/manager/auto/PersistenceManagerAutoTest.java Mon Jun 18 13:43:33 2007
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.jackrabbit.ocm.persistence.auto;
+package org.apache.jackrabbit.ocm.manager.auto;
 
 import javax.jcr.Repository;
 import javax.jcr.UnsupportedRepositoryOperationException;
@@ -26,8 +26,8 @@
 import org.apache.commons.logging.LogFactory;
 import org.apache.jackrabbit.ocm.RepositoryLifecycleTestSetup;
 import org.apache.jackrabbit.ocm.TestBase;
-import org.apache.jackrabbit.ocm.persistence.PersistenceManager;
-import org.apache.jackrabbit.ocm.persistence.impl.PersistenceManagerImpl;
+import org.apache.jackrabbit.ocm.manager.ObjectContentManager;
+import org.apache.jackrabbit.ocm.manager.impl.PersistenceManagerImpl;
 import org.apache.jackrabbit.ocm.repository.RepositoryUtil;
 import org.apache.jackrabbit.ocm.testmodel.inheritance.impl.DocumentImpl;
 import org.apache.jackrabbit.ocm.testmodel.inheritance.impl.DocumentStream;
@@ -68,7 +68,7 @@
 	
 	public void testAuto() {
 		
-		PersistenceManager persistenceManager = this.getPersistenceManager();
+		ObjectContentManager persistenceManager = this.getPersistenceManager();
 
 		//---------------------------------------------------------------------------------------------------------
 		// Insert cmsobjects

Modified: jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/test/java/org/apache/jackrabbit/ocm/manager/basic/AllTests.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/test/java/org/apache/jackrabbit/ocm/manager/basic/AllTests.java?view=diff&rev=548484&r1=547884&r2=548484
==============================================================================
--- jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/test/java/org/apache/jackrabbit/ocm/manager/basic/AllTests.java (original)
+++ jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/test/java/org/apache/jackrabbit/ocm/manager/basic/AllTests.java Mon Jun 18 13:43:33 2007
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.jackrabbit.ocm.persistence.basic;
+package org.apache.jackrabbit.ocm.manager.basic;
 
 import junit.framework.Test;
 import junit.framework.TestSuite;

Modified: jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/test/java/org/apache/jackrabbit/ocm/manager/basic/PersistenceManagerAvoidRecursiveLoopTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/test/java/org/apache/jackrabbit/ocm/manager/basic/PersistenceManagerAvoidRecursiveLoopTest.java?view=diff&rev=548484&r1=547884&r2=548484
==============================================================================
--- jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/test/java/org/apache/jackrabbit/ocm/manager/basic/PersistenceManagerAvoidRecursiveLoopTest.java (original)
+++ jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/test/java/org/apache/jackrabbit/ocm/manager/basic/PersistenceManagerAvoidRecursiveLoopTest.java Mon Jun 18 13:43:33 2007
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.jackrabbit.ocm.persistence.basic;
+package org.apache.jackrabbit.ocm.manager.basic;
 
 import java.util.Collection;
 
@@ -28,8 +28,8 @@
 import org.apache.commons.logging.LogFactory;
 import org.apache.jackrabbit.ocm.RepositoryLifecycleTestSetup;
 import org.apache.jackrabbit.ocm.TestBase;
-import org.apache.jackrabbit.ocm.persistence.PersistenceManager;
-import org.apache.jackrabbit.ocm.persistence.impl.PersistenceManagerImpl;
+import org.apache.jackrabbit.ocm.manager.ObjectContentManager;
+import org.apache.jackrabbit.ocm.manager.impl.PersistenceManagerImpl;
 import org.apache.jackrabbit.ocm.repository.RepositoryUtil;
 import org.apache.jackrabbit.ocm.testmodel.crossreference.A;
 import org.apache.jackrabbit.ocm.testmodel.crossreference.B;
@@ -80,7 +80,7 @@
     {
         try
         {
-        	PersistenceManager persistenceManager = getPersistenceManager();
+        	ObjectContentManager persistenceManager = getPersistenceManager();
             // --------------------------------------------------------------------------------
             // Create and store an object graph in the repository
             // --------------------------------------------------------------------------------

Modified: jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/test/java/org/apache/jackrabbit/ocm/manager/basic/PersistenceManagerCopyMoveTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/test/java/org/apache/jackrabbit/ocm/manager/basic/PersistenceManagerCopyMoveTest.java?view=diff&rev=548484&r1=547884&r2=548484
==============================================================================
--- jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/test/java/org/apache/jackrabbit/ocm/manager/basic/PersistenceManagerCopyMoveTest.java (original)
+++ jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/test/java/org/apache/jackrabbit/ocm/manager/basic/PersistenceManagerCopyMoveTest.java Mon Jun 18 13:43:33 2007
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.jackrabbit.ocm.persistence.basic;
+package org.apache.jackrabbit.ocm.manager.basic;
 
 import java.util.ArrayList;
 import java.util.Collection;

Modified: jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/test/java/org/apache/jackrabbit/ocm/manager/basic/PersistenceManagerRemoveTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/test/java/org/apache/jackrabbit/ocm/manager/basic/PersistenceManagerRemoveTest.java?view=diff&rev=548484&r1=547884&r2=548484
==============================================================================
--- jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/test/java/org/apache/jackrabbit/ocm/manager/basic/PersistenceManagerRemoveTest.java (original)
+++ jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/test/java/org/apache/jackrabbit/ocm/manager/basic/PersistenceManagerRemoveTest.java Mon Jun 18 13:43:33 2007
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.jackrabbit.ocm.persistence.basic;
+package org.apache.jackrabbit.ocm.manager.basic;
 
 import java.io.ByteArrayInputStream;
 import java.sql.Timestamp;
@@ -29,7 +29,7 @@
 import org.apache.commons.logging.LogFactory;
 import org.apache.jackrabbit.ocm.RepositoryLifecycleTestSetup;
 import org.apache.jackrabbit.ocm.TestBase;
-import org.apache.jackrabbit.ocm.persistence.PersistenceManager;
+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;
@@ -85,7 +85,7 @@
 		try
 		{
 			
-			PersistenceManager persistenceManager = this.getPersistenceManager();
+			ObjectContentManager persistenceManager = this.getPersistenceManager();
 			persistenceManager.remove("/test5");
 			persistenceManager.save();
 
@@ -118,7 +118,7 @@
 		try
 		{
 
-			PersistenceManager persistenceManager = getPersistenceManager();
+			ObjectContentManager persistenceManager = getPersistenceManager();
 
 			for (int i = 1; i <= 10; i++)
 			{

Modified: jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/test/java/org/apache/jackrabbit/ocm/manager/basic/PersistenceManagerSameNameSiblingTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/test/java/org/apache/jackrabbit/ocm/manager/basic/PersistenceManagerSameNameSiblingTest.java?view=diff&rev=548484&r1=547884&r2=548484
==============================================================================
--- jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/test/java/org/apache/jackrabbit/ocm/manager/basic/PersistenceManagerSameNameSiblingTest.java (original)
+++ jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/test/java/org/apache/jackrabbit/ocm/manager/basic/PersistenceManagerSameNameSiblingTest.java Mon Jun 18 13:43:33 2007
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.jackrabbit.ocm.persistence.basic;
+package org.apache.jackrabbit.ocm.manager.basic;
 
 import java.io.ByteArrayInputStream;
 import java.sql.Timestamp;
@@ -33,12 +33,12 @@
 import org.apache.commons.logging.LogFactory;
 import org.apache.jackrabbit.ocm.RepositoryLifecycleTestSetup;
 import org.apache.jackrabbit.ocm.TestBase;
+import org.apache.jackrabbit.ocm.manager.ObjectContentManager;
+import org.apache.jackrabbit.ocm.manager.atomictypeconverter.impl.DefaultAtomicTypeConverterProvider;
+import org.apache.jackrabbit.ocm.manager.impl.PersistenceManagerImpl;
+import org.apache.jackrabbit.ocm.manager.objectconverter.ObjectConverter;
+import org.apache.jackrabbit.ocm.manager.objectconverter.impl.ObjectConverterImpl;
 import org.apache.jackrabbit.ocm.mapper.impl.DigesterMapperImpl;
-import org.apache.jackrabbit.ocm.persistence.PersistenceManager;
-import org.apache.jackrabbit.ocm.persistence.atomictypeconverter.impl.DefaultAtomicTypeConverterProvider;
-import org.apache.jackrabbit.ocm.persistence.impl.PersistenceManagerImpl;
-import org.apache.jackrabbit.ocm.persistence.objectconverter.ObjectConverter;
-import org.apache.jackrabbit.ocm.persistence.objectconverter.impl.ObjectConverterImpl;
 import org.apache.jackrabbit.ocm.query.Filter;
 import org.apache.jackrabbit.ocm.query.Query;
 import org.apache.jackrabbit.ocm.query.QueryManager;
@@ -88,7 +88,7 @@
 		try
 		{
 			this.importData(date);
-			PersistenceManager persistenceManager = this.getPersistenceManager();
+			ObjectContentManager persistenceManager = this.getPersistenceManager();
 				
 			// Query all objects 
 			QueryManager queryManager = this.getQueryManager();
@@ -145,7 +145,7 @@
 
 	public void testUnsupportedSameNameSiblings()
 	{
-		     PersistenceManager persistenceManager = getPersistenceManager();
+		     ObjectContentManager persistenceManager = getPersistenceManager();
              try
              {
             	 
@@ -178,7 +178,7 @@
 		try
 		{
 
-			PersistenceManager persistenceManager = getPersistenceManager();
+			ObjectContentManager persistenceManager = getPersistenceManager();
 			
 			
 			for (int i = 1; i <= 10; i++)

Modified: jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/test/java/org/apache/jackrabbit/ocm/manager/basic/PersistenceManagerTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/test/java/org/apache/jackrabbit/ocm/manager/basic/PersistenceManagerTest.java?view=diff&rev=548484&r1=547884&r2=548484
==============================================================================
--- jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/test/java/org/apache/jackrabbit/ocm/manager/basic/PersistenceManagerTest.java (original)
+++ jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/test/java/org/apache/jackrabbit/ocm/manager/basic/PersistenceManagerTest.java Mon Jun 18 13:43:33 2007
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.jackrabbit.ocm.persistence.basic;
+package org.apache.jackrabbit.ocm.manager.basic;
 
 import java.util.ArrayList;
 import java.util.Collection;
@@ -26,7 +26,7 @@
 import org.apache.commons.logging.LogFactory;
 import org.apache.jackrabbit.ocm.RepositoryLifecycleTestSetup;
 import org.apache.jackrabbit.ocm.TestBase;
-import org.apache.jackrabbit.ocm.persistence.PersistenceManager;
+import org.apache.jackrabbit.ocm.manager.ObjectContentManager;
 import org.apache.jackrabbit.ocm.testmodel.A;
 import org.apache.jackrabbit.ocm.testmodel.B;
 import org.apache.jackrabbit.ocm.testmodel.C;
@@ -75,7 +75,7 @@
     {
         try
         {
-        	PersistenceManager persistenceManager = getPersistenceManager();
+        	ObjectContentManager persistenceManager = getPersistenceManager();
 
 
             // --------------------------------------------------------------------------------
@@ -165,7 +165,7 @@
     {
     	 try
          {
-         	PersistenceManager persistenceManager = getPersistenceManager();
+         	ObjectContentManager persistenceManager = getPersistenceManager();
 
 
              // --------------------------------------------------------------------------------         	
@@ -212,7 +212,7 @@
     
     public void testIsPersistent()
     {    
-    	PersistenceManager persistenceManager = getPersistenceManager();
+    	ObjectContentManager persistenceManager = getPersistenceManager();
     	assertTrue("Class A is not persistent ", persistenceManager.isPersistent(A.class));
     	assertFalse("Class String is  persistent - hum ? ", persistenceManager.isPersistent(String.class));
     }

Modified: jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/test/java/org/apache/jackrabbit/ocm/manager/beanconverter/AllTests.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/test/java/org/apache/jackrabbit/ocm/manager/beanconverter/AllTests.java?view=diff&rev=548484&r1=547884&r2=548484
==============================================================================
--- jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/test/java/org/apache/jackrabbit/ocm/manager/beanconverter/AllTests.java (original)
+++ jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/test/java/org/apache/jackrabbit/ocm/manager/beanconverter/AllTests.java Mon Jun 18 13:43:33 2007
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.jackrabbit.ocm.persistence.beanconverter;
+package org.apache.jackrabbit.ocm.manager.beanconverter;
 
 import junit.framework.Test;
 import junit.framework.TestSuite;

Modified: jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/test/java/org/apache/jackrabbit/ocm/manager/beanconverter/BeanDescriptorTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/test/java/org/apache/jackrabbit/ocm/manager/beanconverter/BeanDescriptorTest.java?view=diff&rev=548484&r1=547884&r2=548484
==============================================================================
--- jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/test/java/org/apache/jackrabbit/ocm/manager/beanconverter/BeanDescriptorTest.java (original)
+++ jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/test/java/org/apache/jackrabbit/ocm/manager/beanconverter/BeanDescriptorTest.java Mon Jun 18 13:43:33 2007
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.jackrabbit.ocm.persistence.beanconverter;
+package org.apache.jackrabbit.ocm.manager.beanconverter;
 
 
 
@@ -28,7 +28,7 @@
 
 import org.apache.jackrabbit.ocm.RepositoryLifecycleTestSetup;
 import org.apache.jackrabbit.ocm.TestBase;
-import org.apache.jackrabbit.ocm.persistence.PersistenceManager;
+import org.apache.jackrabbit.ocm.manager.ObjectContentManager;
 import org.apache.jackrabbit.ocm.testmodel.A;
 import org.apache.jackrabbit.ocm.testmodel.B;
 import org.apache.jackrabbit.ocm.testmodel.D;
@@ -253,7 +253,7 @@
     {
         try
         {
-        	PersistenceManager persistenceManager = getPersistenceManager();
+        	ObjectContentManager persistenceManager = getPersistenceManager();
 
             // --------------------------------------------------------------------------------
             // Create and store an object graph in the repository

Modified: jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/test/java/org/apache/jackrabbit/ocm/manager/beanconverter/FakeBeanConverter.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/test/java/org/apache/jackrabbit/ocm/manager/beanconverter/FakeBeanConverter.java?view=diff&rev=548484&r1=547884&r2=548484
==============================================================================
--- jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/test/java/org/apache/jackrabbit/ocm/manager/beanconverter/FakeBeanConverter.java (original)
+++ jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/test/java/org/apache/jackrabbit/ocm/manager/beanconverter/FakeBeanConverter.java Mon Jun 18 13:43:33 2007
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.jackrabbit.ocm.persistence.beanconverter;
+package org.apache.jackrabbit.ocm.manager.beanconverter;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -26,13 +26,13 @@
 import org.apache.jackrabbit.ocm.exception.PersistenceException;
 import org.apache.jackrabbit.ocm.exception.RepositoryException;
 
+import org.apache.jackrabbit.ocm.manager.atomictypeconverter.AtomicTypeConverterProvider;
+import org.apache.jackrabbit.ocm.manager.beanconverter.BeanConverter;
+import org.apache.jackrabbit.ocm.manager.beanconverter.impl.AbstractBeanConverterImpl;
+import org.apache.jackrabbit.ocm.manager.objectconverter.ObjectConverter;
 import org.apache.jackrabbit.ocm.mapper.Mapper;
 import org.apache.jackrabbit.ocm.mapper.model.BeanDescriptor;
 import org.apache.jackrabbit.ocm.mapper.model.ClassDescriptor;
-import org.apache.jackrabbit.ocm.persistence.atomictypeconverter.AtomicTypeConverterProvider;
-import org.apache.jackrabbit.ocm.persistence.beanconverter.BeanConverter;
-import org.apache.jackrabbit.ocm.persistence.beanconverter.impl.AbstractBeanConverterImpl;
-import org.apache.jackrabbit.ocm.persistence.objectconverter.ObjectConverter;
 import org.apache.jackrabbit.ocm.testmodel.B;
 
 public class FakeBeanConverter extends AbstractBeanConverterImpl implements BeanConverter {
@@ -50,7 +50,7 @@
     }
         
     /**
-     * @see org.apache.jackrabbit.ocm.persistence.beanconverter.BeanConverter#insert(javax.jcr.Session, javax.jcr.Node, org.apache.jackrabbit.ocm.mapper.Mapper, java.lang.String, java.lang.Object)
+     * @see org.apache.jackrabbit.ocm.manager.beanconverter.BeanConverter#insert(javax.jcr.Session, javax.jcr.Node, org.apache.jackrabbit.ocm.mapper.Mapper, java.lang.String, java.lang.Object)
      */
 	public void insert(Session session, Node parentNode, BeanDescriptor beanDescriptor, ClassDescriptor beanClassDescriptor, Object object, ClassDescriptor parentClassDescriptor, Object parent)
 	throws PersistenceException, RepositoryException, 	JcrMappingException {
@@ -64,7 +64,7 @@
     } 
 
     /**
-     * @see org.apache.jackrabbit.ocm.persistence.beanconverter.BeanConverter#update(javax.jcr.Session, javax.jcr.Node, org.apache.jackrabbit.ocm.mapper.Mapper, java.lang.String, java.lang.Object)
+     * @see org.apache.jackrabbit.ocm.manager.beanconverter.BeanConverter#update(javax.jcr.Session, javax.jcr.Node, org.apache.jackrabbit.ocm.mapper.Mapper, java.lang.String, java.lang.Object)
      */
 	public void update(Session session, Node parentNode, BeanDescriptor beanDescriptor, ClassDescriptor beanClassDescriptor, Object object, ClassDescriptor parentClassDescriptor, Object parent)
 	throws PersistenceException, RepositoryException,	JcrMappingException {
@@ -77,7 +77,7 @@
     }
 
     /**
-     * @see org.apache.jackrabbit.ocm.persistence.beanconverter.BeanConverter#getObject(javax.jcr.Session, javax.jcr.Node, org.apache.jackrabbit.ocm.mapper.Mapper, java.lang.String, java.lang.Class)
+     * @see org.apache.jackrabbit.ocm.manager.beanconverter.BeanConverter#getObject(javax.jcr.Session, javax.jcr.Node, org.apache.jackrabbit.ocm.mapper.Mapper, java.lang.String, java.lang.Class)
      */
     public Object getObject(Session session, Node parentNode, BeanDescriptor beanDescriptor, ClassDescriptor beanClassDescriptor, Class beanClass, Object parent)
 	throws PersistenceException, RepositoryException,JcrMappingException {
@@ -93,7 +93,7 @@
     }
 
     /**
-     * @see org.apache.jackrabbit.ocm.persistence.beanconverter.BeanConverter#remove(javax.jcr.Session, javax.jcr.Node, org.apache.jackrabbit.ocm.mapper.Mapper, java.lang.String)
+     * @see org.apache.jackrabbit.ocm.manager.beanconverter.BeanConverter#remove(javax.jcr.Session, javax.jcr.Node, org.apache.jackrabbit.ocm.mapper.Mapper, java.lang.String)
      */
 	public void remove(Session session, Node parentNode, BeanDescriptor beanDescriptor, ClassDescriptor beanClassDescriptor, Object object, ClassDescriptor parentClassDescriptor, Object parent)
     throws PersistenceException,	RepositoryException, JcrMappingException {

Modified: jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/test/java/org/apache/jackrabbit/ocm/manager/collectionconverter/AllTests.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/test/java/org/apache/jackrabbit/ocm/manager/collectionconverter/AllTests.java?view=diff&rev=548484&r1=547884&r2=548484
==============================================================================
--- jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/test/java/org/apache/jackrabbit/ocm/manager/collectionconverter/AllTests.java (original)
+++ jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/test/java/org/apache/jackrabbit/ocm/manager/collectionconverter/AllTests.java Mon Jun 18 13:43:33 2007
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.jackrabbit.ocm.persistence.collectionconverter;
+package org.apache.jackrabbit.ocm.manager.collectionconverter;
 
 import org.apache.jackrabbit.ocm.RepositoryLifecycleTestSetup;
 

Modified: jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/test/java/org/apache/jackrabbit/ocm/manager/collectionconverter/ArrayListTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/test/java/org/apache/jackrabbit/ocm/manager/collectionconverter/ArrayListTest.java?view=diff&rev=548484&r1=547884&r2=548484
==============================================================================
--- jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/test/java/org/apache/jackrabbit/ocm/manager/collectionconverter/ArrayListTest.java (original)
+++ jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/test/java/org/apache/jackrabbit/ocm/manager/collectionconverter/ArrayListTest.java Mon Jun 18 13:43:33 2007
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.jackrabbit.ocm.persistence.collectionconverter;
+package org.apache.jackrabbit.ocm.manager.collectionconverter;
 
 import java.util.ArrayList;
 
@@ -25,7 +25,7 @@
 import org.apache.commons.logging.LogFactory;
 import org.apache.jackrabbit.ocm.RepositoryLifecycleTestSetup;
 import org.apache.jackrabbit.ocm.TestBase;
-import org.apache.jackrabbit.ocm.persistence.PersistenceManager;
+import org.apache.jackrabbit.ocm.manager.ObjectContentManager;
 import org.apache.jackrabbit.ocm.testmodel.collection.ArrayListElement;
 import org.apache.jackrabbit.ocm.testmodel.collection.Element;
 import org.apache.jackrabbit.ocm.testmodel.collection.Main;
@@ -71,7 +71,7 @@
     {
         try
         {
-        	PersistenceManager persistenceManager = getPersistenceManager();
+        	ObjectContentManager persistenceManager = getPersistenceManager();
         	
 
             // --------------------------------------------------------------------------------

Modified: jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/test/java/org/apache/jackrabbit/ocm/manager/collectionconverter/DefaultCollectionConverterImplTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/test/java/org/apache/jackrabbit/ocm/manager/collectionconverter/DefaultCollectionConverterImplTest.java?view=diff&rev=548484&r1=547884&r2=548484
==============================================================================
--- jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/test/java/org/apache/jackrabbit/ocm/manager/collectionconverter/DefaultCollectionConverterImplTest.java (original)
+++ jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/test/java/org/apache/jackrabbit/ocm/manager/collectionconverter/DefaultCollectionConverterImplTest.java Mon Jun 18 13:43:33 2007
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.jackrabbit.ocm.persistence.collectionconverter;
+package org.apache.jackrabbit.ocm.manager.collectionconverter;
 
 import java.util.ArrayList;
 import java.util.Collection;
@@ -26,7 +26,7 @@
 import org.apache.commons.logging.LogFactory;
 import org.apache.jackrabbit.ocm.RepositoryLifecycleTestSetup;
 import org.apache.jackrabbit.ocm.TestBase;
-import org.apache.jackrabbit.ocm.persistence.PersistenceManager;
+import org.apache.jackrabbit.ocm.manager.ObjectContentManager;
 import org.apache.jackrabbit.ocm.testmodel.A;
 import org.apache.jackrabbit.ocm.testmodel.C;
 
@@ -73,7 +73,7 @@
     {
         try
         {
-        	PersistenceManager persistenceManager = getPersistenceManager();
+        	ObjectContentManager persistenceManager = getPersistenceManager();
 
             // --------------------------------------------------------------------------------
             // Create and store an object with a null collection field
@@ -155,7 +155,7 @@
     {
         try
         {
-        	PersistenceManager persistenceManager = getPersistenceManager();
+        	ObjectContentManager persistenceManager = getPersistenceManager();
 
             // --------------------------------------------------------------------------------
             // Create and store an object graph in the repository
@@ -239,7 +239,7 @@
         try
         {
 
-        	PersistenceManager persistenceManager = getPersistenceManager();
+        	ObjectContentManager persistenceManager = getPersistenceManager();
 
             // --------------------------------------------------------------------------------
             // Create and store an object graph in the repository

Modified: jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/test/java/org/apache/jackrabbit/ocm/manager/collectionconverter/HashMapTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/test/java/org/apache/jackrabbit/ocm/manager/collectionconverter/HashMapTest.java?view=diff&rev=548484&r1=547884&r2=548484
==============================================================================
--- jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/test/java/org/apache/jackrabbit/ocm/manager/collectionconverter/HashMapTest.java (original)
+++ jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/test/java/org/apache/jackrabbit/ocm/manager/collectionconverter/HashMapTest.java Mon Jun 18 13:43:33 2007
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.jackrabbit.ocm.persistence.collectionconverter;
+package org.apache.jackrabbit.ocm.manager.collectionconverter;
 
 import junit.framework.Test;
 import junit.framework.TestSuite;
@@ -23,7 +23,7 @@
 import org.apache.commons.logging.LogFactory;
 import org.apache.jackrabbit.ocm.RepositoryLifecycleTestSetup;
 import org.apache.jackrabbit.ocm.TestBase;
-import org.apache.jackrabbit.ocm.persistence.PersistenceManager;
+import org.apache.jackrabbit.ocm.manager.ObjectContentManager;
 import org.apache.jackrabbit.ocm.testmodel.collection.Element;
 import org.apache.jackrabbit.ocm.testmodel.collection.HashMapElement;
 import org.apache.jackrabbit.ocm.testmodel.collection.Main;
@@ -71,7 +71,7 @@
     {
         try
         {
-        	PersistenceManager persistenceManager = getPersistenceManager();
+        	ObjectContentManager persistenceManager = getPersistenceManager();
         	
             // --------------------------------------------------------------------------------
             // Create and store an object graph in the repository with null hashmap

Modified: jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/test/java/org/apache/jackrabbit/ocm/manager/collectionconverter/MultiValueCollectionConverterImplTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/test/java/org/apache/jackrabbit/ocm/manager/collectionconverter/MultiValueCollectionConverterImplTest.java?view=diff&rev=548484&r1=547884&r2=548484
==============================================================================
--- jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/test/java/org/apache/jackrabbit/ocm/manager/collectionconverter/MultiValueCollectionConverterImplTest.java (original)
+++ jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/test/java/org/apache/jackrabbit/ocm/manager/collectionconverter/MultiValueCollectionConverterImplTest.java Mon Jun 18 13:43:33 2007
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.jackrabbit.ocm.persistence.collectionconverter;
+package org.apache.jackrabbit.ocm.manager.collectionconverter;
 
 import java.util.ArrayList;
 import java.util.Collection;
@@ -26,7 +26,7 @@
 import org.apache.commons.logging.LogFactory;
 import org.apache.jackrabbit.ocm.RepositoryLifecycleTestSetup;
 import org.apache.jackrabbit.ocm.TestBase;
-import org.apache.jackrabbit.ocm.persistence.PersistenceManager;
+import org.apache.jackrabbit.ocm.manager.ObjectContentManager;
 import org.apache.jackrabbit.ocm.testmodel.A;
 import org.apache.jackrabbit.ocm.testmodel.C;
 import org.apache.jackrabbit.ocm.testmodel.MultiValue;
@@ -76,7 +76,7 @@
     {
         try
         {
-        	PersistenceManager persistenceManager = getPersistenceManager();
+        	ObjectContentManager persistenceManager = getPersistenceManager();
 
             // --------------------------------------------------------------------------------
             // Create and store an object graph in the repository

Modified: jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/test/java/org/apache/jackrabbit/ocm/manager/collectionconverter/NTCollectionConverterImplTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/test/java/org/apache/jackrabbit/ocm/manager/collectionconverter/NTCollectionConverterImplTest.java?view=diff&rev=548484&r1=547884&r2=548484
==============================================================================
--- jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/test/java/org/apache/jackrabbit/ocm/manager/collectionconverter/NTCollectionConverterImplTest.java (original)
+++ jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/test/java/org/apache/jackrabbit/ocm/manager/collectionconverter/NTCollectionConverterImplTest.java Mon Jun 18 13:43:33 2007
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.jackrabbit.ocm.persistence.collectionconverter;
+package org.apache.jackrabbit.ocm.manager.collectionconverter;
 
 import java.util.ArrayList;
 import java.util.Collection;
@@ -26,7 +26,7 @@
 import org.apache.commons.logging.LogFactory;
 import org.apache.jackrabbit.ocm.RepositoryLifecycleTestSetup;
 import org.apache.jackrabbit.ocm.TestBase;
-import org.apache.jackrabbit.ocm.persistence.PersistenceManager;
+import org.apache.jackrabbit.ocm.manager.ObjectContentManager;
 import org.apache.jackrabbit.ocm.testmodel.A;
 import org.apache.jackrabbit.ocm.testmodel.C;
 import org.apache.jackrabbit.ocm.testmodel.Page;
@@ -76,7 +76,7 @@
     {
         try
         {
-        	PersistenceManager persistenceManager = getPersistenceManager();
+        	ObjectContentManager persistenceManager = getPersistenceManager();
             
         	// --------------------------------------------------------------------------------
             // Create and store an object graph in the repository with a null collection

Modified: jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/test/java/org/apache/jackrabbit/ocm/manager/collectionconverter/ResidualNodesCollectionConverterImplTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/test/java/org/apache/jackrabbit/ocm/manager/collectionconverter/ResidualNodesCollectionConverterImplTest.java?view=diff&rev=548484&r1=547884&r2=548484
==============================================================================
--- jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/test/java/org/apache/jackrabbit/ocm/manager/collectionconverter/ResidualNodesCollectionConverterImplTest.java (original)
+++ jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/test/java/org/apache/jackrabbit/ocm/manager/collectionconverter/ResidualNodesCollectionConverterImplTest.java Mon Jun 18 13:43:33 2007
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.jackrabbit.ocm.persistence.collectionconverter;
+package org.apache.jackrabbit.ocm.manager.collectionconverter;
 
 import junit.framework.Test;
 import junit.framework.TestSuite;
@@ -23,8 +23,8 @@
 import org.apache.commons.logging.LogFactory;
 import org.apache.jackrabbit.ocm.RepositoryLifecycleTestSetup;
 import org.apache.jackrabbit.ocm.TestBase;
-import org.apache.jackrabbit.ocm.persistence.PersistenceManager;
-import org.apache.jackrabbit.ocm.persistence.collectionconverter.impl.ManagedHashMap;
+import org.apache.jackrabbit.ocm.manager.ObjectContentManager;
+import org.apache.jackrabbit.ocm.manager.collectionconverter.impl.ManagedHashMap;
 import org.apache.jackrabbit.ocm.testmodel.Paragraph;
 import org.apache.jackrabbit.ocm.testmodel.Residual;
 
@@ -72,7 +72,7 @@
     {
         try
         {
-        	PersistenceManager persistenceManager = getPersistenceManager();
+        	ObjectContentManager persistenceManager = getPersistenceManager();
 
             // --------------------------------------------------------------------------------
             // Create and store an object graph in the repository with null values

Modified: jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/test/java/org/apache/jackrabbit/ocm/manager/collectionconverter/ResidualPropertiesCollectionConverterImplTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/test/java/org/apache/jackrabbit/ocm/manager/collectionconverter/ResidualPropertiesCollectionConverterImplTest.java?view=diff&rev=548484&r1=547884&r2=548484
==============================================================================
--- jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/test/java/org/apache/jackrabbit/ocm/manager/collectionconverter/ResidualPropertiesCollectionConverterImplTest.java (original)
+++ jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/test/java/org/apache/jackrabbit/ocm/manager/collectionconverter/ResidualPropertiesCollectionConverterImplTest.java Mon Jun 18 13:43:33 2007
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.jackrabbit.ocm.persistence.collectionconverter;
+package org.apache.jackrabbit.ocm.manager.collectionconverter;
 
 import java.util.Arrays;
 import java.util.List;
@@ -26,8 +26,8 @@
 import org.apache.commons.logging.LogFactory;
 import org.apache.jackrabbit.ocm.RepositoryLifecycleTestSetup;
 import org.apache.jackrabbit.ocm.TestBase;
-import org.apache.jackrabbit.ocm.persistence.PersistenceManager;
-import org.apache.jackrabbit.ocm.persistence.collectionconverter.impl.ManagedHashMap;
+import org.apache.jackrabbit.ocm.manager.ObjectContentManager;
+import org.apache.jackrabbit.ocm.manager.collectionconverter.impl.ManagedHashMap;
 import org.apache.jackrabbit.ocm.testmodel.Residual;
 
 /**
@@ -74,7 +74,7 @@
     {
         try
         {
-        	PersistenceManager persistenceManager = getPersistenceManager();
+        	ObjectContentManager persistenceManager = getPersistenceManager();
 
             // --------------------------------------------------------------------------------
             // Create and store an object graph in the repository with a null hashmap

Modified: jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/test/java/org/apache/jackrabbit/ocm/manager/inheritance/AllTests.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/test/java/org/apache/jackrabbit/ocm/manager/inheritance/AllTests.java?view=diff&rev=548484&r1=547884&r2=548484
==============================================================================
--- jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/test/java/org/apache/jackrabbit/ocm/manager/inheritance/AllTests.java (original)
+++ jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/test/java/org/apache/jackrabbit/ocm/manager/inheritance/AllTests.java Mon Jun 18 13:43:33 2007
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.jackrabbit.ocm.persistence.inheritance;
+package org.apache.jackrabbit.ocm.manager.inheritance;
 
 import org.apache.jackrabbit.ocm.RepositoryLifecycleTestSetup;
 

Modified: jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/test/java/org/apache/jackrabbit/ocm/manager/inheritance/PersistenceManagerInheritanceConcreteClassTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/test/java/org/apache/jackrabbit/ocm/manager/inheritance/PersistenceManagerInheritanceConcreteClassTest.java?view=diff&rev=548484&r1=547884&r2=548484
==============================================================================
--- jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/test/java/org/apache/jackrabbit/ocm/manager/inheritance/PersistenceManagerInheritanceConcreteClassTest.java (original)
+++ jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/test/java/org/apache/jackrabbit/ocm/manager/inheritance/PersistenceManagerInheritanceConcreteClassTest.java Mon Jun 18 13:43:33 2007
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.jackrabbit.ocm.persistence.inheritance;
+package org.apache.jackrabbit.ocm.manager.inheritance;
 
 import java.util.Collection;
 
@@ -25,7 +25,7 @@
 import org.apache.commons.logging.LogFactory;
 import org.apache.jackrabbit.ocm.RepositoryLifecycleTestSetup;
 import org.apache.jackrabbit.ocm.TestBase;
-import org.apache.jackrabbit.ocm.persistence.PersistenceManager;
+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;
@@ -70,7 +70,7 @@
 	public void testRetrieveSingleton() {
 
 		try {
-			PersistenceManager persistenceManager = this.getPersistenceManager();
+			ObjectContentManager persistenceManager = this.getPersistenceManager();
 
 			//---------------------------------------------------------------------------------------------------------
 			// Insert a  Document 
@@ -130,7 +130,7 @@
 
 	
 	public void testRetrieveCollection() {
-		PersistenceManager persistenceManager = this.getPersistenceManager();
+		ObjectContentManager persistenceManager = this.getPersistenceManager();
 
 		//---------------------------------------------------------------------------------------------------------
 		// Insert cmsobjects
@@ -293,7 +293,7 @@
 	}
 	  
 	public void testBeanCollection() {
-		PersistenceManager persistenceManager = this.getPersistenceManager();
+		ObjectContentManager persistenceManager = this.getPersistenceManager();
 
 		//---------------------------------------------------------------------------------------------------------
 		// Insert cmsobjects

Modified: jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/test/java/org/apache/jackrabbit/ocm/manager/inheritance/PersistenceManagerInheritanceHierarchyTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/test/java/org/apache/jackrabbit/ocm/manager/inheritance/PersistenceManagerInheritanceHierarchyTest.java?view=diff&rev=548484&r1=547884&r2=548484
==============================================================================
--- jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/test/java/org/apache/jackrabbit/ocm/manager/inheritance/PersistenceManagerInheritanceHierarchyTest.java (original)
+++ jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/test/java/org/apache/jackrabbit/ocm/manager/inheritance/PersistenceManagerInheritanceHierarchyTest.java Mon Jun 18 13:43:33 2007
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.jackrabbit.ocm.persistence.inheritance;
+package org.apache.jackrabbit.ocm.manager.inheritance;
 
 import java.util.Collection;
 
@@ -25,7 +25,7 @@
 import org.apache.commons.logging.LogFactory;
 import org.apache.jackrabbit.ocm.RepositoryLifecycleTestSetup;
 import org.apache.jackrabbit.ocm.TestBase;
-import org.apache.jackrabbit.ocm.persistence.PersistenceManager;
+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;
@@ -69,7 +69,7 @@
 	public void testRetrieveSingleton() {
 
 		try {
-			PersistenceManager persistenceManager = this.getPersistenceManager();
+			ObjectContentManager persistenceManager = this.getPersistenceManager();
 
 			//---------------------------------------------------------------------------------------------------------
 			// Insert a descendant object
@@ -125,7 +125,7 @@
 
 	
 	public void testRetrieveCollection() {
-		PersistenceManager persistenceManager = this.getPersistenceManager();
+		ObjectContentManager persistenceManager = this.getPersistenceManager();
 
 		//---------------------------------------------------------------------------------------------------------	
 		// Insert  descendant objects

Modified: jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/test/java/org/apache/jackrabbit/ocm/manager/interfaces/AllTests.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/test/java/org/apache/jackrabbit/ocm/manager/interfaces/AllTests.java?view=diff&rev=548484&r1=547884&r2=548484
==============================================================================
--- jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/test/java/org/apache/jackrabbit/ocm/manager/interfaces/AllTests.java (original)
+++ jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/test/java/org/apache/jackrabbit/ocm/manager/interfaces/AllTests.java Mon Jun 18 13:43:33 2007
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.jackrabbit.ocm.persistence.interfaces;
+package org.apache.jackrabbit.ocm.manager.interfaces;
 
 import org.apache.jackrabbit.ocm.RepositoryLifecycleTestSetup;
 

Modified: jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/test/java/org/apache/jackrabbit/ocm/manager/interfaces/PersistenceManagerInterfaceConcreteClassTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/test/java/org/apache/jackrabbit/ocm/manager/interfaces/PersistenceManagerInterfaceConcreteClassTest.java?view=diff&rev=548484&r1=547884&r2=548484
==============================================================================
--- jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/test/java/org/apache/jackrabbit/ocm/manager/interfaces/PersistenceManagerInterfaceConcreteClassTest.java (original)
+++ jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/test/java/org/apache/jackrabbit/ocm/manager/interfaces/PersistenceManagerInterfaceConcreteClassTest.java Mon Jun 18 13:43:33 2007
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.jackrabbit.ocm.persistence.interfaces;
+package org.apache.jackrabbit.ocm.manager.interfaces;
 
 import java.util.Collection;
 
@@ -25,7 +25,7 @@
 import org.apache.commons.logging.LogFactory;
 import org.apache.jackrabbit.ocm.RepositoryLifecycleTestSetup;
 import org.apache.jackrabbit.ocm.TestBase;
-import org.apache.jackrabbit.ocm.persistence.PersistenceManager;
+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;
@@ -73,7 +73,7 @@
 	public void testRetrieveSingleton() {
 
 		try {
-			PersistenceManager persistenceManager = this.getPersistenceManager();
+			ObjectContentManager persistenceManager = this.getPersistenceManager();
 
 			//---------------------------------------------------------------------------------------------------------
 			// Insert 
@@ -132,7 +132,7 @@
 	
 	
 	public void testRetrieveCollection() {
-	PersistenceManager persistenceManager = this.getPersistenceManager();
+	ObjectContentManager persistenceManager = this.getPersistenceManager();
 
 	//---------------------------------------------------------------------------------------------------------
 	// Insert cmsobjects
@@ -304,7 +304,7 @@
  
 
 public void testBeanCollection() {
-	PersistenceManager persistenceManager = this.getPersistenceManager();
+	ObjectContentManager persistenceManager = this.getPersistenceManager();
 
 	//---------------------------------------------------------------------------------------------------------
 	// Insert cmsobjects

Modified: jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/test/java/org/apache/jackrabbit/ocm/manager/interfaces/PersistenceManagerInterfaceHierarchyTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/test/java/org/apache/jackrabbit/ocm/manager/interfaces/PersistenceManagerInterfaceHierarchyTest.java?view=diff&rev=548484&r1=547884&r2=548484
==============================================================================
--- jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/test/java/org/apache/jackrabbit/ocm/manager/interfaces/PersistenceManagerInterfaceHierarchyTest.java (original)
+++ jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/test/java/org/apache/jackrabbit/ocm/manager/interfaces/PersistenceManagerInterfaceHierarchyTest.java Mon Jun 18 13:43:33 2007
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.jackrabbit.ocm.persistence.interfaces;
+package org.apache.jackrabbit.ocm.manager.interfaces;
 
 import java.util.Collection;
 
@@ -25,7 +25,7 @@
 import org.apache.commons.logging.LogFactory;
 import org.apache.jackrabbit.ocm.RepositoryLifecycleTestSetup;
 import org.apache.jackrabbit.ocm.TestBase;
-import org.apache.jackrabbit.ocm.persistence.PersistenceManager;
+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;
@@ -70,7 +70,7 @@
 	public void testRetrieveSingleton() {
 
 		try {
-			PersistenceManager persistenceManager = this.getPersistenceManager();
+			ObjectContentManager persistenceManager = this.getPersistenceManager();
 
 			//---------------------------------------------------------------------------------------------------------
 			// Insert 
@@ -104,7 +104,7 @@
 	
 	public void testRetrieveCollection() {
 		
-		PersistenceManager persistenceManager = this.getPersistenceManager();
+		ObjectContentManager persistenceManager = this.getPersistenceManager();
 
 		//---------------------------------------------------------------------------------------------------------	
 		// Insert  descendant objects



Mime
View raw message