rubyfox-server 2.8.4.0 → 2.9.0.0

data/lib/rubyfox/server/data/lib/jetty/start.d/http.ini

@@ -0,0 +1,7 @@
+#
+# Initialize module http
+#
+--module=http
+## HTTP Connector Configuration
+jetty.port=8080
+http.timeout=30000

data/lib/rubyfox/server/data/lib/jetty/start.d/https.ini

@@ -0,0 +1,9 @@
+#
+# Initialize module https
+#
+#--module=https
+## HTTPS Configuration
+# HTTP port to listen on
+https.port=8443
+# HTTPS idle timeout in milliseconds
+https.timeout=30000

data/lib/rubyfox/server/data/lib/jetty/start.d/ssl.ini

@@ -0,0 +1,19 @@
+#
+# Initialize module ssl
+#
+--module=ssl
+## SSL Keystore Configuration
+# define the port to use for secure redirection
+jetty.secure.port=8443
+
+# Setup a demonstration keystore and truststore
+jetty.keystore=etc/keystore
+jetty.truststore=etc/keystore
+
+# Set the demonstration passwords.
+# Note that OBF passwords are not secure, just protected from casual observation
+# See http://www.eclipse.org/jetty/documentation/current/configuring-security-secure-passwords.html
+jetty.keystore.password=OBF:1vny1zlo1x8e1vnw1vn61x8g1zlu1vn4
+jetty.keymanager.password=OBF:1u2u1wml1z7s1z7a1wnl1u2g
+jetty.truststore.password=OBF:1vny1zlo1x8e1vnw1vn61x8g1zlu1vn4
+

data/lib/rubyfox/server/data/lib/jetty/start.ini

@@ -0,0 +1,84 @@
+#===========================================================
+# Jetty start.jar arguments
+#
+# The contents of this file, together with the *.ini
+# files found in start.d directory are used to build
+# the classpath and command line on a call to
+#    java -jar start.jar [arg...]
+#
+# Use the following command to see more options
+#    java -jar start.jar --help
+#
+# Each line in these files is prepended to the command line
+# as arguments and may be either:
+#  + A property like: name=value
+#  + A module to enable like: --module=jmx
+#  + An XML configuration file like: etc/jetty-feature.xml
+#  + A start.jar option like: --dry-run
+#
+# If --exec or --dry-run are used, then this file may also 
+# contain lines with:
+#  + A JVM option like: -Xmx2000m 
+#  + A System Property like: -Dcom.sun.management.jmxremote
+#
+# The --add-to-start=module option can be used to append
+# a configuration template for a module to start.ini
+# The --add-to-startd=module option can be used to create
+# a configuration template for a module in start.d/module.ini
+# For example configure and run with SPDY use
+#
+#   java -jar start.jar --add-to-startd=spdy
+#   $EDITOR start.d/spdy.ini
+#   java -jar start.jar
+#
+#===========================================================
+
+
+#
+# Initialize module server
+#
+--module=server
+## Server Threading Configuration
+# minimum number of threads
+threads.min=10
+# maximum number of threads
+threads.max=200
+# thread idle timeout in milliseconds
+threads.timeout=60000
+# What host to listen on (leave commented to listen on all interfaces)
+#jetty.host=myhost.com
+# Dump the state of the Jetty server, components, and webapps after startup
+jetty.dump.start=false
+# Dump the state of the Jetty server, before stop
+jetty.dump.stop=false
+
+org.eclipse.jetty.server.Request.maxFormContentSize=10000000
+
+#
+# Initialize module deploy
+#
+--module=deploy
+
+#
+# Initialize module websocket
+#
+--module=websocket
+
+#
+# Initialize module jsp
+#
+--module=jsp
+# JSP Configuration
+# To use an non-jdk compiler for JSP compilation uncomment next line
+# -Dorg.apache.jasper.compiler.disablejsr199=true
+
+#
+# Initialize module ext
+#
+--module=ext
+
+#
+# Initialize module resources
+#
+--module=resources
+

data/lib/rubyfox/server/data/sfs2x-service

@@ -110,7 +110,7 @@ test_jvm() {
   if [ "$ver_major" -lt "1" ]; then
     return;
   elif [ "$ver_major" -eq "1" ]; then
-    if [ "$ver_minor" -lt "6" ]; then
+    if [ "$ver_minor" -lt "7" ]; then
       return;
     fi
   fi
@@ -333,7 +333,7 @@ fi
 
 if [ -z "$app_java_home" ]; then
   echo No suitable Java Virtual Machine could be found on your system.
-  echo The version of the JVM must be at least 1.6.
+  echo The version of the JVM must be at least 1.7.
   echo Please define INSTALL4J_JAVA_HOME to point to a suitable JVM.
   echo You can also try to delete the JVM cache file $db_file
 exit 83
@@ -348,14 +348,14 @@ for i in `ls "$app_home/SFS2X/lib" 2> /dev/null | egrep "\.(jar$|zip$)"`
 do
   add_class_path "$app_home/SFS2X/lib/$i"
 done
-for i in `ls "$app_home/SFS2X/lib/Jetty" 2> /dev/null | egrep "\.(jar$|zip$)"`
-do
-  add_class_path "$app_home/SFS2X/lib/Jetty/$i"
-done
 for i in `ls "$app_home/SFS2X/extensions/__lib__" 2> /dev/null | egrep "\.(jar$|zip$)"`
 do
   add_class_path "$app_home/SFS2X/extensions/__lib__/$i"
 done
+for i in `ls "$app_home/SFS2X/lib/jetty/lib" 2> /dev/null | egrep "\.(jar$|zip$)"`
+do
+  add_class_path "$app_home/SFS2X/lib/jetty/lib/$i"
+done
 add_class_path "$app_home/SFS2X"
 
 vmoptions_val=""
@@ -389,14 +389,14 @@ case "$1" in
     start)
         echo "Starting sfs2x-service"
 
-$INSTALL4J_JAVA_PREFIX nohup "$app_java_home/bin/java" -server -Dinstall4j.jvmDir="$app_java_home" -Dexe4j.moduleName="$prg_dir/$progname" "-Dfile.encoding=UTF-8" "-Dinstall4j.launcherId=23" "-Dinstall4j.swt=false" "$vmov_1" "$vmov_2" "$vmov_3" "$vmov_4" "$vmov_5" $INSTALL4J_ADD_VM_PARAMS -classpath "$local_classpath" com.install4j.runtime.launcher.Launcher start com.smartfoxserver.v2.Main false false "" "" true true false "sfs-splash.png" true true 0 0 "" 20 20 "Arial" "0,0,0" 8 500 "version 2.7.0" 20 40 "Arial" "0,0,0" 8 500 -1  > /dev/null 2>&1 &
+$INSTALL4J_JAVA_PREFIX nohup "$app_java_home/bin/java" -server -Dinstall4j.jvmDir="$app_java_home" -Dexe4j.moduleName="$prg_dir/$progname" "-Dfile.encoding=UTF-8" "-Dinstall4j.launcherId=23" "-Dinstall4j.swt=false" "$vmov_1" "$vmov_2" "$vmov_3" "$vmov_4" "$vmov_5" $INSTALL4J_ADD_VM_PARAMS -classpath "$local_classpath" com.install4j.runtime.launcher.Launcher start com.smartfoxserver.v2.Main false false "" "" true true false "sfs-splash.png" true true 0 0 "" 20 20 "Arial" "0,0,0" 8 500 "version 2.9.0" 20 40 "Arial" "0,0,0" 8 500 -1  > /dev/null 2>&1 &
 
 
     ;;
     start-launchd)
         echo "Starting sfs2x-service"
 
-$INSTALL4J_JAVA_PREFIX "$app_java_home/bin/java" -server -Dinstall4j.jvmDir="$app_java_home" -Dexe4j.moduleName="$prg_dir/$progname" "-Dfile.encoding=UTF-8" "-Dinstall4j.launcherId=23" "-Dinstall4j.swt=false" "$vmov_1" "$vmov_2" "$vmov_3" "$vmov_4" "$vmov_5" $INSTALL4J_ADD_VM_PARAMS -classpath "$local_classpath" com.install4j.runtime.launcher.Launcher start com.smartfoxserver.v2.Main false false "" "" true true false "sfs-splash.png" true true 0 0 "" 20 20 "Arial" "0,0,0" 8 500 "version 2.7.0" 20 40 "Arial" "0,0,0" 8 500 -1 
+$INSTALL4J_JAVA_PREFIX "$app_java_home/bin/java" -server -Dinstall4j.jvmDir="$app_java_home" -Dexe4j.moduleName="$prg_dir/$progname" "-Dfile.encoding=UTF-8" "-Dinstall4j.launcherId=23" "-Dinstall4j.swt=false" "$vmov_1" "$vmov_2" "$vmov_3" "$vmov_4" "$vmov_5" $INSTALL4J_ADD_VM_PARAMS -classpath "$local_classpath" com.install4j.runtime.launcher.Launcher start com.smartfoxserver.v2.Main false false "" "" true true false "sfs-splash.png" true true 0 0 "" 20 20 "Arial" "0,0,0" 8 500 "version 2.9.0" 20 40 "Arial" "0,0,0" 8 500 -1 
 
 
     ;;
@@ -415,7 +415,7 @@ $INSTALL4J_JAVA_PREFIX "$app_java_home/bin/java" -server -Dinstall4j.jvmDir="$ap
 
         echo "Restarting sfs2x-service"
 
-$INSTALL4J_JAVA_PREFIX nohup "$app_java_home/bin/java" -server -Dinstall4j.jvmDir="$app_java_home" -Dexe4j.moduleName="$prg_dir/$progname" "-Dfile.encoding=UTF-8" "-Dinstall4j.launcherId=23" "-Dinstall4j.swt=false" "$vmov_1" "$vmov_2" "$vmov_3" "$vmov_4" "$vmov_5" $INSTALL4J_ADD_VM_PARAMS -classpath "$local_classpath" com.install4j.runtime.launcher.Launcher start com.smartfoxserver.v2.Main false false "" "" true true false "sfs-splash.png" true true 0 0 "" 20 20 "Arial" "0,0,0" 8 500 "version 2.7.0" 20 40 "Arial" "0,0,0" 8 500 -1  > /dev/null 2>&1 &
+$INSTALL4J_JAVA_PREFIX nohup "$app_java_home/bin/java" -server -Dinstall4j.jvmDir="$app_java_home" -Dexe4j.moduleName="$prg_dir/$progname" "-Dfile.encoding=UTF-8" "-Dinstall4j.launcherId=23" "-Dinstall4j.swt=false" "$vmov_1" "$vmov_2" "$vmov_3" "$vmov_4" "$vmov_5" $INSTALL4J_ADD_VM_PARAMS -classpath "$local_classpath" com.install4j.runtime.launcher.Launcher start com.smartfoxserver.v2.Main false false "" "" true true false "sfs-splash.png" true true 0 0 "" 20 20 "Arial" "0,0,0" 8 500 "version 2.9.0" 20 40 "Arial" "0,0,0" 8 500 -1  > /dev/null 2>&1 &
 
 
     ;;

data/lib/rubyfox/server/data/sfs2x-service.vmoptions

@@ -1,5 +1,5 @@
 # Enter one VM parameter per line
 # To include another file, uncomment the following line and enter the file path:
 # -include-options [path to other .vmoption file]
--classpath/p ./:lib/*:lib/Jetty/*:extensions/__lib__/*
+-classpath/p ./:lib/*:lib/jetty/lib/*:extensions/__lib__/*
 -Dfile.encoding=UTF-8

data/lib/rubyfox/server/data/sfs2x.sh

@@ -2,11 +2,11 @@
 # Use -Xms512M -Xmx512M to start with 512MB of heap memory. Set size according to your needs.
 # Use -XX:+CMSClassUnloadingEnabled -XX:+CMSPermGenSweepingEnabled for PermGen GC
 
-#JRE_FOLDER="../jre/bin"
+JRE_FOLDER="../jre/bin"
 JAVA_CMD="java"
-#if [ -d "$JRE_FOLDER" ]; then
-#    JAVA_CMD="../jre/bin/java"
-#fi
+if [ -d "$JRE_FOLDER" ]; then
+    JAVA_CMD="../jre/bin/java"
+fi
 
-CPATH="./:lib/*:lib/Jetty/*:extensions/__lib__/*"
-${JAVA_CMD} -cp ${CPATH} -Dfile.encoding=UTF-8 com.smartfoxserver.v2.Main $1 $2
+CPATH="./:lib/*:lib/jetty/lib/*:extensions/__lib__/*"
+${JAVA_CMD} -cp ${CPATH} -Dfile.encoding=UTF-8 com.smartfoxserver.v2.Main $1 $2

data/lib/rubyfox/server/data/www/root/admin/ReleaseNotes.txt

@@ -2,6 +2,29 @@
 SmartFoxServer 2X Administration Tool
 =====================================
 
+v1.5.0
+======
+
+New features
+------------
+- New Extension Manager module added, to easily upload new versions of the server Extensions using the Admin Tool.
+- "Thread pools" tab added to the Server Configurator module to configure the new threading system introduced in SmartFoxServer 2X v2.9.
+- Administration permissions can now be assigned in the "Remote admin" tab of the Server Configurator module. Administrators can now be given access to some modules only and server halting/restarting capability can be inhibited.
+- New settings added to the "Web server" tab in Server Configurator module to activate HTTP and HTTPS support separately in the internal web server. Also, HTTP and HTTPS ports can now be configured from within the Admin Tool itself (no need to edit the Jetty configuration manually anymore).
+- New settings added to the "HTML5 WebSockets" tab in Server Configurator module, now supporting SSL encryption activation.
+- The "new version" alert in the Admin Tool's header now indicates the minimum required version in case the update is provided as a patch.
+- New button to reset realtime charts added to Dashboard module.
+- In the Zone Configurator module a new flag allows to explicitly declare that values entered in the Area of Interest and map limits settings of an MMORoom should be treated as floating point numbers.
+- All passwords in Server Configurator module are now displayed as asterisks.
+- Zone Monitor module now shows if the bad words filter is active on the monitored Room.
+- All tables showing configuration parameters in Server Configurator, Zone Configurator and Zone Monitor modules now retain the column width if resized.
+
+Fixed bugs
+----------
+- Negative numbers couldn't be entered as map limits in the "MMO settings" tab of the Zone Configurator module.
+- Error "No instance called 'traffic' is defined" thrown under specific circumstances when using the Zone Monitor module.
+
+
 v1.4.1
 ======
 

data/lib/rubyfox/server/data/www/root/admin/index.html

@@ -51,7 +51,7 @@
             attributes.name = "AdminTool";
             attributes.align = "middle";
             swfobject.embedSWF(
-                "AdminTool.swf?v=1.4.1", "flashContent", 
+                "AdminTool.swf?v=1.5.0", "flashContent", 
                 "100%", "100%", 
                 swfVersionStr, xiSwfUrlStr, 
                 flashvars, params, attributes);
@@ -78,19 +78,17 @@
 	   	
        	<noscript>
             <object classid="clsid:D27CDB6E-AE6D-11cf-96B8-444553540000" width="100%" height="100%" id="AdminTool">
-                <param name="movie" value="AdminTool.swf?v=1.4.1" />
+                <param name="movie" value="AdminTool.swf?v=1.5.0" />
                 <param name="quality" value="high" />
                 <param name="bgcolor" value="#ffffff" />
                 <param name="allowScriptAccess" value="sameDomain" />
                 <param name="allowFullScreen" value="true" />
-                <param name="wmode" value="opaque" />
                 <!--[if !IE]>-->
-                <object type="application/x-shockwave-flash" data="AdminTool.swf?v=1.4.1" width="100%" height="100%">
+                <object type="application/x-shockwave-flash" data="AdminTool.swf?v=1.5.0" width="100%" height="100%">
                     <param name="quality" value="high" />
                     <param name="bgcolor" value="#ffffff" />
                     <param name="allowScriptAccess" value="sameDomain" />
                     <param name="allowFullScreen" value="true" />
-                    <param name="wmode" value="opaque" />
                 <!--<![endif]-->
                 <!--[if gte IE 6]>-->
                 	<p> 
@@ -105,16 +103,6 @@
                 </object>
                 <!--<![endif]-->
             </object>
-	    </noscript>
+	    </noscript>		
    </body>
-   
-	<script type="text/javascript">
-	function onFlexInitialized()
-	{
-		// Force the browser to set flex app with focus
-		document.getElementById("AdminTool").tabIndex = 0
-		document.getElementById("AdminTool").focus();
-	}
-	</script>
-   
 </html>

data/lib/rubyfox/server/data/www/root/admin/modules/config.xml

@@ -5,6 +5,7 @@
 		<module id="BlueBoxMonitor" label="BlueBox Monitor" description="Monitor clients connected through the BlueBox http tunnelling system"/>
 		<module id="LogViewer" label="Log Viewer" description="Check and download SmartFoxServer boot and runtime logs"/>
 		<module id="BanManager" label="Ban Manager" description="Check banned users lists, cancel bannings and ban other users/IPs"/>
+		<module id="ExtensionManager" label="Extension Manager" description="Upload Extension files to the SmartFoxServer instance"/>
 		<module id="ZoneConfigurator" label="Zone Configurator" description="Create and delete SmartFoxServer Zones and static Rooms, or modify the settings of the existing ones"/>
 		<module id="ServerConfigurator" label="Server Configurator" description="Modify the global settings of the SmartFoxServer instance"/>
 		<module id="Analytics" label="Analytics" description="Check the SmartFoxServer usage statistics from a business point of view"/>

data/lib/rubyfox/server/data/www/sfs2x-ws.xml

@@ -0,0 +1,30 @@
+<?xml version="1.0"  encoding="ISO-8859-1"?>
+<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "http://www.eclipse.org/jetty/configure_9_0.dtd">
+
+<!-- ==================================================================
+Configure and deploy the test web application in $(jetty.home)/webapps/test
+
+Note. If this file did not exist or used a context path other that /test
+then the default configuration of jetty.xml would discover the test
+webapplication with a WebAppDeployer.  By specifying a context in this
+directory, additional configuration may be specified and hot deployments
+detected.
+===================================================================== -->
+
+<Configure class="org.eclipse.jetty.webapp.WebAppContext">
+
+	<!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
+	<!-- Required minimal context configuration :                        -->
+	<!--  + contextPath                                                  -->
+	<!--  + war OR resourceBase                                          -->
+	<!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
+	<Set name="contextPath">/BlueBox</Set>
+	<Set name="war"><Property name="jetty.webapps" default="."/>/sfs2x-ws.war</Set>
+
+	<!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
+	<!-- Optional context configuration                                  -->
+	<!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
+	<Set name="extractWAR">true</Set>
+	<Set name="copyWebDir">false</Set>
+ 
+</Configure>

data/lib/rubyfox/server/version.rb

@@ -1,5 +1,5 @@
 module Rubyfox
   module Server
-    VERSION = "2.8.4.0"
+    VERSION = "2.9.0.0"
   end
 end