Merge remote-tracking branch 'origin/OpenOLAT_15.1'

pom.xml

@@ -63,7 +63,7 @@
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 		<targetJdk>1.8</targetJdk>
 		<org.springframework.version>5.2.8.RELEASE</org.springframework.version>
-		<org.hibernate.version>5.4.18.Final</org.hibernate.version>
+		<org.hibernate.version>5.4.19.Final</org.hibernate.version>
 		<apache.cxf>3.3.7</apache.cxf>
 		<apache.pdfbox>2.0.20</apache.pdfbox>
 		<apache.poi>4.1.2</apache.poi>
@@ -98,7 +98,6 @@
 	    <test.env.db.oracle.host>localhost</test.env.db.oracle.host>
 	    <test.env.db.oracle.host.port>1521</test.env.db.oracle.host.port>
 	    <test.env.instance.id>myolat</test.env.instance.id>
-	    <test.env.jmx.rmi.port.0>3000</test.env.jmx.rmi.port.0>
 	    <test.env.webdriver.browser>chrome</test.env.webdriver.browser>
 	    <test.env.webdriver.firefox.version>v0.27.0</test.env.webdriver.firefox.version>
 	    <test.env.webdriver.chrome.version>84.0.4147.30</test.env.webdriver.chrome.version>
@@ -1325,7 +1324,6 @@
 						<test.env.db.postgresql.pass>${test.env.db.postgresql.pass}</test.env.db.postgresql.pass>
 						<test.env.db.postgresql.host.port>${test.env.db.postgresql.host.port}</test.env.db.postgresql.host.port>
 						<test.env.instance.id>${test.env.instance.id}</test.env.instance.id>
-						<test.env.jmx.rmi.port.0>${test.env.jmx.rmi.port.0}</test.env.jmx.rmi.port.0>
 						<arquillian.launch>tomcat-7-managed</arquillian.launch>
 						<webdriver.browser>${test.env.webdriver.browser}</webdriver.browser>
 						<webdriver.firefox.version>${test.env.webdriver.firefox.version}</webdriver.firefox.version>

src/main/java/org/olat/core/commons/services/jmx/_spring/jmxContext.xml

@@ -12,9 +12,5 @@
 	<bean id="org.springframework.jmx.support.MBeanServerFactoryBean" class="org.springframework.jmx.support.MBeanServerFactoryBean">
 		<property name="locateExistingServerIfPossible" value="true" />
 	</bean>
-	
-	<bean id="registry" class="org.springframework.remoting.rmi.RmiRegistryFactoryBean" lazy-init="true">
-	  <property name="port" value="${jmx.rmi.port}"/>
-	</bean>	
 
 </beans>

src/main/resources/serviceconfig/olat.properties

@@ -649,8 +649,6 @@ mobile.context=/mobile
 server.domainname=localhost
 # the port on which the container is listening
 server.port=8080
-# OLAT JMX server port (must be unique per node in a cluster)
-jmx.rmi.port=3000
 
 ########################################################################
 # MathJAX CDN
@@ -1112,10 +1110,10 @@ certificate.broker.url=vm://embedded?broker.persistent=false
 
 #if you use the jndi connection
 jms.broker.jndi=OpenOLATConnectionFactory
-sysbus.broker.jndi=topic/sysbus
-search.broker.jndi=queue/searchQueue
-index.broker.jndi=queue/indexQueue
-certificate.broker.jndi=queue/certificateQueue
+sysbus.broker.jndi=topic/sysbus&broker.useJmx=false
+search.broker.jndi=queue/searchQueue&broker.useJmx=false
+index.broker.jndi=queue/indexQueue&broker.useJmx=false
+certificate.broker.jndi=queue/certificateQueue&broker.useJmx=false
 
 #####
 #query cache config for singlevm/cluster

src/test/profile/mysql/olat.local.properties

@@ -31,7 +31,6 @@ keepUserLoginAfterDeletion=true
 
 # do not run upgrades and scheduled jobs and such
 cluster.singleton.services = disabled
-jmx.rmi.port=${test.env.jmx.rmi.port.0:1009}
 
 # SingleVM jms.broker.url
 jms.broker.url=vm://embedded?broker.persistent=false

src/test/profile/oracle/olat.local.properties

@@ -31,7 +31,6 @@ keepUserLoginAfterDeletion=true
 
 # do not run upgrades and scheduled jobs and such
 cluster.singleton.services = disabled
-jmx.rmi.port=${test.env.jmx.rmi.port.0:1009}
 
 # SingleVM jms.broker.url
 jms.broker.url=vm://embedded?broker.persistent=false

src/test/profile/postgresql/olat.local.properties

@@ -31,7 +31,6 @@ keepUserLoginAfterDeletion=true
 
 # do not run upgrades and scheduled jobs and such
 cluster.singleton.services = disabled
-jmx.rmi.port=${test.env.jmx.rmi.port.0:1009}
 
 # SingleVM jms.broker.url
 jms.broker.url=vm://embedded?broker.persistent=false