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 ab5d0e9b2 [OPENMEETINGS-2780] spring, tomcat, prometheus, MySql, Tika,
logback; Some instructions
ab5d0e9b2 is described below
commit ab5d0e9b28a12c55e3b33faf850e73845e995249
Author: Maxim Solodovnik <[email protected]>
AuthorDate: Sun Oct 20 12:57:58 2024 +0700
[OPENMEETINGS-2780] spring, tomcat, prometheus, MySql, Tika, logback; Some
instructions
---
.../src/main/assembly/conf/server.xml | 10 ++--
openmeetings-server/src/main/assembly/conf/web.xml | 56 ++++++++++------------
.../src/site/markdown/ExternalVideo.md | 23 +++++++++
pom.xml | 12 ++---
4 files changed, 59 insertions(+), 42 deletions(-)
diff --git a/openmeetings-server/src/main/assembly/conf/server.xml
b/openmeetings-server/src/main/assembly/conf/server.xml
index 9564df641..89cce84f4 100644
--- a/openmeetings-server/src/main/assembly/conf/server.xml
+++ b/openmeetings-server/src/main/assembly/conf/server.xml
@@ -24,8 +24,10 @@
<!-- Security listener. Documentation at /docs/config/listeners.html
<Listener className="org.apache.catalina.security.SecurityListener" />
-->
- <!-- APR library loader. Documentation at /docs/apr.html -->
- <Listener className="org.apache.catalina.core.AprLifecycleListener"
SSLEngine="on" />
+ <!-- OpenSSL support using Tomcat Native -->
+ <Listener className="org.apache.catalina.core.AprLifecycleListener" />
+ <!-- OpenSSL support using FFM API from Java 22 -->
+ <!-- <Listener className="org.apache.catalina.core.OpenSSLLifecycleListener"
/> -->
<!-- Prevent memory leaks due to use of particular java/javax APIs-->
<Listener
className="org.apache.catalina.core.JreMemoryLeakPreventionListener" />
<Listener
className="org.apache.catalina.mbeans.GlobalResourcesLifecycleListener" />
@@ -94,12 +96,12 @@
</SSLHostConfig>
</Connector>
<!--
- <Connector port="5443"
protocol="org.apache.coyote.http11.Http11NioProtocol"
+ <Connector port="8443"
protocol="org.apache.coyote.http11.Http11NioProtocol"
maxThreads="150" SSLEnabled="true" >
<UpgradeProtocol className="org.apache.coyote.http2.Http2Protocol" />
<SSLHostConfig>
<Certificate certificateKeystoreFile="conf/localhost-rsa.jks"
- type="RSA" />
+ certificateKeystorePassword="changeit" type="RSA" />
</SSLHostConfig>
</Connector>
-->
diff --git a/openmeetings-server/src/main/assembly/conf/web.xml
b/openmeetings-server/src/main/assembly/conf/web.xml
index 87f6c66b0..7eb38e1b0 100644
--- a/openmeetings-server/src/main/assembly/conf/web.xml
+++ b/openmeetings-server/src/main/assembly/conf/web.xml
@@ -19,7 +19,7 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xsi:schemaLocation="https://jakarta.ee/xml/ns/jakartaee
https://jakarta.ee/xml/ns/jakartaee/web-app_6_0.xsd";
- version="6.0">
+ version="6.1">
<!-- ======================== Introduction ============================== -->
<!-- This document defines default values for *all* web applications -->
@@ -78,7 +78,7 @@
<!-- contents. [null] -->
<!-- -->
<!-- sendfileSize If the connector used supports sendfile, this -->
- <!-- represents the minimal file size in KB for -->
+ <!-- represents the minimal file size in KiB for -->
<!-- which sendfile will be used. Use a negative -->
<!-- value to always disable sendfile. [48] -->
<!-- -->
@@ -116,6 +116,11 @@
<!-- headers only valid for GET requests, RFC 9110 -->
<!-- (which obsoletes RFC 7233) now allows partial -->
<!-- puts. [true] -->
+ <!-- -->
+ <!-- directoryRedirectStatusCode -->
+ <!-- Status code to use for directory redirects. -->
+ <!-- Possible values: 301, 302, 307, 308 -->
+ <!-- [302] -->
<servlet>
<servlet-name>default</servlet-name>
@@ -155,9 +160,9 @@
<!-- pages. See the jasper documentation for more -->
<!-- information. -->
<!-- -->
- <!-- compilerSourceVM Compiler source VM. [11] -->
+ <!-- compilerSourceVM Compiler source VM. [17] -->
<!-- -->
- <!-- compilerTargetVM Compiler target VM. [11] -->
+ <!-- compilerTargetVM Compiler target VM. [17] -->
<!-- -->
<!-- development Is Jasper used in development mode? If true, -->
<!-- the frequency at which JSPs are checked for -->
@@ -180,8 +185,6 @@
<!-- engineOptionsClass Allows specifying the Options class used to -->
<!-- configure Jasper. If not present, the default -->
<!-- EmbeddedServletOptions will be used. -->
- <!-- This option is ignored when running under a -->
- <!-- SecurityManager. -->
<!-- -->
<!-- errorOnUseBeanInvalidClassAttribute -->
<!-- Should Jasper issue an error when the value of -->
@@ -239,8 +242,6 @@
<!-- scratchdir What scratch directory should we use when -->
<!-- compiling JSP pages? [default work directory -->
<!-- for the current web application] -->
- <!-- This option is ignored when running under a -->
- <!-- SecurityManager. -->
<!-- -->
<!-- suppressSmap Should the generation of SMAP info for JSR45 -->
<!-- debugging be suppressed? [false] -->
@@ -363,7 +364,7 @@
<!-- the arguments to the OS. See the CGI How-To -->
<!-- for more details. The default varies by -->
<!-- platform. -->
- <!-- Windows: [[a-zA-Z0-9\Q-_.\\/:\E]+] -->
+ <!-- Windows: [[\w\Q-.\\/:\E]+] -->
<!-- Others: [.*] -->
<!-- Note that internally the CGI Servlet treats -->
<!-- [.*] as a special case to improve performance -->
@@ -374,7 +375,7 @@
<!-- command line arguments must match else the -->
<!-- request will be rejected. The default matches -->
<!-- the allowed values defined by RFC3875. -->
- <!-- [[a-zA-Z0-9\Q%;/?:@&,$-_.!~*'()\E]+] -->
+ <!-- [[\w\Q%;/?:@&,$-.!~*'()\E]+] -->
<!-- -->
<!-- enableCmdLineArguments -->
<!-- Are command line parameters generated from -->
@@ -521,19 +522,6 @@
</filter>
-->
- <!-- A filter that triggers request parameters parsing and rejects the -->
- <!-- request if some parameters were skipped because of parsing errors or -->
- <!-- request size limitations. -->
-<!--
- <filter>
- <filter-name>failedRequestFilter</filter-name>
- <filter-class>
- org.apache.catalina.filters.FailedRequestFilter
- </filter-class>
- <async-supported>true</async-supported>
- </filter>
--->
-
<!-- NOTE: An SSI Servlet is also available as an alternative SSI -->
<!-- implementation. Use either the Servlet or the Filter but NOT both. -->
@@ -612,14 +600,6 @@
</filter-mapping>
-->
- <!-- The mapping for the Failed Request Filter -->
-<!--
- <filter-mapping>
- <filter-name>failedRequestFilter</filter-name>
- <url-pattern>/*</url-pattern>
- </filter-mapping>
--->
-
<!-- The mapping for the SSI Filter -->
<!--
<filter-mapping>
@@ -1770,6 +1750,10 @@
<extension>ggb</extension>
<mime-type>application/vnd.geogebra.file</mime-type>
</mime-mapping>
+ <mime-mapping>
+ <extension>ggs</extension>
+ <mime-type>application/vnd.geogebra.slides</mime-type>
+ </mime-mapping>
<mime-mapping>
<extension>ggt</extension>
<mime-type>application/vnd.geogebra.tool</mime-type>
@@ -2124,7 +2108,7 @@
</mime-mapping>
<mime-mapping>
<extension>js</extension>
- <mime-type>application/javascript</mime-type>
+ <mime-type>text/javascript</mime-type>
</mime-mapping>
<mime-mapping>
<extension>jsf</extension>
@@ -2474,6 +2458,10 @@
<extension>mjp2</extension>
<mime-type>video/mj2</mime-type>
</mime-mapping>
+ <mime-mapping>
+ <extension>mjs</extension>
+ <mime-type>text/javascript</mime-type>
+ </mime-mapping>
<mime-mapping>
<extension>mk3d</extension>
<mime-type>video/x-matroska</mime-type>
@@ -2912,6 +2900,10 @@
<extension>oprc</extension>
<mime-type>application/vnd.palm</mime-type>
</mime-mapping>
+ <mime-mapping>
+ <extension>opus</extension>
+ <mime-type>audio/ogg</mime-type>
+ </mime-mapping>
<mime-mapping>
<extension>org</extension>
<mime-type>application/vnd.lotus-organizer</mime-type>
diff --git a/openmeetings-server/src/site/markdown/ExternalVideo.md
b/openmeetings-server/src/site/markdown/ExternalVideo.md
index 4ce937ff0..e60123b67 100644
--- a/openmeetings-server/src/site/markdown/ExternalVideo.md
+++ b/openmeetings-server/src/site/markdown/ExternalVideo.md
@@ -4,6 +4,29 @@ Licensed under the Apache License, Version 2.0 (the "License")
http://www.apache
# External Video/Camera
+## Create and use Fake video camera
+
+#### Create fake video device
+```
+sudo modprobe v4l2loopback max_buffers=2 devices=1 video_nr=21
exclusive_caps=1 card_label="Virtual Webcam"
+```
+
+#### Create stream from **Image**
+```
+sudo ffmpeg -stream_loop -1 -re -i ~/Downloads/om/img/IMG_20210207_135607.jpg
-pix_fmt yuv420p -vcodec rawvideo -f v4l2 /dev/video21
+```
+
+#### Create stream from **Video**
+```
+sudo ffmpeg -stream_loop -1 -re -i ~/Downloads/om/video/Avengers2.mp4 -pix_fmt
yuv420p -vcodec rawvideo -f v4l2 /dev/video21
+```
+
+#### Clean everything up
+
+ 1. Stop ffmpeg process
+ 2. `sudo modprobe -r v4l2loopback`
+
+
## Connecting external video source
<div class="bd-callout bd-callout-danger">
diff --git a/pom.xml b/pom.xml
index 76915b21b..9d9a7719c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -88,12 +88,12 @@
<wicketstuff.version>10.2.0</wicketstuff.version>
<wicket-bootstrap.version>7.0.8</wicket-bootstrap.version>
<fullcalendar.version>6.1.14</fullcalendar.version>
- <spring.version>6.1.13</spring.version>
- <tomcat.version>10.1.31</tomcat.version>
+ <spring.version>6.1.14</spring.version>
+ <tomcat.version>11.0.0</tomcat.version>
<jetty.version>11.0.24</jetty.version>
<ical4j.version>4.0.4</ical4j.version>
<cxf.version>4.0.5</cxf.version>
- <io.prometheus.version>1.3.1</io.prometheus.version>
+ <io.prometheus.version>1.3.2</io.prometheus.version>
<aspectjtools.version>1.9.22.1</aspectjtools.version>
<simple-xml.version>2.7.1</simple-xml.version>
<jettison.version>1.5.4</jettison.version>
@@ -118,16 +118,16 @@
<commons-net.version>3.11.1</commons-net.version>
<dom4j.version>2.1.4</dom4j.version>
<postgresql.version>42.7.4</postgresql.version>
- <mysql.version>9.0.0</mysql.version>
+ <mysql.version>9.1.0</mysql.version>
<mssql.version>12.8.1.jre11</mssql.version>
<ojdbc.version>19.24.0.0</ojdbc.version>
<xstream.version>1.4.20</xstream.version>
<api-all.version>2.1.7</api-all.version>
<caldav4j.version>1.0.5</caldav4j.version>
<jackrabbit-webdav.version>2.21.22</jackrabbit-webdav.version>
- <tika-parsers.version>3.0.0-BETA2</tika-parsers.version>
+ <tika-parsers.version>3.0.0</tika-parsers.version>
<slf4j.version>2.0.16</slf4j.version>
- <logback.version>1.5.9</logback.version>
+ <logback.version>1.5.11</logback.version>
<license.excludedScopes>test</license.excludedScopes>
<bcprov.version>1.78.1</bcprov.version>
<mockito.version>5.2.0</mockito.version>
