rubyfox-server 2.17.3.2 → 2.19.2.0

data/lib/rubyfox/server/data/lib/js/JSApi.js

@@ -64,7 +64,8 @@ load($$API_LIB_PATH + 'LibUtil.js');
  * <h4>Notes</h4>
  * <ul>
  * <li>For members of the <em>SFSObject</em> class, please [refer to its Javadoc]{@link http://docs2x.smartfoxserver.com/api-docs/javadoc/server/com/smartfoxserver/v2/entities/data/SFSObject.html}.</li>
- * <li>Strings are handled via UTF-8 encoding, to support all languages and character sets.</li>
+ * <li>SFSObject key strings are limited to ASCII characters.</li>
+ * <li>SFSObject string values support UTF-8 encoding.</li>
  * <li>In JavaScript, long integer numbers are limited to [Number.MAX_SAFE_INTEGER]{@link https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Number/MAX_SAFE_INTEGER} (positive and negative, inclusive).
  * This is inconsistent with the max and min Long values available in Java, which are down to <code>-2^63</code> and up to <code>(2^63)-1</code>.</li>
  * </ul>

data/lib/rubyfox/server/data/lib/js/LibApi.js

@@ -619,25 +619,6 @@ SFSApi.prototype.checkSecurePassword = function(session, originalPass, encrypted
 	return this._javaApi.checkSecurePassword(session, originalPass, encryptedPass);
 }
 
-/*
- * Logs a client into a Zone, turning its <em>Session</em> object into a <em>SFSUser</em> object.
- *
- * @param	{Session} session		The client's <img src="java-icon-small.png"></img> [Session]{@link http://docs2x.smartfoxserver.com/api-docs/javadoc/server/com/smartfoxserver/bitswarm/sessions/Session.html} object, usually provided by the <img src="java-icon-small.png"></img> [SFSEventType.USER_LOGIN]{@link http://docs2x.smartfoxserver.com/api-docs/javadoc/server/com/smartfoxserver/v2/core/SFSEventType.html#USER_LOGIN} event.
- * @param	{string} name			The user name.
- * @param	{string} pass			The user password.
- * @param	{string} zoneName		The name of the Zone to join.
- * @param	{SFSObject} params		A <em>SFSObject</em> containing the custom parameters to be sent back to the client, attached to the client-side <em>LOGIN</em> event.
- * @param	{boolean} forceLogout	If a user with the same name is already logged in the system and <code>true</code> is passed, that user will be disconnected before logging in the new user.
- *
- * @return {SFSUser} The <img src="java-icon-small.png"></img> [SFSUser]{@link http://docs2x.smartfoxserver.com/api-docs/javadoc/server/com/smartfoxserver/v2/entities/SFSUser.html} object representing the logged-in user.
- */
-/*
-SFSApi.prototype.login = function(session, name, pass, zoneName, params, forceLogout)
-{
-	return this._javaApi.login(session, name, pass, zoneName, params, forceLogout)
-}
-*/
-
 /**
  * Logs a user out of the current Zone.
  *
@@ -800,7 +781,16 @@ SFSApi.prototype.disconnectSession = function(session)
  */
 SFSApi.prototype.createRoom = function(zone, settings, owner, joinIt, roomToLeave, fireClientEvent, fireServerEvent)
 {
-	return this._javaApi.createRoom(zone, settings, owner, joinIt, roomToLeave, fireClientEvent, fireServerEvent);
+	return this._javaApi.createRoom
+	(
+		zone,
+		settings,
+		(owner === undefined ? null : owner),
+		(joinIt === undefined ? false : joinIt),
+		(roomToLeave === undefined ? null : roomToLeave),
+		(fireClientEvent === undefined ? false : fireClientEvent),
+		(fireServerEvent === undefined ? false : fireServerEvent)
+	);
 }
 
 /**
@@ -906,11 +896,16 @@ SFSApi.prototype.getUserBySession = function(session)
  */
 SFSApi.prototype.joinRoom = function(user, roomToJoin, password, asSpectator, roomToLeave, fireClientEvent, fireServerEvent)
 {
-	// Switch from JS undefined to Java null
-	if (roomToLeave == undefined)
-		roomToLeave = null;
-
-	this._javaApi.joinRoom(user, roomToJoin, password, asSpectator, roomToLeave, fireClientEvent, fireServerEvent);
+	this._javaApi.joinRoom
+	(
+		user,
+		roomToJoin,
+		(password === undefined ? null : password),
+		(asSpectator === undefined ? false : asSpectator),
+		(roomToLeave === undefined ? null : roomToLeave),
+		(fireClientEvent === undefined ? false : fireClientEvent),
+		(fireServerEvent === undefined ? false : fireServerEvent)
+	);
 }
 
 /**
@@ -923,7 +918,13 @@ SFSApi.prototype.joinRoom = function(user, roomToJoin, password, asSpectator, ro
  */
 SFSApi.prototype.leaveRoom = function(user, room, fireClientEvent, fireServerEvent)
 {
-	this._javaApi.leaveRoom(user, room, fireClientEvent, fireServerEvent);
+	this._javaApi.leaveRoom
+	(
+		user,
+		room,
+		(fireClientEvent === undefined ? false : fireClientEvent),
+		(fireServerEvent === undefined ? false : fireServerEvent)
+	);
 }
 
 /**
@@ -935,7 +936,12 @@ SFSApi.prototype.leaveRoom = function(user, room, fireClientEvent, fireServerEve
  */
 SFSApi.prototype.removeRoom = function(room, fireClientEvent, fireServerEvent)
 {
-	this._javaApi.removeRoom(room, fireClientEvent, fireServerEvent);
+	this._javaApi.removeRoom
+	(
+		room,
+		(fireClientEvent === undefined ? false : fireClientEvent),
+		(fireServerEvent === undefined ? false : fireServerEvent)
+	);
 }
 
 /**
@@ -950,7 +956,13 @@ SFSApi.prototype.removeRoom = function(room, fireClientEvent, fireServerEvent)
  */
 SFSApi.prototype.sendPublicMessage = function(targetRoom, sender, message, params)
 {
-	this._javaApi.sendPublicMessage(targetRoom, sender, message, params);
+	this._javaApi.sendPublicMessage
+	(
+		targetRoom,
+		sender,
+		message,
+		(params === undefined ? null : params)
+	);
 }
 
 /**
@@ -965,7 +977,13 @@ SFSApi.prototype.sendPublicMessage = function(targetRoom, sender, message, param
  */
 SFSApi.prototype.sendPrivateMessage = function(sender, recipient, message, params)
 {
-	this._javaApi.sendPrivateMessage(sender, recipient, message, params);
+	this._javaApi.sendPrivateMessage
+	(
+		sender,
+		recipient,
+		message,
+		(params === undefined ? null : params)
+	);
 }
 
 /**
@@ -1023,7 +1041,13 @@ SFSApi.prototype.sendObjectMessage = function(targetRoom, sender, message, recip
 	if (recipients instanceof Array)
 		recipients = $$Util.toList(recipients);
 
-	this._javaApi.sendObjectMessage(targetRoom, sender, message, recipients);
+	this._javaApi.sendObjectMessage
+	(
+		targetRoom,
+		sender,
+		message,
+		(recipients === undefined ? null : recipients)
+	);
 }
 
 /**
@@ -1068,7 +1092,15 @@ SFSApi.prototype.setRoomVariables = function(user, targetRoom, variables, fireCl
 	if (variables instanceof Array)
 		variables = $$Util.toList(variables);
 
-	this._javaApi.setRoomVariables(user, targetRoom, variables, fireClientEvent, fireServerEvent, overrideOwnership);
+	this._javaApi.setRoomVariables
+	(
+		user,
+		targetRoom,
+		variables,
+		(fireClientEvent === undefined ? false : fireClientEvent),
+		(fireServerEvent === undefined ? false : fireServerEvent),
+		(overrideOwnership === undefined ? false : overrideOwnership)
+	);
 }
 
 /**
@@ -1115,7 +1147,13 @@ SFSApi.prototype.setUserVariables = function(owner, variables, fireClientEvent,
 	if (variables instanceof Array)
 		variables = $$Util.toList(variables);
 
-	this._javaApi.setUserVariables(owner, variables, fireClientEvent, fireServerEvent);
+	this._javaApi.setUserVariables
+	(
+		owner,
+		variables,
+		(fireClientEvent === undefined ? false : fireClientEvent),
+		(fireServerEvent === undefined ? false : fireServerEvent)
+	);
 }
 
 /**
@@ -1203,7 +1241,13 @@ SFSApi.prototype.unsubscribeRoomGroup = function(user, groupId)
  */
 SFSApi.prototype.spectatorToPlayer = function(user, targetRoom, fireClientEvent, fireServerEvent)
 {
-	this._javaApi.spectatorToPlayer(user, targetRoom, fireClientEvent, fireServerEvent);
+	this._javaApi.spectatorToPlayer
+	(
+		user,
+		targetRoom,
+		(fireClientEvent === undefined ? false : fireClientEvent),
+		(fireServerEvent === undefined ? false : fireServerEvent)
+	);
 }
 
 /**
@@ -1218,7 +1262,13 @@ SFSApi.prototype.spectatorToPlayer = function(user, targetRoom, fireClientEvent,
  */
 SFSApi.prototype.playerToSpectator = function(user, targetRoom, fireClientEvent, fireServerEvent)
 {
-	this._javaApi.playerToSpectator(user, targetRoom, fireClientEvent, fireServerEvent);
+	this._javaApi.playerToSpectator
+	(
+		user,
+		targetRoom,
+		(fireClientEvent === undefined ? false : fireClientEvent),
+		(fireServerEvent === undefined ? false : fireServerEvent)
+	);
 }
 
 //==============================================================================
@@ -1251,7 +1301,7 @@ BuddyApi = function()
  *
  * <p>This causes saved data (the list of buddies and their persistent Buddy Variables) to be loaded from the Buddy List storage.</p>
  *
- * @param	{SFSUser} user		The <img src="java-icon-small.png"></img> [SFSUser]{@link http://docs2x.smartfoxserver.com/api-docs/javadoc/server/com/smartfoxserver/v2/entities/SFSUser.html} object representing the user whose Buddy List should be loaded.
+ * @param	{SFSUser} user						The <img src="java-icon-small.png"></img> [SFSUser]{@link http://docs2x.smartfoxserver.com/api-docs/javadoc/server/com/smartfoxserver/v2/entities/SFSUser.html} object representing the user whose Buddy List should be loaded.
  * @param	{boolean} [fireServerEvent=false]	If <code>true</code>, a server-side event of type <img src="java-icon-small.png"></img> [SFSEventType.BUDDY_LIST_INIT]{@link http://docs2x.smartfoxserver.com/api-docs/javadoc/server/com/smartfoxserver/v2/core/SFSEventType.html#BUDDY_LIST_INIT} will be fired to notify the Buddy List initialization success.
  *
  * @return {SFSBuddyList} A <img src="java-icon-small.png"></img> [SFSBuddyList]{@link http://docs2x.smartfoxserver.com/api-docs/javadoc/server/com/smartfoxserver/v2/buddylist/SFSBuddyList.html} class instance representing the usere's Buddy List.
@@ -1260,7 +1310,11 @@ BuddyApi = function()
  */
 BuddyApi.prototype.initBuddyList = function(user, fireServerEvent)
 {
-	return this._javaApi.initBuddyList(user, fireServerEvent);
+	return this._javaApi.initBuddyList
+	(
+		user,
+		(fireServerEvent === undefined ? false : fireServerEvent)
+	);
 }
 
 /**
@@ -1274,7 +1328,12 @@ BuddyApi.prototype.initBuddyList = function(user, fireServerEvent)
  */
 BuddyApi.prototype.goOnline = function(user, online, fireServerEvent)
 {
-	this._javaApi.goOnline(user, online, fireServerEvent);
+	this._javaApi.goOnline
+	(
+		user,
+		online,
+		(fireServerEvent === undefined ? false : fireServerEvent)
+	);
 }
 
 /**
@@ -1290,7 +1349,14 @@ BuddyApi.prototype.goOnline = function(user, online, fireServerEvent)
  */
 BuddyApi.prototype.addBuddy = function(owner, buddyName, isTemp, fireClientEvent, fireServerEvent)
 {
-	this._javaApi.addBuddy(owner, buddyName, isTemp, fireClientEvent, fireServerEvent);
+	this._javaApi.addBuddy
+	(
+		owner,
+		buddyName,
+		isTemp,
+		(fireClientEvent === undefined ? false : fireClientEvent),
+		(fireServerEvent === undefined ? false : fireServerEvent)
+	);
 }
 
 /**
@@ -1311,7 +1377,13 @@ BuddyApi.prototype.setBuddyVariables = function(owner, variables, fireClientEven
 	if (variables instanceof Array)
 		variables = $$Util.toList(variables);
 
-	this._javaApi.setBuddyVariables(user, variables, fireClientEvent, fireServerEvent);
+	this._javaApi.setBuddyVariables
+	(
+		owner,
+		variables,
+		(fireClientEvent === undefined ? false : fireClientEvent),
+		(fireServerEvent === undefined ? false : fireServerEvent)
+	);
 }
 
 /**
@@ -1324,7 +1396,13 @@ BuddyApi.prototype.setBuddyVariables = function(owner, variables, fireClientEven
  */
 BuddyApi.prototype.removeBuddy = function(owner, buddyName, fireClientEvent, fireServerEvent)
 {
-	this._javaApi.removeBuddy(owner, buddyName, fireClientEvent, fireServerEvent);
+	this._javaApi.removeBuddy
+	(
+		owner,
+		buddyName,
+		(fireClientEvent === undefined ? false : fireClientEvent),
+		(fireServerEvent === undefined ? false : fireServerEvent)
+	);
 }
 
 /**
@@ -1340,7 +1418,14 @@ BuddyApi.prototype.removeBuddy = function(owner, buddyName, fireClientEvent, fir
  */
 BuddyApi.prototype.blockBuddy = function(owner, buddyName, isBlocked, fireClientEvent, fireServerEvent)
 {
-	this._javaApi.blockBuddy(owner, buddyName, isBlocked, fireClientEvent, fireServerEvent);
+	this._javaApi.blockBuddy
+	(
+		owner,
+		buddyName,
+		isBlocked,
+		(fireClientEvent === undefined ? false : fireClientEvent),
+		(fireServerEvent === undefined ? false : fireServerEvent)
+	);
 }
 
 /**
@@ -1431,7 +1516,14 @@ GameApi = function()
  */
 GameApi.prototype.createGame = function(zone, settings, owner, fireClientEvent, fireServerEvent)
 {
-	return this._javaApi.createGame(zone, settings, owner, fireClientEvent, fireServerEvent);
+	return this._javaApi.createGame
+	(
+		zone,
+		settings,
+		(owner === undefined ? null : owner),
+		(fireClientEvent === undefined ? false : fireClientEvent),
+		(fireServerEvent === undefined ? false : fireServerEvent)
+	);
 }
 
 /**
@@ -1487,7 +1579,14 @@ GameApi.prototype.sendInvitation = function(inviter, invitees, expirySeconds, in
 		throw new java.lang.IllegalArgumentException("Callback handler must implement these three methods: onAccepted, onRefused, onExpired");
 
 	var handler = Java.extend(InvitationCallback, invCallBackHandler);
-	this._javaApi.sendInvitation(inviter, invitees, expirySeconds, new handler(), params);
+	this._javaApi.sendInvitation
+	(
+		inviter,
+		invitees,
+		expirySeconds,
+		new handler(),
+		(params === undefined ? null : params)
+	);
 }
 
 /**
@@ -1546,7 +1645,14 @@ GameApi.prototype.sendInvitation = function(inviter, invitees, expirySeconds, in
  */
 GameApi.prototype.replyToInvitation = function(invitedUser, invitationId, reply, params, fireClientEvent)
 {
-	this._javaApi.replyToInvitation(invitedUser, invitationId, reply, params, fireClientEvent);
+	this._javaApi.replyToInvitation
+	(
+		invitedUser,
+		invitationId,
+		reply,
+		(params === undefined ? null : params),
+		(fireClientEvent === undefined ? false : fireClientEvent)
+	);
 }
 
 /**
@@ -1567,7 +1673,16 @@ GameApi.prototype.sendJoinRoomInvitation = function(target, inviter, invitees, e
 	if (invitees instanceof Array)
 		invitees = $$Util.toList(invitees);
 
-	this._javaApi.sendJoinRoomInvitation(target, inviter, invitees, expirySeconds, asSpect, leaveLastJoinedRoom, params);
+	this._javaApi.sendJoinRoomInvitation
+	(
+		target,
+		inviter,
+		invitees,
+		expirySeconds,
+		(asSpect === undefined ? false : asSpect),
+		(leaveLastJoinedRoom === undefined ? false : leaveLastJoinedRoom),
+		(params === undefined ? null : params)
+	);
 }
 
 //==============================================================================
@@ -1616,7 +1731,13 @@ MMOApi = function()
  */
 MMOApi.prototype.sendObjectMessage = function(targetRoom, sender, message, aoi)
 {
-	this._javaApi.sendObjectMessage(targetRoom, sender, message, aoi);
+	this._javaApi.sendObjectMessage
+	(
+		targetRoom,
+		sender,
+		message,
+		(aoi === undefined ? null : aoi)
+	);
 }
 
 /**
@@ -1634,7 +1755,14 @@ MMOApi.prototype.sendObjectMessage = function(targetRoom, sender, message, aoi)
  */
 MMOApi.prototype.sendPublicMessage = function(targetRoom, sender, message, params, aoi)
 {
-	this._javaApi.sendPublicMessage(targetRoom, sender, message, params, aoi);
+	this._javaApi.sendPublicMessage
+	(
+		targetRoom,
+		sender,
+		message,
+		(params === undefined ? null : params),
+		(aoi === undefined ? null : aoi)
+	);
 }
 
 /**
@@ -1688,7 +1816,12 @@ MMOApi.prototype.setMMOItemVariables = function(item, variables, fireClientEvent
 	if (variables instanceof Array)
 		variables = $$Util.toList(variables);
 
-	this._javaApi.setMMOItemVariables(item, variables, fireClientEvent);
+	this._javaApi.setMMOItemVariables
+	(
+		item,
+		variables,
+		(fireClientEvent === undefined ? false : fireClientEvent)
+	);
 }
 
 //--- MMOApi helper object -----------------------------------------------------

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

@@ -91,8 +91,8 @@ create_db_entry() {
   db_new_file=${db_file}_new
   if [ -f "$db_file" ]; then
     awk '$2 != "'"$test_dir"'" {print $0}' $db_file > $db_new_file
-    rm "$db_file"
-    mv "$db_new_file" "$db_file"
+    cp "$db_new_file" "$db_file"
+    rm "$db_new_file" 2> /dev/null
   fi
   dir_escaped=`echo "$test_dir" | sed -e 's/ /\\\\ /g'`
   echo "JRE_VERSION	$dir_escaped	$ver_major	$ver_minor	$ver_micro	$ver_patch" >> $db_file
@@ -148,17 +148,17 @@ test_jvm() {
   if [ "$ver_major" = "" ]; then
     return;
   fi
-  if [ "$ver_major" -lt "1" ]; then
+  if [ "$ver_major" -lt "11" ]; then
     return;
-  elif [ "$ver_major" -eq "1" ]; then
-    if [ "$ver_minor" -lt "8" ]; then
-      return;
-    fi
   fi
 
   if [ "$ver_major" = "" ]; then
     return;
   fi
+  if [ "$ver_major" -gt "16" ]; then
+    return;
+  fi
+
   app_java_home=$test_dir
 }
 
@@ -280,8 +280,8 @@ if [ -f "$app_home/.install4j/pref_jre.cfg" ]; then
     read file_jvm_home < "$app_home/.install4j/pref_jre.cfg"
     test_jvm "$file_jvm_home"
     if [ -z "$app_java_home" ] && [ $tested_jvm = "false" ]; then
-if [ -f "$db_file" ]; then
-  rm "$db_file" 2> /dev/null
+if [ -w "$db_file" ]; then
+  /bin/sh -c ': > "$db_file"' 2> /dev/null
 fi
         test_jvm "$file_jvm_home"
     fi
@@ -291,8 +291,8 @@ fi
 if [ -z "$app_java_home" ]; then
   test_jvm "$app_home/jre" 
   if [ -z "$app_java_home" ] && [ $tested_jvm = "false" ]; then
-if [ -f "$db_file" ]; then
-  rm "$db_file" 2> /dev/null
+if [ -w "$db_file" ]; then
+  /bin/sh -c ': > "$db_file"' 2> /dev/null
 fi
     test_jvm "$app_home/jre"
   fi
@@ -334,7 +334,7 @@ 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 /Library/Internet\ Plug-Ins/JavaAppletPlugin.plugin/Contents/Home /Library/Java/JavaVirtualMachines/*.jdk/Contents/Home/jre /Library/Java/JavaVirtualMachines/*.jre/Contents/Home /Library/Java/JavaVirtualMachines/*.jdk/Contents/Home"
+  common_jvm_locations=" /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 /Library/Java/JavaVirtualMachines/*.jre/Contents/Home /Library/Java/JavaVirtualMachines/*.jdk/Contents/Home"
   for current_location in $common_jvm_locations
   do
 if [ -z "$app_java_home" ]; then
@@ -361,8 +361,8 @@ if [ -f "$app_home/.install4j/inst_jre.cfg" ]; then
     read file_jvm_home < "$app_home/.install4j/inst_jre.cfg"
     test_jvm "$file_jvm_home"
     if [ -z "$app_java_home" ] && [ $tested_jvm = "false" ]; then
-if [ -f "$db_file" ]; then
-  rm "$db_file" 2> /dev/null
+if [ -w "$db_file" ]; then
+  /bin/sh -c ': > "$db_file"' 2> /dev/null
 fi
         test_jvm "$file_jvm_home"
     fi
@@ -398,40 +398,36 @@ cd "$app_home"
 app_home=`pwd`
 bundled_jre_home="$app_home/jre"
 
-if [ "__i4j_lang_restart" = "$1" ]; then
-  cd "$old_pwd"
-else
 cd "$prg_dir"/.
 
+cache_home="$XDG_CACHE_HOME"
+if [ "W$cache_home" = "W" ]; then
+  cache_home="$HOME/.cache"
 fi
-if [ "__i4j_extract_and_exit" = "$1" ]; then
-  cd "$old_pwd"
-  exit 0
-fi
-db_home=$HOME
-db_file_suffix=
+db_home="$cache_home/install4j"
+mkdir -p "$db_home" > /dev/null 2>&1
+db_file="$db_home/jre_version"
 if [ ! -w "$db_home" ]; then
   db_home=/tmp
-  db_file_suffix=_$USER
+  db_file="$db_home/install4j_jre_version_$USER"
 fi
-db_file=$db_home/.install4j$db_file_suffix
 if [ -d "$db_file" ] || ([ -f "$db_file" ] && [ ! -r "$db_file" ]) || ([ -f "$db_file" ] && [ ! -w "$db_file" ]); then
-  db_file=$db_home/.install4j_jre$db_file_suffix
+  db_file="${db_file}.2"
 fi
-if [ ! "__i4j_lang_restart" = "$1" ]; then
+if [ ! "__i4j_lang_restart" = "$1" ] && [ ! "__i4j_auth_restart" = "$1" ]; then
 run_unpack200 "$bundled_jre_home"
 run_unpack200 "$bundled_jre_home/jre"
 fi
 search_jre
 if [ -z "$app_java_home" ]; then
-if [ -f "$db_file" ]; then
-  rm "$db_file" 2> /dev/null
+if [ -w "$db_file" ]; then
+  /bin/sh -c ': > "$db_file"' 2> /dev/null
 fi
   search_jre
 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.8.
+  echo The version of the JVM must be at least 11 and at most 16.
   echo Please define INSTALL4J_JAVA_HOME to point to a suitable JVM.
   exit 83
 fi

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

@@ -9,8 +9,6 @@
         <url-pattern>/HelloServlet</url-pattern>
     </servlet-mapping>
     <session-config>
-        <session-timeout>
-            30
-        </session-timeout>
+        <session-timeout>30</session-timeout>
     </session-config>
 </web-app>