Index: /FCKeditor.Java/branches/2.4/src/main/java/net/fckeditor/handlers/ExtensionsHandler.java
===================================================================
--- /FCKeditor.Java/branches/2.4/src/main/java/net/fckeditor/handlers/ExtensionsHandler.java	(revision 1530)
+++ /FCKeditor.Java/branches/2.4/src/main/java/net/fckeditor/handlers/ExtensionsHandler.java	(revision 1531)
@@ -46,19 +46,19 @@
 		// load defaults
 		extensionsAllowed.put(ResourceType.FILE, Utils.getSet(ConfigurationHandler
-		    .getDefaultProperty("connector.extensions.file.allowed")));
+		    .getDefaultProperty("connector.resourceType.file.extensions.allowed")));
 		extensionsDenied.put(ResourceType.FILE, Utils.getSet(ConfigurationHandler
-		    .getDefaultProperty("connector.extensions.file.denied")));
+		    .getDefaultProperty("connector.resourceType.file.extensions.denied")));
 		extensionsAllowed.put(ResourceType.MEDIA, Utils.getSet(ConfigurationHandler
-		    .getDefaultProperty("connector.extensions.media.allowed")));
+		    .getDefaultProperty("connector.resourceType.media.extensions.allowed")));
 		extensionsDenied.put(ResourceType.MEDIA, Utils.getSet(ConfigurationHandler
-		    .getDefaultProperty("connector.extensions.media.denied")));
+		    .getDefaultProperty("connector.resourceType.media.extensions.denied")));
 		extensionsAllowed.put(ResourceType.IMAGE, Utils.getSet(ConfigurationHandler
-		    .getDefaultProperty("connector.extensions.image.allowed")));
+		    .getDefaultProperty("connector.resourceType.image.extensions.allowed")));
 		extensionsDenied.put(ResourceType.IMAGE, Utils.getSet(ConfigurationHandler
-		    .getDefaultProperty("connector.extensions.image.denied")));
+		    .getDefaultProperty("connector.resourceType.image.extensions.denied")));
 		extensionsAllowed.put(ResourceType.FLASH, Utils.getSet(ConfigurationHandler
-		    .getDefaultProperty("connector.extensions.flash.allowed")));
+		    .getDefaultProperty("connector.resourceType.flash.extensions.allowed")));
 		extensionsDenied.put(ResourceType.FLASH, Utils.getSet(ConfigurationHandler
-		    .getDefaultProperty("connector.extensions.flash.denied")));
+		    .getDefaultProperty("connector.resourceType.flash.extensions.denied")));
 	}
 
Index: /FCKeditor.Java/branches/2.4/src/main/resources/META-INF/FCKeditor.tld
===================================================================
--- /FCKeditor.Java/branches/2.4/src/main/resources/META-INF/FCKeditor.tld	(revision 1530)
+++ /FCKeditor.Java/branches/2.4/src/main/resources/META-INF/FCKeditor.tld	(revision 1531)
@@ -60,5 +60,5 @@
 				The path/folder in which the editor is deployed under
 				the given context. The context path will be
-				automatically attached. (E.g. '/fckeditor')
+				automatically attached. (e.g. '/fckeditor')
 			</description>
 			<name>basePath</name>
Index: /FCKeditor.Java/branches/2.4/src/main/resources/net/fckeditor/handlers/default.properties
===================================================================
--- /FCKeditor.Java/branches/2.4/src/main/resources/net/fckeditor/handlers/default.properties	(revision 1530)
+++ /FCKeditor.Java/branches/2.4/src/main/resources/net/fckeditor/handlers/default.properties	(revision 1531)
@@ -4,9 +4,15 @@
 ## @version $Id: default.properties 1184 2008-01-03 10:39:36Z th-schwarz $ 
 
-# default extensions settings
-connector.extensions.file.denied = php|php3|php5|phtml|asp|aspx|ascx|jsp|cfm|cfc|pl|bat|exe|dll|reg|cgi
-connector.extensions.flash.allowed = swf|fla
-connector.extensions.image.allowed = jpg|gif|jpeg|png|bmp
-connector.extensions.link.allowed = 7z|aiff|asf|avi|bmp|csv|doc|fla|flv|gif|gz|gzip|jpeg|jpg|mid|mov|mp3|mp4|mpc|mpeg|mpg|ods|odt|pdf|png|ppt|pxd|qt|ram|rar|rm|rmi|rmvb|rtf|sdc|sitd|swf|sxc|sxw|tar|tgz|tif|tiff|txt|vsd|wav|wma|wmv|xls|xml|zip
+# default allowed extensions settings
+connector.resourceType.file.extensions.allowed = 7z|aiff|asf|avi|bmp|csv|doc|fla|flv|gif|gz|gzip|jpeg|jpg|mid|mov|mp3|mp4|mpc|mpeg|mpg|ods|odt|pdf|png|ppt|pxd|qt|ram|rar|rm|rmi|rmvb|rtf|sdc|sitd|swf|sxc|sxw|tar|tgz|tif|tiff|txt|vsd|wav|wma|wmv|xls|xml|zip
+connector.resourceType.image.extensions.allowed = bmp|gif|jpeg|jpg|png
+connector.resourceType.flash.extensions.allowed = swf|fla
+connector.resourceType.media.extensions.allowed = aiff|asf|avi|bmp|fla|flv|gif|jpeg|jpg|mid|mov|mp3|mp4|mpc|mpeg|mpg|png|qt|ram|rm|rmi|rmvb|swf|tif|tiff|wav|wma|wmv
+
+# default resource type paths
+connector.resourceType.file.path = /file
+connector.resourceType.image.path = /image
+connector.resourceType.flash.path = /flash
+connector.resourceType.media.path = /media
 
 # Due to security issues with Apache modules, it is recommended to leave this