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 2019/02/09 05:59:05 UTC
[openmeetings] branch 4.0.x updated: [OPENMEETINGS-1975] red5 and
tomcat versions are updated
This is an automated email from the ASF dual-hosted git repository.
solomax pushed a commit to branch 4.0.x
in repository https://gitbox.apache.org/repos/asf/openmeetings.git
The following commit(s) were added to refs/heads/4.0.x by this push:
new cf44129 [OPENMEETINGS-1975] red5 and tomcat versions are updated
cf44129 is described below
commit cf441299143562c1055373f48d68d7a76ab14054
Author: Maxim Solodovnik <so...@gmail.com>
AuthorDate: Sat Feb 9 12:58:51 2019 +0700
[OPENMEETINGS-1975] red5 and tomcat versions are updated
---
openmeetings-server/pom.xml | 4 +-
.../src/main/assembly/components/all.xml | 4 -
.../src/main/assembly/scripts/red5.bat | 57 --------------
.../src/main/assembly/scripts/red5.sh | 90 ----------------------
pom.xml | 6 +-
5 files changed, 5 insertions(+), 156 deletions(-)
diff --git a/openmeetings-server/pom.xml b/openmeetings-server/pom.xml
index 2aff399..debaca2 100644
--- a/openmeetings-server/pom.xml
+++ b/openmeetings-server/pom.xml
@@ -117,7 +117,7 @@
<id>prepare-red5-server</id>
<activation>
<file>
- <missing>red5-server/red5-server-1.0.10-M10.tar.gz</missing> <!-- TODO should be in-sync with global property -->
+ <missing>red5-server/red5-server-1.0.10.tar.gz</missing> <!-- TODO should be in-sync with global property -->
</file>
</activation>
<build>
@@ -134,7 +134,7 @@
</goals>
<configuration>
<url>https://github.com/Red5/red5-server/releases/download</url>
- <fromFile>v${red5-server.version}/red5-server-${red5-server.version}.tar.gz</fromFile>
+ <fromFile>v${red5-server.version}-RELEASE/red5-server-${red5-server.version}.tar.gz</fromFile>
<toDir>${red5-server-file.dir}</toDir>
<skip>${red5-server.dwnd.skip}</skip>
</configuration>
diff --git a/openmeetings-server/src/main/assembly/components/all.xml b/openmeetings-server/src/main/assembly/components/all.xml
index e771419..8ec129c 100644
--- a/openmeetings-server/src/main/assembly/components/all.xml
+++ b/openmeetings-server/src/main/assembly/components/all.xml
@@ -55,7 +55,6 @@
<exclude>plugins/tomcat-*.jar</exclude> <!-- added for Red5 lib substitution -->
<exclude>plugins/ecj*.jar</exclude> <!-- added for Red5 lib substitution -->
<exclude>*.sh</exclude>
- <exclude>red5.bat</exclude>
<exclude>conf/jee-container.xml</exclude>
</excludes>
</fileSet>
@@ -66,9 +65,6 @@
<includes>
<include>*.sh</include>
</includes>
- <excludes>
- <exclude>red5.sh</exclude>
- </excludes>
</fileSet>
<fileSet>
<directory>src/main/assembly/scripts</directory>
diff --git a/openmeetings-server/src/main/assembly/scripts/red5.bat b/openmeetings-server/src/main/assembly/scripts/red5.bat
deleted file mode 100644
index 3a3f10f..0000000
--- a/openmeetings-server/src/main/assembly/scripts/red5.bat
+++ /dev/null
@@ -1,57 +0,0 @@
-@echo off
-REM #############################################
-REM Licensed under the Apache License, Version 2.0 (the "License");
-REM you may not use this file except in compliance with the License.
-REM You may obtain a copy of the License at
-REM
-REM http://www.apache.org/licenses/LICENSE-2.0
-REM
-REM Unless required by applicable law or agreed to in writing, software
-REM distributed under the License is distributed on an "AS IS" BASIS,
-REM WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-REM See the License for the specific language governing permissions and
-REM limitations under the License.
-REM #############################################
-
-SETLOCAL
-
-if NOT DEFINED RED5_HOME set RED5_HOME=%~dp0
-
-if NOT DEFINED JAVA_HOME goto err
-
-REM JAVA options
-REM You can set JVM additional options here if you want
-if NOT DEFINED JVM_OPTS set JVM_OPTS=-Xms256m -Xmx1g -Xverify:none -XX:+TieredCompilation -XX:+UseBiasedLocking -XX:InitialCodeCacheSize=8m -XX:ReservedCodeCacheSize=32m -Dorg.terracotta.quartz.skipUpdateCheck=true -XX:MaxMetaspaceSize=128m -XX:+UseConcMarkSweepGC -XX:ParallelGCThreads=2
-REM Set up logging options
-set LOGGING_OPTS=-Dlogback.ContextSelector=org.red5.logging.LoggingContextSelector -Dcatalina.useNaming=true
-REM Set up security options
-REM set SECURITY_OPTS=-Djava.security.debug=failure -Djava.security.manager -Djava.security.policy="%RED5_HOME%/conf/red5.policy"
-set SECURITY_OPTS=-Djava.security.debug=failure
-REM Set up tomcat options
-set TOMCAT_OPTS=-Dcatalina.home=%RED5_HOME%
-REM Native path
-set NATIVE=-Djava.library.path="%RED5_HOME%\lib\native"
-REM Setup python/jython path
-set JYTHON_OPTS=-Dpython.home=lib
-REM Combined java options
-set JAVA_OPTS=%LOGGING_OPTS% %SECURITY_OPTS% %JAVA_OPTS% %JVM_OPTS% %TOMCAT_OPTS% %NATIVE% %JYTHON_OPTS%
-
-set RED5_CLASSPATH=%RED5_HOME%\red5-service.jar;%RED5_HOME%\conf;%CLASSPATH%
-
-if NOT DEFINED RED5_MAINCLASS set RED5_MAINCLASS=org.red5.server.Bootstrap
-
-if NOT DEFINED RED5_OPTS set RED5_OPTS=9999
-
-goto launchRed5
-
-:launchRed5
-echo Starting Red5
-"%JAVA_HOME%\bin\java" %JAVA_OPTS% -cp "%RED5_CLASSPATH%" %RED5_MAINCLASS% %RED5_OPTS%
-goto finally
-
-:err
-echo JAVA_HOME environment variable not set! Take a look at the readme.
-pause
-
-:finally
-ENDLOCAL
diff --git a/openmeetings-server/src/main/assembly/scripts/red5.sh b/openmeetings-server/src/main/assembly/scripts/red5.sh
deleted file mode 100755
index 3740cc6..0000000
--- a/openmeetings-server/src/main/assembly/scripts/red5.sh
+++ /dev/null
@@ -1,90 +0,0 @@
-#!/bin/bash
-##############################################
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-##############################################
-
-if [ -z "$RED5_HOME" ]; then
- export RED5_HOME=`pwd`;
-fi
-
-P=":" # The default classpath separator
-OS=`uname`
-case "$OS" in
- CYGWIN*|MINGW*) # Windows Cygwin or Windows MinGW
- P=";" # Since these are actually Windows, let Java know
- ;;
- Linux*)
- LD_LIBRARY_PATH=$RED5_HOME/lib/native
- export LD_LIBRARY_PATH
- # Native path
- NATIVE="-Djava.library.path=$LD_LIBRARY_PATH"
- ;;
- Darwin*)
- DYLD_LIBRARY_PATH=$DYLD_LIBRARY_PATH:$RED5_HOME/lib/native
- export DYLD_LIBRARY_PATH
- # Native path
- NATIVE="-Djava.library.path=$DYLD_LIBRARY_PATH"
- ;;
- SunOS*)
- if [ -z "$JAVA_HOME" ]; then
- export JAVA_HOME=/opt/local/java/sun6;
- fi
- ;;
- *)
- # Do nothing
- ;;
-esac
-
-echo "Running on " $OS
-
-# JAVA options
-# You can set JVM additional options here if you want
-if [ -z "$JVM_OPTS" ]; then
- JVM_OPTS="-Xms256m -Xmx1g -Xverify:none -XX:+TieredCompilation -XX:+UseBiasedLocking -XX:InitialCodeCacheSize=8m -XX:ReservedCodeCacheSize=32m -Dorg.terracotta.quartz.skipUpdateCheck=true -XX:MaxMetaspaceSize=128m -XX:+UseConcMarkSweepGC -XX:ParallelGCThreads=2"
-fi
-# Set up security options
-SECURITY_OPTS="-Djava.security.debug=failure"
-# Set up tomcat options
-TOMCAT_OPTS="-Dcatalina.home=$RED5_HOME -Dcatalina.useNaming=true"
-# Jython options
-JYTHON="-Dpython.home=lib"
-
-export JAVA_OPTS="$SECURITY_OPTS $JAVA_OPTS $JVM_OPTS $TOMCAT_OPTS $NATIVE $JYTHON"
-
-if [ -z "$RED5_MAINCLASS" ]; then
- export RED5_MAINCLASS=org.red5.server.Bootstrap
-fi
-
-if [ -z "$RED5_OPTS" ]; then
- export RED5_OPTS=9999
-fi
-
-for JAVA in "${JAVA_HOME}/bin/java" "${JAVA_HOME}/Home/bin/java" "/usr/bin/java" "/usr/local/bin/java"
-do
- if [ -x "$JAVA" ]
- then
- break
- fi
-done
-
-if [ ! -x "$JAVA" ]
-then
- echo "Unable to locate Java. Please set JAVA_HOME environment variable."
- exit
-fi
-
-export RED5_CLASSPATH="${RED5_HOME}/red5-service.jar${P}${RED5_HOME}/conf${P}${CLASSPATH}"
-
-# start Red5
-echo "Starting Red5"
-exec "$JAVA" -Dred5.root="${RED5_HOME}" $JAVA_OPTS -cp "${RED5_CLASSPATH}" "$RED5_MAINCLASS" $RED5_OPTS
diff --git a/pom.xml b/pom.xml
index 8b00533..9a88a59 100644
--- a/pom.xml
+++ b/pom.xml
@@ -76,11 +76,11 @@
<wicket.version>8.3.0</wicket.version>
<wicketju.version>8.1.0</wicketju.version>
<wickets.version>8.3.0</wickets.version>
- <red5-server.version>1.0.10-M10</red5-server.version>
- <red5-client.version>1.0.10-M10</red5-client.version>
+ <red5-server.version>1.0.10</red5-server.version>
+ <red5-client.version>1.0.10</red5-client.version>
<spring.version>5.1.4.RELEASE</spring.version>
<mina.version>2.0.19</mina.version>
- <tomcat.version>9.0.14</tomcat.version>
+ <tomcat.version>9.0.16</tomcat.version>
<ical4j.version>3.0.6</ical4j.version>
<cxf.version>3.3.0</cxf.version>
<selenium.version>3.141.59</selenium.version>