You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jackrabbit.apache.org by cl...@apache.org on 2007/05/10 23:25:22 UTC
svn commit: r536999 [3/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...
Modified: jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/main/java/org/apache/jackrabbit/ocm/persistence/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/persistence/collectionconverter/impl/AbstractCollectionConverterImpl.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/collectionconverter/impl/AbstractCollectionConverterImpl.java (original)
+++ jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/main/java/org/apache/jackrabbit/ocm/persistence/collectionconverter/impl/AbstractCollectionConverterImpl.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.collectionconverter.impl;
+package org.apache.jackrabbit.ocm.persistence.collectionconverter.impl;
import java.util.Map;
@@ -27,13 +27,13 @@
import javax.jcr.nodetype.ConstraintViolationException;
import javax.jcr.version.VersionException;
-import org.apache.portals.graffito.jcr.exception.JcrMappingException;
-import org.apache.portals.graffito.jcr.exception.PersistenceException;
-import org.apache.portals.graffito.jcr.mapper.Mapper;
-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.objectconverter.ObjectConverter;
+import org.apache.jackrabbit.ocm.exception.JcrMappingException;
+import org.apache.jackrabbit.ocm.exception.PersistenceException;
+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.portals.graffito.jcr.persistence.collectionconverter.CollectionConverter#insertCollection(javax.jcr.Session, javax.jcr.Node, org.apache.portals.graffito.jcr.mapper.model.CollectionDescriptor, org.apache.portals.graffito.jcr.persistence.collectionconverter.ManageableCollection)
+ * @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)
*/
public void insertCollection(Session session, Node parentNode, CollectionDescriptor collectionDescriptor,
ManageableCollection collection) {
@@ -94,7 +94,7 @@
throw new PersistenceException("Cannot insert collection field : " + collectionDescriptor.getFieldName()
+ " of class " + collectionDescriptor.getClassDescriptor().getClassName() + " on locked parent.", le);
} catch (RepositoryException re) {
- throw new org.apache.portals.graffito.jcr.exception.RepositoryException("Cannot insert collection field : "
+ throw new org.apache.jackrabbit.ocm.exception.RepositoryException("Cannot insert collection field : "
+ collectionDescriptor.getFieldName() + " of class "
+ collectionDescriptor.getClassDescriptor().getClassName(), re);
}
@@ -102,7 +102,7 @@
/**
*
- * @see org.apache.portals.graffito.jcr.persistence.collectionconverter.CollectionConverter#updateCollection(javax.jcr.Session, javax.jcr.Node, org.apache.portals.graffito.jcr.mapper.model.CollectionDescriptor, org.apache.portals.graffito.jcr.persistence.collectionconverter.ManageableCollection)
+ * @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)
*/
public void updateCollection(Session session, Node parentNode, CollectionDescriptor collectionDescriptor,
ManageableCollection collection) {
@@ -119,34 +119,34 @@
throw new PersistenceException("Cannot insert collection field : " + collectionDescriptor.getFieldName()
+ " of class " + collectionDescriptor.getClassDescriptor().getClassName() + " Constraint violation.", cve);
} catch (RepositoryException re) {
- throw new org.apache.portals.graffito.jcr.exception.RepositoryException("Cannot insert collection field : "
+ throw new org.apache.jackrabbit.ocm.exception.RepositoryException("Cannot insert collection field : "
+ collectionDescriptor.getFieldName() + " of class "
+ collectionDescriptor.getClassDescriptor().getClassName(), re);
}
}
/**
- * @see org.apache.portals.graffito.jcr.persistence.collectionconverter.CollectionConverter#getCollection(javax.jcr.Session, javax.jcr.Node, org.apache.portals.graffito.jcr.mapper.model.CollectionDescriptor, java.lang.Class)
+ * @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)
*/
public ManageableCollection getCollection(Session session, Node parentNode, CollectionDescriptor collectionDescriptor,
Class collectionFieldClass) {
try {
return doGetCollection(session, parentNode, collectionDescriptor, collectionFieldClass);
} catch (RepositoryException re) {
- throw new org.apache.portals.graffito.jcr.exception.RepositoryException("Cannot get collection field : "
+ throw new org.apache.jackrabbit.ocm.exception.RepositoryException("Cannot get collection field : "
+ collectionDescriptor.getFieldName() + "for " + collectionDescriptor.getClassDescriptor().getClassName(), re);
}
}
/**
- * @see org.apache.portals.graffito.jcr.persistence.collectionconverter.CollectionConverter#isNull(Session, Node, CollectionDescriptor, Class)
+ * @see org.apache.jackrabbit.ocm.persistence.collectionconverter.CollectionConverter#isNull(Session, Node, CollectionDescriptor, Class)
*/
public boolean isNull(Session session, Node parentNode, CollectionDescriptor collectionDescriptor,
Class collectionFieldClass) {
try {
return doIsNull(session, parentNode, collectionDescriptor, collectionFieldClass);
} catch (RepositoryException re) {
- throw new org.apache.portals.graffito.jcr.exception.RepositoryException("Cannot check if the collections has elements : "
+ throw new org.apache.jackrabbit.ocm.exception.RepositoryException("Cannot check if the collections has elements : "
+ collectionDescriptor.getFieldName() + "for " + collectionDescriptor.getClassDescriptor().getClassName(), re);
}
}
Modified: jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/main/java/org/apache/jackrabbit/ocm/persistence/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/persistence/collectionconverter/impl/BeanReferenceCollectionConverterImpl.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/collectionconverter/impl/BeanReferenceCollectionConverterImpl.java (original)
+++ jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/main/java/org/apache/jackrabbit/ocm/persistence/collectionconverter/impl/BeanReferenceCollectionConverterImpl.java Thu May 10 14:25:11 2007
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.portals.graffito.jcr.persistence.collectionconverter.impl;
+package org.apache.jackrabbit.ocm.persistence.collectionconverter.impl;
import java.util.Iterator;
@@ -34,17 +34,17 @@
import javax.jcr.nodetype.ConstraintViolationException;
import javax.jcr.version.VersionException;
-import org.apache.portals.graffito.jcr.exception.JcrMappingException;
-import org.apache.portals.graffito.jcr.exception.PersistenceException;
-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.CollectionDescriptor;
-import org.apache.portals.graffito.jcr.mapper.model.FieldDescriptor;
-import org.apache.portals.graffito.jcr.persistence.atomictypeconverter.AtomicTypeConverter;
-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.reflection.ReflectionUtils;
+import org.apache.jackrabbit.ocm.exception.JcrMappingException;
+import org.apache.jackrabbit.ocm.exception.PersistenceException;
+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;
/**
* Collection Mapping used to map a reference/uuid property list into a java bean collection (readonly).
Modified: jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/main/java/org/apache/jackrabbit/ocm/persistence/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/persistence/collectionconverter/impl/DefaultCollectionConverterImpl.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/collectionconverter/impl/DefaultCollectionConverterImpl.java (original)
+++ jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/main/java/org/apache/jackrabbit/ocm/persistence/collectionconverter/impl/DefaultCollectionConverterImpl.java Thu May 10 14:25:11 2007
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.portals.graffito.jcr.persistence.collectionconverter.impl;
+package org.apache.jackrabbit.ocm.persistence.collectionconverter.impl;
import java.util.ArrayList;
@@ -29,14 +29,14 @@
import javax.jcr.RepositoryException;
import javax.jcr.Session;
-import org.apache.portals.graffito.jcr.exception.JcrMappingException;
-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.CollectionDescriptor;
-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.reflection.ReflectionUtils;
+import org.apache.jackrabbit.ocm.exception.JcrMappingException;
+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;
/**
* Default Collection Mapping/convertion implementation.
Modified: jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/main/java/org/apache/jackrabbit/ocm/persistence/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/persistence/collectionconverter/impl/ManageableArrayList.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/collectionconverter/impl/ManageableArrayList.java (original)
+++ jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/main/java/org/apache/jackrabbit/ocm/persistence/collectionconverter/impl/ManageableArrayList.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.collectionconverter.impl;
+package org.apache.jackrabbit.ocm.persistence.collectionconverter.impl;
import java.util.ArrayList;
import java.util.Iterator;
-import org.apache.portals.graffito.jcr.persistence.collectionconverter.ManageableCollection;
+import org.apache.jackrabbit.ocm.persistence.collectionconverter.ManageableCollection;
/**
*
@@ -33,7 +33,7 @@
/**
*
- * @see org.apache.portals.graffito.jcr.persistence.collectionconverter.ManageableCollection#addObject(java.lang.Object)
+ * @see org.apache.jackrabbit.ocm.persistence.collectionconverter.ManageableCollection#addObject(java.lang.Object)
*/
public void addObject(Object object)
{
@@ -43,7 +43,7 @@
/**
*
- * @see org.apache.portals.graffito.jcr.persistence.collectionconverter.ManageableCollection#getIterator()
+ * @see org.apache.jackrabbit.ocm.persistence.collectionconverter.ManageableCollection#getIterator()
*/
public Iterator getIterator()
{
@@ -52,7 +52,7 @@
/**
*
- * @see org.apache.portals.graffito.jcr.persistence.collectionconverter.ManageableCollection#getSize()
+ * @see org.apache.jackrabbit.ocm.persistence.collectionconverter.ManageableCollection#getSize()
*/
public int getSize()
{
Modified: jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/main/java/org/apache/jackrabbit/ocm/persistence/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/persistence/collectionconverter/impl/ManageableSet.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/collectionconverter/impl/ManageableSet.java (original)
+++ jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/main/java/org/apache/jackrabbit/ocm/persistence/collectionconverter/impl/ManageableSet.java Thu May 10 14:25:11 2007
@@ -1,10 +1,10 @@
-package org.apache.portals.graffito.jcr.persistence.collectionconverter.impl;
+package org.apache.jackrabbit.ocm.persistence.collectionconverter.impl;
import java.util.Collection;
import java.util.HashSet;
import java.util.Iterator;
-import org.apache.portals.graffito.jcr.persistence.collectionconverter.ManageableCollection;
+import org.apache.jackrabbit.ocm.persistence.collectionconverter.ManageableCollection;
/**
@@ -19,21 +19,21 @@
}
/**
- * @see org.apache.portals.graffito.jcr.persistence.collectionconverter.ManageableCollection#addObject(java.lang.Object)
+ * @see org.apache.jackrabbit.ocm.persistence.collectionconverter.ManageableCollection#addObject(java.lang.Object)
*/
public void addObject(Object object) {
add(object);
}
/**
- * @see org.apache.portals.graffito.jcr.persistence.collectionconverter.ManageableCollection#getIterator()
+ * @see org.apache.jackrabbit.ocm.persistence.collectionconverter.ManageableCollection#getIterator()
*/
public Iterator getIterator() {
return iterator();
}
/**
- * @see org.apache.portals.graffito.jcr.persistence.collectionconverter.ManageableCollection#getSize()
+ * @see org.apache.jackrabbit.ocm.persistence.collectionconverter.ManageableCollection#getSize()
*/
public int getSize() {
return size();
Modified: jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/main/java/org/apache/jackrabbit/ocm/persistence/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/persistence/collectionconverter/impl/ManageableVector.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/collectionconverter/impl/ManageableVector.java (original)
+++ jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/main/java/org/apache/jackrabbit/ocm/persistence/collectionconverter/impl/ManageableVector.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.collectionconverter.impl;
+package org.apache.jackrabbit.ocm.persistence.collectionconverter.impl;
import java.util.Iterator;
import java.util.Vector;
-import org.apache.portals.graffito.jcr.persistence.collectionconverter.ManageableCollection;
+import org.apache.jackrabbit.ocm.persistence.collectionconverter.ManageableCollection;
/**
*
@@ -32,7 +32,7 @@
/**
*
- * @see org.apache.portals.graffito.jcr.persistence.collectionconverter.ManageableCollection#addObject(java.lang.Object)
+ * @see org.apache.jackrabbit.ocm.persistence.collectionconverter.ManageableCollection#addObject(java.lang.Object)
*/
public void addObject(Object object)
{
@@ -41,7 +41,7 @@
/**
*
- * @see org.apache.portals.graffito.jcr.persistence.collectionconverter.ManageableCollection#getIterator()
+ * @see org.apache.jackrabbit.ocm.persistence.collectionconverter.ManageableCollection#getIterator()
*/
public Iterator getIterator()
{
@@ -50,7 +50,7 @@
/**
*
- * @see org.apache.portals.graffito.jcr.persistence.collectionconverter.ManageableCollection#getSize()
+ * @see org.apache.jackrabbit.ocm.persistence.collectionconverter.ManageableCollection#getSize()
*/
public int getSize()
{
Modified: jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/main/java/org/apache/jackrabbit/ocm/persistence/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/persistence/collectionconverter/impl/ManagedHashMap.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/collectionconverter/impl/ManagedHashMap.java (original)
+++ jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/main/java/org/apache/jackrabbit/ocm/persistence/collectionconverter/impl/ManagedHashMap.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.persistence.collectionconverter.impl;
+package org.apache.jackrabbit.ocm.persistence.collectionconverter.impl;
import java.util.HashMap;
import java.util.Iterator;
import java.util.Map;
-import org.apache.portals.graffito.jcr.persistence.collectionconverter.ManageableCollection;
+import org.apache.jackrabbit.ocm.persistence.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/persistence/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/persistence/collectionconverter/impl/MultiValueCollectionConverterImpl.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/collectionconverter/impl/MultiValueCollectionConverterImpl.java (original)
+++ jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/main/java/org/apache/jackrabbit/ocm/persistence/collectionconverter/impl/MultiValueCollectionConverterImpl.java Thu May 10 14:25:11 2007
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.portals.graffito.jcr.persistence.collectionconverter.impl;
+package org.apache.jackrabbit.ocm.persistence.collectionconverter.impl;
import java.util.Iterator;
@@ -29,14 +29,14 @@
import javax.jcr.ValueFactory;
import javax.jcr.ValueFormatException;
-import org.apache.portals.graffito.jcr.exception.PersistenceException;
-import org.apache.portals.graffito.jcr.mapper.Mapper;
-import org.apache.portals.graffito.jcr.mapper.model.CollectionDescriptor;
-import org.apache.portals.graffito.jcr.persistence.atomictypeconverter.AtomicTypeConverter;
-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.reflection.ReflectionUtils;
+import org.apache.jackrabbit.ocm.exception.PersistenceException;
+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;
/**
* Collection Mapping/convertion implementation used for multi values properties
Modified: jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/main/java/org/apache/jackrabbit/ocm/persistence/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/persistence/collectionconverter/impl/NTCollectionConverterImpl.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/collectionconverter/impl/NTCollectionConverterImpl.java (original)
+++ jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/main/java/org/apache/jackrabbit/ocm/persistence/collectionconverter/impl/NTCollectionConverterImpl.java Thu May 10 14:25:11 2007
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.portals.graffito.jcr.persistence.collectionconverter.impl;
+package org.apache.jackrabbit.ocm.persistence.collectionconverter.impl;
import java.util.ArrayList;
@@ -37,13 +37,13 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-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.CollectionDescriptor;
-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.reflection.ReflectionUtils;
+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;
/**
* Collection Mapping/convertion based on node type.
@@ -125,7 +125,7 @@
/**
*
- * @see org.apache.portals.graffito.jcr.persistence.collectionconverter.CollectionConverter#updateCollection(javax.jcr.Session, javax.jcr.Node, org.apache.portals.graffito.jcr.mapper.model.CollectionDescriptor, org.apache.portals.graffito.jcr.persistence.collectionconverter.ManageableCollection)
+ * @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)
*/
protected void doUpdateCollection(Session session,
Node parentNode,
@@ -189,7 +189,7 @@
}
/**
- * @see org.apache.portals.graffito.jcr.persistence.collectionconverter.CollectionConverter#getCollection(javax.jcr.Session, javax.jcr.Node, org.apache.portals.graffito.jcr.mapper.model.CollectionDescriptor, java.lang.Class)
+ * @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)
*/
protected ManageableCollection doGetCollection(Session session,
Node parentNode,
Modified: jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/main/java/org/apache/jackrabbit/ocm/persistence/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/persistence/collectionconverter/impl/ReferenceCollectionConverterImpl.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/collectionconverter/impl/ReferenceCollectionConverterImpl.java (original)
+++ jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/main/java/org/apache/jackrabbit/ocm/persistence/collectionconverter/impl/ReferenceCollectionConverterImpl.java Thu May 10 14:25:11 2007
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.portals.graffito.jcr.persistence.collectionconverter.impl;
+package org.apache.jackrabbit.ocm.persistence.collectionconverter.impl;
import java.util.Iterator;
@@ -34,12 +34,12 @@
import javax.jcr.nodetype.ConstraintViolationException;
import javax.jcr.version.VersionException;
-import org.apache.portals.graffito.jcr.exception.PersistenceException;
-import org.apache.portals.graffito.jcr.mapper.Mapper;
-import org.apache.portals.graffito.jcr.mapper.model.CollectionDescriptor;
-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.jackrabbit.ocm.exception.PersistenceException;
+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/persistence/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/persistence/collectionconverter/impl/ResidualNodesCollectionConverterImpl.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/collectionconverter/impl/ResidualNodesCollectionConverterImpl.java (original)
+++ jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/main/java/org/apache/jackrabbit/ocm/persistence/collectionconverter/impl/ResidualNodesCollectionConverterImpl.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.collectionconverter.impl;
+package org.apache.jackrabbit.ocm.persistence.collectionconverter.impl;
import java.util.ArrayList;
import java.util.HashSet;
@@ -29,13 +29,13 @@
import javax.jcr.Session;
import javax.jcr.ValueFormatException;
-import org.apache.portals.graffito.jcr.exception.PersistenceException;
-import org.apache.portals.graffito.jcr.mapper.Mapper;
-import org.apache.portals.graffito.jcr.mapper.model.CollectionDescriptor;
-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.collectionconverter.impl.AbstractCollectionConverterImpl;
-import org.apache.portals.graffito.jcr.persistence.objectconverter.ObjectConverter;
+import org.apache.jackrabbit.ocm.exception.PersistenceException;
+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/persistence/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/persistence/collectionconverter/impl/ResidualPropertiesCollectionConverterImpl.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/collectionconverter/impl/ResidualPropertiesCollectionConverterImpl.java (original)
+++ jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/main/java/org/apache/jackrabbit/ocm/persistence/collectionconverter/impl/ResidualPropertiesCollectionConverterImpl.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.collectionconverter.impl;
+package org.apache.jackrabbit.ocm.persistence.collectionconverter.impl;
import java.util.ArrayList;
import java.util.Iterator;
@@ -30,16 +30,16 @@
import javax.jcr.ValueFactory;
import javax.jcr.ValueFormatException;
-import org.apache.portals.graffito.jcr.exception.PersistenceException;
-import org.apache.portals.graffito.jcr.mapper.Mapper;
-import org.apache.portals.graffito.jcr.mapper.model.CollectionDescriptor;
-import org.apache.portals.graffito.jcr.mapper.model.FieldDescriptor;
-import org.apache.portals.graffito.jcr.persistence.atomictypeconverter.AtomicTypeConverter;
-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.collectionconverter.impl.AbstractCollectionConverterImpl;
-import org.apache.portals.graffito.jcr.persistence.objectconverter.ObjectConverter;
-import org.apache.portals.graffito.jcr.reflection.ReflectionUtils;
+import org.apache.jackrabbit.ocm.exception.PersistenceException;
+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;
/**
* The <code>ResidualPropertiesCollectionConverterImpl</code> is a collection
Modified: jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/main/java/org/apache/jackrabbit/ocm/persistence/impl/CustomNodeTypeCreatorImpl.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/main/java/org/apache/jackrabbit/ocm/persistence/impl/CustomNodeTypeCreatorImpl.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/impl/CustomNodeTypeCreatorImpl.java (original)
+++ jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/main/java/org/apache/jackrabbit/ocm/persistence/impl/CustomNodeTypeCreatorImpl.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.persistence.impl;
+package org.apache.jackrabbit.ocm.persistence.impl;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.apache.portals.graffito.jcr.exception.CustomNodeTypeCreationException;
-import org.apache.portals.graffito.jcr.persistence.CustomNodeTypeCreator;
-import org.apache.portals.graffito.jcr.persistence.PersistenceManager;
+import org.apache.jackrabbit.ocm.exception.CustomNodeTypeCreationException;
+import org.apache.jackrabbit.ocm.persistence.CustomNodeTypeCreator;
+import org.apache.jackrabbit.ocm.persistence.PersistenceManager;
/** Default implementation of the jackrabbit custom node creator.
*
@@ -54,7 +54,7 @@
/** This method is supposed to create custom node types on repository
* setup.
*
- * @throws org.apache.portals.graffito.jcr.exception.CustomNodeTypeCreationException
+ * @throws org.apache.jackrabbit.ocm.exception.CustomNodeTypeCreationException
* @return true/false
*/
public boolean createInitialJcrCustomNodeTypes() throws CustomNodeTypeCreationException
@@ -67,7 +67,7 @@
/** Method to add a jcr custom node type to an existing jcr repository.
*
- * @throws org.apache.portals.graffito.jcr.exception.CustomNodeTypeCreationException
+ * @throws org.apache.jackrabbit.ocm.exception.CustomNodeTypeCreationException
* @return true/false
*/
public boolean addJcrCustomNodeType() throws CustomNodeTypeCreationException
Modified: jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/main/java/org/apache/jackrabbit/ocm/persistence/impl/ObjectIterator.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/main/java/org/apache/jackrabbit/ocm/persistence/impl/ObjectIterator.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/impl/ObjectIterator.java (original)
+++ jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/main/java/org/apache/jackrabbit/ocm/persistence/impl/ObjectIterator.java Thu May 10 14:25:11 2007
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.portals.graffito.jcr.persistence.impl;
+package org.apache.jackrabbit.ocm.persistence.impl;
import java.util.Iterator;
@@ -23,7 +23,7 @@
import javax.jcr.NodeIterator;
import javax.jcr.Session;
-import org.apache.portals.graffito.jcr.persistence.objectconverter.ObjectConverter;
+import org.apache.jackrabbit.ocm.persistence.objectconverter.ObjectConverter;
/**
Modified: jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/main/java/org/apache/jackrabbit/ocm/persistence/impl/PersistenceManagerImpl.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/main/java/org/apache/jackrabbit/ocm/persistence/impl/PersistenceManagerImpl.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/impl/PersistenceManagerImpl.java (original)
+++ jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/main/java/org/apache/jackrabbit/ocm/persistence/impl/PersistenceManagerImpl.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.impl;
+package org.apache.jackrabbit.ocm.persistence.impl;
import java.util.ArrayList;
@@ -40,31 +40,31 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.apache.portals.graffito.jcr.exception.IllegalUnlockException;
-import org.apache.portals.graffito.jcr.exception.IncorrectPersistentClassException;
-import org.apache.portals.graffito.jcr.exception.JcrMappingException;
-import org.apache.portals.graffito.jcr.exception.LockedException;
-import org.apache.portals.graffito.jcr.exception.PersistenceException;
-import org.apache.portals.graffito.jcr.exception.VersionException;
-import org.apache.portals.graffito.jcr.mapper.Mapper;
-import org.apache.portals.graffito.jcr.mapper.impl.DigesterMapperImpl;
-import org.apache.portals.graffito.jcr.mapper.model.ClassDescriptor;
-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.cache.ObjectCache;
-import org.apache.portals.graffito.jcr.persistence.cache.impl.RequestObjectCacheImpl;
-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.persistence.objectconverter.impl.ProxyManagerImpl;
-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.version.Version;
-import org.apache.portals.graffito.jcr.version.VersionIterator;
+import org.apache.jackrabbit.ocm.exception.IllegalUnlockException;
+import org.apache.jackrabbit.ocm.exception.IncorrectPersistentClassException;
+import org.apache.jackrabbit.ocm.exception.JcrMappingException;
+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.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;
+import org.apache.jackrabbit.ocm.version.Version;
+import org.apache.jackrabbit.ocm.version.VersionIterator;
/**
*
- * Default implementation for {@link org.apache.portals.graffito.jcr.persistence.PersistenceManager}
+ * Default implementation for {@link org.apache.jackrabbit.ocm.persistence.PersistenceManager}
*
* @author Sandro Boehme
* @author <a href="mailto:christophe.lombart@sword-technologies.com">Lombart Christophe</a>
@@ -192,8 +192,8 @@
}
/**
- * @see org.apache.portals.graffito.jcr.persistence.PersistenceManager#getObject(java.lang.Class, java.lang.String)
- * @throws org.apache.portals.graffito.jcr.exception.RepositoryException if the underlying repository
+ * @see org.apache.jackrabbit.ocm.persistence.PersistenceManager#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
* @throws PersistenceException if the object cannot be retrieved from the path
@@ -205,7 +205,7 @@
}
}
catch(RepositoryException e) {
- throw new org.apache.portals.graffito.jcr.exception.RepositoryException(
+ throw new org.apache.jackrabbit.ocm.exception.RepositoryException(
"Impossible to get the object at " + path, e);
}
@@ -217,8 +217,8 @@
/**
- * @see org.apache.portals.graffito.jcr.persistence.PersistenceManager#getObject(java.lang.Class, java.lang.String)
- * @throws org.apache.portals.graffito.jcr.exception.RepositoryException if the underlying repository
+ * @see org.apache.jackrabbit.ocm.persistence.PersistenceManager#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
* @throws PersistenceException if the object cannot be retrieved from the path
@@ -234,7 +234,7 @@
}
catch(RepositoryException e) {
- throw new org.apache.portals.graffito.jcr.exception.RepositoryException(
+ throw new org.apache.jackrabbit.ocm.exception.RepositoryException(
"Impossible to get the object with uuid : " + uuid, e);
}
@@ -242,7 +242,7 @@
}
/**
- * @see org.apache.portals.graffito.jcr.persistence.PersistenceManager#getObject(java.lang.Class, java.lang.String, java.lang.String)
+ * @see org.apache.jackrabbit.ocm.persistence.PersistenceManager#getObject(java.lang.Class, java.lang.String, java.lang.String)
*/
public Object getObject( String path, String versionName) {
String pathVersion = null;
@@ -256,7 +256,7 @@
}
catch(RepositoryException e) {
- throw new org.apache.portals.graffito.jcr.exception.RepositoryException(
+ throw new org.apache.jackrabbit.ocm.exception.RepositoryException(
"Impossible to get the object at " + path + " - version :" + versionName,
e);
}
@@ -267,8 +267,8 @@
}
/**
- * @see org.apache.portals.graffito.jcr.persistence.PersistenceManager#getObject(java.lang.Class, java.lang.String)
- * @throws org.apache.portals.graffito.jcr.exception.RepositoryException if the underlying repository
+ * @see org.apache.jackrabbit.ocm.persistence.PersistenceManager#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
* @throws PersistenceException if the object cannot be retrieved from the path
@@ -280,7 +280,7 @@
}
}
catch(RepositoryException e) {
- throw new org.apache.portals.graffito.jcr.exception.RepositoryException(
+ throw new org.apache.jackrabbit.ocm.exception.RepositoryException(
"Impossible to get the object at " + path, e);
}
@@ -291,7 +291,7 @@
}
/**
- * @see org.apache.portals.graffito.jcr.persistence.PersistenceManager#getObject(java.lang.Class, java.lang.String, java.lang.String)
+ * @see org.apache.jackrabbit.ocm.persistence.PersistenceManager#getObject(java.lang.Class, java.lang.String, java.lang.String)
*/
public Object getObject(Class objectClass, String path, String versionName) {
String pathVersion = null;
@@ -305,7 +305,7 @@
}
catch(RepositoryException e) {
- throw new org.apache.portals.graffito.jcr.exception.RepositoryException(
+ throw new org.apache.jackrabbit.ocm.exception.RepositoryException(
"Impossible to get the object at " + path + " - version :" + versionName,
e);
}
@@ -316,7 +316,7 @@
}
/**
- * @see org.apache.portals.graffito.jcr.persistence.PersistenceManager#retrieveAllMappedAttributes(Object)
+ * @see org.apache.jackrabbit.ocm.persistence.PersistenceManager#retrieveAllMappedAttributes(Object)
*/
public void retrieveAllMappedAttributes(Object object) {
objectConverter.retrieveAllMappedAttributes(session, object);
@@ -324,7 +324,7 @@
}
/**
- * @see org.apache.portals.graffito.jcr.persistence.PersistenceManager#retrieveMappedAttribute(Object, String)
+ * @see org.apache.jackrabbit.ocm.persistence.PersistenceManager#retrieveMappedAttribute(Object, String)
*/
public void retrieveMappedAttribute(Object object, String attributeName) {
objectConverter.retrieveMappedAttribute(session, object, attributeName);
@@ -332,7 +332,7 @@
}
/**
- * @see org.apache.portals.graffito.jcr.persistence.PersistenceManager#insert(java.lang.Object)
+ * @see org.apache.jackrabbit.ocm.persistence.PersistenceManager#insert(java.lang.Object)
*/
public void insert(Object object) {
String path = objectConverter.getPath(session, object);
@@ -354,7 +354,7 @@
}
}
catch(RepositoryException e) {
- throw new org.apache.portals.graffito.jcr.exception.RepositoryException(
+ throw new org.apache.jackrabbit.ocm.exception.RepositoryException(
"Impossible to insert the object at " + path, e);
}
@@ -362,7 +362,7 @@
}
/**
- * @see org.apache.portals.graffito.jcr.persistence.PersistenceManager#update(java.lang.Object)
+ * @see org.apache.jackrabbit.ocm.persistence.PersistenceManager#update(java.lang.Object)
*/
public void update(Object object) {
String path = objectConverter.getPath(session, object);
@@ -375,7 +375,7 @@
}
}
catch(javax.jcr.RepositoryException e) {
- throw new org.apache.portals.graffito.jcr.exception.RepositoryException("Impossible to update", e);
+ throw new org.apache.jackrabbit.ocm.exception.RepositoryException("Impossible to update", e);
}
objectConverter.update(session, object);
@@ -383,7 +383,7 @@
/**
*
- * @see org.apache.portals.graffito.jcr.persistence.PersistenceManager#remove(java.lang.String)
+ * @see org.apache.jackrabbit.ocm.persistence.PersistenceManager#remove(java.lang.String)
*/
public void remove(String path) {
try {
@@ -399,14 +399,14 @@
}
catch(RepositoryException e) {
- throw new org.apache.portals.graffito.jcr.exception.RepositoryException(
+ throw new org.apache.jackrabbit.ocm.exception.RepositoryException(
"Impossible to remove the object at " + path);
}
}
/**
*
- * @see org.apache.portals.graffito.jcr.persistence.PersistenceManager#remove(java.lang.Object)
+ * @see org.apache.jackrabbit.ocm.persistence.PersistenceManager#remove(java.lang.Object)
*/
public void remove(Object object) {
this.remove(objectConverter.getPath(session, object));
@@ -414,7 +414,7 @@
/**
*
- * @see org.apache.portals.graffito.jcr.persistence.PersistenceManager#remove(org.apache.portals.graffito.jcr.query.Query)
+ * @see org.apache.jackrabbit.ocm.persistence.PersistenceManager#remove(org.apache.jackrabbit.ocm.query.Query)
*/
public void remove(Query query) {
try {
@@ -454,16 +454,16 @@
}
catch(InvalidQueryException iqe) {
- throw new org.apache.portals.graffito.jcr.exception.RepositoryException("Invalid query expression", iqe);
+ throw new org.apache.jackrabbit.ocm.exception.RepositoryException("Invalid query expression", iqe);
}
catch(RepositoryException e) {
- throw new org.apache.portals.graffito.jcr.exception.RepositoryException("Impossible to get the object collection", e);
+ throw new org.apache.jackrabbit.ocm.exception.RepositoryException("Impossible to get the object collection", e);
}
}
/**
*
- * @see org.apache.portals.graffito.jcr.persistence.PersistenceManager#objectExists(java.lang.String)
+ * @see org.apache.jackrabbit.ocm.persistence.PersistenceManager#objectExists(java.lang.String)
*/
public boolean objectExists(String path) {
try {
@@ -471,13 +471,13 @@
return session.itemExists(path);
}
catch(RepositoryException e) {
- throw new org.apache.portals.graffito.jcr.exception.RepositoryException("Impossible to check if the object exist", e);
+ throw new org.apache.jackrabbit.ocm.exception.RepositoryException("Impossible to check if the object exist", e);
}
}
/**
*
- * @see org.apache.portals.graffito.jcr.persistence.PersistenceManager#isPersistent(java.lang.Class)
+ * @see org.apache.jackrabbit.ocm.persistence.PersistenceManager#isPersistent(java.lang.Class)
*/
public boolean isPersistent(final Class clazz) {
@@ -495,7 +495,7 @@
/**
*
- * @see org.apache.portals.graffito.jcr.persistence.PersistenceManager#getObject(org.apache.portals.graffito.jcr.query.Query)
+ * @see org.apache.jackrabbit.ocm.persistence.PersistenceManager#getObject(org.apache.jackrabbit.ocm.query.Query)
*/
public Object getObject(Query query) {
try {
@@ -520,17 +520,17 @@
return object;
}
catch(InvalidQueryException iqe) {
- throw new org.apache.portals.graffito.jcr.exception.RepositoryException("Invalid query expression", iqe);
+ throw new org.apache.jackrabbit.ocm.exception.RepositoryException("Invalid query expression", iqe);
}
catch(RepositoryException e) {
- throw new org.apache.portals.graffito.jcr.exception.RepositoryException(
+ throw new org.apache.jackrabbit.ocm.exception.RepositoryException(
"Impossible to get the object collection", e);
}
}
/**
*
- * @see org.apache.portals.graffito.jcr.persistence.PersistenceManager#getObjects(org.apache.portals.graffito.jcr.query.Query)
+ * @see org.apache.jackrabbit.ocm.persistence.PersistenceManager#getObjects(org.apache.jackrabbit.ocm.query.Query)
*/
public Collection getObjects(Query query) {
try {
@@ -552,17 +552,17 @@
return result;
}
catch(InvalidQueryException iqe) {
- throw new org.apache.portals.graffito.jcr.exception.RepositoryException("Invalid query expression", iqe);
+ throw new org.apache.jackrabbit.ocm.exception.RepositoryException("Invalid query expression", iqe);
}
catch(RepositoryException e) {
- throw new org.apache.portals.graffito.jcr.exception.RepositoryException(
+ throw new org.apache.jackrabbit.ocm.exception.RepositoryException(
"Impossible to get the object collection", e);
}
}
/**
*
- * @see org.apache.portals.graffito.jcr.persistence.PersistenceManager#getObjectIterator(org.apache.portals.graffito.jcr.query.Query)
+ * @see org.apache.jackrabbit.ocm.persistence.PersistenceManager#getObjectIterator(org.apache.jackrabbit.ocm.query.Query)
*/
public Iterator getObjectIterator(Query query) {
try {
@@ -580,17 +580,17 @@
}
catch(InvalidQueryException iqe) {
- throw new org.apache.portals.graffito.jcr.exception.RepositoryException("Invalid query expression", iqe);
+ throw new org.apache.jackrabbit.ocm.exception.RepositoryException("Invalid query expression", iqe);
}
catch(RepositoryException e) {
- throw new org.apache.portals.graffito.jcr.exception.RepositoryException(
+ throw new org.apache.jackrabbit.ocm.exception.RepositoryException(
"Impossible to get the object collection", e);
}
}
/**
*
- * @see org.apache.portals.graffito.jcr.persistence.PersistenceManager#checkin(java.lang.String)
+ * @see org.apache.jackrabbit.ocm.persistence.PersistenceManager#checkin(java.lang.String)
*/
public void checkin(String path) {
this.checkin(path, null);
@@ -598,7 +598,7 @@
/**
*
- * @see org.apache.portals.graffito.jcr.persistence.PersistenceManager#checkin(java.lang.String, java.lang.String[])
+ * @see org.apache.jackrabbit.ocm.persistence.PersistenceManager#checkin(java.lang.String, java.lang.String[])
*/
public void checkin(String path, String[] versionLabels) {
try {
@@ -636,7 +636,7 @@
throw new VersionException("Cannot checkin locked node at path " + path, le);
}
catch (RepositoryException e) {
- throw new org.apache.portals.graffito.jcr.exception.RepositoryException(
+ throw new org.apache.jackrabbit.ocm.exception.RepositoryException(
"Impossible to checkin the object " + path, e);
}
@@ -644,7 +644,7 @@
/**
*
- * @see org.apache.portals.graffito.jcr.persistence.PersistenceManager#checkout(java.lang.String)
+ * @see org.apache.jackrabbit.ocm.persistence.PersistenceManager#checkout(java.lang.String)
*/
public void checkout(String path) {
Node node = null;
@@ -669,14 +669,14 @@
throw new VersionException("Cannot checkout locked node at path " + path, le);
}
catch(javax.jcr.RepositoryException e) {
- throw new org.apache.portals.graffito.jcr.exception.RepositoryException("Impossible to checkout the object " + path, e);
+ throw new org.apache.jackrabbit.ocm.exception.RepositoryException("Impossible to checkout the object " + path, e);
}
}
/**
*
- * @see org.apache.portals.graffito.jcr.persistence.PersistenceManager#addVersionLabel(java.lang.String, java.lang.String, java.lang.String)
+ * @see org.apache.jackrabbit.ocm.persistence.PersistenceManager#addVersionLabel(java.lang.String, java.lang.String, java.lang.String)
*/
public void addVersionLabel(String path, String versionName, String versionLabel) {
try {
@@ -706,13 +706,13 @@
uroe);
}
catch(javax.jcr.RepositoryException e) {
- throw new org.apache.portals.graffito.jcr.exception.RepositoryException(e);
+ throw new org.apache.jackrabbit.ocm.exception.RepositoryException(e);
}
}
/**
*
- * @see org.apache.portals.graffito.jcr.persistence.PersistenceManager#getVersion(java.lang.String, java.lang.String)
+ * @see org.apache.jackrabbit.ocm.persistence.PersistenceManager#getVersion(java.lang.String, java.lang.String)
*/
public Version getVersion(String path, String versionName) {
try {
@@ -738,13 +738,13 @@
throw new VersionException("Impossible to retrieve versions for path " + path, uroe);
}
catch(javax.jcr.RepositoryException e) {
- throw new org.apache.portals.graffito.jcr.exception.RepositoryException(e);
+ throw new org.apache.jackrabbit.ocm.exception.RepositoryException(e);
}
}
/**
*
- * @see org.apache.portals.graffito.jcr.persistence.PersistenceManager#getVersionLabels(java.lang.String, java.lang.String)
+ * @see org.apache.jackrabbit.ocm.persistence.PersistenceManager#getVersionLabels(java.lang.String, java.lang.String)
*/
public String[] getVersionLabels(String path, String versionName) {
try {
@@ -773,12 +773,12 @@
throw new VersionException("Impossible to retrieve versions for path " + path, uroe);
}
catch(RepositoryException e) {
- throw new org.apache.portals.graffito.jcr.exception.RepositoryException(e);
+ throw new org.apache.jackrabbit.ocm.exception.RepositoryException(e);
}
}
/**
- * @see org.apache.portals.graffito.jcr.persistence.PersistenceManager#getAllVersionLabels(java.lang.String)
+ * @see org.apache.jackrabbit.ocm.persistence.PersistenceManager#getAllVersionLabels(java.lang.String)
*/
public String[] getAllVersionLabels(String path) {
try {
@@ -801,13 +801,13 @@
throw new VersionException("Impossible to retrieve version history for path " + path, uroe);
}
catch(RepositoryException e) {
- throw new org.apache.portals.graffito.jcr.exception.RepositoryException(e);
+ throw new org.apache.jackrabbit.ocm.exception.RepositoryException(e);
}
}
/**
*
- * @see org.apache.portals.graffito.jcr.persistence.PersistenceManager#getAllVersions(java.lang.String)
+ * @see org.apache.jackrabbit.ocm.persistence.PersistenceManager#getAllVersions(java.lang.String)
*/
public VersionIterator getAllVersions(String path) {
try {
@@ -831,13 +831,13 @@
throw new VersionException("Impossible to retrieve version history for path " + path, uroe);
}
catch(RepositoryException e) {
- throw new org.apache.portals.graffito.jcr.exception.RepositoryException(e);
+ throw new org.apache.jackrabbit.ocm.exception.RepositoryException(e);
}
}
/**
*
- * @see org.apache.portals.graffito.jcr.persistence.PersistenceManager#getRootVersion(java.lang.String)
+ * @see org.apache.jackrabbit.ocm.persistence.PersistenceManager#getRootVersion(java.lang.String)
*/
public Version getRootVersion(String path) {
try {
@@ -861,13 +861,13 @@
uroe);
}
catch(RepositoryException e) {
- throw new org.apache.portals.graffito.jcr.exception.RepositoryException(e);
+ throw new org.apache.jackrabbit.ocm.exception.RepositoryException(e);
}
}
/**
*
- * @see org.apache.portals.graffito.jcr.persistence.PersistenceManager#getBaseVersion(java.lang.String)
+ * @see org.apache.jackrabbit.ocm.persistence.PersistenceManager#getBaseVersion(java.lang.String)
*/
public Version getBaseVersion(String path) {
try {
@@ -889,13 +889,13 @@
uroe);
}
catch(javax.jcr.RepositoryException e) {
- throw new org.apache.portals.graffito.jcr.exception.RepositoryException(e);
+ throw new org.apache.jackrabbit.ocm.exception.RepositoryException(e);
}
}
/**
*
- * @see org.apache.portals.graffito.jcr.persistence.PersistenceManager#lock(java.lang.String, java.lang.Object, boolean, boolean)
+ * @see org.apache.jackrabbit.ocm.persistence.PersistenceManager#lock(java.lang.String, java.lang.Object, boolean, boolean)
*/
public String lock(final String absPath, final boolean isDeep, final boolean isSessionScoped)
throws LockedException {
@@ -912,18 +912,18 @@
}
catch (LockException e) {
// Only one case with LockException remains: if node is not mix:lockable, propably error in custom node types definitions
- throw new org.apache.portals.graffito.jcr.exception.RepositoryException(
+ throw new org.apache.jackrabbit.ocm.exception.RepositoryException(
"Node of type is not type mix:lockable", e);
}
catch (RepositoryException e) {
- throw new org.apache.portals.graffito.jcr.exception.RepositoryException(e.getMessage(),
+ throw new org.apache.jackrabbit.ocm.exception.RepositoryException(e.getMessage(),
e);
}
}
/**
*
- * @see org.apache.portals.graffito.jcr.persistence.PersistenceManager#unlock(java.lang.String, java.lang.Object, java.lang.String)
+ * @see org.apache.jackrabbit.ocm.persistence.PersistenceManager#unlock(java.lang.String, java.lang.Object, java.lang.String)
*/
public void unlock(final String absPath, final String lockToken)
throws IllegalUnlockException {
@@ -955,14 +955,14 @@
}
catch (RepositoryException e) {
// This also catch UnsupportedRepositoryOperationException - we assume that implementation supports it (jackrabbit does)
- throw new org.apache.portals.graffito.jcr.exception.RepositoryException(e.getMessage(),
+ throw new org.apache.jackrabbit.ocm.exception.RepositoryException(e.getMessage(),
e);
}
}
/**
*
- * @see org.apache.portals.graffito.jcr.persistence.PersistenceManager#isLocked(java.lang.String)
+ * @see org.apache.jackrabbit.ocm.persistence.PersistenceManager#isLocked(java.lang.String)
*/
public boolean isLocked(final String absPath) {
try {
@@ -972,13 +972,13 @@
}
catch (RepositoryException e) {
// node.isLocked() RepositoryException if an error occurs.
- throw new org.apache.portals.graffito.jcr.exception.RepositoryException(
+ throw new org.apache.jackrabbit.ocm.exception.RepositoryException(
"An exception was thrown while checking the lock at path : " + absPath, e);
}
}
/**
- * @see org.apache.portals.graffito.jcr.persistence.PersistenceManager#getQueryManager()
+ * @see org.apache.jackrabbit.ocm.persistence.PersistenceManager#getQueryManager()
*/
public QueryManager getQueryManager() {
return this.queryManager;
@@ -1038,7 +1038,7 @@
/**
*
- * @see org.apache.portals.graffito.jcr.persistence.PersistenceManager#logout()
+ * @see org.apache.jackrabbit.ocm.persistence.PersistenceManager#logout()
*/
public void logout() {
try {
@@ -1067,7 +1067,7 @@
/**
*
- * @see org.apache.portals.graffito.jcr.persistence.PersistenceManager#save()
+ * @see org.apache.jackrabbit.ocm.persistence.PersistenceManager#save()
*/
public void save() {
try {
Modified: jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/main/java/org/apache/jackrabbit/ocm/persistence/impl/PersistenceUtil.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/main/java/org/apache/jackrabbit/ocm/persistence/impl/PersistenceUtil.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/impl/PersistenceUtil.java (original)
+++ jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/main/java/org/apache/jackrabbit/ocm/persistence/impl/PersistenceUtil.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.persistence.impl;
+package org.apache.jackrabbit.ocm.persistence.impl;
import javax.jcr.Node;
import javax.jcr.Session;
-import org.apache.portals.graffito.jcr.exception.PersistenceException;
-import org.apache.portals.graffito.jcr.exception.RepositoryException;
-import org.apache.portals.graffito.jcr.mapper.model.BeanDescriptor;
+import org.apache.jackrabbit.ocm.exception.PersistenceException;
+import org.apache.jackrabbit.ocm.exception.RepositoryException;
+import org.apache.jackrabbit.ocm.mapper.model.BeanDescriptor;
/**
Copied: jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/main/java/org/apache/jackrabbit/ocm/persistence/objectconverter/ObjectConverter.java (from r535963, jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/main/java/org/apache/portals/graffito/jcr/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/persistence/objectconverter/ObjectConverter.java?view=diff&rev=536999&p1=jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/main/java/org/apache/portals/graffito/jcr/persistence/objectconverter/ObjectConverter.java&r1=535963&p2=jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/main/java/org/apache/jackrabbit/ocm/persistence/objectconverter/ObjectConverter.java&r2=536999
==============================================================================
--- jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/main/java/org/apache/portals/graffito/jcr/persistence/objectconverter/ObjectConverter.java (original)
+++ jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/main/java/org/apache/jackrabbit/ocm/persistence/objectconverter/ObjectConverter.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.objectconverter;
+package org.apache.jackrabbit.ocm.persistence.objectconverter;
import javax.jcr.Node;
import javax.jcr.Session;
-import org.apache.portals.graffito.jcr.exception.PersistenceException;
+import org.apache.jackrabbit.ocm.exception.PersistenceException;
/**
Propchange: jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/main/java/org/apache/jackrabbit/ocm/persistence/objectconverter/ObjectConverter.java
------------------------------------------------------------------------------
svn:eol-style = native
Copied: jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/main/java/org/apache/jackrabbit/ocm/persistence/objectconverter/ProxyManager.java (from r535963, jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/main/java/org/apache/portals/graffito/jcr/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/persistence/objectconverter/ProxyManager.java?view=diff&rev=536999&p1=jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/main/java/org/apache/portals/graffito/jcr/persistence/objectconverter/ProxyManager.java&r1=535963&p2=jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/main/java/org/apache/jackrabbit/ocm/persistence/objectconverter/ProxyManager.java&r2=536999
==============================================================================
--- jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/main/java/org/apache/portals/graffito/jcr/persistence/objectconverter/ProxyManager.java (original)
+++ jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/main/java/org/apache/jackrabbit/ocm/persistence/objectconverter/ProxyManager.java Thu May 10 14:25:11 2007
@@ -1,10 +1,10 @@
-package org.apache.portals.graffito.jcr.persistence.objectconverter;
+package org.apache.jackrabbit.ocm.persistence.objectconverter;
import javax.jcr.Node;
import javax.jcr.Session;
-import org.apache.portals.graffito.jcr.mapper.model.CollectionDescriptor;
-import org.apache.portals.graffito.jcr.persistence.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/persistence/objectconverter/ProxyManager.java
------------------------------------------------------------------------------
svn:eol-style = native
Modified: jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/main/java/org/apache/jackrabbit/ocm/persistence/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/persistence/objectconverter/impl/BeanLazyLoader.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/BeanLazyLoader.java (original)
+++ jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/main/java/org/apache/jackrabbit/ocm/persistence/objectconverter/impl/BeanLazyLoader.java Thu May 10 14:25:11 2007
@@ -15,13 +15,13 @@
* limitations under the License.
*/
-package org.apache.portals.graffito.jcr.persistence.objectconverter.impl;
+package org.apache.jackrabbit.ocm.persistence.objectconverter.impl;
import javax.jcr.Session;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.apache.portals.graffito.jcr.persistence.objectconverter.ObjectConverter;
+import org.apache.jackrabbit.ocm.persistence.objectconverter.ObjectConverter;
import net.sf.cglib.proxy.LazyLoader;
Modified: jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/main/java/org/apache/jackrabbit/ocm/persistence/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/persistence/objectconverter/impl/CollectionLazyLoader.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/CollectionLazyLoader.java (original)
+++ jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/main/java/org/apache/jackrabbit/ocm/persistence/objectconverter/impl/CollectionLazyLoader.java Thu May 10 14:25:11 2007
@@ -15,17 +15,17 @@
* 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.Session;
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.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;
Modified: jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/main/java/org/apache/jackrabbit/ocm/persistence/objectconverter/impl/ObjectConverterImpl.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/main/java/org/apache/jackrabbit/ocm/persistence/objectconverter/impl/ObjectConverterImpl.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/ObjectConverterImpl.java (original)
+++ jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/main/java/org/apache/jackrabbit/ocm/persistence/objectconverter/impl/ObjectConverterImpl.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.HashMap;
import java.util.Iterator;
@@ -30,27 +30,27 @@
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.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.mapper.model.CollectionDescriptor;
-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.AtomicTypeConverterProvider;
-import org.apache.portals.graffito.jcr.persistence.beanconverter.BeanConverter;
-import org.apache.portals.graffito.jcr.persistence.cache.ObjectCache;
-import org.apache.portals.graffito.jcr.persistence.cache.impl.RequestObjectCacheImpl;
-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.collectionconverter.impl.DefaultCollectionConverterImpl;
-import org.apache.portals.graffito.jcr.persistence.impl.PersistenceUtil;
-import org.apache.portals.graffito.jcr.persistence.objectconverter.ObjectConverter;
-import org.apache.portals.graffito.jcr.persistence.objectconverter.ProxyManager;
-import org.apache.portals.graffito.jcr.reflection.ReflectionUtils;
-import org.apache.portals.graffito.jcr.repository.RepositoryUtil;
+import org.apache.jackrabbit.ocm.exception.JcrMappingException;
+import org.apache.jackrabbit.ocm.exception.PersistenceException;
+import org.apache.jackrabbit.ocm.mapper.Mapper;
+import org.apache.jackrabbit.ocm.mapper.model.BeanDescriptor;
+import org.apache.jackrabbit.ocm.mapper.model.ClassDescriptor;
+import org.apache.jackrabbit.ocm.mapper.model.CollectionDescriptor;
+import org.apache.jackrabbit.ocm.mapper.model.FieldDescriptor;
+import org.apache.jackrabbit.ocm.persistence.PersistenceConstant;
+import org.apache.jackrabbit.ocm.persistence.atomictypeconverter.AtomicTypeConverterProvider;
+import org.apache.jackrabbit.ocm.persistence.beanconverter.BeanConverter;
+import org.apache.jackrabbit.ocm.persistence.cache.ObjectCache;
+import org.apache.jackrabbit.ocm.persistence.cache.impl.RequestObjectCacheImpl;
+import org.apache.jackrabbit.ocm.persistence.collectionconverter.CollectionConverter;
+import org.apache.jackrabbit.ocm.persistence.collectionconverter.ManageableCollection;
+import org.apache.jackrabbit.ocm.persistence.collectionconverter.ManageableCollectionUtil;
+import org.apache.jackrabbit.ocm.persistence.collectionconverter.impl.DefaultCollectionConverterImpl;
+import org.apache.jackrabbit.ocm.persistence.impl.PersistenceUtil;
+import org.apache.jackrabbit.ocm.persistence.objectconverter.ObjectConverter;
+import org.apache.jackrabbit.ocm.persistence.objectconverter.ProxyManager;
+import org.apache.jackrabbit.ocm.reflection.ReflectionUtils;
+import org.apache.jackrabbit.ocm.repository.RepositoryUtil;
/**
* Default implementation for {@link ObjectConverterImpl}
@@ -60,7 +60,7 @@
*/
public class ObjectConverterImpl implements ObjectConverter {
- private static final String DEFAULT_BEAN_CONVERTER = "org.apache.portals.graffito.jcr.persistence.beanconverter.impl.DefaultBeanConverterImpl";
+ private static final String DEFAULT_BEAN_CONVERTER = "org.apache.jackrabbit.ocm.persistence.beanconverter.impl.DefaultBeanConverterImpl";
private final static Log log = LogFactory.getLog(ObjectConverterImpl.class);
@@ -134,7 +134,7 @@
}
/**
- * @see org.apache.portals.graffito.jcr.persistence.objectconverter.ObjectConverter#insert(javax.jcr.Session,
+ * @see org.apache.jackrabbit.ocm.persistence.objectconverter.ObjectConverter#insert(javax.jcr.Session,
* java.lang.Object)
*/
public void insert(Session session, Object object) {
@@ -148,14 +148,14 @@
} catch (PathNotFoundException pnfe) {
throw new PersistenceException("Impossible to insert the object at '" + path + "'", pnfe);
} catch (RepositoryException re) {
- throw new org.apache.portals.graffito.jcr.exception.RepositoryException("Impossible to insert the object at '" + path
+ throw new org.apache.jackrabbit.ocm.exception.RepositoryException("Impossible to insert the object at '" + path
+ "'", re);
}
}
/**
*
- * @see org.apache.portals.graffito.jcr.persistence.objectconverter.ObjectConverter#insert(javax.jcr.Session,
+ * @see org.apache.jackrabbit.ocm.persistence.objectconverter.ObjectConverter#insert(javax.jcr.Session,
* javax.jcr.Node, java.lang.String, java.lang.Object)
*/
public void insert(Session session, Node parentNode, String nodeName, Object object) {
@@ -222,7 +222,7 @@
}
/**
- * @see org.apache.portals.graffito.jcr.persistence.objectconverter.ObjectConverter#update(javax.jcr.Session,
+ * @see org.apache.jackrabbit.ocm.persistence.objectconverter.ObjectConverter#update(javax.jcr.Session,
* java.lang.Object)
*/
public void update(Session session, Object object) {
@@ -235,14 +235,14 @@
} catch (PathNotFoundException pnfe) {
throw new PersistenceException("Impossible to update the object at '" + path + "'", pnfe);
} catch (RepositoryException re) {
- throw new org.apache.portals.graffito.jcr.exception.RepositoryException("Impossible to update the object at '" + path
+ throw new org.apache.jackrabbit.ocm.exception.RepositoryException("Impossible to update the object at '" + path
+ "'", re);
}
}
/**
*
- * @see org.apache.portals.graffito.jcr.persistence.objectconverter.ObjectConverter#update(javax.jcr.Session,
+ * @see org.apache.jackrabbit.ocm.persistence.objectconverter.ObjectConverter#update(javax.jcr.Session,
* javax.jcr.Node, java.lang.String, java.lang.Object)
*/
public void update(Session session, Node parentNode, String nodeName, Object object) {
@@ -260,13 +260,13 @@
} catch (PathNotFoundException pnfe) {
throw new PersistenceException("Impossible to update the object: " + nodeName + " at node : " + parentNode, pnfe);
} catch (RepositoryException re) {
- throw new org.apache.portals.graffito.jcr.exception.RepositoryException("Impossible to update the object: "
+ throw new org.apache.jackrabbit.ocm.exception.RepositoryException("Impossible to update the object: "
+ nodeName + " at node : " + parentNode, re);
}
}
/**
- * @see org.apache.portals.graffito.jcr.persistence.objectconverter.ObjectConverter#getObject(javax.jcr.Session,
+ * @see org.apache.jackrabbit.ocm.persistence.objectconverter.ObjectConverter#getObject(javax.jcr.Session,
* java.lang.Class, java.lang.String)
*/
public Object getObject(Session session, String path) {
@@ -316,14 +316,14 @@
// HINT should never get here
throw new PersistenceException("Impossible to get the object at " + path, pnfe);
} catch (RepositoryException re) {
- throw new org.apache.portals.graffito.jcr.exception.RepositoryException("Impossible to get the object at " + path, re);
+ throw new org.apache.jackrabbit.ocm.exception.RepositoryException("Impossible to get the object at " + path, re);
}
}
/**
- * @see org.apache.portals.graffito.jcr.persistence.objectconverter.ObjectConverter#getObject(javax.jcr.Session,
+ * @see org.apache.jackrabbit.ocm.persistence.objectconverter.ObjectConverter#getObject(javax.jcr.Session,
* java.lang.Class, java.lang.String)
*/
public Object getObject(Session session, Class clazz, String path)
@@ -384,7 +384,7 @@
// HINT should never get here
throw new PersistenceException("Impossible to get the object at " + path, pnfe);
} catch (RepositoryException re) {
- throw new org.apache.portals.graffito.jcr.exception.RepositoryException("Impossible to get the object at " + path, re);
+ throw new org.apache.jackrabbit.ocm.exception.RepositoryException("Impossible to get the object at " + path, re);
}
}
@@ -402,7 +402,7 @@
throw new PersistenceException("Impossible to get the object at " + path, pnfe);
} catch (RepositoryException re) {
- throw new org.apache.portals.graffito.jcr.exception.RepositoryException("Impossible to get the object at " + path, re);
+ throw new org.apache.jackrabbit.ocm.exception.RepositoryException("Impossible to get the object at " + path, re);
}
}
@@ -438,7 +438,7 @@
throw new PersistenceException("Impossible to get the object at " + path, pnfe);
} catch (RepositoryException re) {
- throw new org.apache.portals.graffito.jcr.exception.RepositoryException("Impossible to get the object at " + path, re);
+ throw new org.apache.jackrabbit.ocm.exception.RepositoryException("Impossible to get the object at " + path, re);
}
}
@@ -451,7 +451,7 @@
* descriptor
* @throws JcrMappingException
* thrown if the node type is unknown
- * @throws org.apache.portals.graffito.jcr.exception.RepositoryException
+ * @throws org.apache.jackrabbit.ocm.exception.RepositoryException
* thrown if an error occured in the underlying repository
*/
private void checkNodeType(Session session, ClassDescriptor classDescriptor) {
@@ -475,7 +475,7 @@
throw new JcrMappingException("Mapping for class '" + classDescriptor.getClassName()
+ "' use unknown primary or mixin node type '" + jcrTypeName + "'");
} catch (RepositoryException re) {
- throw new org.apache.portals.graffito.jcr.exception.RepositoryException(re);
+ throw new org.apache.jackrabbit.ocm.exception.RepositoryException(re);
}
}
@@ -496,7 +496,7 @@
*
* @throws PersistenceException
* thrown if node types are incompatible
- * @throws org.apache.portals.graffito.jcr.exception.RepositoryException
+ * @throws org.apache.jackrabbit.ocm.exception.RepositoryException
* thrown if an error occured in the underlying repository
*/
private void checkCompatiblePrimaryNodeTypes(Session session, Node node, ClassDescriptor classDescriptor,
@@ -519,7 +519,7 @@
+ classDescriptor.getJcrNodeType() + "'");
}
} catch (RepositoryException re) {
- throw new org.apache.portals.graffito.jcr.exception.RepositoryException(re);
+ throw new org.apache.jackrabbit.ocm.exception.RepositoryException(re);
}
}
@@ -555,7 +555,7 @@
}
/**
- * @see org.apache.portals.graffito.jcr.persistence.objectconverter.ObjectConverter#getPath(javax.jcr.Session,
+ * @see org.apache.jackrabbit.ocm.persistence.objectconverter.ObjectConverter#getPath(javax.jcr.Session,
* java.lang.Object)
* @throws JcrMappingException
*/