You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openmeetings.apache.org by so...@apache.org on 2018/10/05 07:47:51 UTC

[openmeetings] branch master updated: [OPENMEETINGS-1859] redundant dependency is removed

This is an automated email from the ASF dual-hosted git repository.

solomax pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/openmeetings.git


The following commit(s) were added to refs/heads/master by this push:
     new 8de7fbd  [OPENMEETINGS-1859] redundant dependency is removed
8de7fbd is described below

commit 8de7fbd4e5f076e4a2cea732b2eeea879fde5ee6
Author: Maxim Solodovnik <so...@gmail.com>
AuthorDate: Fri Oct 5 14:47:30 2018 +0700

    [OPENMEETINGS-1859] redundant dependency is removed
---
 openmeetings-web/pom.xml                                     |  5 -----
 .../src/main/webapp/WEB-INF/classes/applicationContext.xml   | 12 ++++++------
 pom.xml                                                      |  1 -
 3 files changed, 6 insertions(+), 12 deletions(-)

diff --git a/openmeetings-web/pom.xml b/openmeetings-web/pom.xml
index 1033e00..8ff7e9f 100644
--- a/openmeetings-web/pom.xml
+++ b/openmeetings-web/pom.xml
@@ -715,11 +715,6 @@
 			<scope>test</scope>
 		</dependency>
 		<dependency>
-			<groupId>org.apache.pdfbox</groupId>
-			<artifactId>pdfbox</artifactId>
-			<version>${pdfbox.version}</version>
-		</dependency>
-		<dependency>
 			<groupId>org.apache.tomcat.embed</groupId>
 			<artifactId>tomcat-embed-websocket</artifactId>
 			<version>${tomcat.version}</version>
diff --git a/openmeetings-web/src/main/webapp/WEB-INF/classes/applicationContext.xml b/openmeetings-web/src/main/webapp/WEB-INF/classes/applicationContext.xml
index 8199493..b9b33cc 100644
--- a/openmeetings-web/src/main/webapp/WEB-INF/classes/applicationContext.xml
+++ b/openmeetings-web/src/main/webapp/WEB-INF/classes/applicationContext.xml
@@ -140,12 +140,12 @@
 
 	<!-- Kurento -->
 	<bean id="kurentoHandler" class="org.apache.openmeetings.core.remote.KurentoHandler" init-method="init" destroy-method="destroy"
-			p:kurentoWsUrl="ws://127.0.0.1:8888/kurento"
-			p:turnUrl=""
-			p:turnUser=""
-			p:turnSecret=""
+			p:kurentoWsUrl="ws://209.188.14.137:8888/kurento"
+			p:turnUrl="209.188.14.137:3478"
+			p:turnUser="solo-work"
+			p:turnSecret="t2DgV3NMQyRKj4SOH7"
 			p:turnMode="rest"
-			p:turnTtl="3600"
-			p:checkTimeout="200"
+			p:turnTtl="60"
+			p:checkTimeout="500"
 			/>
 </beans>
diff --git a/pom.xml b/pom.xml
index 898c89f..3e84b47 100644
--- a/pom.xml
+++ b/pom.xml
@@ -100,7 +100,6 @@
 		<commons-io.version>2.6</commons-io.version>
 		<mysql.version>8.0.11</mysql.version>
 		<mssql.version>6.2.1.jre8</mssql.version>
-		<pdfbox.version>2.0.11</pdfbox.version>
 		<commons-collections4.version>4.2</commons-collections4.version>
 		<xstream.version>1.4.10</xstream.version>
 		<api-all.version>2.0.0.AM2</api-all.version>