From f8ccf20d448f47404d41ecc0aa2b43bee8fa8858 Mon Sep 17 00:00:00 2001
From: srosse <none@none>
Date: Fri, 17 Mar 2017 10:21:58 +0100
Subject: [PATCH] OO-2612: update settings for Wildfly 10.1
---
INSTALL.APPSERVER.README | 10 +++++++---
.../persistence/_spring/databaseCorecontext.xml | 2 +-
src/main/resources/META-INF/persistence.xml | 1 +
.../WEB-INF/jboss-deployment-structure.xml | 1 +
4 files changed, 10 insertions(+), 4 deletions(-)
diff --git a/INSTALL.APPSERVER.README b/INSTALL.APPSERVER.README
index 87acbb40538..b56f05817e1 100644
--- a/INSTALL.APPSERVER.README
+++ b/INSTALL.APPSERVER.README
@@ -15,17 +15,20 @@ To create your eclipse project, use these commands instead of the default one:
for JBoss AS:
mvn eclipse:clean eclipse:eclipse -P-tomcat,wildfly
-Configuration WildFly (JBoss AS 8.0)
+Configuration WildFly (JBoss AS 10.1)
------------------------------------
-1. Define a JDBC connection pool in your standalone.xml configuration with a jndi-name like:
+1. We need Hibernate 5.2, you need to use the utorial to update the version of hibernate
+ in Widlfly: http://docs.jboss.org/hibernate/orm/5.2/topical/html_single/wildfly/Wildfly.html
+
+2. Define a JDBC connection pool in your standalone.xml configuration with a jndi-name like:
java:jboss/datasources/OpenOLATDS and set this JNDI name
in olat.local.properties set the following properties:
db.source=jndi
db.jndi=java:jboss/datasources/OpenOLATDS
cluster.mode=Cluster
The cluster mode will disable the hibernate cache
-2. Create a queue with a jndi-name like:
+3. Create a queue with a jndi-name like:
java:jboss/exported/jms/queue/searchQueue
and a topic:
java:jboss/exported/jms/topic/sysbus
@@ -36,6 +39,7 @@ Configuration WildFly (JBoss AS 8.0)
search.broker.jndi=java:jboss/exported/jms/queue/searchQueue
index.broker.jndi=java:jboss/exported/jms/queue/indexQueue
exam.broker.jndi=java:jboss/exported/jms/queue/examQueue
+ certificate.broker.jndi=java:jboss/exported/jms/queue/certificateQueue
Features located on the application server
diff --git a/src/main/java/org/olat/core/commons/persistence/_spring/databaseCorecontext.xml b/src/main/java/org/olat/core/commons/persistence/_spring/databaseCorecontext.xml
index 4f8a23e9262..5a211cd82fc 100644
--- a/src/main/java/org/olat/core/commons/persistence/_spring/databaseCorecontext.xml
+++ b/src/main/java/org/olat/core/commons/persistence/_spring/databaseCorecontext.xml
@@ -149,7 +149,7 @@
<props>
<prop key="hibernate.cache.use_query_cache">true</prop>
<prop key="hibernate.cache.use_second_level_cache">true</prop>
- <prop key="hibernate.cache.region.factory_class">org.jboss.as.jpa.hibernate4.infinispan.InfinispanRegionFactory</prop>
+ <prop key="hibernate.cache.region.factory_class">org.jboss.as.jpa.hibernate5.infinispan.InfinispanRegionFactory</prop>
<prop key="hibernate.cache.infinispan.statistics">true</prop>
<prop key="hibernate.cache.infinispan.cachemanager">java:jboss/infinispan/container/hibernate</prop>
<prop key="hibernate.transaction.manager_lookup_class">org.hibernate.transaction.JBossTransactionManagerLookup</prop>
diff --git a/src/main/resources/META-INF/persistence.xml b/src/main/resources/META-INF/persistence.xml
index 95f2aa950f6..a8d4cc3605a 100644
--- a/src/main/resources/META-INF/persistence.xml
+++ b/src/main/resources/META-INF/persistence.xml
@@ -200,6 +200,7 @@
<property name="hibernate.max_fetch_depth" value="10"/>
<property name="hibernate.connection.handling_mode" value="DELAYED_ACQUISITION_AND_RELEASE_AFTER_TRANSACTION"/>
<property name="hibernate.session_factory.interceptor" value="org.olat.core.commons.persistence.AuditInterceptor"/>
+ <property name="jboss.as.jpa.providerModule" value="org.hibernate:5.2" />
</properties>
</persistence-unit>
</persistence>
\ No newline at end of file
diff --git a/src/main/webapp-wildfly/WEB-INF/jboss-deployment-structure.xml b/src/main/webapp-wildfly/WEB-INF/jboss-deployment-structure.xml
index 2441b0091b6..e03930329d6 100644
--- a/src/main/webapp-wildfly/WEB-INF/jboss-deployment-structure.xml
+++ b/src/main/webapp-wildfly/WEB-INF/jboss-deployment-structure.xml
@@ -14,6 +14,7 @@
</dependencies>
<exclusions>
<module name="org.slf4j" />
+ <module name="org.javassist" />
<module name="org.apache.commons.logging" />
</exclusions>
</deployment>
--
GitLab