rubyfox-server 2.11.1.0 → 2.12.1.0

data/lib/rubyfox/server/data/lib/jetty/modules/setuid.mod

@@ -6,14 +6,14 @@
 server
 
 [lib]
-lib/setuid/jetty-setuid-java-1.0.1.jar
+lib/setuid/jetty-setuid-java-1.0.3.jar
 
 [xml]
 etc/jetty-setuid.xml
 
 [ini-template]
 ## SetUID Configuration
-# jetty.startServerAsPrivileged=false
-# jetty.username=jetty
-# jetty.groupname=jetty
-# jetty.umask=002
+# jetty.setuid.startServerAsPrivileged=false
+# jetty.setuid.userName=jetty
+# jetty.setuid.groupName=jetty
+# jetty.setuid.umask=002

data/lib/rubyfox/server/data/lib/jetty/modules/spring.mod

@@ -0,0 +1,17 @@
+#
+# Spring
+#
+
+[name]
+spring
+
+[depend]
+server
+
+[lib]
+lib/spring/*.jar
+
+[ini-template]
+## See http://www.eclipse.org/jetty/documentation/current/frameworks.html#framework-jetty-spring
+## for information on how to complete spring configuration
+

data/lib/rubyfox/server/data/lib/jetty/modules/ssl.mod

@@ -2,28 +2,96 @@
 # SSL Keystore module
 #
 
+[name]
+ssl
+
 [depend]
 server
 
 [xml]
 etc/jetty-ssl.xml
+etc/jetty-ssl-context.xml
 
 [files]
-http://git.eclipse.org/c/jetty/org.eclipse.jetty.project.git/plain/jetty-server/src/main/config/etc/keystore:etc/keystore
+https://raw.githubusercontent.com/eclipse/jetty.project/master/jetty-server/src/test/config/etc/keystore?id=${jetty.tag.version}|etc/keystore
 
 [ini-template]
-## SSL Keystore Configuration
-# define the port to use for secure redirection
-jetty.secure.port=8443
+### TLS(SSL) Connector Configuration
+
+## Connector host/address to bind to
+# jetty.ssl.host=0.0.0.0
+
+## Connector port to listen on
+# jetty.ssl.port=8443
+
+## Connector idle timeout in milliseconds
+# jetty.ssl.idleTimeout=30000
+
+## Connector socket linger time in seconds (-1 to disable)
+# jetty.ssl.soLingerTime=-1
+
+## Number of acceptors (-1 picks default based on number of cores)
+# jetty.ssl.acceptors=-1
+
+## Number of selectors (-1 picks default based on number of cores)
+# jetty.ssl.selectors=-1
+
+## ServerSocketChannel backlog (0 picks platform default)
+# jetty.ssl.acceptorQueueSize=0
+
+## Thread priority delta to give to acceptor threads
+# jetty.ssl.acceptorPriorityDelta=0
+
+## Whether request host names are checked to match any SNI names
+# jetty.ssl.sniHostCheck=true
+
+## max age in seconds for a Strict-Transport-Security response header (default -1)
+# jetty.ssl.stsMaxAgeSeconds=31536000
+
+## include subdomain property in any Strict-Transport-Security header (default false)
+# jetty.ssl.stsIncludeSubdomains=true
+
+### SslContextFactory Configuration
+## 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
+
+## Keystore file path (relative to $jetty.base)
+# jetty.sslContext.keyStorePath=etc/keystore
+
+## Truststore file path (relative to $jetty.base)
+# jetty.sslContext.trustStorePath=etc/keystore
+
+## Keystore password
+# jetty.sslContext.keyStorePassword=OBF:1vny1zlo1x8e1vnw1vn61x8g1zlu1vn4
+
+## Keystore type and provider
+# jetty.sslContext.keyStoreType=JKS
+# jetty.sslContext.keyStoreProvider=
+
+## KeyManager password
+# jetty.sslContext.keyManagerPassword=OBF:1u2u1wml1z7s1z7a1wnl1u2g
+
+## Truststore password
+# jetty.sslContext.trustStorePassword=OBF:1vny1zlo1x8e1vnw1vn61x8g1zlu1vn4
+
+## Truststore type and provider
+# jetty.sslContext.trustStoreType=JKS
+# jetty.sslContext.trustStoreProvider=
+
+## whether client certificate authentication is required
+# jetty.sslContext.needClientAuth=false
+
+## Whether client certificate authentication is desired
+# jetty.sslContext.wantClientAuth=false
+
+## Whether cipher order is significant (since java 8 only)
+# jetty.sslContext.useCipherSuitesOrder=true
 
-# Setup a demonstration keystore and truststore
-jetty.keystore=etc/keystore
-jetty.truststore=etc/keystore
+## To configure Includes / Excludes for Cipher Suites or Protocols see tweak-ssl.xml example at
+## https://www.eclipse.org/jetty/documentation/current/configuring-ssl.html#configuring-sslcontextfactory-cipherSuites
 
-# 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
+## Set the size of the SslSession cache
+# jetty.sslContext.sslSessionCacheSize=-1
 
+## Set the timeout (in seconds) of the SslSession cache timeout
+# jetty.sslContext.sslSessionTimeout=-1

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

@@ -3,5 +3,5 @@
 #
 --module=http
 ## HTTP Connector Configuration
-jetty.port=8080
-http.timeout=30000
+jetty.http.port=8080
+jetty.http.idleTimeout=30000

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

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

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

@@ -4,16 +4,16 @@
 --module=ssl
 ## SSL Keystore Configuration
 # define the port to use for secure redirection
-jetty.secure.port=8443
+jetty.ssl.port=8443
 
 # Setup a demonstration keystore and truststore
-jetty.keystore=etc/keystore
-jetty.truststore=etc/keystore
+jetty.sslContext.keyStorePath=etc/keystore
+jetty.sslContext.trustStorePath=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
+jetty.sslContext.keyStorePassword=OBF:1vny1zlo1x8e1vnw1vn61x8g1zlu1vn4
+jetty.sslContext.keyManagerPassword=OBF:1u2u1wml1z7s1z7a1wnl1u2g
+jetty.sslContext.trustStorePassword=OBF:1vny1zlo1x8e1vnw1vn61x8g1zlu1vn4
 

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

@@ -40,17 +40,17 @@
 --module=server
 ## Server Threading Configuration
 # minimum number of threads
-threads.min=10
+jetty.threadPool.minThreads=10
 # maximum number of threads
-threads.max=200
+jetty.threadPool.maxThreads=200
 # thread idle timeout in milliseconds
-threads.timeout=60000
+jetty.threadPool.idleTimeout=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
+jetty.server.dumpAfterStart=false
 # Dump the state of the Jetty server, before stop
-jetty.dump.stop=false
+jetty.server.dumpBeforeStop=false
 
 org.eclipse.jetty.server.Request.maxFormContentSize=10000000
 
@@ -62,7 +62,7 @@ org.eclipse.jetty.server.Request.maxFormContentSize=10000000
 #
 # Initialize module websocket
 #
---module=websocket
+
 
 #
 # Initialize module jsp
@@ -75,7 +75,6 @@ org.eclipse.jetty.server.Request.maxFormContentSize=10000000
 #
 # Initialize module ext
 #
---module=ext
 
 #
 # Initialize 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 "7" ]; then
+    if [ "$ver_minor" -lt "8" ]; then
       return;
     fi
   fi
@@ -167,7 +167,7 @@ read_vmoptions() {
   if [ ! -r "$vmoptions_file" ]; then
     vmoptions_file="$prg_dir/$vmoptions_file"
   fi
-  if [ -r "$vmoptions_file" ]; then
+  if [ -r "$vmoptions_file" ] && [ -f "$vmoptions_file" ]; then
     exec 8< "$vmoptions_file"
     while read cur_option<&8; do
       is_comment=`expr "W$cur_option" : 'W *#.*'`
@@ -207,24 +207,32 @@ read_vmoptions() {
 }
 
 
+unpack_file() {
+  if [ -f "$1" ]; then
+    jar_file=`echo "$1" | awk '{ print substr($0,1,length-5) }'`
+    bin/unpack200 -r "$1" "$jar_file"
+
+    if [ $? -ne 0 ]; then
+      echo "Error unpacking jar files. The architecture or bitness (32/64)"
+      echo "of the bundled JVM might not match your machine."
+      echo "You might also need administrative privileges for this operation."
+exit 1
+    fi
+  fi
+}
+
 run_unpack200() {
   if [ -f "$1/lib/rt.jar.pack" ]; then
     old_pwd200=`pwd`
     cd "$1"
     echo "Preparing JRE ..."
-    jar_files="lib/rt.jar lib/jfxrt.jar lib/charsets.jar lib/plugin.jar lib/deploy.jar lib/ext/localedata.jar lib/jsse.jar"
-    for jar_file in $jar_files
+    for pack_file in lib/*.jar.pack
     do
-      if [ -f "${jar_file}.pack" ]; then
-        bin/unpack200 -r ${jar_file}.pack $jar_file
-
-        if [ $? -ne 0 ]; then
-          echo "Error unpacking jar files. The architecture or bitness (32/64)"
-          echo "of the bundled JVM might not match your machine."
-          echo "You might also need administrative privileges for this operation."
-exit 1
-        fi
-      fi
+      unpack_file $pack_file
+    done
+    for pack_file in lib/ext/*.jar.pack
+    do
+      unpack_file $pack_file
     done
     cd "$old_pwd200"
   fi
@@ -298,7 +306,8 @@ fi
 
 
 if [ -z "$app_java_home" ]; then
-  common_jvm_locations="/opt/i4j_jres/* /usr/local/i4j_jres/* $HOME/.i4j_jres/* /usr/bin/java* /usr/bin/jdk* /usr/bin/jre* /usr/bin/j2*re* /usr/bin/j2sdk* /usr/java* /usr/java*/jre /usr/jdk* /usr/jre* /usr/j2*re* /usr/j2sdk* /usr/java/j2*re* /usr/java/j2sdk* /opt/java* /usr/java/jdk* /usr/java/jre* /usr/lib/java/jre /usr/local/java* /usr/local/jdk* /usr/local/jre* /usr/local/j2*re* /usr/local/j2sdk* /usr/jdk/java* /usr/jdk/jdk* /usr/jdk/jre* /usr/jdk/j2*re* /usr/jdk/j2sdk* /usr/lib/jvm/* /usr/lib/java* /usr/lib/jdk* /usr/lib/jre* /usr/lib/j2*re* /usr/lib/j2sdk* /System/Library/Frameworks/JavaVM.framework/Versions/1.?/Home"
+  common_jvm_locations="/opt/i4j_jres/* /usr/local/i4j_jres/* $HOME/.i4j_jres/* /usr/bin/java* /usr/bin/jdk* /usr/bin/jre* /usr/bin/j2*re* /usr/bin/j2sdk* /usr/java* /usr/java*/jre /usr/jdk* /usr/jre* /usr/j2*re* /usr/j2sdk* /usr/java/j2*re* /usr/java/j2sdk* /opt/java* /usr/java/jdk* /usr/java/jre* /usr/lib/java/jre /usr/local/java* /usr/local/jdk* /usr/local/jre* /usr/local/j2*re* /usr/local/j2sdk* /usr/jdk/java* /usr/jdk/jdk* /usr/jdk/jre* /usr/jdk/j2*re* /usr/jdk/j2sdk* /usr/lib/jvm/* /usr/lib/java* /usr/lib/jdk* /usr/lib/jre* /usr/lib/j2*re* /usr/lib/j2sdk* /System/Library/Frameworks/JavaVM.framework/Versions/1.?/Home
+ /Library/Internet\ Plug-Ins/JavaAppletPlugin.plugin/Contents/Home /Library/Java/JavaVirtualMachines/*.jdk/Contents/Home/jre"
   for current_location in $common_jvm_locations
   do
 if [ -z "$app_java_home" ]; then
@@ -333,7 +342,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.7.
+  echo The version of the JVM must be at least 1.8.
   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
@@ -344,15 +353,15 @@ compiz_workaround
 i4j_classpath="$app_home/.install4j/i4jruntime.jar"
 local_classpath=""
 add_class_path "$i4j_classpath"
-for i in `ls "$app_home/SFS2X/lib" 2> /dev/null | egrep "\.(jar$|zip$)"`
+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/extensions/__lib__" 2> /dev/null | egrep "\.(jar$|zip$)"`
+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$)"`
+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
@@ -389,14 +398,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.9.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.12.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.9.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.12.0" 20 40 "Arial" "0,0,0" 8 500 -1 
 
 
     ;;
@@ -415,7 +424,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.9.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.12.0" 20 40 "Arial" "0,0,0" 8 500 -1  > /dev/null 2>&1 &
 
 
     ;;

data/lib/rubyfox/server/data/www/HelloServlet/META-INF/MANIFEST.MF

@@ -0,0 +1,2 @@
+Manifest-Version: 1.0
+

data/lib/rubyfox/server/data/www/HelloServlet/META-INF/context.xml

@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Context antiJARLocking="true" path="/TestWenApp"/>

data/lib/rubyfox/server/data/www/HelloServlet/WEB-INF/web.xml

@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<web-app version="3.0" xmlns="http://java.sun.com/xml/ns/javaee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_3_0.xsd">
+    <servlet>
+        <servlet-name>HelloServlet</servlet-name>
+        <servlet-class>simple.test.jsp.HelloServlet</servlet-class>
+    </servlet>
+    <servlet-mapping>
+        <servlet-name>HelloServlet</servlet-name>
+        <url-pattern>/HelloServlet</url-pattern>
+    </servlet-mapping>
+    <session-config>
+        <session-timeout>
+            30
+        </session-timeout>
+    </session-config>
+</web-app>

data/lib/rubyfox/server/data/www/HelloServlet/index.jsp

@@ -0,0 +1,40 @@
+<%-- 
+    This servlet example is taken from this tutorial:
+	http://www.roseindia.net/jsp/simple-jsp-example/conversiontable-of-kilometers-per.shtml
+--%>
+
+<%@page contentType="text/html" pageEncoding="UTF-8"%>
+<!DOCTYPE html>
+
+<html>
+    <head>
+        <title>ConversionTable of Kilometers perLiter and Miles per Gallon </title>
+    </head>
+    <body>
+    <h2 style="color:#cc0000">:: JSP Example ::</h2>
+    <h3 style="color:#cc0000">ConversionTable of Kilometers per Liter and Miles per Gallon</h2>
+	
+    <table border="1" cellspacing="0" cellpadding="8" bordercolor="white" bgcolor="#f4f4f4">
+        <tr>
+            <td bgcolor="#ffcc00"><b>Kilometers per Liter</b></td>
+            <td bgcolor="#ffcc00"><b>Miles per Gallon</b></td>
+        <tr>
+        <%
+            double kmpl=0.0;
+            double mpg=0.0;
+            final double CONVERSION_FACTOR = 2.352145;
+
+            for (kmpl = 5; kmpl < 25;kmpl++) {
+            	mpg = kmpl * CONVERSION_FACTOR;
+        %>      
+        <tr>
+            <td><%=kmpl%></td>
+            <td><%=mpg%></td>
+        </tr>
+        <%    
+            }
+        %>
+    </table>
+</body>
+</html>
+

data/lib/rubyfox/server/data/www/PyServletExample/MyModule.py

@@ -0,0 +1,5 @@
+alpha = "alpha"
+beta = "beta"
+
+def square(x):
+	return x*x

data/lib/rubyfox/server/data/www/PyServletExample/WEB-INF/web.xml

@@ -0,0 +1,37 @@
+<?xml version = '1.0' encoding = 'UTF-8'?>
+<!DOCTYPE web-app PUBLIC
+"-//Sun Microsystems, Inc.//DTD Web Application 2.3//EN"
+"http://java.sun.com/dtd/web-app_2_3.dtd">
+
+<web-app>
+	<display-name>default</display-name>
+	<description></description>
+	
+	<welcome-file-list>
+		<welcome-file>index.py</welcome-file>
+		<welcome-file>index.htm</welcome-file>
+		<welcome-file>index.html</welcome-file>
+	</welcome-file-list>	
+	
+	<error-page>
+		<error-code>404</error-code>
+		<location>/errors/404.htm</location>
+	</error-page>
+	
+	<servlet>
+		<servlet-name>DefaultServlet</servlet-name>
+		<servlet-class>org.python.util.PyServlet</servlet-class>
+
+		<init-param>
+			<param-name>python.home</param-name>
+			<param-value>./lib/</param-value>
+		</init-param>
+
+		<load-on-startup>1</load-on-startup>
+	</servlet>
+	
+	<servlet-mapping>
+		<servlet-name>DefaultServlet</servlet-name>
+		<url-pattern>*.py</url-pattern>
+	</servlet-mapping>
+</web-app>

data/lib/rubyfox/server/data/www/PyServletExample/errors/404.htm

@@ -0,0 +1,20 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
+<title>Welcome Page</title>
+<style type="text/css">
+<!--
+body,td,th {
+	font-family: Georgia, Times New Roman, Times, serif;
+}
+body {
+	background-color: #0033FF;
+}
+-->
+</style></head>
+
+<body>
+<p style="font-size:60px; color:#FFFFFF; font-weight:bolder">Error 404!! </p>
+</body>
+</html>

data/lib/rubyfox/server/data/www/PyServletExample/index.py

@@ -0,0 +1,42 @@
+from javax.servlet.http import HttpServlet
+from com.smartfoxserver.v2 import SmartFoxServer
+
+from random import randint
+from MyModule import alpha, square
+
+class index(HttpServlet):
+
+	def __init__(self):
+		self.htmlHead = "<html><head></head><body style='font-family:Verdana'>"
+		self.closeHtml = "</body></html>"
+
+		
+	def doGet(self, request, response):	
+		w = response.getWriter()
+		w.println(self.htmlHead)
+		
+		w.println("<h2>SmartFoxServer 2X :: Status</h2><hr>")
+		w.println("<p>ver: " + SmartFoxServer.version + "<p>")
+		w.println("<p>rnd: " + str(randint(0,1000)) + "<p>")
+		w.println("<table cellpadding='6' cellspacing='0' border='0'>")
+		w.println("<tr bgcolor='#eeeeee'><th align='left'>Key</th><th align='left'>Value</th></tr>")
+		
+		sfs = SmartFoxServer.getInstance()
+		zManager = sfs.getZoneManager()
+		zones = zManager.getZoneList()
+		
+		for zone in zones:
+			w.println('<ul><li><b>' + zone.name + '</b>')
+			
+			rooms = zone.getRoomList()
+			for room in rooms:
+				w.println(('<ul><li>%s (%s/%s)</li></ul>' % (room.name, room.maxUsers, room.maxSpectators)))				
+			
+			w.println('</li></ul>')
+		
+		w.println(self.closeHtml)
+		w.close()
+		
+	def doPost(self, request, response):	
+		pass
+		

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

@@ -2,6 +2,17 @@
 SmartFoxServer 2X Administration Tool
 =====================================
 
+v2.0.0
+======
+
+New features
+------------
+- Upgraded interface and Flash Player compatibility; this will allow for future expansions under development.
+- Admin Tool is now ready to be delivered as a native application, when the Flash Player will be phased out from certain browsers.
+- New setting in the "Remote admin" tab of the Server Configurator module makes it possible to encrypt the Admin Tool's connection to the server.
+- A custom name can be assigned to the server in the "General" tab of the Server Configurator module, for easier identification in case of environments running multiple SmartFoxServer instances.
+
+
 v1.5.2
 ======
 
@@ -10,6 +21,7 @@ New features
 - License Manager module now features a "Reload" button to make SmartFoxServer hot reload the license in case of changes (e.g max CCU upgrade), thus avoiding a full server restart (requires SmartFoxServer 2X v2.11 or later)
 - New setting in License Module to activate an email notification in case the number of users currently connected to the server are approaching the maximum CCU number of the license.
 
+
 v1.5.1
 ======