Merge branch 'master' into 7.0.0

Kurento · Jan 11, 2023 · fc9c6db · fc9c6db
2 parents 03965d2 + b196130
commit fc9c6db
Show file tree

Hide file tree

Showing 79 changed files with 350 additions and 383 deletions.
diff --git a/NOTICE b/NOTICE
@@ -1,4 +1,4 @@
-(C) Copyright 2016 Kurento (http://kurento.org)
+(C) Copyright 2016 Kurento (https://kurento.openvidu.io/)
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.

diff --git a/README.md b/README.md
@@ -7,7 +7,7 @@
 
 Copyright 2018 [Kurento]. Licensed under [Apache 2.0 License].
 
-[Kurento]: https://kurento.org
+[Kurento]: https://kurento.openvidu.io/
 [KurentoImage]: https://secure.gravatar.com/avatar/21a2a12c56b2a91c8918d5779f1778bf?s=120
 [Apache 2.0 License]: http://www.apache.org/licenses/LICENSE-2.0
 
@@ -23,7 +23,7 @@ Demo applications that showcase how to use the Kurento Java Client.
 About Kurento
 =============
 
-Kurento is an open source software project providing a platform suitable for creating modular applications with advanced real-time communication capabilities. For knowing more about Kurento, please visit the Kurento project website: https://www.kurento.org.
+Kurento is an open source software project providing a platform suitable for creating modular applications with advanced real-time communication capabilities. For knowing more about Kurento, please visit the Kurento project website: https://kurento.openvidu.io/.
 
 Kurento is part of [FIWARE]. For further information on the relationship of FIWARE and Kurento check the [Kurento FIWARE Catalog Entry]. Kurento is also part of the [NUBOMEDIA] research initiative.
 
@@ -38,7 +38,7 @@ Documentation
 
 The Kurento project provides detailed [documentation] including tutorials, installation and development guides. The [Open API specification], also known as *Kurento Protocol*, is available on [apiary.io].
 
-[documentation]: https://www.kurento.org/documentation
+[documentation]: https://kurento.openvidu.io/documentation
 [Open API specification]: http://kurento.github.io/doc-kurento/
 [apiary.io]: http://docs.streamoriented.apiary.io/
 
@@ -60,7 +60,7 @@ Issues:
 
 News:
 
-* [Kurento Blog](https://www.kurento.org/blog)
+* [Kurento Blog](https://kurento.openvidu.io/blog)
 * [Google Groups](https://groups.google.com/forum/#!forum/kurento)
 
 

diff --git a/bin/set-versions.sh b/bin/set-versions.sh
@@ -6,21 +6,37 @@
 #/ versions to the one provided as argument.
 #/
 #/
+#/ Notice
+#/ ======
+#/
+#/ This script does not use the Maven `versions` plugin (with goals such as
+#/ `versions:update-parent`, `versions:update-child-modules`, or `versions:set`)
+#/ because running Maven requires that the *current* versions are all correct
+#/ and existing (available for download or installed locally).
+#/
+#/ We have frequently found that this is a limitation, because some times it is
+#/ needed to update from an unexisting version (like if some component is
+#/ skipping a patch number, during separate development of different modules),
+#/ or when doing a Release (when the release version is not yet available).
+#/
+#/ It ends up being less troublesome to just edit the pom.xml directly.
+#/
+#/
 #/ Arguments
 #/ =========
 #/
-#/ <Version>
+#/ <BaseVersion>
 #/
-#/   Base version number to set. When '--release' is used, this version will
-#/   be used as-is; otherwise, a nightly/snapshot indicator will be appended.
+#/   Base version number to use. When '--release' is used, this string will
+#/   be set as-is; otherwise, a nightly/snapshot suffix is added.
 #/
-#/   <Version> should be in a format compatible with Semantic Versioning,
-#/   such as "1.2.3" or, in general terms, "<Major>.<Minor>.<Patch>".
+#/   <BaseVersion> must be in the Semantic Versioning format, such as "1.2.3"
+#/   ("<Major>.<Minor>.<Patch>").
 #/
 #/ --release
 #/
-#/   Use version numbers intended for Release builds, such as "1.2.3". If this
-#/   option is not given, a nightly/snapshot indicator is appended: "-dev".
+#/   Do not add nightly/snapshot suffix to the base version number.
+#/   The resulting value will be valid for a Release build.
 #/
 #/   Optional. Default: Disabled.
 #/
@@ -40,12 +56,8 @@
 set -o errexit -o errtrace -o pipefail -o nounset
 
 # Check dependencies.
-command -v mvn >/dev/null || {
-    echo "ERROR: 'mvn' is not installed; please install it"
-    exit 1
-}
 command -v xmlstarlet >/dev/null || {
-    log "ERROR: 'xmlstarlet' is not installed; please install it"
+    echo "ERROR: 'xmlstarlet' is not installed; please install it"
     exit 1
 }
 
@@ -66,6 +78,12 @@ while [[ $# -gt 0 ]]; do
         --release)
             CFG_RELEASE="true"
             ;;
+        --kms-api)
+            # Ignore argument.
+            if [[ -n "${2-}" ]]; then
+                shift
+            fi
+            ;;
         --git-add)
             CFG_GIT_ADD="true"
             ;;
@@ -88,7 +106,7 @@ fi
 
 REGEX='^[[:digit:]]+\.[[:digit:]]+\.[[:digit:]]+$'
 [[ "$CFG_VERSION" =~ $REGEX ]] || {
-    echo "ERROR: '$CFG_VERSION' must be compatible with Semantic Versioning: <Major>.<Minor>.<Patch>"
+    echo "ERROR: '$CFG_VERSION' is not SemVer (<Major>.<Minor>.<Patch>)"
     exit 1
 }
 
@@ -102,9 +120,9 @@ echo "CFG_GIT_ADD=$CFG_GIT_ADD"
 # ==================
 
 if [[ "$CFG_RELEASE" == "true" ]]; then
-    VERSION="$CFG_VERSION"
+    VERSION_JAVA="$CFG_VERSION"
 else
-    VERSION="${CFG_VERSION}-SNAPSHOT"
+    VERSION_JAVA="${CFG_VERSION}-SNAPSHOT"
 fi
 
 
@@ -129,21 +147,39 @@ function git_add() {
 # Apply version
 # =============
 
-if [[ "$CFG_RELEASE" == "true" ]]; then
-    MVN_ALLOW_SNAPSHOTS="false"
-else
-    MVN_ALLOW_SNAPSHOTS="true"
-fi
-
-# Parent version: Update to latest available.
-mvn versions:update-parent \
-    -DgenerateBackupPoms=false \
-    -DallowSnapshots="$MVN_ALLOW_SNAPSHOTS"
-
-# Children versions: Make them inherit from parent.
-mvn versions:update-child-modules \
-    -DgenerateBackupPoms=false \
-    -DallowSnapshots="$MVN_ALLOW_SNAPSHOTS"
+# Parent: Update to the new version of kurento-java.
+xmlstarlet edit -S --inplace \
+        --update "/_:project/_:parent/_:version" \
+        --value "$VERSION_JAVA" \
+        pom.xml
+
+# Children: Make them inherit from the new parent.
+CHILDREN=(
+    kurento-chroma
+    kurento-crowddetector
+    kurento-group-call
+    kurento-hello-world
+    kurento-hello-world-recording
+    kurento-hello-world-repository
+    kurento-magic-mirror
+    kurento-metadata-example
+    kurento-one2many-call
+    kurento-one2one-call
+    kurento-one2one-call-advanced
+    kurento-one2one-call-recording
+    kurento-platedetector
+    kurento-player
+    kurento-pointerdetector
+    kurento-rtp-receiver
+    kurento-send-data-channel
+    kurento-show-data-channel
+)
+for CHILD in "${CHILDREN[@]}"; do
+    find "$CHILD" -name pom.xml -print0 | xargs -0 -n1 \
+        xmlstarlet edit -S --inplace \
+            --update "/_:project/_:parent/_:version" \
+            --value "$VERSION_JAVA"
+done
 
 git_add \
     '*pom.xml'

diff --git a/kurento-chroma/README.md b/kurento-chroma/README.md
@@ -23,7 +23,7 @@ What is Kurento
 Kurento is an open source software project providing a platform suitable
 for creating modular applications with advanced real-time communication
 capabilities. For knowing more about Kurento, please visit the Kurento
-project website: http://www.kurento.org.
+project website: https://kurento.openvidu.io/.
 
 Kurento is part of [FIWARE]. For further information on the relationship of
 FIWARE and Kurento check the [Kurento FIWARE Catalog Entry]
@@ -101,15 +101,15 @@ Mailing List] and through [StackOverflow] using the tags *kurento* and
 
 Before asking for support, please read first the [Kurento Netiquette Guidelines]
 
-[documentation]: http://www.kurento.org/documentation
+[documentation]: https://kurento.openvidu.io/documentation
 [FIWARE]: http://www.fiware.org
 [GitHub Kurento bugtracker]: https://github.com/Kurento/bugtracker/issues
 [GitHub Kurento Group]: https://github.com/kurento
 [kurentoms]: http://twitter.com/kurentoms
-[Kurento]: http://kurento.org
-[Kurento Blog]: http://www.kurento.org/blog
+[Kurento]: https://kurento.openvidu.io/
+[Kurento Blog]: https://kurento.openvidu.io/blog
 [Kurento FIWARE Catalog Entry]: http://catalogue.fiware.org/enablers/stream-oriented-kurento
-[Kurento Netiquette Guidelines]: http://www.kurento.org/blog/kurento-netiquette-guidelines
+[Kurento Netiquette Guidelines]: https://kurento.openvidu.io/blog/kurento-netiquette-guidelines
 [Kurento Public Mailing list]: https://groups.google.com/forum/#!forum/kurento
 [KurentoImage]: https://secure.gravatar.com/avatar/21a2a12c56b2a91c8918d5779f1778bf?s=120
 [Apache 2.0 License]: http://www.apache.org/licenses/LICENSE-2.0
@@ -119,4 +119,4 @@ Before asking for support, please read first the [Kurento Netiquette Guidelines]
 [readthedocs.org]: http://kurento.readthedocs.org/
 [Open API specification]: http://kurento.github.io/doc-kurento/
 [apiary.io]: http://docs.streamoriented.apiary.io/
-[instructions]: http://www.kurento.org/docs/current/tutorials/java/module-chromafilter.html
+[instructions]: https://kurento.openvidu.io/docs/current/tutorials/java/module-chromafilter.html
diff --git a/kurento-chroma/pom.xml b/kurento-chroma/pom.xml
@@ -1,6 +1,5 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-		xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-		xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<?xml version="1.0"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 	<modelVersion>4.0.0</modelVersion>
 
 	<!-- Maven coordinates -->
@@ -72,6 +71,7 @@
 		<dependency>
 			<groupId>org.kurento.module</groupId>
 			<artifactId>chroma</artifactId>
+			<version>7.0.0-SNAPSHOT</version>
 		</dependency>
 	</dependencies>
 
@@ -134,9 +134,7 @@
 								<phase>package</phase>
 								<configuration>
 									<tasks>
-										<copy
-											file="${project.build.directory}/target/${project.artifactId}-${project.version}-bin.zip"
-											tofile="${project.build.directory}/target/${project.artifactId}-${project.version}.zip" />
+										<copy file="${project.build.directory}/target/${project.artifactId}-${project.version}-bin.zip" tofile="${project.build.directory}/target/${project.artifactId}-${project.version}.zip"/>
 									</tasks>
 								</configuration>
 							</execution>

diff --git a/kurento-chroma/src/main/resources/static/css/kurento.css b/kurento-chroma/src/main/resources/static/css/kurento.css
@@ -1,5 +1,5 @@
 /*
- * (C) Copyright 2014 Kurento (http://kurento.org/)
+ * (C) Copyright 2014 Kurento (https://kurento.openvidu.io/)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -23,7 +23,6 @@ html {
 
 body {
 	padding-top: 40px;
-	body
 }
 
 video, #console {
@@ -51,4 +50,4 @@ video, #console {
 .col-md-2 {
 	width: 80px;
 	padding-top: 190px;
-}
+}
diff --git a/kurento-chroma/src/main/resources/static/index.html b/kurento-chroma/src/main/resources/static/index.html
@@ -105,7 +105,7 @@ <h3>Remote stream</h3>
 							alt="Universidad Rey Juan Carlos" height="50px" /></a>
 					</div>
 					<div class="col-md-4">
-						<a href="http://www.kurento.org"><img src="img/kurento.png"
+						<a href="https://kurento.openvidu.io/"><img src="img/kurento.png"
 							alt="Kurento" height="50px" /></a>
 					</div>
 					<div class="col-md-4">

diff --git a/kurento-crowddetector/README.md b/kurento-crowddetector/README.md
@@ -10,7 +10,7 @@ Copyright © 2013-2016 [Kurento]. Licensed under [Apache 2.0 License].
 kurento-crowddetector
 =====================
 
-Kurento Java Tutorial: WebRTC in mirror (loopback) with a crowd detector filter. This filter detects people 
+Kurento Java Tutorial: WebRTC in mirror (loopback) with a crowd detector filter. This filter detects people
 agglomeration in video streams.
 
 Running this tutorial
@@ -24,7 +24,7 @@ What is Kurento
 Kurento is an open source software project providing a platform suitable
 for creating modular applications with advanced real-time communication
 capabilities. For knowing more about Kurento, please visit the Kurento
-project website: http://www.kurento.org.
+project website: https://kurento.openvidu.io/.
 
 Kurento is part of [FIWARE]. For further information on the relationship of
 FIWARE and Kurento check the [Kurento FIWARE Catalog Entry]
@@ -102,15 +102,15 @@ Mailing List] and through [StackOverflow] using the tags *kurento* and
 
 Before asking for support, please read first the [Kurento Netiquette Guidelines]
 
-[documentation]: http://www.kurento.org/documentation
+[documentation]: https://kurento.openvidu.io/documentation
 [FIWARE]: http://www.fiware.org
 [GitHub Kurento bugtracker]: https://github.com/Kurento/bugtracker/issues
 [GitHub Kurento Group]: https://github.com/kurento
 [kurentoms]: http://twitter.com/kurentoms
-[Kurento]: http://kurento.org
-[Kurento Blog]: http://www.kurento.org/blog
+[Kurento]: https://kurento.openvidu.io/
+[Kurento Blog]: https://kurento.openvidu.io/blog
 [Kurento FIWARE Catalog Entry]: http://catalogue.fiware.org/enablers/stream-oriented-kurento
-[Kurento Netiquette Guidelines]: http://www.kurento.org/blog/kurento-netiquette-guidelines
+[Kurento Netiquette Guidelines]: https://kurento.openvidu.io/blog/kurento-netiquette-guidelines
 [Kurento Public Mailing list]: https://groups.google.com/forum/#!forum/kurento
 [KurentoImage]: https://secure.gravatar.com/avatar/21a2a12c56b2a91c8918d5779f1778bf?s=120
 [Apache 2.0 License]: http://www.apache.org/licenses/LICENSE-2.0
@@ -120,4 +120,4 @@ Before asking for support, please read first the [Kurento Netiquette Guidelines]
 [readthedocs.org]: http://kurento.readthedocs.org/
 [Open API specification]: http://kurento.github.io/doc-kurento/
 [apiary.io]: http://docs.streamoriented.apiary.io/
-[instructions]: http://www.kurento.org/docs/current/tutorials/java/module-crowddetector.html
+[instructions]: https://kurento.openvidu.io/docs/current/tutorials/java/module-crowddetector.html
diff --git a/kurento-crowddetector/pom.xml b/kurento-crowddetector/pom.xml
@@ -1,6 +1,5 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-		xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-		xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<?xml version="1.0"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 	<modelVersion>4.0.0</modelVersion>
 
 	<!-- Maven coordinates -->
@@ -84,6 +83,7 @@
 		<dependency>
 			<groupId>org.kurento.module</groupId>
 			<artifactId>crowddetector</artifactId>
+			<version>7.0.0-SNAPSHOT</version>
 		</dependency>
 	</dependencies>
 
@@ -120,9 +120,7 @@
 						<phase>package</phase>
 						<configuration>
 							<tasks>
-								<copy
-									file="${project.build.directory}/target/${project.artifactId}-${project.version}-bin.zip"
-									tofile="${project.build.directory}/target/${project.artifactId}-${project.version}.zip" />
+								<copy file="${project.build.directory}/target/${project.artifactId}-${project.version}-bin.zip" tofile="${project.build.directory}/target/${project.artifactId}-${project.version}.zip"/>
 							</tasks>
 						</configuration>
 					</execution>

diff --git a/kurento-crowddetector/src/main/resources/static/css/kurento.css b/kurento-crowddetector/src/main/resources/static/css/kurento.css
@@ -1,5 +1,5 @@
 /*
- * (C) Copyright 2014 Kurento (http://kurento.org/)
+ * (C) Copyright 2014 Kurento (https://kurento.openvidu.io/)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -23,7 +23,6 @@ html {
 
 body {
 	padding-top: 40px;
-	body
 }
 
 video, #console {
@@ -51,4 +50,4 @@ video, #console {
 .col-md-2 {
 	width: 80px;
 	padding-top: 190px;
-}
+}
diff --git a/kurento-crowddetector/src/main/resources/static/index.html b/kurento-crowddetector/src/main/resources/static/index.html
@@ -202,7 +202,7 @@ <h3>Remote stream</h3>
 								alt="Universidad Rey Juan Carlos" height="50px" /></a>
 						</div>
 						<div class="col-md-4">
-							<a href="http://www.kurento.org"><img src="./img/kurento.png"
+							<a href="https://kurento.openvidu.io/"><img src="./img/kurento.png"
 								alt="Kurento" height="50px" /></a>
 						</div>
 						<div class="col-md-4">