jackrabbit-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From clomb...@apache.org
Subject svn commit: r705496 - in /jackrabbit/trunk/jackrabbit-ocm/src/main/java/org/apache/jackrabbit/ocm: manager/objectconverter/ObjectConverter.java manager/objectconverter/impl/ObjectConverterImpl.java query/Filter.java query/impl/FilterImpl.java
Date Fri, 17 Oct 2008 07:33:19 GMT
Author: clombart
Date: Fri Oct 17 00:33:18 2008
New Revision: 705496

URL: http://svn.apache.org/viewvc?rev=705496&view=rev
Log:
Apply patch provided by Boni Gopalan for issue JCR-1816 (Provide more options for OCM CRUD
API Writers to enhance the functionality).

Modified:
    jackrabbit/trunk/jackrabbit-ocm/src/main/java/org/apache/jackrabbit/ocm/manager/objectconverter/ObjectConverter.java
    jackrabbit/trunk/jackrabbit-ocm/src/main/java/org/apache/jackrabbit/ocm/manager/objectconverter/impl/ObjectConverterImpl.java
    jackrabbit/trunk/jackrabbit-ocm/src/main/java/org/apache/jackrabbit/ocm/query/Filter.java
    jackrabbit/trunk/jackrabbit-ocm/src/main/java/org/apache/jackrabbit/ocm/query/impl/FilterImpl.java

Modified: jackrabbit/trunk/jackrabbit-ocm/src/main/java/org/apache/jackrabbit/ocm/manager/objectconverter/ObjectConverter.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-ocm/src/main/java/org/apache/jackrabbit/ocm/manager/objectconverter/ObjectConverter.java?rev=705496&r1=705495&r2=705496&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-ocm/src/main/java/org/apache/jackrabbit/ocm/manager/objectconverter/ObjectConverter.java
(original)
+++ jackrabbit/trunk/jackrabbit-ocm/src/main/java/org/apache/jackrabbit/ocm/manager/objectconverter/ObjectConverter.java
Fri Oct 17 00:33:18 2008
@@ -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);
 
 }

Modified: jackrabbit/trunk/jackrabbit-ocm/src/main/java/org/apache/jackrabbit/ocm/manager/objectconverter/impl/ObjectConverterImpl.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-ocm/src/main/java/org/apache/jackrabbit/ocm/manager/objectconverter/impl/ObjectConverterImpl.java?rev=705496&r1=705495&r2=705496&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-ocm/src/main/java/org/apache/jackrabbit/ocm/manager/objectconverter/impl/ObjectConverterImpl.java
(original)
+++ jackrabbit/trunk/jackrabbit-ocm/src/main/java/org/apache/jackrabbit/ocm/manager/objectconverter/impl/ObjectConverterImpl.java
Fri Oct 17 00:33:18 2008
@@ -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) {

Modified: jackrabbit/trunk/jackrabbit-ocm/src/main/java/org/apache/jackrabbit/ocm/query/Filter.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-ocm/src/main/java/org/apache/jackrabbit/ocm/query/Filter.java?rev=705496&r1=705495&r2=705496&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-ocm/src/main/java/org/apache/jackrabbit/ocm/query/Filter.java
(original)
+++ jackrabbit/trunk/jackrabbit-ocm/src/main/java/org/apache/jackrabbit/ocm/query/Filter.java
Fri Oct 17 00:33:18 2008
@@ -97,6 +97,7 @@
 	Filter addJCRExpression(String jcrExpression);
 	
     Class getFilterClass();
+    Object clone();
 	
 
 }

Modified: jackrabbit/trunk/jackrabbit-ocm/src/main/java/org/apache/jackrabbit/ocm/query/impl/FilterImpl.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-ocm/src/main/java/org/apache/jackrabbit/ocm/query/impl/FilterImpl.java?rev=705496&r1=705495&r2=705496&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-ocm/src/main/java/org/apache/jackrabbit/ocm/query/impl/FilterImpl.java
(original)
+++ jackrabbit/trunk/jackrabbit-ocm/src/main/java/org/apache/jackrabbit/ocm/query/impl/FilterImpl.java
Fri Oct 17 00:33:18 2008
@@ -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()



Mime
View raw message