rubyfox-server 2.13.4.1 → 2.16.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: bb9a7093cd56d2877e77c2a43970ce1a76b1a918
-  data.tar.gz: f4222e586aea73e8c71a151805111e1d05d6017f
+SHA256:
+  metadata.gz: a183189306a883fdb025563067d8eaaeb1f96a42a31e6db2c40c6141b71065d4
+  data.tar.gz: 6814a5e29f1f5e1569b1f5844bf3d0fa23b606e0496dd74e929373bdc806535e
 SHA512:
-  metadata.gz: d2f9d97bf7cda1fe77c25561e347e78fa7b7bd6e9ee1863f3acb131f4868814a1924519899a0e5e94d35cd1bc74101df57b1d2677fab7196c2056c7da445d8d0
-  data.tar.gz: 142e3be258ea7ab47a72dace9abd86b0a8cc3f96a595660de6d67a6ac26aec710eff611a02017f5cd3bf40e3bb0d70c00dd35f3db8da83f849d83211c27e7722
+  metadata.gz: 027206fcafabf230e5b0707b61ba6fcf7dabcf4c05bb78a13c5d0589ebe65e5fbc3de45485a6d09bd5384031607b01249dbc6f36eeb4bff54a6f4d0eea97d77c
+  data.tar.gz: b5b662bbdd47ac1403a730e33877469b1084591e824e0a781bdddb44e75743eb77a00aa5f42ed30b731b2ff2e70397aeeb0b174c6408aca0d8a145d2b3354bb9

data/lib/rubyfox/server/data/config/UploadsLock.txt

@@ -0,0 +1,3 @@
+This file prevents uploads using the Administration Tool's modules that allow it (e.g. Extension Manager).
+This is an additional security measure. Delete this file to enable file uploads in all modules.
+For more information, please visit this URL: http://docs2x.smartfoxserver.com/GettingStarted/admintool-ExtensionManager

data/lib/rubyfox/server/data/config/admin/admintool.xml

@@ -17,7 +17,9 @@
 		<module id="ServerConfigurator" name="Server Configurator" description="Edit the global settings of the SmartFoxServer instance"/>
 		<module id="ZoneConfigurator" name="Zone Configurator" description="Create and delete SmartFoxServer Zones and static Rooms, or edit the settings of the existing ones"/>
 		<module id="ExtensionManager" name="Extension Manager" description="Upload Extension files to the SmartFoxServer instance"/>
+		<module id="ServletManager" name="Servlet Manager" description="Upload servlets to SmartFoxServer instance's web server"/>
 		<module id="LicenseManager" name="License Manager" description="Configure the license of the SmartFoxServer instance"/>
+		<!-- <module id="CustomTool" name="Custom Tool" description="This is a test custom module" className="my.namespace.CustomToolReqHandler"/> -->
 	</modules>
 	
 </admintool>

data/lib/rubyfox/server/data/config/admin/descriptors/config_room.txt

@@ -33,9 +33,13 @@
 	"tooltip":"The Room password (optional). If null or empty string the Room will be public",
 	"type":"TextInput",
 	"value":"{$BasicValue=roomSettings.password}",
-	"componentParams":
+	"componentParams": // DEPRECATED
 	{
 		"displayAsPassword":true
+	},
+	"attributes":
+	{
+		"type":"password"
 	}
 },
 
@@ -46,7 +50,12 @@
 	"tooltip":"The maximum number of users/players allowed in the Room",
 	"type":"NumericStepper",
 	"value":{$BasicValue=roomSettings.maxUsers},
-	"componentParams":
+	"componentParams": // DEPRECATED
+	{
+		"minimum":1,
+		"maximum":2147483647
+	},
+	"attributes":
 	{
 		"minimum":1,
 		"maximum":2147483647
@@ -60,7 +69,12 @@
 	"tooltip":"The maximum number of spectators allowed in the Room",
 	"type":"NumericStepper",
 	"value":{$BasicValue=roomSettings.maxSpectators},
-	"componentParams":
+	"componentParams": // DEPRECATED
+	{
+		"minimum":0,
+		"maximum":2147483647
+	},
+	"attributes":
 	{
 		"minimum":0,
 		"maximum":2147483647
@@ -102,10 +116,11 @@
 	"tooltip":"Declares the modality of dynamic Rooms removal; if the 'DEFAULT' setting is used, regular Rooms will be removed when empty and their creator is disconnected, while Game Rooms will be removed when empty",
 	"type":"ComboBox",
 	"value":"{$BasicValue=roomSettings.autoRemoveMode}",
-	"componentParams":
+	"componentParams": // DEPRECATED
 	{
 		"dataProvider":"DEFAULT,WHEN_EMPTY,WHEN_EMPTY_AND_CREATOR_IS_GONE,NEVER_REMOVE"
-	}
+	},
+	"dataProvider":"DEFAULT,WHEN_EMPTY,WHEN_EMPTY_AND_CREATOR_IS_GONE,NEVER_REMOVE"
 },
 
 // ACTIVATE BAD WORDS FILTER
@@ -135,13 +150,14 @@
 	"name":"permissions.flags",
 	"label":"Permission flags",
 	"tooltip":"These flags indicate which operations are permitted in the Room",
-	"category":"Permissions and events",
+	"category":"Permissions & Events",
 	"type":"DualList",
 	"value":"{$BasicValue=permissions.flags}",
-	"componentParams":
+	"componentParams": // DEPRECATED
 	{
 		"selectableValues":"{$BasicValue=permissions.availableFlags}"
-	}
+	},
+	"dataProvider":"{$BasicValue=permissions.availableFlags}"
 },
 
 // MAX ROOM VARIABLES ALLOWED
@@ -149,10 +165,15 @@
 	"name":"permissions.maxRoomVariablesAllowed",
 	"label":"Max # of Room Variables",
 	"tooltip":"The maximum number of Room Variables allowed in the Room",
-	"category":"Permissions and events",
+	"category":"Permissions & Events",
 	"type":"NumericStepper",
 	"value":{$BasicValue=permissions.maxRoomVariablesAllowed},
-	"componentParams":
+	"componentParams": // DEPRECATED
+	{
+		"minimum":0,
+		"maximum":2147483647
+	},
+	"attributes":
 	{
 		"minimum":0,
 		"maximum":2147483647
@@ -164,13 +185,14 @@
 	"name":"events",
 	"label":"Events",
 	"tooltip":"Specify which events can be fired by the Room",
-	"category":"Permissions and events",
+	"category":"Permissions & Events",
 	"type":"DualList",
 	"value":"{$BasicValue=roomSettings.events}",
-	"componentParams":
+	"componentParams": // DEPRECATED
 	{
 		"selectableValues":"{$BasicValue=roomSettings.availableEvents}"
-	}
+	},
+	"dataProvider":"{$BasicValue=roomSettings.availableEvents}"
 },
 
 //-------------------------------------------
@@ -184,7 +206,7 @@
 	"tooltip":"Customize the Room Variables",
 	"category":"Room Variables",
 	"type":"DataGrid",
-	"componentParams":
+	"componentParams": // DEPRECATED
 	{
 		"height":200
 	},
@@ -204,10 +226,19 @@
 			"tooltip":"The variable data type",
 			"type":"ComboBox",
 			"value":"STRING",
-			"componentParams":
+			"componentParams": // DEPRECATED
 			{
 				"dataProvider":"BOOL,INT,DOUBLE,STRING,OBJECT,ARRAY"
-			}
+			},
+			"dataProvider":"BOOL,INT,DOUBLE,STRING,OBJECT,ARRAY"
+		},
+		{
+			"name":"value",
+			"label":"Value",
+			"tooltip":"Primitive value or JSON block",
+			"type":"TextInput",
+			"value":"",
+			"validator":"notNull"
 		},
 		{
 			"name":"isPrivate",
@@ -238,15 +269,14 @@
 			"value":false
 		},
 		{
-			"name":"value",
-			"label":"Value",
-			"tooltip":"Primitive value or JSON block",
-			"type":"TextInput",
-			"value":"",
-			"validator":"notNull"
+			"name":"isStorable",
+			"label":"Storable",
+			"tooltip":"A storable variable will be saved by the active Room persistence system, if any",
+			"type":"CheckBox",
+			"value":true
 		}
 	],
-	"listValues":{$List=roomVariables, instance=roomSettings, fields=name;type;isPrivate;isPersistent;isGlobal;isHidden;value},
+	"listValues":{$List=roomVariables, instance=roomSettings, fields=name;type;value;isPrivate;isPersistent;isGlobal;isHidden;isStorable},
 	"clazz":"ZoneSettings$RoomVariableDefinition"
 },
 
@@ -264,10 +294,11 @@
 	"value":"{$BasicValue=extension.name}",
 	"trigger":true,
 	"triggerData":{$List=extClasses, instance=extensionsHelper, fields=name;type;classesString},
-	"componentParams":
+	"componentParams": // DEPRECATED
 	{
 		"dataProvider":"{$ListToString=extNames, instance=extensionsHelper}"
-	}
+	},
+	"dataProvider":"{$ListToString=extNames, instance=extensionsHelper}"
 },
 
 // TYPE
@@ -279,10 +310,11 @@
 	"type":"ComboBox",
 	"value":"{$BasicValue=extension.type}",
 	"trigger":true,
-	"componentParams":
+	"componentParams": // DEPRECATED
 	{
 		"dataProvider":"JAVA,JAVASCRIPT,PYTHON"
-	}
+	},
+	"dataProvider":"JAVA,JAVASCRIPT,PYTHON"
 },
 
 // MAIN CLASS
@@ -293,10 +325,11 @@
 	"category":"Room Extension",
 	"type":"ComboBox",
 	"value":"{$BasicValue=extension.file}",
-	"componentParams":
+	"componentParams": // DEPRECATED
 	{
 		"dataProvider":""
-	}
+	},
+	"dataProvider":""
 },
 
 // USE NAMING CONVENTION
@@ -329,10 +362,11 @@
 	"category":"Room Extension",
 	"type":"ComboBox",
 	"value":"{$BasicValue=extension.reloadMode}",
-	"componentParams":
+	"componentParams": // DEPRECATED
 	{
 		"dataProvider":"AUTO,MANUAL,NONE"
-	}
+	},
+	"dataProvider":"AUTO,MANUAL,NONE"
 },
 
 //-------------------------------------------
@@ -344,7 +378,7 @@
 	"name":"mmoSettings.isActive",
 	"label":"Is MMO Room",
 	"tooltip":"Create a Room of type MMORoom, in which joined users are mutually 'visible' based on each other's proximity. Read the documentation for more informations\n\n<b>IMPORTANT</b>\nThe following Room characteristics do not apply to MMORooms:\n<i>Spectators</i> - even if the Room is a Game Room, users can't join it as spectators\n<i>USER_ENTER event</i> - this event is never dispatched; other users entering the current user's Area of Interest (AoI) are notified through the PROXIMITY_LIST_UPDATE event\n<i>USER_EXIT event</i> - this event is dispatched to the user leaving the Room only; other users leaving the current user's Area of Interest are notified through the PROXIMITY_LIST_UPDATE event",
-	"category":"MMO settings",
+	"category":"MMO Settings",
 	"type":"CheckBox",
 	"value":{$BasicValue=mmoSettings.isActive}
 },
@@ -354,7 +388,7 @@
 	"name":"mmoSettings.defaultAOI",
 	"label":"Default AoI",
 	"tooltip":"The distance along the x,y,z axes describing the 'Area of Interest' within which the other users presence in the Room is notified to each client through the PROXIMITY_LIST_UPDATE event. Similarly, users actions (public messages, User Variables updates, etc) are notified when they are within this area only\n\n<b>NOTE</b>\nA value of 100 for an axis means an AoI ranging from -100 to +100 along that axis",
-	"category":"MMO settings",
+	"category":"MMO Settings",
 	"type":"Vector3D",
 	"value":"{$BasicValue=mmoSettings.defaultAOI}",
 	"validator":"aoi"
@@ -365,10 +399,15 @@
 	"name":"mmoSettings.lowerMapLimit",
 	"label":"Lower map limits",
 	"tooltip":"The lower limits for each of the user position coordinates (x,y,z) in the MMORoom. Limits are used to validate the request to set the user position coming from the client. Leave empty for no limits\n\n<b>NOTE</b>\nLower and higher map limits must be both set or not set; if only one of the two properties is set, it will be ignored",
-	"category":"MMO settings",
+	"category":"MMO Settings",
 	"type":"Vector3D",
 	"value":"{$BasicValue=mmoSettings.lowerMapLimit}",
-	"componentParams":
+	"componentParams": // DEPRECATED
+	{
+		"enableClear":true,
+		"allowNegative":true
+	},
+	"attributes":
 	{
 		"enableClear":true,
 		"allowNegative":true
@@ -380,10 +419,15 @@
 	"name":"mmoSettings.higherMapLimit",
 	"label":"Higher map limits",
 	"tooltip":"The upper limits for each of the user position coordinates (x,y,z) in the MMORoom. Limits are used to validate the request to set the user position coming from the client. Leave empty for no limits\n\n<b>NOTE</b>\nLower and higher map limits must be both set or not set; if only one of the two properties is set, it will be ignored",
-	"category":"MMO settings",
+	"category":"MMO Settings",
 	"type":"Vector3D",
 	"value":"{$BasicValue=mmoSettings.higherMapLimit}",
-	"componentParams":
+	"componentParams": // DEPRECATED
+	{
+		"enableClear":true,
+		"allowNegative":true
+	},
+	"attributes":
 	{
 		"enableClear":true,
 		"allowNegative":true
@@ -395,7 +439,7 @@
 	"name":"mmoSettings.forceFloats",
 	"label":"Force floating point",
 	"tooltip":"Force the values entered in the AoI and map limits settings above to be parsed as floating point values, even if integers have been entered. Please note that even if this setting is off, if a decimal value is entered above, it will be treated as a floating point value",
-	"category":"MMO settings",
+	"category":"MMO Settings",
 	"type":"CheckBox",
 	"value":{$BasicValue=mmoSettings.forceFloats}
 },
@@ -405,13 +449,18 @@
 	"name":"mmoSettings.userMaxLimboSeconds",
 	"label":"User max limbo time",
 	"tooltip":"The maximum amount of seconds allowed between the MMORoom join and the first time the user position is set in the Room (known as 'limbo', because the user is inside the Room but he knows nothing about the other users in it, because the proximity system based on the AoI requires his position to be set at least one time); if this time is exeeded, the user is kicked from the Room automatically",
-	"category":"MMO settings",
+	"category":"MMO Settings",
 	"type":"NumericStepper",
 	"value":{$BasicValue=mmoSettings.userMaxLimboSeconds},
-	"componentParams":
+	"componentParams": // DEPRECATED
 	{
 		"minimum":10,
 		"maximum":120
+	},
+	"attributes":
+	{
+		"min":10,
+		"max":120
 	}
 },
 
@@ -420,13 +469,18 @@
 	"name":"mmoSettings.proximityListUpdateMillis",
 	"label":"Millis between proximity list updates",
 	"tooltip":"Minimum time between two subsequent PROXIMITY_LIST_UPDATE events sent to the clients; this should be balanced taking into account the user speed when moving inside the MMORoom (frequency of position updates) and the ratio between the actual client viewport size (or area of visibility in case of 3D environments) and the AoI size",
-	"category":"MMO settings",
+	"category":"MMO Settings",
 	"type":"NumericStepper",
 	"value":{$BasicValue=mmoSettings.proximityListUpdateMillis},
-	"componentParams":
+	"componentParams": // DEPRECATED
 	{
 		"minimum":10,
 		"maximum":2147483647
+	},
+	"attributes":
+	{
+		"min":10,
+		"max":2147483647
 	}
 },
 
@@ -435,7 +489,7 @@
 	"name":"mmoSettings.sendAOIEntryPoint",
 	"label":"Send AoI entry point",
 	"tooltip":"Send the other users entry coordinates in the client's AoI as reserved properties on the User object in the PROXIMITY_LIST_UPDATE event",
-	"category":"MMO settings",
+	"category":"MMO Settings",
 	"type":"CheckBox",
 	"value":{$BasicValue=mmoSettings.sendAOIEntryPoint}
 }

data/lib/rubyfox/server/data/config/admin/descriptors/config_server.txt

@@ -7,7 +7,6 @@
 // GENERAL SETTINGS
 //-------------------------------------------
 
-
 // SERVER NAME
 {
 	"name":"serverName",
@@ -31,10 +30,11 @@
 			"tooltip":"IP address used by SmartFoxServer",
 			"type":"ComboBox",
 			"value":"127.0.0.1",
-			"componentParams":
+			"componentParams": // DEPRECATED
 			{
 				"dataProvider":"{$BasicValue=adminHelper.availableSocketAddresses}"
-			}
+			},
+			"dataProvider":"{$BasicValue=adminHelper.availableSocketAddresses}"
 		},
 		{
 			"name":"port",
@@ -42,10 +42,15 @@
 			"tooltip":"Port used by SmartFoxServer",
 			"type":"NumericStepper",
 			"value":9933,
-			"componentParams":
+			"componentParams": // DEPRECATED
 			{
 				"minimum":0,
 				"maximum":65535
+			},
+			"attributes":
+			{
+				"min":0,
+				"max":65535
 			}
 		},
 		{
@@ -54,10 +59,11 @@
 			"tooltip":"Communication protocol",
 			"type":"ComboBox",
 			"value":"TCP",
-			"componentParams":
+			"componentParams": // DEPRECATED
 			{
 				"dataProvider":"TCP,UDP"
-			}
+			},
+			"dataProvider":"TCP,UDP"
 		}
 	],
 	"listValues":{$List=socketAddresses, instance=serverSettings, fields=address;port;type},
@@ -71,10 +77,15 @@
 	"tooltip":"Maximum idle time for a session (in seconds), after which the client is disconnected; setting a value between 10 and 30 seconds is recommended",
 	"type":"NumericStepper",
 	"value":{$BasicValue=serverSettings.sessionMaxIdleTime},
-	"componentParams":
+	"componentParams": // DEPRECATED
 	{
 		"minimum":5,
 		"maximum":2147483647
+	},
+	"attributes":
+	{
+		"min":5,
+		"max":2147483647
 	}
 },
 
@@ -85,10 +96,15 @@
 	"tooltip":"Maximum idle time for a logged user (in seconds), after which the user is disconnected; this value must be greater than the session maximum idle time",
 	"type":"NumericStepper",
 	"value":{$BasicValue=serverSettings.userMaxIdleTime},
-	"componentParams":
+	"componentParams": // DEPRECATED
 	{
 		"minimum":5,
 		"maximum":2147483647
+	},
+	"attributes":
+	{
+		"min":5,
+		"max":2147483647
 	}
 },
 
@@ -99,10 +115,15 @@
 	"tooltip":"Specifies the minimum message size (in bytes) that triggers the protocol compression; recommended values are those equal to or greater than 1024 bytes",
 	"type":"NumericStepper",
 	"value":{$BasicValue=serverSettings.protocolCompressionThreshold},
-	"componentParams":
+	"componentParams": // DEPRECATED
 	{
 		"minimum":256,
 		"maximum":2147483647
+	},
+	"attributes":
+	{
+		"min":256,
+		"max":2147483647
 	}
 },
 
@@ -140,10 +161,15 @@
 	"tooltip":"[ADVANCED] Adjust the thread pool size for the System Scheduler",
 	"type":"NumericStepper",
 	"value":{$BasicValue=serverSettings.schedulerThreadPoolSize},
-	"componentParams":
+	"componentParams": // DEPRECATED
 	{
 		"minimum":1,
 		"maximum":10000
+	},
+	"attributes":
+	{
+		"min":1,
+		"max":10000
 	}
 },
 
@@ -183,13 +209,18 @@
 	"name":"ipFilter.maxConnectionsPerAddress",
 	"label":"Maximum connections per IP address",
 	"tooltip":"Maximum number of connections coming from the same client IP address",
-	"category":"IP filter",
+	"category":"IP Filter",
 	"type":"NumericStepper",
 	"value":{$BasicValue=ipFilter.maxConnectionsPerAddress},
-	"componentParams":
+	"componentParams": // DEPRECATED
 	{
 		"minimum":1,
 		"maximum":2147483647
+	},
+	"attributes":
+	{
+		"min":1,
+		"max":2147483647
 	}
 },
 
@@ -198,7 +229,7 @@
 	"name":"ipFilter.addressBlackList",
 	"label":"IP addresses black-list",
 	"tooltip":"The black-list prevents the connection attempts coming from the listed client IP addresses",
-	"category":"IP filter",
+	"category":"IP Filter",
 	"type":"DataGrid",
 	"defaultListItem":
 	[
@@ -209,7 +240,7 @@
 			"type":"TextInput",
 			"value":"",
 			"validator":"ip",
-			"componentParams":
+			"componentParams": // DEPRECATED (implicit in validator)
 			{
 				"restrict":"0-9./"
 			}
@@ -223,7 +254,7 @@
 	"name":"ipFilter.addressWhiteList",
 	"label":"IP addresses white-list",
 	"tooltip":"The white-list overrides the maximum connections per IP address limit, allowing any number of connections coming from the listed client IP addresses",
-	"category":"IP filter",
+	"category":"IP Filter",
 	"type":"DataGrid",
 	"defaultListItem":
 	[
@@ -234,7 +265,7 @@
 			"type":"TextInput",
 			"value":"",
 			"validator":"ip",
-			"componentParams":
+			"componentParams": // DEPRECATED (implicit in validator)
 			{
 				"restrict":"0-9./"
 			}
@@ -252,7 +283,7 @@
 	"name":"bannedUserManager.isAutoRemove",
 	"label":"Auto-remove",
 	"tooltip":"Automatically remove banned users from the ban list when their ban-timeframe expires",
-	"category":"Ban manager",
+	"category":"Ban Manager",
 	"type":"CheckBox",
 	"value":{$BasicValue=bannedUserManager.isAutoRemove}
 },
@@ -262,7 +293,7 @@
 	"name":"bannedUserManager.isPersistent",
 	"label":"Persistent",
 	"tooltip":"Persistently store the banned user list so that it's not lost across SmartFoxServer restarts (recommended)",
-	"category":"Ban manager",
+	"category":"Ban Manager",
 	"type":"CheckBox",
 	"value":{$BasicValue=bannedUserManager.isPersistent}
 },
@@ -272,12 +303,16 @@
 	"name":"bannedUserManager.customPersistenceClass",
 	"label":"Custom persistence class name",
 	"tooltip":"Allows to provide a custom class to implement banned user list persistence",
-	"category":"Ban manager",
+	"category":"Ban Manager",
 	"type":"TextInput",
 	"value":"{$BasicValue=bannedUserManager.customPersistenceClass}",
-	"componentParams":
+	"componentParams": // DEPRECATED
 	{
 		"restrict":"a-zA-Z0-9._"
+	},
+	"attributes":
+	{
+		"pattern":"[a-zA-Z0-9._]+"
 	}
 },
 
@@ -290,7 +325,7 @@
 	"name":"webServer.isActive",
 	"label":"Activate",
 	"tooltip":"Enable/disable the embedded web server",
-	"category":"Web server",
+	"category":"Web Server",
 	"type":"CheckBox",
 	"value":{$BasicValue=webServer.isActive}
 },
@@ -300,7 +335,7 @@
 	"name":"webServer.enableHttp",
 	"label":"Enable HTTP",
 	"tooltip":"Enable/disable the HTTP module in the embedded web server",
-	"category":"Web server",
+	"category":"Web Server",
 	"type":"CheckBox",
 	"value":{$BasicValue=webServer.enableHttp}
 },
@@ -309,14 +344,19 @@
 {
 	"name":"webServer.httpPort",
 	"label":"HTTP/WS port",
-	"tooltip":"TCP port used by the embedded web server for HTTP and WS communication",
-	"category":"Web server",
+	"tooltip":"TCP port used by the embedded web server for HTTP and WS communication\n\n<b>NOTE</b>\nThe entered value is ignored if HTTP module is disabled",
+	"category":"Web Server",
 	"type":"NumericStepper",
 	"value":{$BasicValue=webServer.httpPort},
-	"componentParams":
+	"componentParams": // DEPRECATED
 	{
 		"minimum":0,
 		"maximum":65535
+	},
+	"attributes":
+	{
+		"min":0,
+		"max":65535
 	}
 },
 
@@ -325,7 +365,7 @@
 	"name":"webServer.enableHttps",
 	"label":"Enable HTTPS",
 	"tooltip":"Enable/disable the HTTPS module in the embedded web server",
-	"category":"Web server",
+	"category":"Web Server",
 	"type":"CheckBox",
 	"value":{$BasicValue=webServer.enableHttps}
 },
@@ -334,14 +374,19 @@
 {
 	"name":"webServer.httpsPort",
 	"label":"HTTPS/WSS port",
-	"tooltip":"TCP port used by the embedded web server for HTTPS and WSS communication",
-	"category":"Web server",
+	"tooltip":"TCP port used by the embedded web server for HTTPS and WSS communication\n\n<b>NOTE</b>\nThe entered value is ignored if HTTPS module is disabled",
+	"category":"Web Server",
 	"type":"NumericStepper",
 	"value":{$BasicValue=webServer.httpsPort},
-	"componentParams":
+	"componentParams": // DEPRECATED
 	{
 		"minimum":0,
 		"maximum":65535
+	},
+	"attributes":
+	{
+		"min":0,
+		"max":65535
 	}
 },
 
@@ -350,26 +395,26 @@
 	"name":"webServer.isWSActive",
 	"label":"Enable WS/WSS",
 	"tooltip":"Enable/disable the WebSocket communication (both WS and WSS) through the HTTP/S modules; requires one of the two modules (or both) to be active",
-	"category":"Web server",
+	"category":"Web Server",
 	"type":"CheckBox",
 	"value":{$BasicValue=webServer.isWSActive}
 },
 
-// USE WS BINARY PROTOCOL
+// ENABLE X-FORWARDED-FOR DIRECTIVE
 {
-	"name":"webServer.useWSBinaryProtocol",
-	"label":"Use WS binary protocol",
-	"tooltip":"Use binary protocol for WebSocket communication; this must match the specs of the client API",
-	"category":"Web server",
+	"name":"webServer.isXForwardedForActive",
+	"label":"Enable X-Forwarded-For",
+	"tooltip":"Enable this feature only if your server is behind a proxy/firewall supporting the X-Forwarded-For directive. It allows to detect the original IP address of the remote client",
+	"category":"Web Server",
 	"type":"CheckBox",
-	"value":{$BasicValue=webServer.useWSBinaryProtocol}
+	"value":{$BasicValue=webServer.isXForwardedForActive}
 },
 
 // ALLOWED WEBSOCKET ORIGINS
 {
 	"name":"webServer.allowedWebsocketOrigins",
 	"label":"Allowed client origins",
-	"tooltip":"List of origins from which the client should be allowed to connect. It should represent only the URL(s) where the client can be downloaded from",
+	"tooltip":"List of origins from which the client should be allowed to connect; it should represent only the URL(s) where the client can be downloaded from",
 	"category":"Web server",
 	"type":"DataGrid",
 	"defaultListItem":
@@ -386,23 +431,66 @@
 	"listValues":{$List=allowedWebsocketOrigins, instance=webServer, createField=origin}
 },
 
+// TOMCAT STATUS ACCESS
+{
+	"name":"webServer.tomcatUsers",
+	"label":"Tomcat users",
+	"tooltip":"The credentials to enter the advanced web server status console, accessible from the AdminTool's Dashboard module",
+	"category":"Web server",
+	"type":"DataGrid",
+	"defaultListItem":
+	[
+		{
+			"name":"username",
+			"label":"Username",
+			"tooltip":"Tomcat's username",
+			"type":"TextInput",
+			"value":"",
+			"validator":"notNull"
+		},
+		{
+			"name":"password",
+			"label":"Password",
+			"tooltip":"Tomcat's password",
+			"type":"TextInput",
+			"value":"",
+			"validator":"pwd",
+			"componentParams": // DEPRECATED
+			{
+				"displayAsPassword":true
+			},
+			"attributes":
+			{
+				"type":"password"
+			}
+		}
+	],
+	"listValues":{$List=tomcatUsers, instance=webServer, fields=username;password},
+	"clazz":"TomcatUser"
+},
+
 // BLUEBOX POLLING TIMEOUT
 {
 	"name":"webServer.blueBoxPollingTimeout",
 	"label":"BlueBox polling timeout",
 	"tooltip":"The amount of seconds after which a client connected through the BlueBox is considered disconnected if he doesn't send a polling request",
-	"category":"Web server",
+	"category":"Web Server",
 	"type":"NumericStepper",
 	"value":{$BasicValue=webServer.blueBoxPollingTimeout},
-	"componentParams":
+	"componentParams": // DEPRECATED
 	{
 		"minimum":25,
 		"maximum":40
 	},
+	"attributes":
+	{
+		"min":25,
+		"max":40
+	},
 	"separator":
 	{
 		"pos":"before",
-		"text":"\n<b>BlueBox settings</b>"
+		"text":"\n<b>BlueBox Settings</b>"
 	}
 },
 
@@ -411,13 +499,18 @@
 	"name":"webServer.blueBoxMsgQueueSize",
 	"label":"BlueBox messages queue size",
 	"tooltip":"The maximum amount of messages that can be queued for each client connected through the BlueBox",
-	"category":"Web server",
+	"category":"Web Server",
 	"type":"NumericStepper",
 	"value":{$BasicValue=webServer.blueBoxMsgQueueSize},
-	"componentParams":
+	"componentParams": // DEPRECATED
 	{
 		"minimum":20,
 		"maximum":100
+	},
+	"attributes":
+	{
+		"min":20,
+		"max":100
 	}
 },
 
@@ -478,10 +571,15 @@
 	"category":"Mailer",
 	"type":"NumericStepper",
 	"value":{$BasicValue=mailer.smtpPort},
-	"componentParams":
+	"componentParams": // DEPRECATED
 	{
 		"minimum":0,
 		"maximum":65535
+	},
+	"attributes":
+	{
+		"min":0,
+		"max":65535
 	}
 },
 
@@ -504,9 +602,13 @@
 	"category":"Mailer",
 	"type":"TextInput",
 	"value":"{$BasicValue=mailer.mailPass}",
-	"componentParams":
+	"componentParams": // DEPRECATED
 	{
 		"displayAsPassword":true
+	},
+	"attributes":
+	{
+		"type":"password"
 	}
 },
 
@@ -519,7 +621,7 @@
 	"name":"remoteAdmin.administrators",
 	"label":"Administrators",
 	"tooltip":"The access credentials and permissions of SmartFoxServer administrators; removing all the administrators will prevent the AdminTool to reconnect to the server instance after a disconnection",
-	"category":"Remote admin",
+	"category":"Remote Admin",
 	"type":"DataGrid",
 	"defaultListItem":
 	[
@@ -538,9 +640,13 @@
 			"type":"TextInput",
 			"value":"",
 			"validator":"pwd",
-			"componentParams":
+			"componentParams": // DEPRECATED
 			{
 				"displayAsPassword":true
+			},
+			"attributes":
+			{
+				"type":"password"
 			}
 		},
 		{
@@ -556,10 +662,11 @@
 			"tooltip":"The list of AdminTool's modules that the administrator is NOT allowed to access",
 			"type":"DualList",
 			"value":"",
-			"componentParams":
+			"componentParams": // DEPRECATED
 			{
 				"selectableValues":"{$BasicValue=adminHelper.allModules}"
-			}
+			},
+			"dataProvider":"{$BasicValue=adminHelper.allModules}"
 		}
 	],
 	"listValues":{$List=administrators, instance=remoteAdmin, fields=login;password;allowHalt;disabledModulesString},
@@ -567,7 +674,7 @@
 	"separator":
 	{
 		"pos":"before",
-		"text":"<b>IMPORTANT</b>: al the settings below, except 'Use encryption', are <b>applied immediately</b> on submission, without a server restart being required"
+		"text":"<b>IMPORTANT</b>: all settings below, except 'Use encryption', are <b>applied immediately</b> on submission, without a server restart being required"
 	}
 },
 
@@ -576,7 +683,7 @@
 	"name":"remoteAdmin.allowedRemoteAddresses",
 	"label":"Allowed client IP addresses",
 	"tooltip":"List of client IP address which are allowed to access the SmartFoxServer's administration; leave the list empty to skip this check on administrator login",
-	"category":"Remote admin",
+	"category":"Remote Admin",
 	"type":"DataGrid",
 	"defaultListItem":
 	[
@@ -587,7 +694,7 @@
 			"type":"TextInput",
 			"value":"",
 			"validator":"ip",
-			"componentParams":
+			"componentParams": // DEPRECATED (implicit in validator)
 			{
 				"restrict":"0-9."
 			}
@@ -601,13 +708,18 @@
 	"name":"remoteAdmin.adminTcpPort",
 	"label":"Administration TCP port",
 	"tooltip":"TCP port number used for administration; set it to -1 to skip this check on administrator login",
-	"category":"Remote admin",
+	"category":"Remote Admin",
 	"type":"NumericStepper",
 	"value":{$BasicValue=remoteAdmin.adminTcpPort},
-	"componentParams":
+	"componentParams": // DEPRECATED
 	{
 		"minimum":-1,
 		"maximum":65535
+	},
+	"attributes":
+	{
+		"min":-1,
+		"max":65535
 	}
 },
 
@@ -616,7 +728,7 @@
 	"name":"remoteAdmin.useEncryption",
 	"label":"Use encryption",
 	"tooltip":"Enable connection encryption for the Admin Tool; after the restart, the 'Use encryption' checkbox on the login screen must be flagged in order to be able to establish a connection with the server",
-	"category":"Remote admin",
+	"category":"Remote Admin",
 	"type":"CheckBox",
 	"value":{$BasicValue=remoteAdmin.useEncryption}
 },
@@ -643,10 +755,11 @@
 	"category":"Analytics",
 	"type":"ComboBox",
 	"value":"{$BasicValue=analytics.runOnDay}",
-	"componentParams":
+	"componentParams": // DEPRECATED
 	{
 		"dataProvider":"[everyday],Monday,Tuesday,Wednesday,Thursday,Friday,Saturday,Sunday"
-	}
+	},
+	"dataProvider":"[everyday],Monday,Tuesday,Wednesday,Thursday,Friday,Saturday,Sunday"
 },
 
 // RUN AT HOUR OF DAY
@@ -657,10 +770,15 @@
 	"category":"Analytics",
 	"type":"NumericStepper",
 	"value":{$BasicValue=analytics.runAtHour},
-	"componentParams":
+	"componentParams": // DEPRECATED
 	{
 		"minimum":0,
 		"maximum":23
+	},
+	"attributes":
+	{
+		"min":0,
+		"max":23
 	}
 },
 
@@ -712,10 +830,16 @@
 	"category":"Analytics",
 	"type":"TextInput",
 	"value":"{$BasicValue=analytics.locale}",
-	"componentParams":
+	"componentParams": // DEPRECATED
 	{
 		"restrict":"a-zA-Z",
 		"maxChars":2
+	},
+	"attributes":
+	{
+		"pattern":"[a-zA-Z]{2}",
+		"size":2,
+		"maxlength":2
 	}
 },
 
@@ -728,18 +852,23 @@
 	"name":"systemThreadPoolSettings.coreThreads",
 	"label":"Core threads",
 	"tooltip":"Number of core threads in the pool; these will be always available",
-	"category":"Thread pools",
+	"category":"Thread Pools",
 	"type":"NumericStepper",
 	"value":{$BasicValue=systemThreadPoolSettings.coreThreads},
-	"componentParams":
+	"componentParams": // DEPRECATED
 	{
 		"minimum":1,
 		"maximum":10000
 	},
+	"attributes":
+	{
+		"min":1,
+		"max":10000
+	},
 	"separator":
 	{
 		"pos":"before",
-		"text":"<b>IMPORTANT</b>: these settings can affect performance dramatically; change them only if you really know what you are doing\n\n<b>System thread pool</b>"
+		"text":"<b>IMPORTANT</b>: these settings can affect performance dramatically; change them only if you really know what you are doing\n\n<b>System Thread Pool.</b>"
 	}
 },
 
@@ -748,13 +877,18 @@
 	"name":"systemThreadPoolSettings.backupThreads",
 	"label":"Backup threads",
 	"tooltip":"Number of new threads to be added when a backups is called",
-	"category":"Thread pools",
+	"category":"Thread Pools",
 	"type":"NumericStepper",
 	"value":{$BasicValue=systemThreadPoolSettings.backupThreads},
-	"componentParams":
+	"componentParams": // DEPRECATED
 	{
 		"minimum":1,
 		"maximum":10000
+	},
+	"attributes":
+	{
+		"min":1,
+		"max":10000
 	}
 },
 
@@ -763,13 +897,18 @@
 	"name":"systemThreadPoolSettings.maxBackups",
 	"label":"Maximum backups",
 	"tooltip":"Number of times backup threads can be called",
-	"category":"Thread pools",
+	"category":"Thread Pools",
 	"type":"NumericStepper",
 	"value":{$BasicValue=systemThreadPoolSettings.maxBackups},
-	"componentParams":
+	"componentParams": // DEPRECATED
 	{
 		"minimum":1,
 		"maximum":10000
+	},
+	"attributes":
+	{
+		"min":1,
+		"max":10000
 	}
 },
 
@@ -778,13 +917,18 @@
 	"name":"systemThreadPoolSettings.queueSizeTriggeringBackup",
 	"label":"Queue size triggering a backup",
 	"tooltip":"Minimum size of the queue that will trigger a backup, unless the size goes down below this value within the backup triggering time",
-	"category":"Thread pools",
+	"category":"Thread Pools",
 	"type":"NumericStepper",
 	"value":{$BasicValue=systemThreadPoolSettings.queueSizeTriggeringBackup},
-	"componentParams":
+	"componentParams": // DEPRECATED
 	{
 		"minimum":1,
 		"maximum":10000
+	},
+	"attributes":
+	{
+		"min":1,
+		"max":10000
 	}
 },
 
@@ -793,13 +937,18 @@
 	"name":"systemThreadPoolSettings.secondsTriggeringBackup",
 	"label":"Backup triggering time",
 	"tooltip":"The number of seconds after which the backup is called if the queue size keeps being greater than the minimum queue size",
-	"category":"Thread pools",
+	"category":"Thread Pools",
 	"type":"NumericStepper",
 	"value":{$BasicValue=systemThreadPoolSettings.secondsTriggeringBackup},
-	"componentParams":
+	"componentParams": // DEPRECATED
 	{
 		"minimum":1,
 		"maximum":10000
+	},
+	"attributes":
+	{
+		"min":1,
+		"max":10000
 	}
 },
 
@@ -808,13 +957,18 @@
 	"name":"systemThreadPoolSettings.backupThreadsExpiry",
 	"label":"Backup threads expiration",
 	"tooltip":"The number of seconds after which the backup threads are removed, provided they are not needed anymore",
-	"category":"Thread pools",
+	"category":"Thread Pools",
 	"type":"NumericStepper",
 	"value":{$BasicValue=systemThreadPoolSettings.backupThreadsExpiry},
-	"componentParams":
+	"componentParams": // DEPRECATED
 	{
 		"minimum":1,
 		"maximum":10000
+	},
+	"attributes":
+	{
+		"min":1,
+		"max":10000
 	}
 },
 
@@ -823,13 +977,18 @@
 	"name":"systemThreadPoolSettings.queueSizeTriggeringBackupExpiry",
 	"label":"Queue size preventing backup expiration",
 	"tooltip":"The minimum amount of messages in the queue that WILL NOT allow the backup threads to be removed (backup won't expire if the queue size is greater than this value)",
-	"category":"Thread pools",
+	"category":"Thread Pools",
 	"type":"NumericStepper",
 	"value":{$BasicValue=systemThreadPoolSettings.queueSizeTriggeringBackupExpiry},
-	"componentParams":
+	"componentParams": // DEPRECATED
 	{
 		"minimum":1,
 		"maximum":10000
+	},
+	"attributes":
+	{
+		"min":1,
+		"max":10000
 	}
 },
 
@@ -838,7 +997,7 @@
 	"name":"systemThreadPoolSettings.logActivity",
 	"label":"Log activity",
 	"tooltip":"Write basic informations about new threads being added or removed in the log",
-	"category":"Thread pools",
+	"category":"Thread Pools",
 	"type":"CheckBox",
 	"value":{$BasicValue=systemThreadPoolSettings.logActivity}
 },
@@ -860,18 +1019,23 @@
 	"name":"extensionThreadPoolSettings.coreThreads",
 	"label":"Core threads",
 	"tooltip":"Number of core threads in the pool; these will be always available",
-	"category":"Thread pools",
+	"category":"Thread Pools",
 	"type":"NumericStepper",
 	"value":{$BasicValue=extensionThreadPoolSettings.coreThreads},
-	"componentParams":
+	"componentParams": // DEPRECATED
 	{
 		"minimum":1,
 		"maximum":10000
 	},
+	"attributes":
+	{
+		"min":1,
+		"max":10000
+	},
 	"separator":
 	{
 		"pos":"before",
-		"text":"\n<b>Extension thread pool</b>"
+		"text":"\n<b>Extension Thread Pool</b>"
 	}
 },
 
@@ -880,13 +1044,18 @@
 	"name":"extensionThreadPoolSettings.backupThreads",
 	"label":"Backup threads",
 	"tooltip":"Number of new threads to be added when a backup is called",
-	"category":"Thread pools",
+	"category":"Thread Pools",
 	"type":"NumericStepper",
 	"value":{$BasicValue=extensionThreadPoolSettings.backupThreads},
-	"componentParams":
+	"componentParams": // DEPRECATED
 	{
 		"minimum":1,
 		"maximum":10000
+	},
+	"attributes":
+	{
+		"min":1,
+		"max":10000
 	}
 },
 
@@ -895,13 +1064,18 @@
 	"name":"extensionThreadPoolSettings.maxBackups",
 	"label":"Maximum backups",
 	"tooltip":"Number of times backup threads can be called",
-	"category":"Thread pools",
+	"category":"Thread Pools",
 	"type":"NumericStepper",
 	"value":{$BasicValue=extensionThreadPoolSettings.maxBackups},
-	"componentParams":
+	"componentParams": // DEPRECATED
 	{
 		"minimum":1,
 		"maximum":10000
+	},
+	"attributes":
+	{
+		"min":1,
+		"max":10000
 	}
 },
 
@@ -910,13 +1084,18 @@
 	"name":"extensionThreadPoolSettings.queueSizeTriggeringBackup",
 	"label":"Queue size triggering a backup",
 	"tooltip":"Minimum size of the queue that will trigger a backup, unless the size goes down below this value within the backup triggering time",
-	"category":"Thread pools",
+	"category":"Thread Pools",
 	"type":"NumericStepper",
 	"value":{$BasicValue=extensionThreadPoolSettings.queueSizeTriggeringBackup},
-	"componentParams":
+	"componentParams": // DEPRECATED
 	{
 		"minimum":1,
 		"maximum":10000
+	},
+	"attributes":
+	{
+		"min":1,
+		"max":10000
 	}
 },
 
@@ -925,13 +1104,18 @@
 	"name":"extensionThreadPoolSettings.secondsTriggeringBackup",
 	"label":"Backup triggering time",
 	"tooltip":"The number of seconds after which the backup is called if the queue size keeps being greater than the minimum queue size",
-	"category":"Thread pools",
+	"category":"Thread Pools",
 	"type":"NumericStepper",
 	"value":{$BasicValue=extensionThreadPoolSettings.secondsTriggeringBackup},
-	"componentParams":
+	"componentParams": // DEPRECATED
 	{
 		"minimum":1,
 		"maximum":10000
+	},
+	"attributes":
+	{
+		"min":1,
+		"max":10000
 	}
 },
 
@@ -940,13 +1124,18 @@
 	"name":"extensionThreadPoolSettings.backupThreadsExpiry",
 	"label":"Backup threads expiration",
 	"tooltip":"The number of seconds after which the backup threads are removed, provided they are not needed anymore",
-	"category":"Thread pools",
+	"category":"Thread Pools",
 	"type":"NumericStepper",
 	"value":{$BasicValue=extensionThreadPoolSettings.backupThreadsExpiry},
-	"componentParams":
+	"componentParams": // DEPRECATED
 	{
 		"minimum":1,
 		"maximum":10000
+	},
+	"attributes":
+	{
+		"min":1,
+		"max":10000
 	}
 },
 
@@ -955,13 +1144,18 @@
 	"name":"extensionThreadPoolSettings.queueSizeTriggeringBackupExpiry",
 	"label":"Queue size preventing backup expiration",
 	"tooltip":"The minimum amount of messages in the queue that WILL NOT allow the backup threads to be removed (backup won't expire if the queue size is greater than this value)",
-	"category":"Thread pools",
+	"category":"Thread Pools",
 	"type":"NumericStepper",
 	"value":{$BasicValue=extensionThreadPoolSettings.queueSizeTriggeringBackupExpiry},
-	"componentParams":
+	"componentParams": // DEPRECATED
 	{
 		"minimum":1,
 		"maximum":10000
+	},
+	"attributes":
+	{
+		"min":1,
+		"max":10000
 	}
 },
 
@@ -970,7 +1164,7 @@
 	"name":"extensionThreadPoolSettings.logActivity",
 	"label":"Log activity",
 	"tooltip":"Write basic informations about new threads being added or removed in the log",
-	"category":"Thread pools",
+	"category":"Thread Pools",
 	"type":"CheckBox",
 	"value":{$BasicValue=extensionThreadPoolSettings.logActivity}
 },
@@ -985,6 +1179,26 @@
 	"value":{$BasicValue=extensionThreadPoolSettings.prestartAllCoreThreads}
 },
 
+//-------------------------------------------
+// GEOLOCATION DB
+//-------------------------------------------
+
+// UPDATE DATE
+{
+	"name":"adminHelper.geoDbReleaseDate",
+	"label":"Installed database release date",
+	"tooltip":"Release date of the currently installed version of MaxMind's GeoLite2 Country database",
+	"category":"Geolocation DB",
+	"type":"TextInput",
+	"value":"{$BasicValue=adminHelper.geoDbReleaseDate}",
+	"edit":false,
+	"separator":
+	{
+		"pos":"before",
+		"text":"In SmartFoxServer, the <strong>automatic geolocation</strong> of every client and the <strong>demographic view</strong> in the AdminTool's Analytics module are based on <a href=\"http://dev.maxmind.com/geoip/geoip2/geolite2/\" target=\"_blank\">MaxMind's GeoLite2 Country database</a>. An updated version of the database is made available by MaxMind weekly, every Tuesday."
+	}
+},
+
 //-------------------------------------------
 // JVM SETTINGS
 //-------------------------------------------
@@ -994,7 +1208,7 @@
 	"name":"adminHelper.vmOptions",
 	"label":"JVM options",
 	"tooltip":"A list of additional settings to fine tune the Java Virtual Machine when running the SmartFoxServer process \n\n<b>IMPORTANT</b>\nThe following options are mandatory; if missing, SmartFoxServer execution could be negatively affected:\n<i>-Dfile.encoding=UTF-8</i>",
-	"category":"JVM settings",
+	"category":"JVM Settings",
 	"type":"DataGrid",
 	"defaultListItem":
 	[
@@ -1014,8 +1228,8 @@
 {
 	"name":"adminHelper.vmClasspath",
 	"label":"JVM classpath",
-	"tooltip":"A list of search paths for classes and resources used by SmartFoxServer and its custom Extensions \n\n<b>IMPORTANT</b>\nThe following paths are mandatory; if missing, you won't be able to run SmartFoxServer:\n<i>./\nlib/*\nlib/jetty/lib/*\nextensions/__lib__/*</i>",
-	"category":"JVM settings",
+	"tooltip":"A list of search paths for classes and resources used by SmartFoxServer and its custom Extensions \n\n<b>IMPORTANT</b>\nThe following paths are mandatory; if missing, you won't be able to run SmartFoxServer:\n<i>./\nlib/*\nlib/apache-tomcat/bin/*\nextensions/__lib__/*</i>",
+	"category":"JVM Settings",
 	"type":"DataGrid",
 	"defaultListItem":
 	[