[Hibernate-commits] Hibernate Code SVN: r10077 - trunk/HibernateExt/metadata/src/java/org/hibernate/lucene/store

[<hib...@li...>]

Author: epbernard
Date: 2006-07-01 13:18:12 -0400 (Sat, 01 Jul 2006)
New Revision: 10077

Modified:
   trunk/HibernateExt/metadata/src/java/org/hibernate/lucene/store/DirectoryProvider.java
   trunk/HibernateExt/metadata/src/java/org/hibernate/lucene/store/DirectoryProviderFactory.java
   trunk/HibernateExt/metadata/src/java/org/hibernate/lucene/store/FSDirectoryProvider.java
Log:
ANN-385 abstract lucene directory.
Add sylvain as contributor, move ...impl to ...directory_provider

Modified: trunk/HibernateExt/metadata/src/java/org/hibernate/lucene/store/DirectoryProvider.java
===================================================================
--- trunk/HibernateExt/metadata/src/java/org/hibernate/lucene/store/DirectoryProvider.java	2006-07-01 15:11:45 UTC (rev 10076)
+++ trunk/HibernateExt/metadata/src/java/org/hibernate/lucene/store/DirectoryProvider.java	2006-07-01 17:18:12 UTC (rev 10077)
@@ -12,7 +12,9 @@
  * <code>equals()</code> and <code>hashCode()</code> must guaranty to
  * return true for a provider pointing to the same underlying Lucene Store
  * This class must be thread safe regarding <code>getDirectory()</code>
+ *
  * @author Emmanuel Bernard
+ * @author Sylvain Vieujot
  */
 public interface DirectoryProvider<TDirectory extends Directory> {
 	/** get the information toi initialize the directory and build its hashCode */

Modified: trunk/HibernateExt/metadata/src/java/org/hibernate/lucene/store/DirectoryProviderFactory.java
===================================================================
--- trunk/HibernateExt/metadata/src/java/org/hibernate/lucene/store/DirectoryProviderFactory.java	2006-07-01 15:11:45 UTC (rev 10076)
+++ trunk/HibernateExt/metadata/src/java/org/hibernate/lucene/store/DirectoryProviderFactory.java	2006-07-01 17:18:12 UTC (rev 10077)
@@ -15,12 +15,19 @@
 /**
  * Create a Lucene directory provider
  * <p/>
- * Lucene directory providers are configured through...
- * hibernate.lucene.default.impl=FSDirectory
- * hibernate.lucene.toto.impl=FSDirectory
- * hibernate.lucene.toto.*=
+ * Lucene directory providers are configured through properties
+ *   - hibernate.lucene.default.* and
+ *   - hibernate.lucene.<indexname>.*
  *
+ * <indexname> properties have precedence over default
+ *
+ * The implementation is described by
+ * hibernate.lucene.[default|indexname].directory_provider
+ *
+ * If none is defined the default value is FSDirectory
+ *
  * @author Emmanuel Bernard
+ * @author Sylvain Vieujot
  */
 public class DirectoryProviderFactory {
 	public List<DirectoryProvider> providers = new ArrayList<DirectoryProvider>();
@@ -35,7 +42,7 @@
 		Properties indexProps = getDirectoryProperties( cfg, entity );
 
 		//set up the directory
-		String className = indexProps.getProperty( "impl" );
+		String className = indexProps.getProperty( "directory_provider" );
 		if ( StringHelper.isEmpty( className ) ) {
 			className = DEFAULT_DIRECTORY_PROVIDER;
 		}

Modified: trunk/HibernateExt/metadata/src/java/org/hibernate/lucene/store/FSDirectoryProvider.java
===================================================================
--- trunk/HibernateExt/metadata/src/java/org/hibernate/lucene/store/FSDirectoryProvider.java	2006-07-01 15:11:45 UTC (rev 10076)
+++ trunk/HibernateExt/metadata/src/java/org/hibernate/lucene/store/FSDirectoryProvider.java	2006-07-01 17:18:12 UTC (rev 10077)
@@ -19,7 +19,9 @@
  * Use a Lucene FSDirectory
  * The base directory is represented by hibernate.lucene.<index>.indexBase
  * The index is created in <base directory>/<index name>
+ *
  * @author Emmanuel Bernard
+ * @author Sylvain Vieujot
  */
 public class FSDirectoryProvider implements DirectoryProvider {
 	private FSDirectory directory;