diff --git a/openbis/.classpath b/openbis/.classpath
index a9dc0943d61964cb9e3a983a82855007aa7c7104..000cdc62729afefb1737f99ad6a33f91664f787f 100644
--- a/openbis/.classpath
+++ b/openbis/.classpath
@@ -1,42 +1,45 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="src" path="source/java"/>
-	<classpathentry kind="src" path="sourceTest/java"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
-	<classpathentry combineaccessrules="false" kind="src" path="/authentication"/>
-	<classpathentry combineaccessrules="false" kind="src" path="/common"/>
-	<classpathentry kind="lib" path="/libraries/gwt1.5/gwt-user.jar"/>
-	<classpathentry combineaccessrules="false" kind="src" path="/server-common"/>
-	<classpathentry kind="lib" path="/libraries/testng/testng-jdk15.jar" sourcepath="/libraries/testng/src.zip"/>
-	<classpathentry kind="lib" path="/libraries/ext-gwt/gxt.jar">
-		<attributes>
-			<attribute name="javadoc_location" value="jar:platform:/resource/libraries/ext-gwt/gxt-api.zip!/"/>
-		</attributes>
-	</classpathentry>
-	<classpathentry kind="lib" path="/libraries/log4j/log4j.jar" sourcepath="/libraries/log4j/src.zip"/>
-	<classpathentry kind="lib" path="/libraries/spring/spring.jar" sourcepath="/libraries/spring/src.jar"/>
-	<classpathentry kind="lib" path="/libraries/spring/webmvc/spring-webmvc.jar" sourcepath="/libraries/spring/webmvc/src.jar"/>
-	<classpathentry kind="lib" path="/libraries/commons-lang/commons-lang.jar" sourcepath="/libraries/commons-lang/src.zip"/>
-	<classpathentry kind="lib" path="/libraries/restrictionchecker/restrictions.jar"/>
-	<classpathentry combineaccessrules="false" kind="src" path="/dbmigration"/>
-	<classpathentry kind="lib" path="/libraries/jmock/hamcrest/hamcrest-core.jar"/>
-	<classpathentry kind="lib" path="/libraries/jmock/hamcrest/hamcrest-library.jar"/>
-	<classpathentry kind="lib" path="/libraries/jmock/objenesis/objenesis-1.0.jar"/>
-	<classpathentry kind="lib" path="/libraries/jmock/jmock.jar"/>
-	<classpathentry kind="lib" path="/libraries/hibernate-annotations/ejb3-persistence.jar"/>
-	<classpathentry kind="lib" path="/libraries/hibernate-annotations/hibernate-annotations.jar" sourcepath="/libraries/hibernate-annotations/src.zip"/>
-	<classpathentry kind="lib" path="/libraries/hibernate-validator/hibernate-validator.jar" sourcepath="/libraries/hibernate-validator/src.zip"/>
-	<classpathentry kind="lib" path="/libraries/commons-io/commons-io.jar" sourcepath="/libraries/commons-io/src.zip"/>
-	<classpathentry kind="lib" path="/libraries/hibernate/hibernate3.jar" sourcepath="/libraries/hibernate/src.zip"/>
-	<classpathentry kind="lib" path="/libraries/hibernate/jta/jta.jar"/>
-	<classpathentry kind="lib" path="/libraries/commons-logging/commons-logging.jar" sourcepath="/libraries/commons-logging/src.zip"/>
-	<classpathentry kind="lib" path="/libraries/hibernate-annotations/hibernate-commons-annotations.jar"/>
-	<classpathentry kind="lib" path="/libraries/dom4j/dom4j.jar"/>
-	<classpathentry kind="lib" path="/libraries/antlr/antlr.jar"/>
-	<classpathentry kind="lib" path="/libraries/slf4j/slf4j.jar" sourcepath="/libraries/slf4j/src.jar"/>
-	<classpathentry kind="lib" path="/libraries/slf4j/log4j12/slf4j-log4j12.jar" sourcepath="/libraries/slf4j/log4j12/src.jar"/>
-	<classpathentry kind="lib" path="/libraries/spring/test/spring-test.jar" sourcepath="/libraries/spring/test/src.jar"/>
-	<classpathentry kind="lib" path="/libraries/commons-collections/commons-collections.jar" sourcepath="/libraries/commons-collections/src.jar"/>
-	<classpathentry kind="lib" path="/libraries/junit/junit.jar"/>
-	<classpathentry kind="output" path="targets/classes"/>
-</classpath>
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+	<classpathentry kind="src" path="source/java"/>
+	<classpathentry kind="src" path="sourceTest/java"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+	<classpathentry combineaccessrules="false" kind="src" path="/authentication"/>
+	<classpathentry combineaccessrules="false" kind="src" path="/common"/>
+	<classpathentry kind="lib" path="/libraries/gwt1.5/gwt-user.jar"/>
+	<classpathentry combineaccessrules="false" kind="src" path="/server-common"/>
+	<classpathentry kind="lib" path="/libraries/testng/testng-jdk15.jar" sourcepath="/libraries/testng/src.zip"/>
+	<classpathentry kind="lib" path="/libraries/ext-gwt/gxt.jar">
+		<attributes>
+			<attribute name="javadoc_location" value="jar:platform:/resource/libraries/ext-gwt/gxt-api.zip!/"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry kind="lib" path="/libraries/log4j/log4j.jar" sourcepath="/libraries/log4j/src.zip"/>
+	<classpathentry kind="lib" path="/libraries/spring/spring.jar" sourcepath="/libraries/spring/src.jar"/>
+	<classpathentry kind="lib" path="/libraries/spring/webmvc/spring-webmvc.jar" sourcepath="/libraries/spring/webmvc/src.jar"/>
+	<classpathentry kind="lib" path="/libraries/commons-lang/commons-lang.jar" sourcepath="/libraries/commons-lang/src.zip"/>
+	<classpathentry kind="lib" path="/libraries/restrictionchecker/restrictions.jar"/>
+	<classpathentry combineaccessrules="false" kind="src" path="/dbmigration"/>
+	<classpathentry kind="lib" path="/libraries/jmock/hamcrest/hamcrest-core.jar"/>
+	<classpathentry kind="lib" path="/libraries/jmock/hamcrest/hamcrest-library.jar"/>
+	<classpathentry kind="lib" path="/libraries/jmock/objenesis/objenesis-1.0.jar"/>
+	<classpathentry kind="lib" path="/libraries/jmock/jmock.jar"/>
+	<classpathentry kind="lib" path="/libraries/hibernate-annotations/ejb3-persistence.jar"/>
+	<classpathentry kind="lib" path="/libraries/hibernate-annotations/hibernate-annotations.jar" sourcepath="/libraries/hibernate-annotations/src.zip"/>
+	<classpathentry kind="lib" path="/libraries/hibernate-validator/hibernate-validator.jar" sourcepath="/libraries/hibernate-validator/src.zip"/>
+	<classpathentry kind="lib" path="/libraries/commons-io/commons-io.jar" sourcepath="/libraries/commons-io/src.zip"/>
+	<classpathentry kind="lib" path="/libraries/hibernate/hibernate3.jar" sourcepath="/libraries/hibernate/src.zip"/>
+	<classpathentry kind="lib" path="/libraries/hibernate/jta/jta.jar"/>
+	<classpathentry kind="lib" path="/libraries/commons-logging/commons-logging.jar" sourcepath="/libraries/commons-logging/src.zip"/>
+	<classpathentry kind="lib" path="/libraries/hibernate-annotations/hibernate-commons-annotations.jar"/>
+	<classpathentry kind="lib" path="/libraries/dom4j/dom4j.jar"/>
+	<classpathentry kind="lib" path="/libraries/antlr/antlr.jar"/>
+	<classpathentry kind="lib" path="/libraries/slf4j/slf4j.jar" sourcepath="/libraries/slf4j/src.jar"/>
+	<classpathentry kind="lib" path="/libraries/slf4j/log4j12/slf4j-log4j12.jar" sourcepath="/libraries/slf4j/log4j12/src.jar"/>
+	<classpathentry kind="lib" path="/libraries/spring/test/spring-test.jar" sourcepath="/libraries/spring/test/src.jar"/>
+	<classpathentry kind="lib" path="/libraries/commons-collections/commons-collections.jar" sourcepath="/libraries/commons-collections/src.jar"/>
+	<classpathentry kind="lib" path="/libraries/junit/junit.jar"/>
+	<classpathentry kind="lib" path="/libraries/hibernate-search/hibernate-search.jar"/>
+	<classpathentry kind="lib" path="/libraries/hibernate-search/jms.jar"/>
+	<classpathentry kind="lib" path="/libraries/hibernate-search/lucene-core-2.3.0.jar"/>
+	<classpathentry kind="output" path="targets/classes"/>
+</classpath>
diff --git a/openbis/source/java/genericApplicationContext.xml b/openbis/source/java/genericApplicationContext.xml
index 383fc343e17c1e2f38edfc4b502cb62709251d9f..d4c1a6a97468d5b03098718bfc7fd588fd4a9ff2 100644
--- a/openbis/source/java/genericApplicationContext.xml
+++ b/openbis/source/java/genericApplicationContext.xml
@@ -78,7 +78,10 @@
         </property>
         <property name="hibernateProperties">
             <props>
-              <!--   
+            <!-- 
+                <prop key="hibernate.search.default.indexBase">./targets/indexes</prop> 
+                <prop key="hibernate.search.default.directory_provider">org.hibernate.search.store.FSDirectoryProvider</prop>
+             
                 <prop key="hibernate.show_sql">true</prop>
                 <prop key="hibernate.format_sql">true</prop>
                 <prop key="hibernate.cache.use_query_cache">true</prop>