jackrabbit-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From clomb...@apache.org
Subject svn commit: r548484 [2/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/atomictypeconverter/impl/TimestampTypeConverterImpl.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/main/java/org/apache/jackrabbit/ocm/manager/atomictypeconverter/impl/TimestampTypeConverterImpl.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/atomictypeconverter/impl/TimestampTypeConverterImpl.java (original)
+++ jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/main/java/org/apache/jackrabbit/ocm/manager/atomictypeconverter/impl/TimestampTypeConverterImpl.java Mon Jun 18 13:43:33 2007
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.jackrabbit.ocm.persistence.atomictypeconverter.impl;
+package org.apache.jackrabbit.ocm.manager.atomictypeconverter.impl;
 
 import java.sql.Timestamp;
 
@@ -24,7 +24,7 @@
 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;
 
 /**
  * 
@@ -37,7 +37,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)
 	{
@@ -49,7 +49,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)
     {
@@ -66,7 +66,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/main/java/org/apache/jackrabbit/ocm/manager/atomictypeconverter/impl/UndefinedTypeConverterImpl.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/main/java/org/apache/jackrabbit/ocm/manager/atomictypeconverter/impl/UndefinedTypeConverterImpl.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/atomictypeconverter/impl/UndefinedTypeConverterImpl.java (original)
+++ jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/main/java/org/apache/jackrabbit/ocm/manager/atomictypeconverter/impl/UndefinedTypeConverterImpl.java Mon Jun 18 13:43:33 2007
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.jackrabbit.ocm.persistence.atomictypeconverter.impl;
+package org.apache.jackrabbit.ocm.manager.atomictypeconverter.impl;
 
 import java.io.InputStream;
 import java.sql.Timestamp;
@@ -29,7 +29,7 @@
 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;
 
 /**
  * 
@@ -42,7 +42,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)
 	{
@@ -113,7 +113,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)
     {
@@ -177,7 +177,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/main/java/org/apache/jackrabbit/ocm/manager/atomictypeconverter/impl/UtilDateTypeConverterImpl.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/main/java/org/apache/jackrabbit/ocm/manager/atomictypeconverter/impl/UtilDateTypeConverterImpl.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/atomictypeconverter/impl/UtilDateTypeConverterImpl.java (original)
+++ jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/main/java/org/apache/jackrabbit/ocm/manager/atomictypeconverter/impl/UtilDateTypeConverterImpl.java Mon Jun 18 13:43:33 2007
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.jackrabbit.ocm.persistence.atomictypeconverter.impl;
+package org.apache.jackrabbit.ocm.manager.atomictypeconverter.impl;
 
 import java.util.Calendar;
 import java.util.Date;
@@ -26,7 +26,7 @@
 import javax.jcr.ValueFormatException;
 
 import org.apache.jackrabbit.ocm.exception.IncorrectAtomicTypeException;
-import org.apache.jackrabbit.ocm.persistence.atomictypeconverter.AtomicTypeConverter;
+import org.apache.jackrabbit.ocm.manager.atomictypeconverter.AtomicTypeConverter;
 
 /**
  * Util Date Converter
@@ -39,7 +39,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)
 	{
@@ -55,7 +55,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)
     {
@@ -73,7 +73,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)
 	{

Copied: jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/main/java/org/apache/jackrabbit/ocm/manager/beanconverter/BeanConverter.java (from r547884, jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/main/java/org/apache/jackrabbit/ocm/persistence/beanconverter/BeanConverter.java)
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/main/java/org/apache/jackrabbit/ocm/manager/beanconverter/BeanConverter.java?view=diff&rev=548484&p1=jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/main/java/org/apache/jackrabbit/ocm/persistence/beanconverter/BeanConverter.java&r1=547884&p2=jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/main/java/org/apache/jackrabbit/ocm/manager/beanconverter/BeanConverter.java&r2=548484
==============================================================================
--- jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/main/java/org/apache/jackrabbit/ocm/persistence/beanconverter/BeanConverter.java (original)
+++ jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/main/java/org/apache/jackrabbit/ocm/manager/beanconverter/BeanConverter.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 javax.jcr.Node;
@@ -23,9 +23,9 @@
 import org.apache.jackrabbit.ocm.exception.JcrMappingException;
 import org.apache.jackrabbit.ocm.exception.PersistenceException;
 import org.apache.jackrabbit.ocm.exception.RepositoryException;
+import org.apache.jackrabbit.ocm.manager.beanconverter.impl.ParentBeanConverterImpl;
 import org.apache.jackrabbit.ocm.mapper.model.BeanDescriptor;
 import org.apache.jackrabbit.ocm.mapper.model.ClassDescriptor;
-import org.apache.jackrabbit.ocm.persistence.beanconverter.impl.ParentBeanConverterImpl;
 
 /**
  * Interface describing a custom bean converter. 

Propchange: jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/main/java/org/apache/jackrabbit/ocm/manager/beanconverter/BeanConverter.java
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/main/java/org/apache/jackrabbit/ocm/manager/beanconverter/impl/AbstractBeanConverterImpl.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/main/java/org/apache/jackrabbit/ocm/manager/beanconverter/impl/AbstractBeanConverterImpl.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/beanconverter/impl/AbstractBeanConverterImpl.java (original)
+++ jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/main/java/org/apache/jackrabbit/ocm/manager/beanconverter/impl/AbstractBeanConverterImpl.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.impl;
+package org.apache.jackrabbit.ocm.manager.beanconverter.impl;
 
 import javax.jcr.Node;
 import javax.jcr.Session;
@@ -22,13 +22,13 @@
 import org.apache.jackrabbit.ocm.exception.JcrMappingException;
 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.impl.PersistenceUtil;
+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.impl.PersistenceUtil;
-import org.apache.jackrabbit.ocm.persistence.objectconverter.ObjectConverter;
 /**
  * 
  * Abstract Bean Converter Class

Modified: jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/main/java/org/apache/jackrabbit/ocm/manager/beanconverter/impl/DefaultBeanConverterImpl.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/main/java/org/apache/jackrabbit/ocm/manager/beanconverter/impl/DefaultBeanConverterImpl.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/beanconverter/impl/DefaultBeanConverterImpl.java (original)
+++ jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/main/java/org/apache/jackrabbit/ocm/manager/beanconverter/impl/DefaultBeanConverterImpl.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.impl;
+package org.apache.jackrabbit.ocm.manager.beanconverter.impl;
 
 import javax.jcr.Node;
 import javax.jcr.PathNotFoundException;
@@ -28,12 +28,12 @@
 import org.apache.jackrabbit.ocm.exception.JcrMappingException;
 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.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.objectconverter.ObjectConverter;
 /**
  * 
  * Default Bean Converter

Modified: jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/main/java/org/apache/jackrabbit/ocm/manager/beanconverter/impl/InlineBeanConverterImpl.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/main/java/org/apache/jackrabbit/ocm/manager/beanconverter/impl/InlineBeanConverterImpl.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/beanconverter/impl/InlineBeanConverterImpl.java (original)
+++ jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/main/java/org/apache/jackrabbit/ocm/manager/beanconverter/impl/InlineBeanConverterImpl.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.impl;
+package org.apache.jackrabbit.ocm.manager.beanconverter.impl;
 
 import javax.jcr.Node;
 import javax.jcr.Session;
@@ -22,13 +22,13 @@
 import org.apache.jackrabbit.ocm.exception.JcrMappingException;
 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.objectconverter.ObjectConverter;
+import org.apache.jackrabbit.ocm.manager.objectconverter.impl.SimpleFieldsHelper;
 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.objectconverter.ObjectConverter;
-import org.apache.jackrabbit.ocm.persistence.objectconverter.impl.SimpleFieldsHelper;
 /**
  * 
  * Bean converter used to map some node properties into one nested bean field.

Modified: jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/main/java/org/apache/jackrabbit/ocm/manager/beanconverter/impl/ParentBeanConverterImpl.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/main/java/org/apache/jackrabbit/ocm/manager/beanconverter/impl/ParentBeanConverterImpl.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/beanconverter/impl/ParentBeanConverterImpl.java (original)
+++ jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/main/java/org/apache/jackrabbit/ocm/manager/beanconverter/impl/ParentBeanConverterImpl.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.impl;
+package org.apache.jackrabbit.ocm.manager.beanconverter.impl;
 
 import javax.jcr.Node;
 import javax.jcr.Session;
@@ -24,12 +24,12 @@
 import org.apache.jackrabbit.ocm.exception.JcrMappingException;
 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.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.objectconverter.ObjectConverter;
 /**
  * 
  * Bean converter used to access to the parent object. 

Modified: jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/main/java/org/apache/jackrabbit/ocm/manager/beanconverter/impl/ReferenceBeanConverterImpl.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/main/java/org/apache/jackrabbit/ocm/manager/beanconverter/impl/ReferenceBeanConverterImpl.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/beanconverter/impl/ReferenceBeanConverterImpl.java (original)
+++ jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/main/java/org/apache/jackrabbit/ocm/manager/beanconverter/impl/ReferenceBeanConverterImpl.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.impl;
+package org.apache.jackrabbit.ocm.manager.beanconverter.impl;
 
 import javax.jcr.ItemNotFoundException;
 import javax.jcr.Node;
@@ -29,13 +29,13 @@
 import org.apache.jackrabbit.ocm.exception.JcrMappingException;
 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.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.mapper.model.FieldDescriptor;
-import org.apache.jackrabbit.ocm.persistence.atomictypeconverter.AtomicTypeConverterProvider;
-import org.apache.jackrabbit.ocm.persistence.beanconverter.BeanConverter;
-import org.apache.jackrabbit.ocm.persistence.objectconverter.ObjectConverter;
 import org.apache.jackrabbit.ocm.reflection.ReflectionUtils;
 /**
  * 

Copied: jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/main/java/org/apache/jackrabbit/ocm/manager/cache/ObjectCache.java (from r547884, jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/main/java/org/apache/jackrabbit/ocm/persistence/cache/ObjectCache.java)
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/main/java/org/apache/jackrabbit/ocm/manager/cache/ObjectCache.java?view=diff&rev=548484&p1=jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/main/java/org/apache/jackrabbit/ocm/persistence/cache/ObjectCache.java&r1=547884&p2=jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/main/java/org/apache/jackrabbit/ocm/manager/cache/ObjectCache.java&r2=548484
==============================================================================
--- jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/main/java/org/apache/jackrabbit/ocm/persistence/cache/ObjectCache.java (original)
+++ jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/main/java/org/apache/jackrabbit/ocm/manager/cache/ObjectCache.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.cache;
+package org.apache.jackrabbit.ocm.manager.cache;
 
 
 

Modified: jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/main/java/org/apache/jackrabbit/ocm/manager/cache/impl/RequestObjectCacheImpl.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/main/java/org/apache/jackrabbit/ocm/manager/cache/impl/RequestObjectCacheImpl.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/cache/impl/RequestObjectCacheImpl.java (original)
+++ jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/main/java/org/apache/jackrabbit/ocm/manager/cache/impl/RequestObjectCacheImpl.java Mon Jun 18 13:43:33 2007
@@ -14,12 +14,12 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.jackrabbit.ocm.persistence.cache.impl;
+package org.apache.jackrabbit.ocm.manager.cache.impl;
 
 import java.util.HashMap;
 import java.util.Map;
 
-import org.apache.jackrabbit.ocm.persistence.cache.ObjectCache;
+import org.apache.jackrabbit.ocm.manager.cache.ObjectCache;
 
 /**
 *

Copied: jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/main/java/org/apache/jackrabbit/ocm/manager/collectionconverter/CollectionConverter.java (from r547884, jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/main/java/org/apache/jackrabbit/ocm/persistence/collectionconverter/CollectionConverter.java)
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/main/java/org/apache/jackrabbit/ocm/manager/collectionconverter/CollectionConverter.java?view=diff&rev=548484&p1=jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/main/java/org/apache/jackrabbit/ocm/persistence/collectionconverter/CollectionConverter.java&r1=547884&p2=jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/main/java/org/apache/jackrabbit/ocm/manager/collectionconverter/CollectionConverter.java&r2=548484
==============================================================================
--- jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/main/java/org/apache/jackrabbit/ocm/persistence/collectionconverter/CollectionConverter.java (original)
+++ jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/main/java/org/apache/jackrabbit/ocm/manager/collectionconverter/CollectionConverter.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 javax.jcr.Node;
 import javax.jcr.Session;

Propchange: jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/main/java/org/apache/jackrabbit/ocm/manager/collectionconverter/CollectionConverter.java
------------------------------------------------------------------------------
    svn:eol-style = native

Copied: jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/main/java/org/apache/jackrabbit/ocm/manager/collectionconverter/ManageableCollection.java (from r547884, jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/main/java/org/apache/jackrabbit/ocm/persistence/collectionconverter/ManageableCollection.java)
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/main/java/org/apache/jackrabbit/ocm/manager/collectionconverter/ManageableCollection.java?view=diff&rev=548484&p1=jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/main/java/org/apache/jackrabbit/ocm/persistence/collectionconverter/ManageableCollection.java&r1=547884&p2=jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/main/java/org/apache/jackrabbit/ocm/manager/collectionconverter/ManageableCollection.java&r2=548484
==============================================================================
--- jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/main/java/org/apache/jackrabbit/ocm/persistence/collectionconverter/ManageableCollection.java (original)
+++ jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/main/java/org/apache/jackrabbit/ocm/manager/collectionconverter/ManageableCollection.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.Iterator;
 

Propchange: jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/main/java/org/apache/jackrabbit/ocm/manager/collectionconverter/ManageableCollection.java
------------------------------------------------------------------------------
    svn:eol-style = native

Copied: jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/main/java/org/apache/jackrabbit/ocm/manager/collectionconverter/ManageableCollectionUtil.java (from r547884, jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/main/java/org/apache/jackrabbit/ocm/persistence/collectionconverter/ManageableCollectionUtil.java)
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/main/java/org/apache/jackrabbit/ocm/manager/collectionconverter/ManageableCollectionUtil.java?view=diff&rev=548484&p1=jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/main/java/org/apache/jackrabbit/ocm/persistence/collectionconverter/ManageableCollectionUtil.java&r1=547884&p2=jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/main/java/org/apache/jackrabbit/ocm/manager/collectionconverter/ManageableCollectionUtil.java&r2=548484
==============================================================================
--- jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/main/java/org/apache/jackrabbit/ocm/persistence/collectionconverter/ManageableCollectionUtil.java (original)
+++ jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/main/java/org/apache/jackrabbit/ocm/manager/collectionconverter/ManageableCollectionUtil.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,9 +25,9 @@
 import java.util.Vector;
 
 import org.apache.jackrabbit.ocm.exception.JcrMappingException;
-import org.apache.jackrabbit.ocm.persistence.collectionconverter.impl.ManageableArrayList;
-import org.apache.jackrabbit.ocm.persistence.collectionconverter.impl.ManageableSet;
-import org.apache.jackrabbit.ocm.persistence.collectionconverter.impl.ManageableVector;
+import org.apache.jackrabbit.ocm.manager.collectionconverter.impl.ManageableArrayList;
+import org.apache.jackrabbit.ocm.manager.collectionconverter.impl.ManageableSet;
+import org.apache.jackrabbit.ocm.manager.collectionconverter.impl.ManageableVector;
 import org.apache.jackrabbit.ocm.reflection.ReflectionUtils;
 
 /**

Propchange: jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/main/java/org/apache/jackrabbit/ocm/manager/collectionconverter/ManageableCollectionUtil.java
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/main/java/org/apache/jackrabbit/ocm/manager/collectionconverter/impl/AbstractCollectionConverterImpl.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/main/java/org/apache/jackrabbit/ocm/manager/collectionconverter/impl/AbstractCollectionConverterImpl.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/collectionconverter/impl/AbstractCollectionConverterImpl.java (original)
+++ jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/main/java/org/apache/jackrabbit/ocm/manager/collectionconverter/impl/AbstractCollectionConverterImpl.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.impl;
+package org.apache.jackrabbit.ocm.manager.collectionconverter.impl;
 
 import java.util.Map;
 
@@ -29,11 +29,11 @@
 
 import org.apache.jackrabbit.ocm.exception.JcrMappingException;
 import org.apache.jackrabbit.ocm.exception.PersistenceException;
+import org.apache.jackrabbit.ocm.manager.collectionconverter.CollectionConverter;
+import org.apache.jackrabbit.ocm.manager.collectionconverter.ManageableCollection;
+import org.apache.jackrabbit.ocm.manager.objectconverter.ObjectConverter;
 import org.apache.jackrabbit.ocm.mapper.Mapper;
 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.objectconverter.ObjectConverter;
 
 /** 
  * Abstract class used for all CollectionConverter
@@ -72,7 +72,7 @@
 			Class collectionFieldClass) throws RepositoryException;
 
 	/**
-	 * @see org.apache.jackrabbit.ocm.persistence.collectionconverter.CollectionConverter#insertCollection(javax.jcr.Session, javax.jcr.Node, org.apache.jackrabbit.ocm.mapper.model.CollectionDescriptor, org.apache.jackrabbit.ocm.persistence.collectionconverter.ManageableCollection)
+	 * @see org.apache.jackrabbit.ocm.manager.collectionconverter.CollectionConverter#insertCollection(javax.jcr.Session, javax.jcr.Node, org.apache.jackrabbit.ocm.mapper.model.CollectionDescriptor, org.apache.jackrabbit.ocm.manager.collectionconverter.ManageableCollection)
 	 */
 	public void insertCollection(Session session, Node parentNode, CollectionDescriptor collectionDescriptor,
 			ManageableCollection collection) {
@@ -102,7 +102,7 @@
 
 	/**
 	 *
-	 * @see org.apache.jackrabbit.ocm.persistence.collectionconverter.CollectionConverter#updateCollection(javax.jcr.Session, javax.jcr.Node, org.apache.jackrabbit.ocm.mapper.model.CollectionDescriptor, org.apache.jackrabbit.ocm.persistence.collectionconverter.ManageableCollection)
+	 * @see org.apache.jackrabbit.ocm.manager.collectionconverter.CollectionConverter#updateCollection(javax.jcr.Session, javax.jcr.Node, org.apache.jackrabbit.ocm.mapper.model.CollectionDescriptor, org.apache.jackrabbit.ocm.manager.collectionconverter.ManageableCollection)
 	 */
 	public void updateCollection(Session session, Node parentNode, CollectionDescriptor collectionDescriptor,
 			ManageableCollection collection) {
@@ -126,7 +126,7 @@
 	}
 
 	/**
-	 * @see org.apache.jackrabbit.ocm.persistence.collectionconverter.CollectionConverter#getCollection(javax.jcr.Session, javax.jcr.Node, org.apache.jackrabbit.ocm.mapper.model.CollectionDescriptor, java.lang.Class)
+	 * @see org.apache.jackrabbit.ocm.manager.collectionconverter.CollectionConverter#getCollection(javax.jcr.Session, javax.jcr.Node, org.apache.jackrabbit.ocm.mapper.model.CollectionDescriptor, java.lang.Class)
 	 */
 	public ManageableCollection getCollection(Session session, Node parentNode, CollectionDescriptor collectionDescriptor,
 			Class collectionFieldClass) {
@@ -139,7 +139,7 @@
 	}
 
 	/**
-	 * @see org.apache.jackrabbit.ocm.persistence.collectionconverter.CollectionConverter#isNull(Session, Node, CollectionDescriptor, Class)
+	 * @see org.apache.jackrabbit.ocm.manager.collectionconverter.CollectionConverter#isNull(Session, Node, CollectionDescriptor, Class)
 	 */
 	public boolean isNull(Session session, Node parentNode, CollectionDescriptor collectionDescriptor,
 			Class collectionFieldClass) {

Modified: jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/main/java/org/apache/jackrabbit/ocm/manager/collectionconverter/impl/BeanReferenceCollectionConverterImpl.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/main/java/org/apache/jackrabbit/ocm/manager/collectionconverter/impl/BeanReferenceCollectionConverterImpl.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/collectionconverter/impl/BeanReferenceCollectionConverterImpl.java (original)
+++ jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/main/java/org/apache/jackrabbit/ocm/manager/collectionconverter/impl/BeanReferenceCollectionConverterImpl.java Mon Jun 18 13:43:33 2007
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.jackrabbit.ocm.persistence.collectionconverter.impl;
+package org.apache.jackrabbit.ocm.manager.collectionconverter.impl;
 
 
 import java.util.Iterator;
@@ -36,14 +36,14 @@
 
 import org.apache.jackrabbit.ocm.exception.JcrMappingException;
 import org.apache.jackrabbit.ocm.exception.PersistenceException;
+import org.apache.jackrabbit.ocm.manager.atomictypeconverter.AtomicTypeConverter;
+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.mapper.Mapper;
 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.atomictypeconverter.AtomicTypeConverter;
-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.reflection.ReflectionUtils;
 
 /**

Modified: jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/main/java/org/apache/jackrabbit/ocm/manager/collectionconverter/impl/DefaultCollectionConverterImpl.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/main/java/org/apache/jackrabbit/ocm/manager/collectionconverter/impl/DefaultCollectionConverterImpl.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/collectionconverter/impl/DefaultCollectionConverterImpl.java (original)
+++ jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/main/java/org/apache/jackrabbit/ocm/manager/collectionconverter/impl/DefaultCollectionConverterImpl.java Mon Jun 18 13:43:33 2007
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.jackrabbit.ocm.persistence.collectionconverter.impl;
+package org.apache.jackrabbit.ocm.manager.collectionconverter.impl;
 
 
 import java.util.ArrayList;
@@ -30,12 +30,12 @@
 import javax.jcr.Session;
 
 import org.apache.jackrabbit.ocm.exception.JcrMappingException;
+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.mapper.Mapper;
 import org.apache.jackrabbit.ocm.mapper.model.ClassDescriptor;
 import org.apache.jackrabbit.ocm.mapper.model.CollectionDescriptor;
-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.reflection.ReflectionUtils;
 
 /**

Modified: jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/main/java/org/apache/jackrabbit/ocm/manager/collectionconverter/impl/ManageableArrayList.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/main/java/org/apache/jackrabbit/ocm/manager/collectionconverter/impl/ManageableArrayList.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/collectionconverter/impl/ManageableArrayList.java (original)
+++ jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/main/java/org/apache/jackrabbit/ocm/manager/collectionconverter/impl/ManageableArrayList.java Mon Jun 18 13:43:33 2007
@@ -14,12 +14,12 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.jackrabbit.ocm.persistence.collectionconverter.impl;
+package org.apache.jackrabbit.ocm.manager.collectionconverter.impl;
 
 import java.util.ArrayList;
 import java.util.Iterator;
 
-import org.apache.jackrabbit.ocm.persistence.collectionconverter.ManageableCollection;
+import org.apache.jackrabbit.ocm.manager.collectionconverter.ManageableCollection;
 
 /** 
  *
@@ -33,7 +33,7 @@
 
 	/**
 	 * 
-	 * @see org.apache.jackrabbit.ocm.persistence.collectionconverter.ManageableCollection#addObject(java.lang.Object)
+	 * @see org.apache.jackrabbit.ocm.manager.collectionconverter.ManageableCollection#addObject(java.lang.Object)
 	 */
     public void addObject(Object object)
     {
@@ -43,7 +43,7 @@
 
     /**
      * 
-     * @see org.apache.jackrabbit.ocm.persistence.collectionconverter.ManageableCollection#getIterator()
+     * @see org.apache.jackrabbit.ocm.manager.collectionconverter.ManageableCollection#getIterator()
      */
     public Iterator getIterator()
     {
@@ -52,7 +52,7 @@
 
     /**
      * 
-     * @see org.apache.jackrabbit.ocm.persistence.collectionconverter.ManageableCollection#getSize()
+     * @see org.apache.jackrabbit.ocm.manager.collectionconverter.ManageableCollection#getSize()
      */
 	public int getSize()
 	{

Modified: jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/main/java/org/apache/jackrabbit/ocm/manager/collectionconverter/impl/ManageableSet.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/main/java/org/apache/jackrabbit/ocm/manager/collectionconverter/impl/ManageableSet.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/collectionconverter/impl/ManageableSet.java (original)
+++ jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/main/java/org/apache/jackrabbit/ocm/manager/collectionconverter/impl/ManageableSet.java Mon Jun 18 13:43:33 2007
@@ -1,10 +1,10 @@
-package org.apache.jackrabbit.ocm.persistence.collectionconverter.impl;
+package org.apache.jackrabbit.ocm.manager.collectionconverter.impl;
 
 import java.util.Collection;
 import java.util.HashSet;
 import java.util.Iterator;
 
-import org.apache.jackrabbit.ocm.persistence.collectionconverter.ManageableCollection;
+import org.apache.jackrabbit.ocm.manager.collectionconverter.ManageableCollection;
 
 
 /**
@@ -19,21 +19,21 @@
     }
     
     /**
-     * @see org.apache.jackrabbit.ocm.persistence.collectionconverter.ManageableCollection#addObject(java.lang.Object)
+     * @see org.apache.jackrabbit.ocm.manager.collectionconverter.ManageableCollection#addObject(java.lang.Object)
      */
     public void addObject(Object object) {
         add(object);
     }
 
     /**
-     * @see org.apache.jackrabbit.ocm.persistence.collectionconverter.ManageableCollection#getIterator()
+     * @see org.apache.jackrabbit.ocm.manager.collectionconverter.ManageableCollection#getIterator()
      */
     public Iterator getIterator() {
         return iterator();
     }
 
     /**
-     * @see org.apache.jackrabbit.ocm.persistence.collectionconverter.ManageableCollection#getSize()
+     * @see org.apache.jackrabbit.ocm.manager.collectionconverter.ManageableCollection#getSize()
      */
     public int getSize() {
         return size();

Modified: jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/main/java/org/apache/jackrabbit/ocm/manager/collectionconverter/impl/ManageableVector.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/main/java/org/apache/jackrabbit/ocm/manager/collectionconverter/impl/ManageableVector.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/collectionconverter/impl/ManageableVector.java (original)
+++ jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/main/java/org/apache/jackrabbit/ocm/manager/collectionconverter/impl/ManageableVector.java Mon Jun 18 13:43:33 2007
@@ -14,12 +14,12 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.jackrabbit.ocm.persistence.collectionconverter.impl;
+package org.apache.jackrabbit.ocm.manager.collectionconverter.impl;
 
 import java.util.Iterator;
 import java.util.Vector;
 
-import org.apache.jackrabbit.ocm.persistence.collectionconverter.ManageableCollection;
+import org.apache.jackrabbit.ocm.manager.collectionconverter.ManageableCollection;
 
 /** 
  *
@@ -32,7 +32,7 @@
 
 	/**
 	 * 
-	 * @see org.apache.jackrabbit.ocm.persistence.collectionconverter.ManageableCollection#addObject(java.lang.Object)
+	 * @see org.apache.jackrabbit.ocm.manager.collectionconverter.ManageableCollection#addObject(java.lang.Object)
 	 */
     public void addObject(Object object)
     {
@@ -41,7 +41,7 @@
 
     /**
      * 
-     * @see org.apache.jackrabbit.ocm.persistence.collectionconverter.ManageableCollection#getIterator()
+     * @see org.apache.jackrabbit.ocm.manager.collectionconverter.ManageableCollection#getIterator()
      */
     public Iterator getIterator()
     {
@@ -50,7 +50,7 @@
     
     /**
      * 
-     * @see org.apache.jackrabbit.ocm.persistence.collectionconverter.ManageableCollection#getSize()
+     * @see org.apache.jackrabbit.ocm.manager.collectionconverter.ManageableCollection#getSize()
      */
 	public int getSize()
 	{

Modified: jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/main/java/org/apache/jackrabbit/ocm/manager/collectionconverter/impl/ManagedHashMap.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/main/java/org/apache/jackrabbit/ocm/manager/collectionconverter/impl/ManagedHashMap.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/collectionconverter/impl/ManagedHashMap.java (original)
+++ jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/main/java/org/apache/jackrabbit/ocm/manager/collectionconverter/impl/ManagedHashMap.java Mon Jun 18 13:43:33 2007
@@ -14,13 +14,13 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.jackrabbit.ocm.persistence.collectionconverter.impl;
+package org.apache.jackrabbit.ocm.manager.collectionconverter.impl;
 
 import java.util.HashMap;
 import java.util.Iterator;
 import java.util.Map;
 
-import org.apache.jackrabbit.ocm.persistence.collectionconverter.ManageableCollection;
+import org.apache.jackrabbit.ocm.manager.collectionconverter.ManageableCollection;
 
 /**
  * The <code>ManagedHashMap</code> class provides Map support to JCR Mapping

Modified: jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/main/java/org/apache/jackrabbit/ocm/manager/collectionconverter/impl/MultiValueCollectionConverterImpl.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/main/java/org/apache/jackrabbit/ocm/manager/collectionconverter/impl/MultiValueCollectionConverterImpl.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/collectionconverter/impl/MultiValueCollectionConverterImpl.java (original)
+++ jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/main/java/org/apache/jackrabbit/ocm/manager/collectionconverter/impl/MultiValueCollectionConverterImpl.java Mon Jun 18 13:43:33 2007
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.jackrabbit.ocm.persistence.collectionconverter.impl;
+package org.apache.jackrabbit.ocm.manager.collectionconverter.impl;
 
 
 import java.util.Iterator;
@@ -30,12 +30,12 @@
 import javax.jcr.ValueFormatException;
 
 import org.apache.jackrabbit.ocm.exception.PersistenceException;
+import org.apache.jackrabbit.ocm.manager.atomictypeconverter.AtomicTypeConverter;
+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.mapper.Mapper;
 import org.apache.jackrabbit.ocm.mapper.model.CollectionDescriptor;
-import org.apache.jackrabbit.ocm.persistence.atomictypeconverter.AtomicTypeConverter;
-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.reflection.ReflectionUtils;
 
 /**

Modified: jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/main/java/org/apache/jackrabbit/ocm/manager/collectionconverter/impl/NTCollectionConverterImpl.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/main/java/org/apache/jackrabbit/ocm/manager/collectionconverter/impl/NTCollectionConverterImpl.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/collectionconverter/impl/NTCollectionConverterImpl.java (original)
+++ jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/main/java/org/apache/jackrabbit/ocm/manager/collectionconverter/impl/NTCollectionConverterImpl.java Mon Jun 18 13:43:33 2007
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.jackrabbit.ocm.persistence.collectionconverter.impl;
+package org.apache.jackrabbit.ocm.manager.collectionconverter.impl;
 
 
 import java.util.ArrayList;
@@ -37,12 +37,12 @@
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
+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.mapper.Mapper;
 import org.apache.jackrabbit.ocm.mapper.model.ClassDescriptor;
 import org.apache.jackrabbit.ocm.mapper.model.CollectionDescriptor;
-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.reflection.ReflectionUtils;
 
 /**
@@ -125,7 +125,7 @@
 
     /**
      *
-     * @see org.apache.jackrabbit.ocm.persistence.collectionconverter.CollectionConverter#updateCollection(javax.jcr.Session, javax.jcr.Node, org.apache.jackrabbit.ocm.mapper.model.CollectionDescriptor, org.apache.jackrabbit.ocm.persistence.collectionconverter.ManageableCollection)
+     * @see org.apache.jackrabbit.ocm.manager.collectionconverter.CollectionConverter#updateCollection(javax.jcr.Session, javax.jcr.Node, org.apache.jackrabbit.ocm.mapper.model.CollectionDescriptor, org.apache.jackrabbit.ocm.manager.collectionconverter.ManageableCollection)
      */
     protected void doUpdateCollection(Session session,
                                       Node parentNode,
@@ -189,7 +189,7 @@
     }
 
     /**
-     * @see org.apache.jackrabbit.ocm.persistence.collectionconverter.CollectionConverter#getCollection(javax.jcr.Session, javax.jcr.Node, org.apache.jackrabbit.ocm.mapper.model.CollectionDescriptor, java.lang.Class)
+     * @see org.apache.jackrabbit.ocm.manager.collectionconverter.CollectionConverter#getCollection(javax.jcr.Session, javax.jcr.Node, org.apache.jackrabbit.ocm.mapper.model.CollectionDescriptor, java.lang.Class)
      */
     protected ManageableCollection doGetCollection(Session session,
                                                    Node parentNode,

Modified: jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/main/java/org/apache/jackrabbit/ocm/manager/collectionconverter/impl/ReferenceCollectionConverterImpl.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/main/java/org/apache/jackrabbit/ocm/manager/collectionconverter/impl/ReferenceCollectionConverterImpl.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/collectionconverter/impl/ReferenceCollectionConverterImpl.java (original)
+++ jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/main/java/org/apache/jackrabbit/ocm/manager/collectionconverter/impl/ReferenceCollectionConverterImpl.java Mon Jun 18 13:43:33 2007
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.jackrabbit.ocm.persistence.collectionconverter.impl;
+package org.apache.jackrabbit.ocm.manager.collectionconverter.impl;
 
 
 import java.util.Iterator;
@@ -35,11 +35,11 @@
 import javax.jcr.version.VersionException;
 
 import org.apache.jackrabbit.ocm.exception.PersistenceException;
+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.mapper.Mapper;
 import org.apache.jackrabbit.ocm.mapper.model.CollectionDescriptor;
-import org.apache.jackrabbit.ocm.persistence.collectionconverter.ManageableCollection;
-import org.apache.jackrabbit.ocm.persistence.collectionconverter.ManageableCollectionUtil;
-import org.apache.jackrabbit.ocm.persistence.objectconverter.ObjectConverter;
 
 /**
  *

Modified: jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/main/java/org/apache/jackrabbit/ocm/manager/collectionconverter/impl/ResidualNodesCollectionConverterImpl.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/main/java/org/apache/jackrabbit/ocm/manager/collectionconverter/impl/ResidualNodesCollectionConverterImpl.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/collectionconverter/impl/ResidualNodesCollectionConverterImpl.java (original)
+++ jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/main/java/org/apache/jackrabbit/ocm/manager/collectionconverter/impl/ResidualNodesCollectionConverterImpl.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.impl;
+package org.apache.jackrabbit.ocm.manager.collectionconverter.impl;
 
 import java.util.ArrayList;
 import java.util.HashSet;
@@ -30,12 +30,12 @@
 import javax.jcr.ValueFormatException;
 
 import org.apache.jackrabbit.ocm.exception.PersistenceException;
+import org.apache.jackrabbit.ocm.manager.collectionconverter.ManageableCollection;
+import org.apache.jackrabbit.ocm.manager.collectionconverter.ManageableCollectionUtil;
+import org.apache.jackrabbit.ocm.manager.collectionconverter.impl.AbstractCollectionConverterImpl;
+import org.apache.jackrabbit.ocm.manager.objectconverter.ObjectConverter;
 import org.apache.jackrabbit.ocm.mapper.Mapper;
 import org.apache.jackrabbit.ocm.mapper.model.CollectionDescriptor;
-import org.apache.jackrabbit.ocm.persistence.collectionconverter.ManageableCollection;
-import org.apache.jackrabbit.ocm.persistence.collectionconverter.ManageableCollectionUtil;
-import org.apache.jackrabbit.ocm.persistence.collectionconverter.impl.AbstractCollectionConverterImpl;
-import org.apache.jackrabbit.ocm.persistence.objectconverter.ObjectConverter;
 
 /**
  * The <code>ResidualNodesCollectionConverterImpl</code> is a collection

Modified: jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/main/java/org/apache/jackrabbit/ocm/manager/collectionconverter/impl/ResidualPropertiesCollectionConverterImpl.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/main/java/org/apache/jackrabbit/ocm/manager/collectionconverter/impl/ResidualPropertiesCollectionConverterImpl.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/collectionconverter/impl/ResidualPropertiesCollectionConverterImpl.java (original)
+++ jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/main/java/org/apache/jackrabbit/ocm/manager/collectionconverter/impl/ResidualPropertiesCollectionConverterImpl.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.impl;
+package org.apache.jackrabbit.ocm.manager.collectionconverter.impl;
 
 import java.util.ArrayList;
 import java.util.Iterator;
@@ -31,14 +31,14 @@
 import javax.jcr.ValueFormatException;
 
 import org.apache.jackrabbit.ocm.exception.PersistenceException;
+import org.apache.jackrabbit.ocm.manager.atomictypeconverter.AtomicTypeConverter;
+import org.apache.jackrabbit.ocm.manager.collectionconverter.ManageableCollection;
+import org.apache.jackrabbit.ocm.manager.collectionconverter.ManageableCollectionUtil;
+import org.apache.jackrabbit.ocm.manager.collectionconverter.impl.AbstractCollectionConverterImpl;
+import org.apache.jackrabbit.ocm.manager.objectconverter.ObjectConverter;
 import org.apache.jackrabbit.ocm.mapper.Mapper;
 import org.apache.jackrabbit.ocm.mapper.model.CollectionDescriptor;
 import org.apache.jackrabbit.ocm.mapper.model.FieldDescriptor;
-import org.apache.jackrabbit.ocm.persistence.atomictypeconverter.AtomicTypeConverter;
-import org.apache.jackrabbit.ocm.persistence.collectionconverter.ManageableCollection;
-import org.apache.jackrabbit.ocm.persistence.collectionconverter.ManageableCollectionUtil;
-import org.apache.jackrabbit.ocm.persistence.collectionconverter.impl.AbstractCollectionConverterImpl;
-import org.apache.jackrabbit.ocm.persistence.objectconverter.ObjectConverter;
 import org.apache.jackrabbit.ocm.reflection.ReflectionUtils;
 
 /**

Modified: jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/main/java/org/apache/jackrabbit/ocm/manager/impl/CustomNodeTypeCreatorImpl.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/main/java/org/apache/jackrabbit/ocm/manager/impl/CustomNodeTypeCreatorImpl.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/impl/CustomNodeTypeCreatorImpl.java (original)
+++ jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/main/java/org/apache/jackrabbit/ocm/manager/impl/CustomNodeTypeCreatorImpl.java Mon Jun 18 13:43:33 2007
@@ -14,14 +14,14 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.jackrabbit.ocm.persistence.impl;
+package org.apache.jackrabbit.ocm.manager.impl;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 
 import org.apache.jackrabbit.ocm.exception.CustomNodeTypeCreationException;
-import org.apache.jackrabbit.ocm.persistence.CustomNodeTypeCreator;
-import org.apache.jackrabbit.ocm.persistence.PersistenceManager;
+import org.apache.jackrabbit.ocm.manager.CustomNodeTypeCreator;
+import org.apache.jackrabbit.ocm.manager.ObjectContentManager;
 
 /** Default implementation of the jackrabbit custom node creator.
  *
@@ -91,7 +91,7 @@
      * 
      * @return jcrSession
      */
-    public PersistenceManager getJcrSession()
+    public ObjectContentManager getJcrSession()
     {
         return jcrSession;
     }

Modified: jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/main/java/org/apache/jackrabbit/ocm/manager/impl/ObjectIterator.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/main/java/org/apache/jackrabbit/ocm/manager/impl/ObjectIterator.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/impl/ObjectIterator.java (original)
+++ jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/main/java/org/apache/jackrabbit/ocm/manager/impl/ObjectIterator.java Mon Jun 18 13:43:33 2007
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.jackrabbit.ocm.persistence.impl;
+package org.apache.jackrabbit.ocm.manager.impl;
 
 import java.util.Iterator;
 
@@ -23,7 +23,7 @@
 import javax.jcr.NodeIterator;
 import javax.jcr.Session;
 
-import org.apache.jackrabbit.ocm.persistence.objectconverter.ObjectConverter;
+import org.apache.jackrabbit.ocm.manager.objectconverter.ObjectConverter;
 
 
 /**

Modified: jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/main/java/org/apache/jackrabbit/ocm/manager/impl/PersistenceManagerImpl.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/main/java/org/apache/jackrabbit/ocm/manager/impl/PersistenceManagerImpl.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/impl/PersistenceManagerImpl.java (original)
+++ jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/main/java/org/apache/jackrabbit/ocm/manager/impl/PersistenceManagerImpl.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.impl;
+package org.apache.jackrabbit.ocm.manager.impl;
 
 
 import java.util.ArrayList;
@@ -46,16 +46,16 @@
 import org.apache.jackrabbit.ocm.exception.LockedException;
 import org.apache.jackrabbit.ocm.exception.PersistenceException;
 import org.apache.jackrabbit.ocm.exception.VersionException;
+import org.apache.jackrabbit.ocm.manager.ObjectContentManager;
+import org.apache.jackrabbit.ocm.manager.atomictypeconverter.impl.DefaultAtomicTypeConverterProvider;
+import org.apache.jackrabbit.ocm.manager.cache.ObjectCache;
+import org.apache.jackrabbit.ocm.manager.cache.impl.RequestObjectCacheImpl;
+import org.apache.jackrabbit.ocm.manager.objectconverter.ObjectConverter;
+import org.apache.jackrabbit.ocm.manager.objectconverter.impl.ObjectConverterImpl;
+import org.apache.jackrabbit.ocm.manager.objectconverter.impl.ProxyManagerImpl;
 import org.apache.jackrabbit.ocm.mapper.Mapper;
 import org.apache.jackrabbit.ocm.mapper.impl.DigesterMapperImpl;
 import org.apache.jackrabbit.ocm.mapper.model.ClassDescriptor;
-import org.apache.jackrabbit.ocm.persistence.PersistenceManager;
-import org.apache.jackrabbit.ocm.persistence.atomictypeconverter.impl.DefaultAtomicTypeConverterProvider;
-import org.apache.jackrabbit.ocm.persistence.cache.ObjectCache;
-import org.apache.jackrabbit.ocm.persistence.cache.impl.RequestObjectCacheImpl;
-import org.apache.jackrabbit.ocm.persistence.objectconverter.ObjectConverter;
-import org.apache.jackrabbit.ocm.persistence.objectconverter.impl.ObjectConverterImpl;
-import org.apache.jackrabbit.ocm.persistence.objectconverter.impl.ProxyManagerImpl;
 import org.apache.jackrabbit.ocm.query.Query;
 import org.apache.jackrabbit.ocm.query.QueryManager;
 import org.apache.jackrabbit.ocm.query.impl.QueryManagerImpl;
@@ -64,14 +64,14 @@
 import org.apache.jackrabbit.ocm.lock.Lock;
 /**
  *
- * Default implementation for {@link org.apache.jackrabbit.ocm.persistence.PersistenceManager}
+ * Default implementation for {@link org.apache.jackrabbit.ocm.manager.ObjectContentManager}
  *
  * @author Sandro Boehme
  * @author <a href="mailto:christophe.lombart@sword-technologies.com">Lombart Christophe</a>
  * @author Martin Koci
  * @author <a href='mailto:the_mindstorm[at]evolva[dot]ro'>Alexandru Popescu</a>
  */
-public class PersistenceManagerImpl implements PersistenceManager {
+public class PersistenceManagerImpl implements ObjectContentManager {
     /**
      * Logger.
      */
@@ -201,7 +201,7 @@
 	}
 
 	/**
-     * @see org.apache.jackrabbit.ocm.persistence.PersistenceManager#getObject(java.lang.Class, java.lang.String)
+     * @see org.apache.jackrabbit.ocm.manager.ObjectContentManager#getObject(java.lang.Class, java.lang.String)
      * @throws org.apache.jackrabbit.ocm.exception.RepositoryException if the underlying repository
      *  has thrown a javax.jcr.RepositoryException
      * @throws JcrMappingException if the mapping for the class is not correct
@@ -226,7 +226,7 @@
 
     
     /**
-     * @see org.apache.jackrabbit.ocm.persistence.PersistenceManager#getObject(java.lang.Class, java.lang.String)
+     * @see org.apache.jackrabbit.ocm.manager.ObjectContentManager#getObject(java.lang.Class, java.lang.String)
      * @throws org.apache.jackrabbit.ocm.exception.RepositoryException if the underlying repository
      *  has thrown a javax.jcr.RepositoryException
      * @throws JcrMappingException if the mapping for the class is not correct
@@ -251,7 +251,7 @@
 
     }    
     /**
-     * @see org.apache.jackrabbit.ocm.persistence.PersistenceManager#getObject(java.lang.Class, java.lang.String, java.lang.String)
+     * @see org.apache.jackrabbit.ocm.manager.ObjectContentManager#getObject(java.lang.Class, java.lang.String, java.lang.String)
      */
     public Object getObject( String path, String versionName) {
         String pathVersion = null;
@@ -276,7 +276,7 @@
     }
 
     /**
-     * @see org.apache.jackrabbit.ocm.persistence.PersistenceManager#getObject(java.lang.Class, java.lang.String)
+     * @see org.apache.jackrabbit.ocm.manager.ObjectContentManager#getObject(java.lang.Class, java.lang.String)
      * @throws org.apache.jackrabbit.ocm.exception.RepositoryException if the underlying repository
      *  has thrown a javax.jcr.RepositoryException
      * @throws JcrMappingException if the mapping for the class is not correct
@@ -300,7 +300,7 @@
     }
 
     /**
-     * @see org.apache.jackrabbit.ocm.persistence.PersistenceManager#getObject(java.lang.Class, java.lang.String, java.lang.String)
+     * @see org.apache.jackrabbit.ocm.manager.ObjectContentManager#getObject(java.lang.Class, java.lang.String, java.lang.String)
      */
     public Object getObject(Class objectClass, String path, String versionName) {
         String pathVersion = null;
@@ -325,7 +325,7 @@
     }    
     
     /**
-     * @see org.apache.jackrabbit.ocm.persistence.PersistenceManager#retrieveAllMappedAttributes(Object)
+     * @see org.apache.jackrabbit.ocm.manager.ObjectContentManager#retrieveAllMappedAttributes(Object)
      */
     public void retrieveAllMappedAttributes(Object object) {
 		objectConverter.retrieveAllMappedAttributes(session, object);
@@ -333,7 +333,7 @@
 	}
 
     /**
-     * @see org.apache.jackrabbit.ocm.persistence.PersistenceManager#retrieveMappedAttribute(Object, String)
+     * @see org.apache.jackrabbit.ocm.manager.ObjectContentManager#retrieveMappedAttribute(Object, String)
      */    
 	public void retrieveMappedAttribute(Object object, String attributeName) {
 		objectConverter.retrieveMappedAttribute(session, object, attributeName);
@@ -341,7 +341,7 @@
 	}
 
 	/**
-     * @see org.apache.jackrabbit.ocm.persistence.PersistenceManager#insert(java.lang.Object)
+     * @see org.apache.jackrabbit.ocm.manager.ObjectContentManager#insert(java.lang.Object)
      */
     public void insert(Object object) {
         String path = objectConverter.getPath(session, object);
@@ -371,7 +371,7 @@
     }
 
     /**
-     * @see org.apache.jackrabbit.ocm.persistence.PersistenceManager#update(java.lang.Object)
+     * @see org.apache.jackrabbit.ocm.manager.ObjectContentManager#update(java.lang.Object)
      */
     public void update(Object object) {
         String path = objectConverter.getPath(session, object);
@@ -392,7 +392,7 @@
 
     /**
      *
-     * @see org.apache.jackrabbit.ocm.persistence.PersistenceManager#remove(java.lang.String)
+     * @see org.apache.jackrabbit.ocm.manager.ObjectContentManager#remove(java.lang.String)
      */
     public void remove(String path) {
         try {
@@ -415,7 +415,7 @@
 
     /**
      *
-     * @see org.apache.jackrabbit.ocm.persistence.PersistenceManager#remove(java.lang.Object)
+     * @see org.apache.jackrabbit.ocm.manager.ObjectContentManager#remove(java.lang.Object)
      */
     public void remove(Object object) {
         this.remove(objectConverter.getPath(session, object));
@@ -423,7 +423,7 @@
 
     /**
      *
-     * @see org.apache.jackrabbit.ocm.persistence.PersistenceManager#remove(org.apache.jackrabbit.ocm.query.Query)
+     * @see org.apache.jackrabbit.ocm.manager.ObjectContentManager#remove(org.apache.jackrabbit.ocm.query.Query)
      */
     public void remove(Query query) {
         try {
@@ -472,7 +472,7 @@
 
     /**
      *
-     * @see org.apache.jackrabbit.ocm.persistence.PersistenceManager#objectExists(java.lang.String)
+     * @see org.apache.jackrabbit.ocm.manager.ObjectContentManager#objectExists(java.lang.String)
      */
     public boolean objectExists(String path) {
         try {
@@ -486,7 +486,7 @@
 
     /**
      *
-     * @see org.apache.jackrabbit.ocm.persistence.PersistenceManager#isPersistent(java.lang.Class)
+     * @see org.apache.jackrabbit.ocm.manager.ObjectContentManager#isPersistent(java.lang.Class)
      */
     public boolean isPersistent(final Class clazz) {
         
@@ -504,7 +504,7 @@
 
     /**
      *
-     * @see org.apache.jackrabbit.ocm.persistence.PersistenceManager#getObject(org.apache.jackrabbit.ocm.query.Query)
+     * @see org.apache.jackrabbit.ocm.manager.ObjectContentManager#getObject(org.apache.jackrabbit.ocm.query.Query)
      */
     public Object getObject(Query query) {
         try {
@@ -539,7 +539,7 @@
 
     /**
      *
-     * @see org.apache.jackrabbit.ocm.persistence.PersistenceManager#getObjects(org.apache.jackrabbit.ocm.query.Query)
+     * @see org.apache.jackrabbit.ocm.manager.ObjectContentManager#getObjects(org.apache.jackrabbit.ocm.query.Query)
      */
     public Collection getObjects(Query query) {
         try {
@@ -571,7 +571,7 @@
 
     /**
      *
-     * @see org.apache.jackrabbit.ocm.persistence.PersistenceManager#getObjectIterator(org.apache.jackrabbit.ocm.query.Query)
+     * @see org.apache.jackrabbit.ocm.manager.ObjectContentManager#getObjectIterator(org.apache.jackrabbit.ocm.query.Query)
      */
     public Iterator getObjectIterator(Query query) {
         try {
@@ -599,7 +599,7 @@
 
     /**
      *
-     * @see org.apache.jackrabbit.ocm.persistence.PersistenceManager#checkin(java.lang.String)
+     * @see org.apache.jackrabbit.ocm.manager.ObjectContentManager#checkin(java.lang.String)
      */
     public void checkin(String path) {
         this.checkin(path, null);
@@ -607,7 +607,7 @@
 
     /**
      *
-     * @see org.apache.jackrabbit.ocm.persistence.PersistenceManager#checkin(java.lang.String, java.lang.String[])
+     * @see org.apache.jackrabbit.ocm.manager.ObjectContentManager#checkin(java.lang.String, java.lang.String[])
      */
     public void checkin(String path, String[] versionLabels) {
         try {
@@ -653,7 +653,7 @@
 
     /**
      *
-     * @see org.apache.jackrabbit.ocm.persistence.PersistenceManager#checkout(java.lang.String)
+     * @see org.apache.jackrabbit.ocm.manager.ObjectContentManager#checkout(java.lang.String)
      */
     public void checkout(String path) {
         Node node = null;
@@ -685,7 +685,7 @@
 
     /**
      *
-     * @see org.apache.jackrabbit.ocm.persistence.PersistenceManager#addVersionLabel(java.lang.String, java.lang.String, java.lang.String)
+     * @see org.apache.jackrabbit.ocm.manager.ObjectContentManager#addVersionLabel(java.lang.String, java.lang.String, java.lang.String)
      */
     public void addVersionLabel(String path, String versionName, String versionLabel) {
         try {
@@ -721,7 +721,7 @@
 
     /**
      *
-     * @see org.apache.jackrabbit.ocm.persistence.PersistenceManager#getVersion(java.lang.String, java.lang.String)
+     * @see org.apache.jackrabbit.ocm.manager.ObjectContentManager#getVersion(java.lang.String, java.lang.String)
      */
     public Version getVersion(String path, String versionName) {
         try {
@@ -753,7 +753,7 @@
 
     /**
      *
-     * @see org.apache.jackrabbit.ocm.persistence.PersistenceManager#getVersionLabels(java.lang.String, java.lang.String)
+     * @see org.apache.jackrabbit.ocm.manager.ObjectContentManager#getVersionLabels(java.lang.String, java.lang.String)
      */
     public String[] getVersionLabels(String path, String versionName) {
         try {
@@ -787,7 +787,7 @@
     }
 
     /**
-     * @see org.apache.jackrabbit.ocm.persistence.PersistenceManager#getAllVersionLabels(java.lang.String)
+     * @see org.apache.jackrabbit.ocm.manager.ObjectContentManager#getAllVersionLabels(java.lang.String)
      */
     public String[] getAllVersionLabels(String path) {
         try {
@@ -816,7 +816,7 @@
 
     /**
      *
-     * @see org.apache.jackrabbit.ocm.persistence.PersistenceManager#getAllVersions(java.lang.String)
+     * @see org.apache.jackrabbit.ocm.manager.ObjectContentManager#getAllVersions(java.lang.String)
      */
     public VersionIterator getAllVersions(String path) {
         try {
@@ -846,7 +846,7 @@
 
     /**
      *
-     * @see org.apache.jackrabbit.ocm.persistence.PersistenceManager#getRootVersion(java.lang.String)
+     * @see org.apache.jackrabbit.ocm.manager.ObjectContentManager#getRootVersion(java.lang.String)
      */
     public Version getRootVersion(String path) {
         try {
@@ -876,7 +876,7 @@
 
     /**
      *
-     * @see org.apache.jackrabbit.ocm.persistence.PersistenceManager#getBaseVersion(java.lang.String)
+     * @see org.apache.jackrabbit.ocm.manager.ObjectContentManager#getBaseVersion(java.lang.String)
      */
     public Version getBaseVersion(String path) {
         try {
@@ -904,7 +904,7 @@
 
     /**
      *
-     * @see org.apache.jackrabbit.ocm.persistence.PersistenceManager#lock(java.lang.String, java.lang.Object, boolean, boolean)
+     * @see org.apache.jackrabbit.ocm.manager.ObjectContentManager#lock(java.lang.String, java.lang.Object, boolean, boolean)
      */
     public Lock lock(final String absPath, final boolean isDeep, final boolean isSessionScoped) 
     throws LockedException {
@@ -932,7 +932,7 @@
 
     /**
      *
-     * @see org.apache.jackrabbit.ocm.persistence.PersistenceManager#unlock(java.lang.String, java.lang.Object, java.lang.String)
+     * @see org.apache.jackrabbit.ocm.manager.ObjectContentManager#unlock(java.lang.String, java.lang.Object, java.lang.String)
      */
     public void unlock(final String absPath, final String lockToken) 
     throws IllegalUnlockException {
@@ -971,7 +971,7 @@
 
     /**
      *
-     * @see org.apache.jackrabbit.ocm.persistence.PersistenceManager#isLocked(java.lang.String)
+     * @see org.apache.jackrabbit.ocm.manager.ObjectContentManager#isLocked(java.lang.String)
      */
     public boolean isLocked(final String absPath) {
         try {
@@ -987,7 +987,7 @@
     }
 
     /**
-     * @see org.apache.jackrabbit.ocm.persistence.PersistenceManager#getQueryManager()
+     * @see org.apache.jackrabbit.ocm.manager.ObjectContentManager#getQueryManager()
      */
     public QueryManager getQueryManager() {
         return this.queryManager;
@@ -1051,7 +1051,7 @@
 
     /**
      *
-     * @see org.apache.jackrabbit.ocm.persistence.PersistenceManager#logout()
+     * @see org.apache.jackrabbit.ocm.manager.ObjectContentManager#logout()
      */
     public void logout() {
         try {
@@ -1080,7 +1080,7 @@
 
     /**
      *
-     * @see org.apache.jackrabbit.ocm.persistence.PersistenceManager#save()
+     * @see org.apache.jackrabbit.ocm.manager.ObjectContentManager#save()
      */
     public void save() {
         try {
@@ -1123,7 +1123,7 @@
     
 	/**
 	 * 
-	 * @see org.apache.jackrabbit.ocm.persistence.PersistenceManager#move(java.lang.String, java.lang.String)
+	 * @see org.apache.jackrabbit.ocm.manager.ObjectContentManager#move(java.lang.String, java.lang.String)
 	 */
     public void move(String srcPath, String destPath){
         Workspace workspace = session.getWorkspace();
@@ -1163,7 +1163,7 @@
 
     /**
      * 
-     * @see org.apache.jackrabbit.ocm.persistence.PersistenceManager#copy(java.lang.String, java.lang.String)
+     * @see org.apache.jackrabbit.ocm.manager.ObjectContentManager#copy(java.lang.String, java.lang.String)
      */
     public void copy(String srcPath, String destPath){
         Workspace workspace = session.getWorkspace();

Modified: jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/main/java/org/apache/jackrabbit/ocm/manager/impl/PersistenceUtil.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/main/java/org/apache/jackrabbit/ocm/manager/impl/PersistenceUtil.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/impl/PersistenceUtil.java (original)
+++ jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/main/java/org/apache/jackrabbit/ocm/manager/impl/PersistenceUtil.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.impl;
+package org.apache.jackrabbit.ocm.manager.impl;
 
 import javax.jcr.Node;
 import javax.jcr.Session;

Copied: jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/main/java/org/apache/jackrabbit/ocm/manager/objectconverter/ObjectConverter.java (from r547884, jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/main/java/org/apache/jackrabbit/ocm/persistence/objectconverter/ObjectConverter.java)
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/main/java/org/apache/jackrabbit/ocm/manager/objectconverter/ObjectConverter.java?view=diff&rev=548484&p1=jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/main/java/org/apache/jackrabbit/ocm/persistence/objectconverter/ObjectConverter.java&r1=547884&p2=jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/main/java/org/apache/jackrabbit/ocm/manager/objectconverter/ObjectConverter.java&r2=548484
==============================================================================
--- jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/main/java/org/apache/jackrabbit/ocm/persistence/objectconverter/ObjectConverter.java (original)
+++ jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/main/java/org/apache/jackrabbit/ocm/manager/objectconverter/ObjectConverter.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;
+package org.apache.jackrabbit.ocm.manager.objectconverter;
 
 import javax.jcr.Node;
 import javax.jcr.Session;

Propchange: jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/main/java/org/apache/jackrabbit/ocm/manager/objectconverter/ObjectConverter.java
------------------------------------------------------------------------------
    svn:eol-style = native

Copied: jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/main/java/org/apache/jackrabbit/ocm/manager/objectconverter/ProxyManager.java (from r547884, jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/main/java/org/apache/jackrabbit/ocm/persistence/objectconverter/ProxyManager.java)
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/main/java/org/apache/jackrabbit/ocm/manager/objectconverter/ProxyManager.java?view=diff&rev=548484&p1=jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/main/java/org/apache/jackrabbit/ocm/persistence/objectconverter/ProxyManager.java&r1=547884&p2=jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/main/java/org/apache/jackrabbit/ocm/manager/objectconverter/ProxyManager.java&r2=548484
==============================================================================
--- jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/main/java/org/apache/jackrabbit/ocm/persistence/objectconverter/ProxyManager.java (original)
+++ jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/main/java/org/apache/jackrabbit/ocm/manager/objectconverter/ProxyManager.java Mon Jun 18 13:43:33 2007
@@ -1,10 +1,10 @@
-package org.apache.jackrabbit.ocm.persistence.objectconverter;
+package org.apache.jackrabbit.ocm.manager.objectconverter;
 
 import javax.jcr.Node;
 import javax.jcr.Session;
 
+import org.apache.jackrabbit.ocm.manager.collectionconverter.CollectionConverter;
 import org.apache.jackrabbit.ocm.mapper.model.CollectionDescriptor;
-import org.apache.jackrabbit.ocm.persistence.collectionconverter.CollectionConverter;
 
 public interface ProxyManager {
 

Propchange: jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/main/java/org/apache/jackrabbit/ocm/manager/objectconverter/ProxyManager.java
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/main/java/org/apache/jackrabbit/ocm/manager/objectconverter/impl/BeanLazyLoader.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/BeanLazyLoader.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/BeanLazyLoader.java (original)
+++ jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/main/java/org/apache/jackrabbit/ocm/manager/objectconverter/impl/BeanLazyLoader.java Mon Jun 18 13:43:33 2007
@@ -15,13 +15,13 @@
  * limitations under the License.
  */
 
-package org.apache.jackrabbit.ocm.persistence.objectconverter.impl;
+package org.apache.jackrabbit.ocm.manager.objectconverter.impl;
 
 import javax.jcr.Session;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
-import org.apache.jackrabbit.ocm.persistence.objectconverter.ObjectConverter;
+import org.apache.jackrabbit.ocm.manager.objectconverter.ObjectConverter;
 
 import net.sf.cglib.proxy.LazyLoader;
 

Modified: jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/main/java/org/apache/jackrabbit/ocm/manager/objectconverter/impl/CollectionLazyLoader.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/CollectionLazyLoader.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/CollectionLazyLoader.java (original)
+++ jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/main/java/org/apache/jackrabbit/ocm/manager/objectconverter/impl/CollectionLazyLoader.java Mon Jun 18 13:43:33 2007
@@ -15,17 +15,17 @@
  * 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.Session;
 
 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.objectconverter.ObjectConverter;
 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.objectconverter.ObjectConverter;
 
 import net.sf.cglib.proxy.LazyLoader;
 



Mime
View raw message