jackrabbit-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From clomb...@apache.org
Subject svn commit: r536999 [4/7] - in /jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src: dtd/ main/java/org/apache/jackrabbit/ main/java/org/apache/jackrabbit/ocm/ main/java/org/apache/jackrabbit/ocm/exception/ main/java/org/apache/jackrabbit/o...
Date Thu, 10 May 2007 21:25:22 GMT
Modified: jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/main/java/org/apache/jackrabbit/ocm/persistence/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/persistence/objectconverter/impl/ProxyManagerImpl.java?view=diff&rev=536999&r1=535963&r2=536999
==============================================================================
--- jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/main/java/org/apache/jackrabbit/ocm/persistence/objectconverter/impl/ProxyManagerImpl.java (original)
+++ jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/main/java/org/apache/jackrabbit/ocm/persistence/objectconverter/impl/ProxyManagerImpl.java Thu May 10 14:25:11 2007
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.portals.graffito.jcr.persistence.objectconverter.impl;
+package org.apache.jackrabbit.ocm.persistence.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.portals.graffito.jcr.mapper.model.CollectionDescriptor;
-import org.apache.portals.graffito.jcr.persistence.collectionconverter.CollectionConverter;
-import org.apache.portals.graffito.jcr.persistence.collectionconverter.ManageableCollection;
-import org.apache.portals.graffito.jcr.persistence.collectionconverter.ManageableCollectionUtil;
-import org.apache.portals.graffito.jcr.persistence.objectconverter.ObjectConverter;
-import org.apache.portals.graffito.jcr.persistence.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 
 {
@@ -50,7 +50,7 @@
 				return null;
 			}
 		} catch (RepositoryException e) {
-			throw new org.apache.portals.graffito.jcr.exception.RepositoryException("Impossible to check,if the object exits on " + path, e);
+			throw new org.apache.jackrabbit.ocm.exception.RepositoryException("Impossible to check,if the object exits on " + path, e);
 		}
 				
 		LazyLoader loader = new BeanLazyLoader(objectConverter, session, beanClass, path) ;		

Modified: jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/main/java/org/apache/jackrabbit/ocm/persistence/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/persistence/objectconverter/impl/SimpleFieldsHelper.java?view=diff&rev=536999&r1=535963&r2=536999
==============================================================================
--- jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/main/java/org/apache/jackrabbit/ocm/persistence/objectconverter/impl/SimpleFieldsHelper.java (original)
+++ jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/main/java/org/apache/jackrabbit/ocm/persistence/objectconverter/impl/SimpleFieldsHelper.java Thu May 10 14:25:11 2007
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.portals.graffito.jcr.persistence.objectconverter.impl;
+package org.apache.jackrabbit.ocm.persistence.objectconverter.impl;
 
 import java.util.Iterator;
 
@@ -33,15 +33,15 @@
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
-import org.apache.portals.graffito.jcr.exception.JcrMappingException;
-import org.apache.portals.graffito.jcr.exception.PersistenceException;
-import org.apache.portals.graffito.jcr.mapper.model.ClassDescriptor;
-import org.apache.portals.graffito.jcr.mapper.model.FieldDescriptor;
-import org.apache.portals.graffito.jcr.persistence.PersistenceConstant;
-import org.apache.portals.graffito.jcr.persistence.atomictypeconverter.AtomicTypeConverter;
-import org.apache.portals.graffito.jcr.persistence.atomictypeconverter.AtomicTypeConverterProvider;
-import org.apache.portals.graffito.jcr.persistence.atomictypeconverter.impl.NullTypeConverterImpl;
-import org.apache.portals.graffito.jcr.reflection.ReflectionUtils;
+import org.apache.jackrabbit.ocm.exception.JcrMappingException;
+import org.apache.jackrabbit.ocm.exception.PersistenceException;
+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;
 
 /**
  * Helper class used to map simple fields.
@@ -74,7 +74,7 @@
 	 * Retrieve simple fields (atomic fields)
 	 * 
 	 * @throws JcrMappingException
-	 * @throws org.apache.portals.graffito.jcr.exception.RepositoryException
+	 * @throws org.apache.jackrabbit.ocm.exception.RepositoryException
 	 */
 	public Object retrieveSimpleFields(Session session, ClassDescriptor classDescriptor, Node node, Object object) 
 	{
@@ -124,7 +124,7 @@
 			throw new PersistenceException(
 					"Cannot retrieve properties of object " + object + " from node " + node, vfe);
 		} catch (RepositoryException re) {
-			throw new org.apache.portals.graffito.jcr.exception.RepositoryException( "Cannot retrieve properties of object " + object
+			throw new org.apache.jackrabbit.ocm.exception.RepositoryException( "Cannot retrieve properties of object " + object
 							+ " from node " + node, re);
 		}
 
@@ -182,7 +182,7 @@
 		} catch (ConstraintViolationException cve) {
 			throw new PersistenceException("Cannot persist properties of object " + object + ". Constraint violation.", cve);
 		} catch (RepositoryException re) {
-			throw new org.apache.portals.graffito.jcr.exception.RepositoryException("Cannot persist properties of object "
+			throw new org.apache.jackrabbit.ocm.exception.RepositoryException("Cannot persist properties of object "
 					+ object, re);
 		}
 	}

Copied: jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/main/java/org/apache/jackrabbit/ocm/query/Filter.java (from r535963, jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/main/java/org/apache/portals/graffito/jcr/query/Filter.java)
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/main/java/org/apache/jackrabbit/ocm/query/Filter.java?view=diff&rev=536999&p1=jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/main/java/org/apache/portals/graffito/jcr/query/Filter.java&r1=535963&p2=jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/main/java/org/apache/jackrabbit/ocm/query/Filter.java&r2=536999
==============================================================================
--- jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/main/java/org/apache/portals/graffito/jcr/query/Filter.java (original)
+++ jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/main/java/org/apache/jackrabbit/ocm/query/Filter.java Thu May 10 14:25:11 2007
@@ -14,9 +14,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.portals.graffito.jcr.query;
+package org.apache.jackrabbit.ocm.query;
 
-import org.apache.portals.graffito.jcr.exception.IncorrectAtomicTypeException;
+import org.apache.jackrabbit.ocm.exception.IncorrectAtomicTypeException;
 
 
 /**

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

Copied: jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/main/java/org/apache/jackrabbit/ocm/query/Query.java (from r535963, jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/main/java/org/apache/portals/graffito/jcr/query/Query.java)
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/main/java/org/apache/jackrabbit/ocm/query/Query.java?view=diff&rev=536999&p1=jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/main/java/org/apache/portals/graffito/jcr/query/Query.java&r1=535963&p2=jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/main/java/org/apache/jackrabbit/ocm/query/Query.java&r2=536999
==============================================================================
--- jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/main/java/org/apache/portals/graffito/jcr/query/Query.java (original)
+++ jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/main/java/org/apache/jackrabbit/ocm/query/Query.java Thu May 10 14:25:11 2007
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.portals.graffito.jcr.query;
+package org.apache.jackrabbit.ocm.query;
 
 /**
  * Graffito JCR Query interface

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

Copied: jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/main/java/org/apache/jackrabbit/ocm/query/QueryManager.java (from r535963, jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/main/java/org/apache/portals/graffito/jcr/query/QueryManager.java)
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/main/java/org/apache/jackrabbit/ocm/query/QueryManager.java?view=diff&rev=536999&p1=jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/main/java/org/apache/portals/graffito/jcr/query/QueryManager.java&r1=535963&p2=jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/main/java/org/apache/jackrabbit/ocm/query/QueryManager.java&r2=536999
==============================================================================
--- jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/main/java/org/apache/portals/graffito/jcr/query/QueryManager.java (original)
+++ jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/main/java/org/apache/jackrabbit/ocm/query/QueryManager.java Thu May 10 14:25:11 2007
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.portals.graffito.jcr.query;
+package org.apache.jackrabbit.ocm.query;
 
 
 

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

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=536999&r1=535963&r2=536999
==============================================================================
--- 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 Thu May 10 14:25:11 2007
@@ -15,19 +15,19 @@
  * limitations under the License.
  */
 
-package org.apache.portals.graffito.jcr.query.impl;
+package org.apache.jackrabbit.ocm.query.impl;
 
 
 import java.util.Map;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
-import org.apache.portals.graffito.jcr.mapper.model.ClassDescriptor;
-import org.apache.portals.graffito.jcr.persistence.atomictypeconverter.AtomicTypeConverter;
-import org.apache.portals.graffito.jcr.query.Filter;
+import org.apache.jackrabbit.ocm.mapper.model.ClassDescriptor;
+import org.apache.jackrabbit.ocm.persistence.atomictypeconverter.AtomicTypeConverter;
+import org.apache.jackrabbit.ocm.query.Filter;
 
 /**
- * {@link org.apache.portals.graffito.jcr.query.Filter}
+ * {@link org.apache.jackrabbit.ocm.query.Filter}
  *
  * @author <a href="mailto:christophe.lombart@sword-technologies.com">Christophe Lombart</a>
  * @author <a href="mailto:the_mindstorm[at]evolva[dot]ro">Alex Popescu</a>
@@ -57,28 +57,28 @@
 
     /**
      *
-     * @see org.apache.portals.graffito.jcr.query.Filter#getFilterClass()
+     * @see org.apache.jackrabbit.ocm.query.Filter#getFilterClass()
      */
     public Class getFilterClass() {
         return claszz;
     }
 
     /**
-     * @see org.apache.portals.graffito.jcr.query.Filter#setScope(java.lang.String)
+     * @see org.apache.jackrabbit.ocm.query.Filter#setScope(java.lang.String)
      */
     public void setScope(String scope) {
         this.scope = scope;
     }
 
     /**
-     * @see org.apache.portals.graffito.jcr.query.Filter#getScope()
+     * @see org.apache.jackrabbit.ocm.query.Filter#getScope()
      */
     public String getScope() {
         return this.scope;
     }
 
     /**
-     * @see org.apache.portals.graffito.jcr.query.Filter#addContains(java.lang.String, java.lang.String)
+     * @see org.apache.jackrabbit.ocm.query.Filter#addContains(java.lang.String, java.lang.String)
      */
     public Filter addContains(String scope, String fullTextSearch) {
         String jcrExpression = null;
@@ -96,7 +96,7 @@
     }
 
     /**
-     * @see org.apache.portals.graffito.jcr.query.Filter#addBetween(java.lang.String, java.lang.Object, java.lang.Object)
+     * @see org.apache.jackrabbit.ocm.query.Filter#addBetween(java.lang.String, java.lang.Object, java.lang.Object)
      */
     public Filter addBetween(String fieldAttributeName, Object value1, Object value2) {
         String jcrExpression = "( @" + this.getJcrFieldName(fieldAttributeName) + " >= "
@@ -110,7 +110,7 @@
     }
 
     /**
-     * @see org.apache.portals.graffito.jcr.query.Filter#addEqualTo(java.lang.String, java.lang.Object)
+     * @see org.apache.jackrabbit.ocm.query.Filter#addEqualTo(java.lang.String, java.lang.Object)
      */
     public Filter addEqualTo(String fieldAttributeName, Object value) {
         String jcrExpression = "@" + this.getJcrFieldName(fieldAttributeName) + " = "
@@ -121,7 +121,7 @@
     }
 
     /**
-     * @see org.apache.portals.graffito.jcr.query.Filter#addGreaterOrEqualThan(java.lang.String, java.lang.Object)
+     * @see org.apache.jackrabbit.ocm.query.Filter#addGreaterOrEqualThan(java.lang.String, java.lang.Object)
      */
     public Filter addGreaterOrEqualThan(String fieldAttributeName, Object value) {
         String jcrExpression = "@" + this.getJcrFieldName(fieldAttributeName) + " >= "
@@ -132,7 +132,7 @@
     }
 
     /**
-     * @see org.apache.portals.graffito.jcr.query.Filter#addGreaterThan(java.lang.String, java.lang.Object)
+     * @see org.apache.jackrabbit.ocm.query.Filter#addGreaterThan(java.lang.String, java.lang.Object)
      */
     public Filter addGreaterThan(String fieldAttributeName, Object value) {
         String jcrExpression = "@" + this.getJcrFieldName(fieldAttributeName) + " > "
@@ -143,7 +143,7 @@
     }
 
     /**
-     * @see org.apache.portals.graffito.jcr.query.Filter#addLessOrEqualThan(java.lang.String, java.lang.Object)
+     * @see org.apache.jackrabbit.ocm.query.Filter#addLessOrEqualThan(java.lang.String, java.lang.Object)
      */
     public Filter addLessOrEqualThan(String fieldAttributeName, Object value) {
         String jcrExpression = "@" + this.getJcrFieldName(fieldAttributeName) + " <= "
@@ -154,7 +154,7 @@
     }
 
     /**
-     * @see org.apache.portals.graffito.jcr.query.Filter#addLessOrEqualThan(java.lang.String, java.lang.Object)
+     * @see org.apache.jackrabbit.ocm.query.Filter#addLessOrEqualThan(java.lang.String, java.lang.Object)
      */
     public Filter addLessThan(String fieldAttributeName, Object value) {
         String jcrExpression = "@" + this.getJcrFieldName(fieldAttributeName) + " < "
@@ -165,7 +165,7 @@
     }
 
     /**
-     * @see org.apache.portals.graffito.jcr.query.Filter#addLike(java.lang.String, java.lang.Object)
+     * @see org.apache.jackrabbit.ocm.query.Filter#addLike(java.lang.String, java.lang.Object)
      */
     public Filter addLike(String fieldAttributeName, Object value) {
         String jcrExpression = "jcr:like(" + "@" + this.getJcrFieldName(fieldAttributeName) + ", '"
@@ -176,7 +176,7 @@
     }
 
     /**
-     * @see org.apache.portals.graffito.jcr.query.Filter#addNotEqualTo(java.lang.String, java.lang.Object)
+     * @see org.apache.jackrabbit.ocm.query.Filter#addNotEqualTo(java.lang.String, java.lang.Object)
      */
     public Filter addNotEqualTo(String fieldAttributeName, Object value) {
         String jcrExpression = "@" + this.getJcrFieldName(fieldAttributeName) + " != "
@@ -187,7 +187,7 @@
     }
 
     /**
-     * @see org.apache.portals.graffito.jcr.query.Filter#addNotNull(java.lang.String)
+     * @see org.apache.jackrabbit.ocm.query.Filter#addNotNull(java.lang.String)
      */
     public Filter addNotNull(String fieldAttributeName) {
         String jcrExpression = "@" + this.getJcrFieldName(fieldAttributeName);
@@ -197,7 +197,7 @@
     }
 
     /**
-     * @see org.apache.portals.graffito.jcr.query.Filter#addIsNull(java.lang.String)
+     * @see org.apache.jackrabbit.ocm.query.Filter#addIsNull(java.lang.String)
      */
     public Filter addIsNull(String fieldAttributeName) {
         String jcrExpression = "not(@" + this.getJcrFieldName(fieldAttributeName) + ")";
@@ -207,7 +207,7 @@
     }
 
     /**
-     * @see org.apache.portals.graffito.jcr.query.Filter#addOrFilter(org.apache.portals.graffito.jcr.query.Filter)
+     * @see org.apache.jackrabbit.ocm.query.Filter#addOrFilter(org.apache.jackrabbit.ocm.query.Filter)
      */
     public Filter addOrFilter(Filter filter) {
         FilterImpl theFilter = (FilterImpl) filter;
@@ -226,7 +226,7 @@
     }
 
     /**
-     * @see org.apache.portals.graffito.jcr.query.Filter#addAndFilter(Filter)
+     * @see org.apache.jackrabbit.ocm.query.Filter#addAndFilter(Filter)
      */
     public Filter addAndFilter(Filter filter) {
         FilterImpl theFilter = (FilterImpl) filter;

Modified: jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/main/java/org/apache/jackrabbit/ocm/query/impl/QueryImpl.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/main/java/org/apache/jackrabbit/ocm/query/impl/QueryImpl.java?view=diff&rev=536999&r1=535963&r2=536999
==============================================================================
--- jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/main/java/org/apache/jackrabbit/ocm/query/impl/QueryImpl.java (original)
+++ jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/main/java/org/apache/jackrabbit/ocm/query/impl/QueryImpl.java Thu May 10 14:25:11 2007
@@ -15,15 +15,15 @@
  * limitations under the License.
  */
 
-package org.apache.portals.graffito.jcr.query.impl;
+package org.apache.jackrabbit.ocm.query.impl;
 
 import java.util.ArrayList;
 import java.util.Iterator;
 
-import org.apache.portals.graffito.jcr.mapper.Mapper;
-import org.apache.portals.graffito.jcr.mapper.model.ClassDescriptor;
-import org.apache.portals.graffito.jcr.query.Filter;
-import org.apache.portals.graffito.jcr.query.Query;
+import org.apache.jackrabbit.ocm.mapper.Mapper;
+import org.apache.jackrabbit.ocm.mapper.model.ClassDescriptor;
+import org.apache.jackrabbit.ocm.query.Filter;
+import org.apache.jackrabbit.ocm.query.Query;
 
 /**
  * Default Query implementation 
@@ -53,7 +53,7 @@
 	}
 
 	/**
-	 * @see org.apache.portals.graffito.jcr.query.Query#setFilter(org.apache.portals.graffito.jcr.query.Filter)
+	 * @see org.apache.jackrabbit.ocm.query.Query#setFilter(org.apache.jackrabbit.ocm.query.Filter)
 	 */
 	public void setFilter(Filter filter)
 	{
@@ -61,7 +61,7 @@
 	}
 
 	/**
-	 * @see org.apache.portals.graffito.jcr.query.Query#getFilter()
+	 * @see org.apache.jackrabbit.ocm.query.Query#getFilter()
 	 */
 	public Filter getFilter()
 	{
@@ -75,7 +75,7 @@
 
 	/**
 	 * 
-	 * @see org.apache.portals.graffito.jcr.query.Query#addOrderByAscending(java.lang.String)
+	 * @see org.apache.jackrabbit.ocm.query.Query#addOrderByAscending(java.lang.String)
 	 */
 	public void addOrderByAscending(String fieldNameAttribute)
 	{

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=536999&r1=535963&r2=536999
==============================================================================
--- 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 Thu May 10 14:25:11 2007
@@ -14,19 +14,19 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.portals.graffito.jcr.query.impl;
+package org.apache.jackrabbit.ocm.query.impl;
 
 
 import java.util.Iterator;
 import java.util.Map;
 
-import org.apache.portals.graffito.jcr.mapper.Mapper;
-import org.apache.portals.graffito.jcr.mapper.model.ClassDescriptor;
-import org.apache.portals.graffito.jcr.mapper.model.FieldDescriptor;
-import org.apache.portals.graffito.jcr.persistence.PersistenceConstant;
-import org.apache.portals.graffito.jcr.query.Filter;
-import org.apache.portals.graffito.jcr.query.Query;
-import org.apache.portals.graffito.jcr.query.QueryManager;
+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;
 
 public class QueryManagerImpl implements QueryManager {
     

Modified: jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/main/java/org/apache/jackrabbit/ocm/reflection/ReflectionUtils.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/main/java/org/apache/jackrabbit/ocm/reflection/ReflectionUtils.java?view=diff&rev=536999&r1=535963&r2=536999
==============================================================================
--- jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/main/java/org/apache/jackrabbit/ocm/reflection/ReflectionUtils.java (original)
+++ jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/main/java/org/apache/jackrabbit/ocm/reflection/ReflectionUtils.java Thu May 10 14:25:11 2007
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.portals.graffito.jcr.reflection;
+package org.apache.jackrabbit.ocm.reflection;
 
 import java.lang.reflect.InvocationTargetException;
 
@@ -22,7 +22,7 @@
 
 import org.apache.commons.beanutils.ConstructorUtils;
 import org.apache.commons.beanutils.PropertyUtils;
-import org.apache.portals.graffito.jcr.exception.JcrMappingException;
+import org.apache.jackrabbit.ocm.exception.JcrMappingException;
 
 
 /**

Modified: jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/main/java/org/apache/jackrabbit/ocm/repository/RepositoryUtil.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/main/java/org/apache/jackrabbit/ocm/repository/RepositoryUtil.java?view=diff&rev=536999&r1=535963&r2=536999
==============================================================================
--- jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/main/java/org/apache/jackrabbit/ocm/repository/RepositoryUtil.java (original)
+++ jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/main/java/org/apache/jackrabbit/ocm/repository/RepositoryUtil.java Thu May 10 14:25:11 2007
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.portals.graffito.jcr.repository;
+package org.apache.jackrabbit.ocm.repository;
 
 import java.util.Hashtable;
 
@@ -27,11 +27,11 @@
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.apache.jackrabbit.core.jndi.RegistryHelper;
+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.util.ISO9075;
 import org.apache.jackrabbit.util.Text;
-import org.apache.portals.graffito.jcr.exception.JcrMappingException;
-import org.apache.portals.graffito.jcr.exception.PersistenceException;
-import org.apache.portals.graffito.jcr.exception.RepositoryException;
 
 /**
 * Utility class for managing JCR repositories.
@@ -45,11 +45,11 @@
     
     /** Graffito namespace prefix constant.
      */
-    public static final String GRAFFITO_NAMESPACE_PREFIX   = "graffito";
+    public static final String OCM_NAMESPACE_PREFIX   = "ocm";
 
     /** Graffito namespace constant.
      */
-    public static final String GRAFFITO_NAMESPACE          = "http://incubator.apache.org/graffito";    
+    public static final String OCM_NAMESPACE          = "http://jackrabbit.apache.org/ocm";    
     /** Item path separator */
     public static final String PATH_SEPARATOR = "/";
     
@@ -248,7 +248,7 @@
             boolean createGraffitoNamespace = true;
             for (int i = 0; i < jcrNamespaces.length; i++)
             {
-                if (jcrNamespaces[i].equals(GRAFFITO_NAMESPACE_PREFIX))
+                if (jcrNamespaces[i].equals(OCM_NAMESPACE_PREFIX))
                 {
                     createGraffitoNamespace = false;
                     log.debug("Graffito namespace exists.");
@@ -257,7 +257,7 @@
              
             if (createGraffitoNamespace)
             {
-                session.getWorkspace().getNamespaceRegistry().registerNamespace(GRAFFITO_NAMESPACE_PREFIX, GRAFFITO_NAMESPACE);
+                session.getWorkspace().getNamespaceRegistry().registerNamespace(OCM_NAMESPACE_PREFIX, OCM_NAMESPACE);
                 log.info("Successfully created graffito namespace.");
             }
             

Modified: jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/main/java/org/apache/jackrabbit/ocm/security/SimpleAccessManager.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/main/java/org/apache/jackrabbit/ocm/security/SimpleAccessManager.java?view=diff&rev=536999&r1=535963&r2=536999
==============================================================================
--- jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/main/java/org/apache/jackrabbit/ocm/security/SimpleAccessManager.java (original)
+++ jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/main/java/org/apache/jackrabbit/ocm/security/SimpleAccessManager.java Thu May 10 14:25:11 2007
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.portals.graffito.jcr.security;
+package org.apache.jackrabbit.ocm.security;
 
 import org.apache.jackrabbit.core.HierarchyManager;
 import org.apache.jackrabbit.core.ItemId;

Modified: jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/main/java/org/apache/jackrabbit/ocm/security/SimpleLoginModule.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/main/java/org/apache/jackrabbit/ocm/security/SimpleLoginModule.java?view=diff&rev=536999&r1=535963&r2=536999
==============================================================================
--- jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/main/java/org/apache/jackrabbit/ocm/security/SimpleLoginModule.java (original)
+++ jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/main/java/org/apache/jackrabbit/ocm/security/SimpleLoginModule.java Thu May 10 14:25:11 2007
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.portals.graffito.jcr.security;
+package org.apache.jackrabbit.ocm.security;
 
 import org.apache.jackrabbit.core.security.AnonymousPrincipal;
 import org.apache.jackrabbit.core.security.CredentialsCallback;

Modified: jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/main/java/org/apache/jackrabbit/ocm/transaction/jackrabbit/UserTransactionImpl.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/main/java/org/apache/jackrabbit/ocm/transaction/jackrabbit/UserTransactionImpl.java?view=diff&rev=536999&r1=535963&r2=536999
==============================================================================
--- jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/main/java/org/apache/jackrabbit/ocm/transaction/jackrabbit/UserTransactionImpl.java (original)
+++ jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/main/java/org/apache/jackrabbit/ocm/transaction/jackrabbit/UserTransactionImpl.java Thu May 10 14:25:11 2007
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.portals.graffito.jcr.transaction.jackrabbit;
+package org.apache.jackrabbit.ocm.transaction.jackrabbit;
 
 import javax.transaction.xa.XAResource;
 import javax.transaction.xa.Xid;

Modified: jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/main/java/org/apache/jackrabbit/ocm/version/Version.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/main/java/org/apache/jackrabbit/ocm/version/Version.java?view=diff&rev=536999&r1=535963&r2=536999
==============================================================================
--- jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/main/java/org/apache/jackrabbit/ocm/version/Version.java (original)
+++ jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/main/java/org/apache/jackrabbit/ocm/version/Version.java Thu May 10 14:25:11 2007
@@ -14,13 +14,13 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.portals.graffito.jcr.version;
+package org.apache.jackrabbit.ocm.version;
 
 import java.util.Calendar;
 
 import javax.jcr.RepositoryException;
 
-import org.apache.portals.graffito.jcr.exception.VersionException;
+import org.apache.jackrabbit.ocm.exception.VersionException;
 
 /**
  * 

Modified: jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/main/java/org/apache/jackrabbit/ocm/version/VersionIterator.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/main/java/org/apache/jackrabbit/ocm/version/VersionIterator.java?view=diff&rev=536999&r1=535963&r2=536999
==============================================================================
--- jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/main/java/org/apache/jackrabbit/ocm/version/VersionIterator.java (original)
+++ jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/main/java/org/apache/jackrabbit/ocm/version/VersionIterator.java Thu May 10 14:25:11 2007
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.portals.graffito.jcr.version;
+package org.apache.jackrabbit.ocm.version;
 
 import java.util.Iterator;
 
@@ -57,7 +57,7 @@
 		try
 		{
 			Version version =  versionIterator.nextVersion();
-			return new org.apache.portals.graffito.jcr.version.Version(version);
+			return new org.apache.jackrabbit.ocm.version.Version(version);
 		}
 		catch (Exception e)
 		{

Copied: jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/test/java/org/apache/jackrabbit/ocm/AllTests.java (from r535963, jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/test/java/org/apache/portals/graffito/jcr/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=536999&p1=jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/test/java/org/apache/portals/graffito/jcr/AllTests.java&r1=535963&p2=jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/test/java/org/apache/jackrabbit/ocm/AllTests.java&r2=536999
==============================================================================
--- jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/test/java/org/apache/portals/graffito/jcr/AllTests.java (original)
+++ jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/test/java/org/apache/jackrabbit/ocm/AllTests.java Thu May 10 14:25:11 2007
@@ -14,14 +14,14 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.portals.graffito.jcr;
+package org.apache.jackrabbit.ocm;
 
 import junit.framework.Test;
 import junit.framework.TestSuite;
 
-import org.apache.portals.graffito.jcr.mapper.DigesterMapperImplTest;
-import org.apache.portals.graffito.jcr.querymanager.QueryManagerTest;
-import org.apache.portals.graffito.jcr.repository.RepositoryUtilTest;
+import org.apache.jackrabbit.ocm.mapper.DigesterMapperImplTest;
+import org.apache.jackrabbit.ocm.querymanager.QueryManagerTest;
+import org.apache.jackrabbit.ocm.repository.RepositoryUtilTest;
 
 
 /**
@@ -37,22 +37,22 @@
 
     public static Test buildSuite() throws Exception {
         TestSuite suite= new TestSuite("Graffito OCM Tests");
-        suite.addTest(org.apache.portals.graffito.jcr.mapper.AllTests.buildSuite());     
-        suite.addTest(org.apache.portals.graffito.jcr.persistence.atomic.AllTests.buildSuite());
-        suite.addTest(org.apache.portals.graffito.jcr.persistence.auto.AllTests.buildSuite());
-        suite.addTest(org.apache.portals.graffito.jcr.persistence.basic.AllTests.buildSuite());
-        suite.addTest(org.apache.portals.graffito.jcr.persistence.beanconverter.AllTests.buildSuite());
-        suite.addTest(org.apache.portals.graffito.jcr.persistence.collectionconverter.AllTests.buildSuite());
-        suite.addTest(org.apache.portals.graffito.jcr.persistence.inheritance.AllTests.buildSuite());
-        suite.addTest(org.apache.portals.graffito.jcr.persistence.interfaces.AllTests.buildSuite());
-        suite.addTest(org.apache.portals.graffito.jcr.persistence.jcrnodetype.AllTests.buildSuite());        
-        suite.addTest(org.apache.portals.graffito.jcr.persistence.lock.AllTests.buildSuite());        
-        suite.addTest(org.apache.portals.graffito.jcr.persistence.proxy.AllTests.buildSuite());
-        suite.addTest(org.apache.portals.graffito.jcr.persistence.query.AllTests.buildSuite());
-        suite.addTest(org.apache.portals.graffito.jcr.persistence.uuid.AllTests.buildSuite());        
-        suite.addTest(org.apache.portals.graffito.jcr.persistence.version.AllTests.buildSuite());        
-        suite.addTest(org.apache.portals.graffito.jcr.querymanager.AllTests.buildSuite());
-        suite.addTest(org.apache.portals.graffito.jcr.repository.AllTests.buildSuite());
+        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.querymanager.AllTests.buildSuite());
+        suite.addTest(org.apache.jackrabbit.ocm.repository.AllTests.buildSuite());
         
         return suite;
     }

Propchange: jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/test/java/org/apache/jackrabbit/ocm/AllTests.java
------------------------------------------------------------------------------
    svn:eol-style = native

Copied: jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/test/java/org/apache/jackrabbit/ocm/RepositoryLifecycleTestSetup.java (from r535963, jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/test/java/org/apache/portals/graffito/jcr/RepositoryLifecycleTestSetup.java)
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/test/java/org/apache/jackrabbit/ocm/RepositoryLifecycleTestSetup.java?view=diff&rev=536999&p1=jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/test/java/org/apache/portals/graffito/jcr/RepositoryLifecycleTestSetup.java&r1=535963&p2=jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/test/java/org/apache/jackrabbit/ocm/RepositoryLifecycleTestSetup.java&r2=536999
==============================================================================
--- jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/test/java/org/apache/portals/graffito/jcr/RepositoryLifecycleTestSetup.java (original)
+++ jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/test/java/org/apache/jackrabbit/ocm/RepositoryLifecycleTestSetup.java Thu May 10 14:25:11 2007
@@ -14,12 +14,12 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.portals.graffito.jcr;
+package org.apache.jackrabbit.ocm;
 
 import junit.extensions.TestSetup;
 import junit.framework.Test;
 
-import org.apache.portals.graffito.jcr.repository.RepositoryUtil;
+import org.apache.jackrabbit.ocm.repository.RepositoryUtil;
 /**
  * A TestSetup that opens/close the JCR repository.
  * 

Propchange: jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/test/java/org/apache/jackrabbit/ocm/RepositoryLifecycleTestSetup.java
------------------------------------------------------------------------------
    svn:eol-style = native

Copied: jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/test/java/org/apache/jackrabbit/ocm/TestBase.java (from r535963, jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/test/java/org/apache/portals/graffito/jcr/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=536999&p1=jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/test/java/org/apache/portals/graffito/jcr/TestBase.java&r1=535963&p2=jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/test/java/org/apache/jackrabbit/ocm/TestBase.java&r2=536999
==============================================================================
--- jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/test/java/org/apache/portals/graffito/jcr/TestBase.java (original)
+++ jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/test/java/org/apache/jackrabbit/ocm/TestBase.java Thu May 10 14:25:11 2007
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.portals.graffito.jcr;
+package org.apache.jackrabbit.ocm;
 
 import java.io.BufferedInputStream;
 import java.io.BufferedOutputStream;
@@ -50,30 +50,30 @@
 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.portals.graffito.jcr.mapper.Mapper;
-import org.apache.portals.graffito.jcr.mapper.impl.DigesterMapperImpl;
-import org.apache.portals.graffito.jcr.persistence.PersistenceManager;
-import org.apache.portals.graffito.jcr.persistence.atomictypeconverter.AtomicTypeConverterProvider;
-import org.apache.portals.graffito.jcr.persistence.atomictypeconverter.impl.BinaryTypeConverterImpl;
-import org.apache.portals.graffito.jcr.persistence.atomictypeconverter.impl.BooleanTypeConverterImpl;
-import org.apache.portals.graffito.jcr.persistence.atomictypeconverter.impl.ByteArrayTypeConverterImpl;
-import org.apache.portals.graffito.jcr.persistence.atomictypeconverter.impl.CalendarTypeConverterImpl;
-import org.apache.portals.graffito.jcr.persistence.atomictypeconverter.impl.DefaultAtomicTypeConverterProvider;
-import org.apache.portals.graffito.jcr.persistence.atomictypeconverter.impl.DoubleTypeConverterImpl;
-import org.apache.portals.graffito.jcr.persistence.atomictypeconverter.impl.IntTypeConverterImpl;
-import org.apache.portals.graffito.jcr.persistence.atomictypeconverter.impl.LongTypeConverterImpl;
-import org.apache.portals.graffito.jcr.persistence.atomictypeconverter.impl.StringTypeConverterImpl;
-import org.apache.portals.graffito.jcr.persistence.atomictypeconverter.impl.TimestampTypeConverterImpl;
-import org.apache.portals.graffito.jcr.persistence.atomictypeconverter.impl.UtilDateTypeConverterImpl;
-import org.apache.portals.graffito.jcr.persistence.impl.PersistenceManagerImpl;
-import org.apache.portals.graffito.jcr.persistence.inheritance.PersistenceManagerInheritanceHierarchyTest;
-import org.apache.portals.graffito.jcr.persistence.objectconverter.ObjectConverter;
-import org.apache.portals.graffito.jcr.persistence.objectconverter.impl.ObjectConverterImpl;
-import org.apache.portals.graffito.jcr.query.QueryManager;
-import org.apache.portals.graffito.jcr.query.impl.QueryManagerImpl;
-import org.apache.portals.graffito.jcr.reflection.ReflectionUtils;
-import org.apache.portals.graffito.jcr.repository.RepositoryUtil;
-import org.apache.portals.graffito.jcr.testmodel.inheritance.Ancestor;
+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;
+import org.apache.jackrabbit.ocm.repository.RepositoryUtil;
+import org.apache.jackrabbit.ocm.testmodel.inheritance.Ancestor;
 import org.xml.sax.ContentHandler;
 
 /**

Propchange: jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/test/java/org/apache/jackrabbit/ocm/TestBase.java
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/test/java/org/apache/jackrabbit/ocm/mapper/AllTests.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/test/java/org/apache/jackrabbit/ocm/mapper/AllTests.java?view=diff&rev=536999&r1=535963&r2=536999
==============================================================================
--- jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/test/java/org/apache/jackrabbit/ocm/mapper/AllTests.java (original)
+++ jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/test/java/org/apache/jackrabbit/ocm/mapper/AllTests.java Thu May 10 14:25:11 2007
@@ -14,12 +14,12 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.portals.graffito.jcr.mapper;
+package org.apache.jackrabbit.ocm.mapper;
 
 import junit.framework.Test;
 import junit.framework.TestSuite;
 
-import org.apache.portals.graffito.jcr.RepositoryLifecycleTestSetup;
+import org.apache.jackrabbit.ocm.RepositoryLifecycleTestSetup;
 
 
 /**

Modified: jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/test/java/org/apache/jackrabbit/ocm/mapper/DigesterMapperImplTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/test/java/org/apache/jackrabbit/ocm/mapper/DigesterMapperImplTest.java?view=diff&rev=536999&r1=535963&r2=536999
==============================================================================
--- jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/test/java/org/apache/jackrabbit/ocm/mapper/DigesterMapperImplTest.java (original)
+++ jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/test/java/org/apache/jackrabbit/ocm/mapper/DigesterMapperImplTest.java Thu May 10 14:25:11 2007
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.portals.graffito.jcr.mapper;
+package org.apache.jackrabbit.ocm.mapper;
 
 import java.util.Collection;
 
@@ -22,26 +22,27 @@
 import junit.framework.TestCase;
 import junit.framework.TestSuite;
 
-import org.apache.portals.graffito.jcr.exception.JcrMappingException;
-import org.apache.portals.graffito.jcr.mapper.impl.DigesterMapperImpl;
-import org.apache.portals.graffito.jcr.mapper.model.BeanDescriptor;
-import org.apache.portals.graffito.jcr.mapper.model.ClassDescriptor;
-import org.apache.portals.graffito.jcr.mapper.model.CollectionDescriptor;
-import org.apache.portals.graffito.jcr.mapper.model.FieldDescriptor;
-import org.apache.portals.graffito.jcr.testmodel.A;
-import org.apache.portals.graffito.jcr.testmodel.B;
-import org.apache.portals.graffito.jcr.testmodel.C;
-import org.apache.portals.graffito.jcr.testmodel.PropertyTest;
-import org.apache.portals.graffito.jcr.testmodel.inheritance.Ancestor;
-import org.apache.portals.graffito.jcr.testmodel.inheritance.AnotherDescendant;
-import org.apache.portals.graffito.jcr.testmodel.inheritance.Descendant;
-import org.apache.portals.graffito.jcr.testmodel.inheritance.SubDescendant;
-import org.apache.portals.graffito.jcr.testmodel.inheritance.impl.CmsObjectImpl;
-import org.apache.portals.graffito.jcr.testmodel.inheritance.impl.DocumentImpl;
-import org.apache.portals.graffito.jcr.testmodel.interfaces.CmsObject;
-import org.apache.portals.graffito.jcr.testmodel.interfaces.Document;
-import org.apache.portals.graffito.jcr.testmodel.interfaces.Interface;
-import org.apache.portals.graffito.jcr.testmodel.proxy.Main;
+import org.apache.jackrabbit.ocm.exception.JcrMappingException;
+import org.apache.jackrabbit.ocm.mapper.Mapper;
+import org.apache.jackrabbit.ocm.mapper.impl.DigesterMapperImpl;
+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.testmodel.A;
+import org.apache.jackrabbit.ocm.testmodel.B;
+import org.apache.jackrabbit.ocm.testmodel.C;
+import org.apache.jackrabbit.ocm.testmodel.PropertyTest;
+import org.apache.jackrabbit.ocm.testmodel.inheritance.Ancestor;
+import org.apache.jackrabbit.ocm.testmodel.inheritance.AnotherDescendant;
+import org.apache.jackrabbit.ocm.testmodel.inheritance.Descendant;
+import org.apache.jackrabbit.ocm.testmodel.inheritance.SubDescendant;
+import org.apache.jackrabbit.ocm.testmodel.inheritance.impl.CmsObjectImpl;
+import org.apache.jackrabbit.ocm.testmodel.inheritance.impl.DocumentImpl;
+import org.apache.jackrabbit.ocm.testmodel.interfaces.CmsObject;
+import org.apache.jackrabbit.ocm.testmodel.interfaces.Document;
+import org.apache.jackrabbit.ocm.testmodel.interfaces.Interface;
+import org.apache.jackrabbit.ocm.testmodel.proxy.Main;
 
 /**
  * Test Mapper
@@ -111,7 +112,7 @@
 					
 			assertNotNull("Mapper is null", mapper);
 
-			ClassDescriptor classDescriptor = mapper.getClassDescriptorByClass(org.apache.portals.graffito.jcr.testmodel.uuid.A.class);
+			ClassDescriptor classDescriptor = mapper.getClassDescriptorByClass(org.apache.jackrabbit.ocm.testmodel.uuid.A.class);
 			assertNotNull("ClassDescriptor is null", classDescriptor);
 			assertTrue("Invalid uuid field", classDescriptor.getUuidFieldDescriptor().getFieldName().equals("uuid"));
 
@@ -132,7 +133,7 @@
 
 			assertNotNull("Mapper is null", mapper);
 
-			ClassDescriptor classDescriptor = mapper.getClassDescriptorByNodeType("graffito:C");
+			ClassDescriptor classDescriptor = mapper.getClassDescriptorByNodeType("ocm:C");
 			//ClassDescriptor classDescriptor = mapper.getClassDescriptorByClass(C.class);
 			assertNotNull("ClassDescriptor is null", classDescriptor);
 			assertTrue("Invalid classname", classDescriptor.getClassName().equals(C.class.getName()));			
@@ -203,7 +204,7 @@
 			CollectionDescriptor collectionDescriptor = classDescriptor2
 					.getCollectionDescriptor("collection");
 			assertNotNull(collectionDescriptor);
-			assertEquals(collectionDescriptor.getJcrNodeType(), "graffito:C");
+			assertEquals(collectionDescriptor.getJcrNodeType(), "ocm:C");
 			assertFalse(collectionDescriptor.isJcrAutoCreated());
 			assertFalse(collectionDescriptor.isJcrMandatory());
 			assertFalse(collectionDescriptor.isJcrProtected());
@@ -280,7 +281,7 @@
 					classDescriptor.getSuperClassDescriptor());
 			assertEquals("Invalid ancestor class for the descendant class",
 					classDescriptor.getSuperClassDescriptor().getClassName(),
-					"org.apache.portals.graffito.jcr.testmodel.inheritance.Ancestor");
+					"org.apache.jackrabbit.ocm.testmodel.inheritance.Ancestor");
 			descendandDescriptors = classDescriptor
 					.getDescendantClassDescriptors();
 			assertEquals("Invalid number of descendants", descendandDescriptors
@@ -306,7 +307,7 @@
 					classDescriptor.getSuperClassDescriptor());
 			assertEquals("Invalid ancestor class for the descendant class",
 					classDescriptor.getSuperClassDescriptor().getClassName(),
-					"org.apache.portals.graffito.jcr.testmodel.inheritance.Descendant");
+					"org.apache.jackrabbit.ocm.testmodel.inheritance.Descendant");
 			descendandDescriptors = classDescriptor
 					.getDescendantClassDescriptors();
 			assertEquals("Invalid number of descendants", descendandDescriptors
@@ -373,7 +374,7 @@
 					classDescriptor.getSuperClassDescriptor());
 			assertEquals("The document class has an invalid ancestor ancestor",
 					classDescriptor.getSuperClassDescriptor().getClassName(),
-					"org.apache.portals.graffito.jcr.testmodel.inheritance.impl.ContentImpl");
+					"org.apache.jackrabbit.ocm.testmodel.inheritance.impl.ContentImpl");
 			assertFalse(
 					"The document class  have a node type per hierarchy strategy",
 					classDescriptor.usesNodeTypePerHierarchyStrategy());
@@ -410,7 +411,7 @@
 			assertTrue("The interface has not implementation/descendant", classDescriptor.hasDescendants());
 			Collection descendants = classDescriptor.getDescendantClassDescriptors();
 			assertEquals("Invalid number of implementation/descendants", descendants.size(), 1);
-			assertEquals("Invalid interface implementation",( (ClassDescriptor) descendants.iterator().next()).getClassName(), "org.apache.portals.graffito.jcr.testmodel.inheritance.AnotherDescendant");
+			assertEquals("Invalid interface implementation",( (ClassDescriptor) descendants.iterator().next()).getClassName(), "org.apache.jackrabbit.ocm.testmodel.inheritance.AnotherDescendant");
 			assertTrue("Invalid extend strategy", classDescriptor.usesNodeTypePerHierarchyStrategy());
 			assertFalse("Incalid extend strategy", classDescriptor.usesNodeTypePerConcreteClassStrategy());
 			
@@ -419,7 +420,7 @@
 			assertFalse("Interface is  an interface", classDescriptor.isInterface());
 			assertTrue("AnotherDescendant  has not a discriminator", classDescriptor.hasDiscriminator());
 			assertEquals("Invalid number of implemented interface", classDescriptor.getImplements().size(), 1);
-			assertEquals("Invalid  interface name", classDescriptor.getImplements().iterator().next(), "org.apache.portals.graffito.jcr.testmodel.interfaces.Interface");
+			assertEquals("Invalid  interface name", classDescriptor.getImplements().iterator().next(), "org.apache.jackrabbit.ocm.testmodel.interfaces.Interface");
 			assertTrue("Invalid extend strategy", classDescriptor.usesNodeTypePerHierarchyStrategy());
 			assertFalse("Invalid extend strategy", classDescriptor.usesNodeTypePerConcreteClassStrategy());
 			

Modified: jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/test/java/org/apache/jackrabbit/ocm/persistence/atomic/AllTests.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/test/java/org/apache/jackrabbit/ocm/persistence/atomic/AllTests.java?view=diff&rev=536999&r1=535963&r2=536999
==============================================================================
--- jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/test/java/org/apache/jackrabbit/ocm/persistence/atomic/AllTests.java (original)
+++ jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/test/java/org/apache/jackrabbit/ocm/persistence/atomic/AllTests.java Thu May 10 14:25:11 2007
@@ -14,12 +14,12 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.portals.graffito.jcr.persistence.atomic;
+package org.apache.jackrabbit.ocm.persistence.atomic;
 
 import junit.framework.Test;
 import junit.framework.TestSuite;
 
-import org.apache.portals.graffito.jcr.RepositoryLifecycleTestSetup;
+import org.apache.jackrabbit.ocm.RepositoryLifecycleTestSetup;
 
 
 /**

Modified: jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/test/java/org/apache/jackrabbit/ocm/persistence/atomic/AtomicTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/test/java/org/apache/jackrabbit/ocm/persistence/atomic/AtomicTest.java?view=diff&rev=536999&r1=535963&r2=536999
==============================================================================
--- jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/test/java/org/apache/jackrabbit/ocm/persistence/atomic/AtomicTest.java (original)
+++ jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/test/java/org/apache/jackrabbit/ocm/persistence/atomic/AtomicTest.java Thu May 10 14:25:11 2007
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.portals.graffito.jcr.persistence.atomic;
+package org.apache.jackrabbit.ocm.persistence.atomic;
 
 import java.io.ByteArrayInputStream;
 import java.sql.Timestamp;
@@ -26,10 +26,10 @@
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
-import org.apache.portals.graffito.jcr.RepositoryLifecycleTestSetup;
-import org.apache.portals.graffito.jcr.TestBase;
-import org.apache.portals.graffito.jcr.persistence.PersistenceManager;
-import org.apache.portals.graffito.jcr.testmodel.Atomic;
+import org.apache.jackrabbit.ocm.RepositoryLifecycleTestSetup;
+import org.apache.jackrabbit.ocm.TestBase;
+import org.apache.jackrabbit.ocm.persistence.PersistenceManager;
+import org.apache.jackrabbit.ocm.testmodel.Atomic;
 
 /**
  * Test Atomic perisstence fields
@@ -93,7 +93,7 @@
             
             ByteArrayInputStream byteArrayInputStream = new ByteArrayInputStream("Test Stream".getBytes());
             a.setInputStream(byteArrayInputStream);
-            a.setNamedProperty("graffito:test");
+            a.setNamedProperty("ocm:test");
             a.setPathProperty("/node1/node2");
             a.setUndefinedProperty("aStringData");
             
@@ -134,7 +134,7 @@
             assertTrue("Invalid timestamp value ", a.getTimestamp().getTime() == now);            
             assertTrue("Invalid int2boolean value ", a.isInt2boolean());
             
-            assertTrue("Invalid namedProperty value ", a.getNamedProperty().equals("graffito:test"));
+            assertTrue("Invalid namedProperty value ", a.getNamedProperty().equals("ocm:test"));
             assertTrue("Invalid pathProperty value ", a.getPathProperty().equals("/node1/node2"));
             assertTrue("Invalid undefinedProperty value ", ((String) a.getUndefinedProperty()).equals("aStringData"));
             // --------------------------------------------------------------------------------

Modified: jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/test/java/org/apache/jackrabbit/ocm/persistence/atomic/Int2BooleanTypeConverterImpl.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/test/java/org/apache/jackrabbit/ocm/persistence/atomic/Int2BooleanTypeConverterImpl.java?view=diff&rev=536999&r1=535963&r2=536999
==============================================================================
--- jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/test/java/org/apache/jackrabbit/ocm/persistence/atomic/Int2BooleanTypeConverterImpl.java (original)
+++ jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/test/java/org/apache/jackrabbit/ocm/persistence/atomic/Int2BooleanTypeConverterImpl.java Thu May 10 14:25:11 2007
@@ -15,13 +15,13 @@
  * limitations under the License.
  */
 
-package org.apache.portals.graffito.jcr.persistence.atomic;
+package org.apache.jackrabbit.ocm.persistence.atomic;
 
 import javax.jcr.Value;
 import javax.jcr.ValueFactory;
 
-import org.apache.portals.graffito.jcr.exception.IncorrectAtomicTypeException;
-import org.apache.portals.graffito.jcr.persistence.atomictypeconverter.AtomicTypeConverter;
+import org.apache.jackrabbit.ocm.exception.IncorrectAtomicTypeException;
+import org.apache.jackrabbit.ocm.persistence.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.portals.graffito.jcr.persistence.atomictypeconverter.AtomicTypeConverter#getValue(java.lang.Object)
+	 * @see org.apache.jackrabbit.ocm.persistence.atomictypeconverter.AtomicTypeConverter#getValue(java.lang.Object)
 	 */
 	public Value getValue(ValueFactory valueFactory, Object propValue)
 	{
@@ -54,7 +54,7 @@
 
     /**
      * 
-     * @see org.apache.portals.graffito.jcr.persistence.atomictypeconverter.AtomicTypeConverter#getObject(javax.jcr.Value)
+     * @see org.apache.jackrabbit.ocm.persistence.atomictypeconverter.AtomicTypeConverter#getObject(javax.jcr.Value)
      */
 	public Object getObject(Value value)
     {
@@ -78,7 +78,7 @@
 	
 	/**
 	 * 
-	 * @see org.apache.portals.graffito.jcr.persistence.atomictypeconverter.AtomicTypeConverter#getStringValue(java.lang.Object)
+	 * @see org.apache.jackrabbit.ocm.persistence.atomictypeconverter.AtomicTypeConverter#getStringValue(java.lang.Object)
 	 */
 	public String getStringValue(Object object)
 	{

Modified: jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/test/java/org/apache/jackrabbit/ocm/persistence/atomic/NullAtomicTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/test/java/org/apache/jackrabbit/ocm/persistence/atomic/NullAtomicTest.java?view=diff&rev=536999&r1=535963&r2=536999
==============================================================================
--- jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/test/java/org/apache/jackrabbit/ocm/persistence/atomic/NullAtomicTest.java (original)
+++ jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/test/java/org/apache/jackrabbit/ocm/persistence/atomic/NullAtomicTest.java Thu May 10 14:25:11 2007
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.portals.graffito.jcr.persistence.atomic;
+package org.apache.jackrabbit.ocm.persistence.atomic;
 
 import java.io.ByteArrayInputStream;
 import java.util.Calendar;
@@ -25,10 +25,10 @@
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
-import org.apache.portals.graffito.jcr.RepositoryLifecycleTestSetup;
-import org.apache.portals.graffito.jcr.TestBase;
-import org.apache.portals.graffito.jcr.persistence.PersistenceManager;
-import org.apache.portals.graffito.jcr.testmodel.Atomic;
+import org.apache.jackrabbit.ocm.RepositoryLifecycleTestSetup;
+import org.apache.jackrabbit.ocm.TestBase;
+import org.apache.jackrabbit.ocm.persistence.PersistenceManager;
+import org.apache.jackrabbit.ocm.testmodel.Atomic;
 
 /**
  * Test Atomic perisstence fields

Modified: jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/test/java/org/apache/jackrabbit/ocm/persistence/auto/AllTests.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/test/java/org/apache/jackrabbit/ocm/persistence/auto/AllTests.java?view=diff&rev=536999&r1=535963&r2=536999
==============================================================================
--- jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/test/java/org/apache/jackrabbit/ocm/persistence/auto/AllTests.java (original)
+++ jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/test/java/org/apache/jackrabbit/ocm/persistence/auto/AllTests.java Thu May 10 14:25:11 2007
@@ -14,9 +14,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.portals.graffito.jcr.persistence.auto;
+package org.apache.jackrabbit.ocm.persistence.auto;
 
-import org.apache.portals.graffito.jcr.RepositoryLifecycleTestSetup;
+import org.apache.jackrabbit.ocm.RepositoryLifecycleTestSetup;
 
 import junit.framework.Test;
 import junit.framework.TestSuite;

Modified: jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/test/java/org/apache/jackrabbit/ocm/persistence/auto/PersistenceManagerAutoTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/test/java/org/apache/jackrabbit/ocm/persistence/auto/PersistenceManagerAutoTest.java?view=diff&rev=536999&r1=535963&r2=536999
==============================================================================
--- jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/test/java/org/apache/jackrabbit/ocm/persistence/auto/PersistenceManagerAutoTest.java (original)
+++ jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/test/java/org/apache/jackrabbit/ocm/persistence/auto/PersistenceManagerAutoTest.java Thu May 10 14:25:11 2007
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.portals.graffito.jcr.persistence.auto;
+package org.apache.jackrabbit.ocm.persistence.auto;
 
 import javax.jcr.Repository;
 import javax.jcr.UnsupportedRepositoryOperationException;
@@ -24,16 +24,16 @@
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
-import org.apache.portals.graffito.jcr.RepositoryLifecycleTestSetup;
-import org.apache.portals.graffito.jcr.TestBase;
-import org.apache.portals.graffito.jcr.persistence.PersistenceManager;
-import org.apache.portals.graffito.jcr.persistence.impl.PersistenceManagerImpl;
-import org.apache.portals.graffito.jcr.repository.RepositoryUtil;
-import org.apache.portals.graffito.jcr.testmodel.inheritance.impl.DocumentImpl;
-import org.apache.portals.graffito.jcr.testmodel.inheritance.impl.DocumentStream;
-import org.apache.portals.graffito.jcr.testmodel.inheritance.impl.FolderImpl;
-import org.apache.portals.graffito.jcr.testmodel.interfaces.Document;
-import org.apache.portals.graffito.jcr.testmodel.interfaces.Folder;
+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.repository.RepositoryUtil;
+import org.apache.jackrabbit.ocm.testmodel.inheritance.impl.DocumentImpl;
+import org.apache.jackrabbit.ocm.testmodel.inheritance.impl.DocumentStream;
+import org.apache.jackrabbit.ocm.testmodel.inheritance.impl.FolderImpl;
+import org.apache.jackrabbit.ocm.testmodel.interfaces.Document;
+import org.apache.jackrabbit.ocm.testmodel.interfaces.Folder;
 
 /**
  * Test autoupdate setting

Modified: jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/test/java/org/apache/jackrabbit/ocm/persistence/basic/AllTests.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/test/java/org/apache/jackrabbit/ocm/persistence/basic/AllTests.java?view=diff&rev=536999&r1=535963&r2=536999
==============================================================================
--- jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/test/java/org/apache/jackrabbit/ocm/persistence/basic/AllTests.java (original)
+++ jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/test/java/org/apache/jackrabbit/ocm/persistence/basic/AllTests.java Thu May 10 14:25:11 2007
@@ -14,12 +14,12 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.portals.graffito.jcr.persistence.basic;
+package org.apache.jackrabbit.ocm.persistence.basic;
 
 import junit.framework.Test;
 import junit.framework.TestSuite;
 
-import org.apache.portals.graffito.jcr.RepositoryLifecycleTestSetup;
+import org.apache.jackrabbit.ocm.RepositoryLifecycleTestSetup;
 
 
 /**

Modified: jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/test/java/org/apache/jackrabbit/ocm/persistence/basic/PersistenceManagerAvoidRecursiveLoopTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/test/java/org/apache/jackrabbit/ocm/persistence/basic/PersistenceManagerAvoidRecursiveLoopTest.java?view=diff&rev=536999&r1=535963&r2=536999
==============================================================================
--- jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/test/java/org/apache/jackrabbit/ocm/persistence/basic/PersistenceManagerAvoidRecursiveLoopTest.java (original)
+++ jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/test/java/org/apache/jackrabbit/ocm/persistence/basic/PersistenceManagerAvoidRecursiveLoopTest.java Thu May 10 14:25:11 2007
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.portals.graffito.jcr.persistence.basic;
+package org.apache.jackrabbit.ocm.persistence.basic;
 
 import java.util.Collection;
 
@@ -26,13 +26,13 @@
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
-import org.apache.portals.graffito.jcr.RepositoryLifecycleTestSetup;
-import org.apache.portals.graffito.jcr.TestBase;
-import org.apache.portals.graffito.jcr.persistence.PersistenceManager;
-import org.apache.portals.graffito.jcr.persistence.impl.PersistenceManagerImpl;
-import org.apache.portals.graffito.jcr.repository.RepositoryUtil;
-import org.apache.portals.graffito.jcr.testmodel.crossreference.A;
-import org.apache.portals.graffito.jcr.testmodel.crossreference.B;
+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.repository.RepositoryUtil;
+import org.apache.jackrabbit.ocm.testmodel.crossreference.A;
+import org.apache.jackrabbit.ocm.testmodel.crossreference.B;
 
 
 /**

Modified: jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/test/java/org/apache/jackrabbit/ocm/persistence/basic/PersistenceManagerRemoveTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/test/java/org/apache/jackrabbit/ocm/persistence/basic/PersistenceManagerRemoveTest.java?view=diff&rev=536999&r1=535963&r2=536999
==============================================================================
--- jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/test/java/org/apache/jackrabbit/ocm/persistence/basic/PersistenceManagerRemoveTest.java (original)
+++ jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/test/java/org/apache/jackrabbit/ocm/persistence/basic/PersistenceManagerRemoveTest.java Thu May 10 14:25:11 2007
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.portals.graffito.jcr.persistence.basic;
+package org.apache.jackrabbit.ocm.persistence.basic;
 
 import java.io.ByteArrayInputStream;
 import java.sql.Timestamp;
@@ -27,14 +27,14 @@
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
-import org.apache.portals.graffito.jcr.RepositoryLifecycleTestSetup;
-import org.apache.portals.graffito.jcr.TestBase;
-import org.apache.portals.graffito.jcr.persistence.PersistenceManager;
-import org.apache.portals.graffito.jcr.query.Filter;
-import org.apache.portals.graffito.jcr.query.Query;
-import org.apache.portals.graffito.jcr.query.QueryManager;
-import org.apache.portals.graffito.jcr.testmodel.Atomic;
-import org.apache.portals.graffito.jcr.testmodel.MultiValue;
+import org.apache.jackrabbit.ocm.RepositoryLifecycleTestSetup;
+import org.apache.jackrabbit.ocm.TestBase;
+import org.apache.jackrabbit.ocm.persistence.PersistenceManager;
+import org.apache.jackrabbit.ocm.query.Filter;
+import org.apache.jackrabbit.ocm.query.Query;
+import org.apache.jackrabbit.ocm.query.QueryManager;
+import org.apache.jackrabbit.ocm.testmodel.Atomic;
+
 
 /**
  * Test Query on atomic fields

Modified: jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/test/java/org/apache/jackrabbit/ocm/persistence/basic/PersistenceManagerSameNameSiblingTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/test/java/org/apache/jackrabbit/ocm/persistence/basic/PersistenceManagerSameNameSiblingTest.java?view=diff&rev=536999&r1=535963&r2=536999
==============================================================================
--- jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/test/java/org/apache/jackrabbit/ocm/persistence/basic/PersistenceManagerSameNameSiblingTest.java (original)
+++ jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/test/java/org/apache/jackrabbit/ocm/persistence/basic/PersistenceManagerSameNameSiblingTest.java Thu May 10 14:25:11 2007
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.portals.graffito.jcr.persistence.basic;
+package org.apache.jackrabbit.ocm.persistence.basic;
 
 import java.io.ByteArrayInputStream;
 import java.sql.Timestamp;
@@ -31,22 +31,22 @@
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
-import org.apache.portals.graffito.jcr.RepositoryLifecycleTestSetup;
-import org.apache.portals.graffito.jcr.TestBase;
-import org.apache.portals.graffito.jcr.mapper.impl.DigesterMapperImpl;
-import org.apache.portals.graffito.jcr.persistence.PersistenceManager;
-import org.apache.portals.graffito.jcr.persistence.atomictypeconverter.impl.DefaultAtomicTypeConverterProvider;
-import org.apache.portals.graffito.jcr.persistence.impl.PersistenceManagerImpl;
-import org.apache.portals.graffito.jcr.persistence.objectconverter.ObjectConverter;
-import org.apache.portals.graffito.jcr.persistence.objectconverter.impl.ObjectConverterImpl;
-import org.apache.portals.graffito.jcr.query.Filter;
-import org.apache.portals.graffito.jcr.query.Query;
-import org.apache.portals.graffito.jcr.query.QueryManager;
-import org.apache.portals.graffito.jcr.query.impl.QueryManagerImpl;
-import org.apache.portals.graffito.jcr.repository.RepositoryUtil;
-import org.apache.portals.graffito.jcr.testmodel.Atomic;
-import org.apache.portals.graffito.jcr.testmodel.Page;
-import org.apache.portals.graffito.jcr.testmodel.Paragraph;
+import org.apache.jackrabbit.ocm.RepositoryLifecycleTestSetup;
+import org.apache.jackrabbit.ocm.TestBase;
+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;
+import org.apache.jackrabbit.ocm.query.impl.QueryManagerImpl;
+import org.apache.jackrabbit.ocm.repository.RepositoryUtil;
+import org.apache.jackrabbit.ocm.testmodel.Atomic;
+import org.apache.jackrabbit.ocm.testmodel.Page;
+import org.apache.jackrabbit.ocm.testmodel.Paragraph;
 
 /**
  * Test Query on atomic fields

Modified: jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/test/java/org/apache/jackrabbit/ocm/persistence/basic/PersistenceManagerTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/test/java/org/apache/jackrabbit/ocm/persistence/basic/PersistenceManagerTest.java?view=diff&rev=536999&r1=535963&r2=536999
==============================================================================
--- jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/test/java/org/apache/jackrabbit/ocm/persistence/basic/PersistenceManagerTest.java (original)
+++ jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/test/java/org/apache/jackrabbit/ocm/persistence/basic/PersistenceManagerTest.java Thu May 10 14:25:11 2007
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.portals.graffito.jcr.persistence.basic;
+package org.apache.jackrabbit.ocm.persistence.basic;
 
 import java.util.ArrayList;
 import java.util.Collection;
@@ -24,13 +24,13 @@
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
-import org.apache.portals.graffito.jcr.RepositoryLifecycleTestSetup;
-import org.apache.portals.graffito.jcr.TestBase;
-import org.apache.portals.graffito.jcr.persistence.PersistenceManager;
-import org.apache.portals.graffito.jcr.testmodel.A;
-import org.apache.portals.graffito.jcr.testmodel.B;
-import org.apache.portals.graffito.jcr.testmodel.C;
-import org.apache.portals.graffito.jcr.testmodel.Discriminator;
+import org.apache.jackrabbit.ocm.RepositoryLifecycleTestSetup;
+import org.apache.jackrabbit.ocm.TestBase;
+import org.apache.jackrabbit.ocm.persistence.PersistenceManager;
+import org.apache.jackrabbit.ocm.testmodel.A;
+import org.apache.jackrabbit.ocm.testmodel.B;
+import org.apache.jackrabbit.ocm.testmodel.C;
+import org.apache.jackrabbit.ocm.testmodel.Discriminator;
 
 /**
  * Test JcrSession

Modified: jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/test/java/org/apache/jackrabbit/ocm/persistence/beanconverter/AllTests.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/test/java/org/apache/jackrabbit/ocm/persistence/beanconverter/AllTests.java?view=diff&rev=536999&r1=535963&r2=536999
==============================================================================
--- jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/test/java/org/apache/jackrabbit/ocm/persistence/beanconverter/AllTests.java (original)
+++ jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/test/java/org/apache/jackrabbit/ocm/persistence/beanconverter/AllTests.java Thu May 10 14:25:11 2007
@@ -14,12 +14,12 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.portals.graffito.jcr.persistence.beanconverter;
+package org.apache.jackrabbit.ocm.persistence.beanconverter;
 
 import junit.framework.Test;
 import junit.framework.TestSuite;
 
-import org.apache.portals.graffito.jcr.RepositoryLifecycleTestSetup;
+import org.apache.jackrabbit.ocm.RepositoryLifecycleTestSetup;
 
 
 /**

Modified: jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/test/java/org/apache/jackrabbit/ocm/persistence/beanconverter/BeanDescriptorTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/test/java/org/apache/jackrabbit/ocm/persistence/beanconverter/BeanDescriptorTest.java?view=diff&rev=536999&r1=535963&r2=536999
==============================================================================
--- jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/test/java/org/apache/jackrabbit/ocm/persistence/beanconverter/BeanDescriptorTest.java (original)
+++ jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/test/java/org/apache/jackrabbit/ocm/persistence/beanconverter/BeanDescriptorTest.java Thu May 10 14:25:11 2007
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.portals.graffito.jcr.persistence.beanconverter;
+package org.apache.jackrabbit.ocm.persistence.beanconverter;
 
 
 
@@ -26,15 +26,15 @@
 import junit.framework.Test;
 import junit.framework.TestSuite;
 
-import org.apache.portals.graffito.jcr.RepositoryLifecycleTestSetup;
-import org.apache.portals.graffito.jcr.TestBase;
-import org.apache.portals.graffito.jcr.persistence.PersistenceManager;
-import org.apache.portals.graffito.jcr.testmodel.B;
-import org.apache.portals.graffito.jcr.testmodel.D;
-import org.apache.portals.graffito.jcr.testmodel.DFull;
-import org.apache.portals.graffito.jcr.testmodel.E;
-import org.apache.portals.graffito.jcr.testmodel.Page;
-import org.apache.portals.graffito.jcr.testmodel.Paragraph;
+import org.apache.jackrabbit.ocm.RepositoryLifecycleTestSetup;
+import org.apache.jackrabbit.ocm.TestBase;
+import org.apache.jackrabbit.ocm.persistence.PersistenceManager;
+import org.apache.jackrabbit.ocm.testmodel.B;
+import org.apache.jackrabbit.ocm.testmodel.D;
+import org.apache.jackrabbit.ocm.testmodel.DFull;
+import org.apache.jackrabbit.ocm.testmodel.E;
+import org.apache.jackrabbit.ocm.testmodel.Page;
+import org.apache.jackrabbit.ocm.testmodel.Paragraph;
 
 /**
  * ObjectConverter test for bean-descriptor with inner bean inlined and inner bean with
@@ -57,7 +57,7 @@
     
     
     /**
-     * @see org.apache.portals.graffito.jcr.TestBase#setUp()
+     * @see org.apache.jackrabbit.ocm.TestBase#setUp()
      */
     protected void setUp() throws Exception {
         super.setUp();
@@ -67,7 +67,7 @@
 
     
     /**
-     * @see org.apache.portals.graffito.jcr.TestBase#tearDown()
+     * @see org.apache.jackrabbit.ocm.TestBase#tearDown()
      */
     public void tearDown() throws Exception {
         clean();

Modified: jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/test/java/org/apache/jackrabbit/ocm/persistence/beanconverter/FakeBeanConverter.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/test/java/org/apache/jackrabbit/ocm/persistence/beanconverter/FakeBeanConverter.java?view=diff&rev=536999&r1=535963&r2=536999
==============================================================================
--- jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/test/java/org/apache/jackrabbit/ocm/persistence/beanconverter/FakeBeanConverter.java (original)
+++ jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/test/java/org/apache/jackrabbit/ocm/persistence/beanconverter/FakeBeanConverter.java Thu May 10 14:25:11 2007
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.portals.graffito.jcr.persistence.beanconverter;
+package org.apache.jackrabbit.ocm.persistence.beanconverter;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -22,17 +22,18 @@
 import javax.jcr.Node;
 import javax.jcr.Session;
 
-import org.apache.portals.graffito.jcr.exception.JcrMappingException;
-import org.apache.portals.graffito.jcr.exception.PersistenceException;
-import org.apache.portals.graffito.jcr.exception.RepositoryException;
-
-import org.apache.portals.graffito.jcr.mapper.Mapper;
-import org.apache.portals.graffito.jcr.mapper.model.BeanDescriptor;
-import org.apache.portals.graffito.jcr.mapper.model.ClassDescriptor;
-import org.apache.portals.graffito.jcr.persistence.atomictypeconverter.AtomicTypeConverterProvider;
-import org.apache.portals.graffito.jcr.persistence.beanconverter.impl.AbstractBeanConverterImpl;
-import org.apache.portals.graffito.jcr.persistence.objectconverter.ObjectConverter;
-import org.apache.portals.graffito.jcr.testmodel.B;
+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.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 {
 
@@ -49,7 +50,7 @@
     }
         
     /**
-     * @see org.apache.portals.graffito.jcr.persistence.beanconverter.BeanConverter#insert(javax.jcr.Session, javax.jcr.Node, org.apache.portals.graffito.jcr.mapper.Mapper, java.lang.String, java.lang.Object)
+     * @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)
      */
 	public void insert(Session session, Node parentNode, BeanDescriptor beanDescriptor, ClassDescriptor beanClassDescriptor, Object object, ClassDescriptor parentClassDescriptor, Object parent)
 	throws PersistenceException, RepositoryException, 	JcrMappingException {
@@ -63,7 +64,7 @@
     } 
 
     /**
-     * @see org.apache.portals.graffito.jcr.persistence.beanconverter.BeanConverter#update(javax.jcr.Session, javax.jcr.Node, org.apache.portals.graffito.jcr.mapper.Mapper, java.lang.String, java.lang.Object)
+     * @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)
      */
 	public void update(Session session, Node parentNode, BeanDescriptor beanDescriptor, ClassDescriptor beanClassDescriptor, Object object, ClassDescriptor parentClassDescriptor, Object parent)
 	throws PersistenceException, RepositoryException,	JcrMappingException {
@@ -76,7 +77,7 @@
     }
 
     /**
-     * @see org.apache.portals.graffito.jcr.persistence.beanconverter.BeanConverter#getObject(javax.jcr.Session, javax.jcr.Node, org.apache.portals.graffito.jcr.mapper.Mapper, java.lang.String, java.lang.Class)
+     * @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)
      */
     public Object getObject(Session session, Node parentNode, BeanDescriptor beanDescriptor, ClassDescriptor beanClassDescriptor, Class beanClass, Object parent)
 	throws PersistenceException, RepositoryException,JcrMappingException {
@@ -92,7 +93,7 @@
     }
 
     /**
-     * @see org.apache.portals.graffito.jcr.persistence.beanconverter.BeanConverter#remove(javax.jcr.Session, javax.jcr.Node, org.apache.portals.graffito.jcr.mapper.Mapper, java.lang.String)
+     * @see org.apache.jackrabbit.ocm.persistence.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/persistence/collectionconverter/AllTests.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/test/java/org/apache/jackrabbit/ocm/persistence/collectionconverter/AllTests.java?view=diff&rev=536999&r1=535963&r2=536999
==============================================================================
--- jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/test/java/org/apache/jackrabbit/ocm/persistence/collectionconverter/AllTests.java (original)
+++ jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/test/java/org/apache/jackrabbit/ocm/persistence/collectionconverter/AllTests.java Thu May 10 14:25:11 2007
@@ -14,9 +14,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.portals.graffito.jcr.persistence.collectionconverter;
+package org.apache.jackrabbit.ocm.persistence.collectionconverter;
 
-import org.apache.portals.graffito.jcr.RepositoryLifecycleTestSetup;
+import org.apache.jackrabbit.ocm.RepositoryLifecycleTestSetup;
 
 import junit.framework.Test;
 import junit.framework.TestSuite;



Mime
View raw message