Property changes on: . ___________________________________________________________________ Modified: svn:ignore - derby.log target *.iws *.ipr *.iml .* jcoverage* junit*.properties + derby.log target *.iws *.ipr *.iml .* jcoverage* junit*.properties target-eclipse Index: src/main/java/org/apache/jackrabbit/ocm/manager/objectconverter/impl/ObjectConverterImpl.java =================================================================== --- src/main/java/org/apache/jackrabbit/ocm/manager/objectconverter/impl/ObjectConverterImpl.java (revision 705141) +++ src/main/java/org/apache/jackrabbit/ocm/manager/objectconverter/impl/ObjectConverterImpl.java (working copy) @@ -75,7 +75,7 @@ private Mapper mapper; - private AtomicTypeConverterProvider atomicTypeConverterProvider; + protected AtomicTypeConverterProvider atomicTypeConverterProvider; private ProxyManager proxyManager; @@ -925,7 +925,7 @@ } - private CollectionConverter getCollectionConverter(Session session, CollectionDescriptor collectionDescriptor) { + public CollectionConverter getCollectionConverter(Session session, CollectionDescriptor collectionDescriptor) { String className = collectionDescriptor.getCollectionConverter(); Map atomicTypeConverters = this.atomicTypeConverterProvider.getAtomicTypeConverters(); if (className == null) { Index: src/main/java/org/apache/jackrabbit/ocm/manager/objectconverter/ObjectConverter.java =================================================================== --- src/main/java/org/apache/jackrabbit/ocm/manager/objectconverter/ObjectConverter.java (revision 705141) +++ src/main/java/org/apache/jackrabbit/ocm/manager/objectconverter/ObjectConverter.java (working copy) @@ -20,6 +20,8 @@ import javax.jcr.Session; import org.apache.jackrabbit.ocm.exception.ObjectContentManagerException; +import org.apache.jackrabbit.ocm.manager.collectionconverter.CollectionConverter; +import org.apache.jackrabbit.ocm.mapper.model.CollectionDescriptor; /** @@ -144,5 +146,7 @@ * @throws ObjectContentManagerException when it is not possible to retrieve the object path */ public String getPath(Session session , Object object) throws ObjectContentManagerException; + + public CollectionConverter getCollectionConverter(Session session, CollectionDescriptor collectionDescriptor); } Index: src/main/java/org/apache/jackrabbit/ocm/query/Filter.java =================================================================== --- src/main/java/org/apache/jackrabbit/ocm/query/Filter.java (revision 705141) +++ src/main/java/org/apache/jackrabbit/ocm/query/Filter.java (working copy) @@ -97,6 +97,7 @@ Filter addJCRExpression(String jcrExpression); Class getFilterClass(); + Object clone(); } Index: src/main/java/org/apache/jackrabbit/ocm/query/impl/FilterImpl.java =================================================================== --- src/main/java/org/apache/jackrabbit/ocm/query/impl/FilterImpl.java (revision 705141) +++ src/main/java/org/apache/jackrabbit/ocm/query/impl/FilterImpl.java (working copy) @@ -62,6 +62,9 @@ this.valueFactory = valueFactory; } + public Object clone(){ + return new FilterImpl(classDescriptor,atomicTypeConverters,claszz,valueFactory); + } /** * * @see org.apache.jackrabbit.ocm.query.Filter#getFilterClass()