rubyfox-server 2.16.0.3 → 2.17.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 168c821e6ab397f3e4cd254155eaf57aea11eab72e53c1e8a2ee8d7628f772ca
-  data.tar.gz: fdcf6ce3e8dd917316ae68371f7c68e92c61b6d1dbba6413aee57952957485a9
+  metadata.gz: '08b6e6ce62063f3630c7103d4db52360e718a2d8a3d094c67a971280ecea26b1'
+  data.tar.gz: 3a887324dca9250e22d32c62998bcad8afe2e084bd6f7b3d2b57f17b17292c4b
 SHA512:
-  metadata.gz: e75b9b3288c50e515d6a0f288d876865f4a4bc11479f20cde87bb6aa70165b18d508c808401b5427b2e1f78eddaba098c84e0d64eb9551d865fe2f05fad9f20b
-  data.tar.gz: d795286ce956f92a3172b2acae439d17a44c24ea6d30825f1889eb15a8912e8194d9860864b29321ccd5aa7874275b09ec1ce5516c97042dde2ce4bea6a784b7
+  metadata.gz: cb8d41e322f9cb713987abd7dd80538c809329ceb6f4c070690f410aa5da2599da534077de87c600583e127ecf129c27f057e2f163e03cc233dbe32de44d1396
+  data.tar.gz: cb874a1c585e4bc089b090768d32823956967ead3a93ca08c4f73468547ed7fa04bf64ac10bab660d6b87ed9b1e063724e4140476eae63b1e2b6702db59663c7

data/lib/rubyfox/server/data/config/logParser.properties

@@ -1,30 +1,19 @@
 # Properties file which configures the operation of the logging for the Admin Tool's Analytics module.
 
-# Global logging properties. 
-# ------------------------------------------ 
-# The set of handlers to be used
-handlers=java.util.logging.FileHandler,java.util.logging.ConsoleHandler
-
-# Default global logging level
-.level=INFO
-
-# Handlers 
-# -----------------------------------------
-
-# --- ConsoleHandler --- 
-# Override of global logging level 
-java.util.logging.ConsoleHandler.level=ALL
-
-# Formatter
-java.util.logging.ConsoleHandler.formatter=com.smartfoxserver.v2.admin.logging.ConsoleLogFormatter
-
-# --- FileHandler --- 
-# Override of global logging level 
-java.util.logging.FileHandler.level=ALL
-
-# Formatter
-java.util.logging.FileHandler.formatter=com.smartfoxserver.v2.admin.logging.FileLogFormatter
-
-# Naming style for the output file
-#java.util.logging.FileHandler.pattern=logs/parser/parser_%g.log
-java.util.logging.FileHandler.pattern=logs/statsParser.log
+# ConsoleAppender
+log4j.appender.consoleAppender=org.apache.log4j.ConsoleAppender
+log4j.appender.consoleAppender.layout=org.apache.log4j.PatternLayout
+log4j.appender.consoleAppender.layout.ConversionPattern=> %d{HH:mm:ss,SSS} %-5p %m%n
+
+# Regular FileAppender
+# NOTE: altering the ConversionPattern will cause a portion of the AdminTool's Log Viewer module to stop working properly
+log4j.appender.fileAppender=org.apache.log4j.DailyRollingFileAppender
+log4j.appender.fileAppender.layout=org.apache.log4j.PatternLayout
+log4j.appender.fileAppender.File=logs/statsParser.log
+log4j.appender.fileAppender.layout.ConversionPattern=%d{dd MMM yyyy | HH:mm:ss,SSS} | %-5p | %m%n
+log4j.appender.fileAppender.Encoding=UTF-8
+log4j.appender.fileAppender.DatePattern='.'yyyy-ww
+
+# log4j.category.com.smartfoxserver.v2=DEBUG,consoleAppender,fileAppender,socketAppender
+log4j.category.com.smartfoxserver.v2.admin=INFO,consoleAppender,fileAppender
+log4j.category.hsqldb.db=WARN,consoleAppender,fileAppender

data/lib/rubyfox/server/data/lib/apache-tomcat/NOTICE

@@ -1,5 +1,5 @@
 Apache Tomcat
-Copyright 1999-2020 The Apache Software Foundation
+Copyright 1999-2021 The Apache Software Foundation
 
 This product includes software developed at
 The Apache Software Foundation (https://www.apache.org/).

data/lib/rubyfox/server/data/lib/apache-tomcat/README.md

@@ -29,6 +29,7 @@ project logo are trademarks of the Apache Software Foundation.
 For every major Tomcat version there is one download page containing
 links to the latest binary and source code downloads, but also
 links for browsing the download directories and archives:
+- [Tomcat 10](https://tomcat.apache.org/download-10.cgi)
 - [Tomcat 9](https://tomcat.apache.org/download-90.cgi)
 - [Tomcat 8](https://tomcat.apache.org/download-80.cgi)
 - [Tomcat 7](https://tomcat.apache.org/download-70.cgi)
@@ -42,6 +43,7 @@ The documentation available as of the date of this release is
 included in the docs webapp which ships with tomcat. You can access that webapp
 by starting tomcat and visiting <http://localhost:8080/docs/> in your browser.
 The most up-to-date documentation for each version can be found at:
+- [Tomcat 10](https://tomcat.apache.org/tomcat-10.0-doc/)
 - [Tomcat 9](https://tomcat.apache.org/tomcat-9.0-doc/)
 - [Tomcat 8](https://tomcat.apache.org/tomcat-8.5-doc/)
 - [Tomcat 7](https://tomcat.apache.org/tomcat-7.0-doc/)

data/lib/rubyfox/server/data/lib/apache-tomcat/RELEASE-NOTES

@@ -16,7 +16,7 @@
 ================================================================================
 
 
-                     Apache Tomcat Version 9.0.38
+                     Apache Tomcat Version 9.0.54
                             Release Notes
 
 
@@ -73,7 +73,7 @@ for use by web applications (by placing them in "lib"):
 * catalina-ssi.jar (Server-side Includes module)
 * catalina-storeconfig.jar (Generation of XML configuration from current state)
 * catalina-tribes.jar (Group communication)
-* ecj-4.15.jar (Eclipse JDT Java compiler)
+* ecj-4.20.jar (Eclipse JDT Java compiler)
 * el-api.jar (EL 3.0 API)
 * jasper.jar (Jasper 2 Compiler and Runtime)
 * jasper-el.jar (Jasper 2 EL implementation)

data/lib/rubyfox/server/data/lib/apache-tomcat/bin/catalina.bat

@@ -239,6 +239,8 @@ set LOGGING_MANAGER=-Djava.util.logging.manager=org.apache.juli.ClassLoaderLogMa
 rem Configure JAVA 9 specific start-up parameters
 set "JDK_JAVA_OPTIONS=%JDK_JAVA_OPTIONS% --add-opens=java.base/java.lang=ALL-UNNAMED"
 set "JDK_JAVA_OPTIONS=%JDK_JAVA_OPTIONS% --add-opens=java.base/java.io=ALL-UNNAMED"
+set "JDK_JAVA_OPTIONS=%JDK_JAVA_OPTIONS% --add-opens=java.base/java.util=ALL-UNNAMED"
+set "JDK_JAVA_OPTIONS=%JDK_JAVA_OPTIONS% --add-opens=java.base/java.util.concurrent=ALL-UNNAMED"
 set "JDK_JAVA_OPTIONS=%JDK_JAVA_OPTIONS% --add-opens=java.rmi/sun.rmi.transport=ALL-UNNAMED"
 
 rem Java 9 no longer supports the java.endorsed.dirs

data/lib/rubyfox/server/data/lib/apache-tomcat/bin/catalina.sh

@@ -326,6 +326,8 @@ fi
 # Add the JAVA 9 specific start-up parameters required by Tomcat
 JDK_JAVA_OPTIONS="$JDK_JAVA_OPTIONS --add-opens=java.base/java.lang=ALL-UNNAMED"
 JDK_JAVA_OPTIONS="$JDK_JAVA_OPTIONS --add-opens=java.base/java.io=ALL-UNNAMED"
+JDK_JAVA_OPTIONS="$JDK_JAVA_OPTIONS --add-opens=java.base/java.util=ALL-UNNAMED"
+JDK_JAVA_OPTIONS="$JDK_JAVA_OPTIONS --add-opens=java.base/java.util.concurrent=ALL-UNNAMED"
 JDK_JAVA_OPTIONS="$JDK_JAVA_OPTIONS --add-opens=java.rmi/sun.rmi.transport=ALL-UNNAMED"
 export JDK_JAVA_OPTIONS
 
@@ -365,10 +367,6 @@ if [ "$1" = "jpda" ] ; then
   shift
 fi
 
-# TODO: Bugzilla 63815
-# This doesn't currently work (and can't be made to work) if values used in
-# CATALINA_OPTS and/or JAVA_OPTS require quoting. See:
-# https://bugs.openjdk.java.net/browse/JDK-8234808
 if [ "$1" = "debug" ] ; then
   if $os400; then
     echo "Debug command not available on OS400"
@@ -380,7 +378,7 @@ if [ "$1" = "debug" ] ; then
         echo "Using Security Manager"
       fi
       shift
-      exec "$_RUNJDB" "$CATALINA_LOGGING_CONFIG" $LOGGING_MANAGER $JAVA_OPTS $CATALINA_OPTS \
+      eval exec "\"$_RUNJDB\"" "\"$CATALINA_LOGGING_CONFIG\"" $LOGGING_MANAGER "$JAVA_OPTS" "$CATALINA_OPTS" \
         -D$ENDORSED_PROP="$JAVA_ENDORSED_DIRS" \
         -classpath "$CLASSPATH" \
         -sourcepath "$CATALINA_HOME"/../../java \
@@ -391,7 +389,7 @@ if [ "$1" = "debug" ] ; then
         -Djava.io.tmpdir="$CATALINA_TMPDIR" \
         org.apache.catalina.startup.Bootstrap "$@" start
     else
-      exec "$_RUNJDB" "$CATALINA_LOGGING_CONFIG" $LOGGING_MANAGER $JAVA_OPTS $CATALINA_OPTS \
+      eval exec "\"$_RUNJDB\"" "\"$CATALINA_LOGGING_CONFIG\"" $LOGGING_MANAGER "$JAVA_OPTS" "$CATALINA_OPTS" \
         -D$ENDORSED_PROP="$JAVA_ENDORSED_DIRS" \
         -classpath "$CLASSPATH" \
         -sourcepath "$CATALINA_HOME"/../../java \

data/lib/rubyfox/server/data/lib/apache-tomcat/conf/catalina.policy

@@ -50,9 +50,14 @@ grant codeBase "file:${java.home}/lib/ext/-" {
         permission java.security.AllPermission;
 };
 
+// This permission is required when using javac to compile JSPs on Java 9
+// onwards
+//grant codeBase "jrt:/jdk.compiler" {
+//        permission java.security.AllPermission;
+//};
 
-// ========== CATALINA CODE PERMISSIONS =======================================
 
+// ========== CATALINA CODE PERMISSIONS =======================================
 
 // These permissions apply to the daemon code
 grant codeBase "file:${catalina.home}/bin/commons-daemon.jar" {

data/lib/rubyfox/server/data/lib/apache-tomcat/conf/catalina.properties

@@ -134,6 +134,7 @@ commons-lang*.jar,\
 commons-logging*.jar,\
 commons-math*.jar,\
 commons-pool*.jar,\
+derby-*.jar,\
 dom4j-*.jar,\
 easymock-*.jar,\
 ecj-*.jar,\