[hibernate-commits] Hibernate SVN: r14329 - in search/trunk: src/java/org/hibernate/search and 1 other directories.

Author: epbernard Date: 2008-02-11 00:18:30 -0500 (Mon, 11 Feb 2008) New Revision: 14329 Modified: search/trunk/build.xml search/trunk/ivy.xml search/trunk/src/java/org/hibernate/search/Version.java search/trunk/src/java/org/hibernate/search/store/FSDirectoryProvider.java search/trunk/src/java/org/hibernate/search/store/FSMasterDirectoryProvider.java search/trunk/src/java/org/hibernate/search/store/FSSlaveDirectoryProvider.java Log: HSEARCH-130 better log info on Directory creation Modified: search/trunk/build.xml =================================================================== --- search/trunk/build.xml 2008-02-11 04:55:53 UTC (rev 14328) +++ search/trunk/build.xml 2008-02-11 05:18:30 UTC (rev 14329) @@ -17,7 +17,7 @@ <!-- Name of project and version, used to create filenames --> <property name="Name" value="Hibernate Search"/> <property name="name" value="hibernate-search"/> - <property name="version" value="3.0.0.GA"/> + <property name="version" value="3.0.1.SNAPSHOT-20080202"/> <property name="javadoc.packagenames" value="org.hibernate.search.*"/> <property name="copy.test" value="true"/> <property name="javac.source" value="1.5"/> Modified: search/trunk/ivy.xml =================================================================== --- search/trunk/ivy.xml 2008-02-11 04:55:53 UTC (rev 14328) +++ search/trunk/ivy.xml 2008-02-11 05:18:30 UTC (rev 14329) @@ -15,5 +15,6 @@ <dependency name="jpa-api" rev="1.0.0.GA" conf="core->default"/> <dependency name="commons-annotations" rev="3.0.0.GA" conf="core->core"/> <dependency name="entitymanager" rev="3.3.1.GA" conf="test->core"/> + <dependency name="annotations" rev="latest" conf="test->core"/> </dependencies> </ivy-module> \ No newline at end of file Modified: search/trunk/src/java/org/hibernate/search/Version.java =================================================================== --- search/trunk/src/java/org/hibernate/search/Version.java 2008-02-11 04:55:53 UTC (rev 14328) +++ search/trunk/src/java/org/hibernate/search/Version.java 2008-02-11 05:18:30 UTC (rev 14329) @@ -10,7 +10,7 @@ * @author Emmanuel Bernard */ public class Version { - public static final String VERSION = "3.0.0.GA"; // + new Date(); + public static final String VERSION = "3.0.1.SNAPSHOT-20080202"; // + new Date(); private static Log log = LogFactory.getLog( Version.class ); static { Modified: search/trunk/src/java/org/hibernate/search/store/FSDirectoryProvider.java =================================================================== --- search/trunk/src/java/org/hibernate/search/store/FSDirectoryProvider.java 2008-02-11 04:55:53 UTC (rev 14328) +++ search/trunk/src/java/org/hibernate/search/store/FSDirectoryProvider.java 2008-02-11 05:18:30 UTC (rev 14329) @@ -8,6 +8,8 @@ import org.apache.lucene.analysis.standard.StandardAnalyzer; import org.apache.lucene.index.IndexWriter; import org.apache.lucene.store.FSDirectory; +import org.apache.commons.logging.LogFactory; +import org.apache.commons.logging.Log; import org.hibernate.HibernateException; import org.hibernate.search.util.DirectoryProviderHelper; import org.hibernate.search.engine.SearchFactoryImplementor; @@ -21,6 +23,7 @@ * @author Sylvain Vieujot */ public class FSDirectoryProvider implements DirectoryProvider<FSDirectory> { + private static Log log = LogFactory.getLog( FSDirectoryProvider.class ); private FSDirectory directory; private String indexName; @@ -28,10 +31,15 @@ File indexDir = DirectoryProviderHelper.determineIndexDir( directoryProviderName, properties ); try { boolean create = !indexDir.exists(); + if (create) { + log.debug( "index directory not found, creating: '" + indexDir.getAbsolutePath() + "'" ); + indexDir.mkdirs(); + } indexName = indexDir.getCanonicalPath(); directory = FSDirectory.getDirectory( indexName ); //this is cheap so it's not done in start() if ( create ) { + log.debug( "Initialize index: '" + indexName + "'" ); IndexWriter iw = new IndexWriter( directory, new StandardAnalyzer(), create ); iw.close(); } Modified: search/trunk/src/java/org/hibernate/search/store/FSMasterDirectoryProvider.java =================================================================== --- search/trunk/src/java/org/hibernate/search/store/FSMasterDirectoryProvider.java 2008-02-11 04:55:53 UTC (rev 14328) +++ search/trunk/src/java/org/hibernate/search/store/FSMasterDirectoryProvider.java 2008-02-11 05:18:30 UTC (rev 14329) @@ -59,12 +59,13 @@ try { boolean create = !indexDir.exists(); if (create) { - log.debug( "Index directory '" + indexName + "' will be initialized"); + log.debug( "index directory not found, creating: '" + indexDir.getAbsolutePath() + "'" ); indexDir.mkdirs(); } indexName = indexDir.getCanonicalPath(); directory = FSDirectory.getDirectory( indexName); if ( create ) { + log.debug( "Initialize index: '" + indexName + "'" ); IndexWriter iw = new IndexWriter( directory, new StandardAnalyzer(), create ); iw.close(); } Modified: search/trunk/src/java/org/hibernate/search/store/FSSlaveDirectoryProvider.java =================================================================== --- search/trunk/src/java/org/hibernate/search/store/FSSlaveDirectoryProvider.java 2008-02-11 04:55:53 UTC (rev 14328) +++ search/trunk/src/java/org/hibernate/search/store/FSSlaveDirectoryProvider.java 2008-02-11 05:18:30 UTC (rev 14329) @@ -60,11 +60,11 @@ log.debug( "Index directory: " + indexDir.getPath() ); try { boolean create = !indexDir.exists(); - indexName = indexDir.getCanonicalPath(); if (create) { + log.debug( "index directory not found, creating: '" + indexDir.getAbsolutePath() + "'" ); indexDir.mkdirs(); - log.debug("Initializing index directory " + indexName); } + indexName = indexDir.getCanonicalPath(); } catch (IOException e) { throw new HibernateException( "Unable to initialize index: " + directoryProviderName, e ); @@ -84,6 +84,7 @@ create = ! subDir.exists(); directory1 = FSDirectory.getDirectory( subDir.getCanonicalPath()); if ( create ) { + log.debug( "Initialize index: '" + subDir.getAbsolutePath() + "'" ); IndexWriter iw = new IndexWriter( directory1, new StandardAnalyzer(), create ); iw.close(); } @@ -92,6 +93,7 @@ create = ! subDir.exists(); directory2 = FSDirectory.getDirectory( subDir.getCanonicalPath()); if ( create ) { + log.debug( "Initialize index: '" + subDir.getAbsolutePath() + "'" ); IndexWriter iw = new IndexWriter( directory2, new StandardAnalyzer(), create ); iw.close(); }