diff --git a/INSTALL.APPSERVER.README b/INSTALL.APPSERVER.README
new file mode 100644
index 0000000000000000000000000000000000000000..59d3eb299cef79cbd60d8c5d87ac396dd8670ac5
--- /dev/null
+++ b/INSTALL.APPSERVER.README
@@ -0,0 +1,37 @@
+
+EXPERIMENTAL: Setting up latest OpenOLAT version on Eclipse With an Application Server
+--------------------------------------------------------------------------------------
+
+OpenOLAT supports only Tomcat officially, but it can also run on other application
+servers like JBoss AS or Glassfish.
+
+The beginning of the installation is the same as Tomcat, it's described in INSTALL.README.
+To create your eclipse project, use these commands instead of the default one:
+
+for JBoss AS:
+  mvn eclipse:clean eclipse:eclipse -P-tomcat,jbossas
+  
+and for Glassfish
+  mvn eclipse:clean eclipse:eclipse -P-tomcat,gae
+  
+
+I use a JBoss AS 7.1 with Hibernate upgraded to the latest version and Glassfish 3.1.2.2
+community version. I created in them a JDBC connection Pool, a JMS connection factory
+(which already exists in JBoss) and a topic for the sysbus and a queue for the search.
+
+
+With this setup, OpenOLAT use the JDBC connection pool of your application server, the JMS
+server and its JAX-RS implementation. JBoss delivers Hibernate too.
+
+
+Features located on the application server:
+OK JDBC Connections
+OK JMS
+OK JAX-RS (restapi)
+x  JAX-WS (onyx, vitero)
+x  Mail
+x  LDAP Connection
+-- Hibernate/JPA (only JBoss because we depend on Hibernate)
+x  Infinispan for caching
+
+
diff --git a/src/main/java/org/olat/search/_spring/searchContext.xml b/src/main/java/org/olat/search/_spring/searchContext.xml
index aae546a87cfd278adf819ac43de95ddc758cffcf..b3925523df03e5671d64f6a4591b55bf401d4c24 100644
--- a/src/main/java/org/olat/search/_spring/searchContext.xml
+++ b/src/main/java/org/olat/search/_spring/searchContext.xml
@@ -258,7 +258,7 @@
 	<!-- SEARCH PROXY SIDE CONFIGURATION -->
 	<!-- =============================== -->
 	<!-- OO-109: bypass the JMS server in no-cluster environment ==> use searchClientLocal if singleVM -->	
-	<alias alias="searchClient" name="searchClientCluster"/>
+	<alias alias="searchClient" name="searchClient${cluster.mode}"/>
 
 	<bean id="searchClientSingleVM" class="org.olat.search.service.searcher.SearchClientLocal"/>
 	
@@ -274,20 +274,4 @@
 
 	<import resource="classpath:org/olat/search/_spring/searchJms_${jms.provider}.xml" />
 
-	<!-- JMS Stuff -->
-	<alias alias="searchConnectionFactory" name="searchConnectionFactory.${jms.provider}"/>
-	<!--  <bean id="searchConnectionFactory.activemq" class="org.apache.activemq.spring.ActiveMQConnectionFactory" lazy-init="true">
-		<property name="brokerURL" value="${search.broker.url}" /> 
-	</bean>  -->
-	<bean name="searchConnectionFactory.jndi" class="org.springframework.jndi.JndiObjectFactoryBean" lazy-init="true">
-        <property name="jndiName"><value>java:/ConnectionFactory</value></property>
-    </bean>
-    
-	<alias alias="searchQueue" name="searchQueue.${jms.provider}"/>
-	<!-- <bean id="searchQueue.activemq" class="org.apache.activemq.command.ActiveMQQueue" lazy-init="true">
-		<constructor-arg value="olat/searchQueue" />
-	</bean> -->
-    <bean id="searchQueue.jndi" class="org.springframework.jndi.JndiObjectFactoryBean" lazy-init="true">
-		<property name="jndiName"><value>java:jboss/exported/jms/queue/searchQueue</value></property>
-	</bean>
 </beans>