Index: /FCKeditor.Java/branches/2.4/src/main/webapp/jsp/sample02.jsp
===================================================================
--- /FCKeditor.Java/branches/2.4/src/main/webapp/jsp/sample02.jsp	(revision 1334)
+++ /FCKeditor.Java/branches/2.4/src/main/webapp/jsp/sample02.jsp	(revision 1335)
@@ -1,3 +1,3 @@
-<%@ taglib uri="http://fckeditor.net/tags-fckeditor" prefix="FCK" %>
+<%@ taglib uri="http://www.fckeditor.net/tags" prefix="FCK" %>
 <!--
  * FCKeditor - The text editor for Internet - http://www.fckeditor.net
@@ -47,11 +47,5 @@
 		<hr>
 		<form action="sampleposteddata.jsp" method="get" target="_blank">
-			<FCK:editor id="EditorDefault"
-				imageBrowserURL="/fckeditor/editor/filemanager/browser/default/browser.html?Type=Image&Connector=../../connectors/jsp/connector"
-				linkBrowserURL="/fckeditor/editor/filemanager/browser/default/browser.html?Connector=../../connectors/jsp/connector"
-				flashBrowserURL="/fckeditor/editor/filemanager/browser/default/browser.html?Type=Flash&Connector=../../connectors/jsp/connector"
-				imageUploadURL="/fckeditor/editor/filemanager/upload/simpleuploader?Type=Image"
-				linkUploadURL="/fckeditor/editor/filemanager/upload/simpleuploader?Type=File"
-				flashUploadURL="/fckeditor/editor/filemanager/upload/simpleuploader?Type=Flash">
+			<FCK:editor id="EditorDefault">
 				This is some <strong>sample text</strong>. You are using <a href="http://www.fredck.com/fckeditor/">FCKeditor</a>.
 			</FCK:editor>
Index: /FCKeditor.Java/branches/2.4/src/main/webapp/jsp/sample03.jsp
===================================================================
--- /FCKeditor.Java/branches/2.4/src/main/webapp/jsp/sample03.jsp	(revision 1334)
+++ /FCKeditor.Java/branches/2.4/src/main/webapp/jsp/sample03.jsp	(revision 1335)
@@ -1,3 +1,3 @@
-<%@ taglib uri="http://fckeditor.net/tags-fckeditor" prefix="FCK" %>
+<%@ taglib uri="http://www.fckeditor.net/tags" prefix="FCK" %>
 <!--
  * FCKeditor - The text editor for Internet - http://www.fckeditor.net
@@ -31,5 +31,4 @@
 		<meta name="robots" content="noindex, nofollow">
 		<link href="../sample.css" rel="stylesheet" type="text/css">
-			<script type="text/javascript" src="../../fckeditor.js"></script>
 			<script type="text/javascript">
 
@@ -97,11 +96,5 @@
 			<FCK:editor id="EditorDefault"
 				autoDetectLanguage="<%=autoDetectLanguageStr%>"
-				defaultLanguage="<%=defaultLanguageStr%>"
-				imageBrowserURL="/fckeditor/editor/filemanager/browser/default/browser.html?Type=Image&Connector=../../connectors/jsp/connector"
-				linkBrowserURL="/fckeditor/editor/filemanager/browser/default/browser.html?Connector=../../connectors/jsp/connector"
-				flashBrowserURL="/fckeditor/editor/filemanager/browser/default/browser.html?Type=Flash&Connector=../../connectors/jsp/connector"
-				imageUploadURL="/fckeditor/editor/filemanager/upload/simpleuploader?Type=Image"
-				linkUploadURL="/fckeditor/editor/filemanager/upload/simpleuploader?Type=File"
-				flashUploadURL="/fckeditor/editor/filemanager/upload/simpleuploader?Type=Flash">
+				defaultLanguage="<%=defaultLanguageStr%>">
 				This is some <strong>sample text</strong>. You are using <a href="http://www.fredck.com/fckeditor/">FCKeditor</a>.
 			</FCK:editor>
Index: /FCKeditor.Java/branches/2.4/src/main/webapp/jsp/sample04.jsp
===================================================================
--- /FCKeditor.Java/branches/2.4/src/main/webapp/jsp/sample04.jsp	(revision 1334)
+++ /FCKeditor.Java/branches/2.4/src/main/webapp/jsp/sample04.jsp	(revision 1335)
@@ -1,3 +1,3 @@
-<%@ taglib uri="http://fckeditor.net/tags-fckeditor" prefix="FCK" %>
+<%@ taglib uri="http://www.fckeditor.net/tags" prefix="FCK" %>
 <!--
  * FCKeditor - The text editor for Internet - http://www.fckeditor.net
@@ -31,5 +31,4 @@
 		<meta name="robots" content="noindex, nofollow">
 		<link href="../sample.css" rel="stylesheet" type="text/css">
-			<script type="text/javascript" src="../../fckeditor.js"></script>
 			<script type="text/javascript">
 
@@ -76,11 +75,5 @@
 		<form action="sampleposteddata.jsp" method="get" target="_blank">
 			<FCK:editor id="EditorDefault" 
-				toolbarSet="<%=toolBarSetStr%>"
-				imageBrowserURL="/fckeditor/editor/filemanager/browser/default/browser.html?Type=Image&Connector=../../connectors/jsp/connector"
-				linkBrowserURL="/fckeditor/editor/filemanager/browser/default/browser.html?Connector=../../connectors/jsp/connector"
-				flashBrowserURL="/fckeditor/editor/filemanager/browser/default/browser.html?Type=Flash&Connector=../../connectors/jsp/connector"
-				imageUploadURL="/fckeditor/editor/filemanager/upload/simpleuploader?Type=Image"
-				linkUploadURL="/fckeditor/editor/filemanager/upload/simpleuploader?Type=File"
-				flashUploadURL="/fckeditor/editor/filemanager/upload/simpleuploader?Type=Flash">
+				toolbarSet="<%=toolBarSetStr%>">
 				This is some <strong>sample text</strong>. You are using <a href="http://www.fredck.com/fckeditor/">FCKeditor</a>.
 			</FCK:editor>
Index: /FCKeditor.Java/branches/2.4/src/main/webapp/jsp/sample05.jsp
===================================================================
--- /FCKeditor.Java/branches/2.4/src/main/webapp/jsp/sample05.jsp	(revision 1334)
+++ /FCKeditor.Java/branches/2.4/src/main/webapp/jsp/sample05.jsp	(revision 1335)
@@ -1,3 +1,3 @@
-<%@ taglib uri="http://fckeditor.net/tags-fckeditor" prefix="FCK" %>
+<%@ taglib uri="http://www.fckeditor.net/tags" prefix="FCK" %>
 <!--
  * FCKeditor - The text editor for Internet - http://www.fckeditor.net
@@ -31,5 +31,4 @@
 		<meta name="robots" content="noindex, nofollow">
 		<link href="../sample.css" rel="stylesheet" type="text/css">
-			<script type="text/javascript" src="../../fckeditor.js"></script>
 			<script type="text/javascript">
 
@@ -46,7 +45,7 @@
 }
 
-function ChangeLanguage( languageCode )
+function ChangeSkin( skinName )
 {
-	window.location.href = window.location.pathname + "?skin=" + languageCode ;
+	window.location.href = window.location.pathname + "?skin=" + skinName ;
 }
 
@@ -57,5 +56,5 @@
 String skinStr=request.getParameter("skin");
 if(skinStr!=null) 
-	skinStr= "/fckeditor/" + "editor/skins/" + skinStr + "/"; 	//basePath +  constant relative skin path + skinName 
+	skinStr= "skins/" + skinStr + "/"; 	//basePath +  constant relative skin path + skinName 
 %>	
 	<body>
@@ -69,5 +68,5 @@
 				</td>
 				<td>
-					<select id="cmbSkins" onchange="ChangeLanguage(this.value);" style="VISIBILITY: hidden">
+					<select id="cmbSkins" onchange="ChangeSkin(this.value);" style="visibility: hidden">
 						<option value="default" selected>Default</option>
 						<option value="office2003">Office 2003</option>
@@ -80,11 +79,5 @@
 		<form action="sampleposteddata.jsp" method="get" target="_blank">
 			<FCK:editor id="EditorDefault"
-				skinPath="<%=skinStr%>"
-				imageBrowserURL="/fckeditor/editor/filemanager/browser/default/browser.html?Type=Image&Connector=../../connectors/jsp/connector"
-				linkBrowserURL="/fckeditor/editor/filemanager/browser/default/browser.html?Connector=../../connectors/jsp/connector"
-				flashBrowserURL="/fckeditor/editor/filemanager/browser/default/browser.html?Type=Flash&Connector=../../connectors/jsp/connector"
-				imageUploadURL="/fckeditor/editor/filemanager/upload/simpleuploader?Type=Image"
-				linkUploadURL="/fckeditor/editor/filemanager/upload/simpleuploader?Type=File"
-				flashUploadURL="/fckeditor/editor/filemanager/upload/simpleuploader?Type=Flash">
+				skinPath="<%=skinStr%>">
 				This is some <strong>sample text</strong>. You are using <a href="http://www.fredck.com/fckeditor/">FCKeditor</a>.
 			</FCK:editor>
Index: /FCKeditor.Java/branches/2.4/src/main/webapp/jsp/sample06.jsp
===================================================================
--- /FCKeditor.Java/branches/2.4/src/main/webapp/jsp/sample06.jsp	(revision 1334)
+++ /FCKeditor.Java/branches/2.4/src/main/webapp/jsp/sample06.jsp	(revision 1335)
@@ -1,3 +1,3 @@
-<%@ taglib uri="http://fckeditor.net/tags-fckeditor" prefix="FCK" %>
+<%@ taglib uri="http://www.fckeditor.net/tags" prefix="FCK" %>
 <!--
  * FCKeditor - The text editor for Internet - http://www.fckeditor.net
@@ -30,6 +30,4 @@
 		<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
 		<meta name="robots" content="noindex, nofollow">
-		<link href="../sample.css" rel="stylesheet" type="text/css" />
-		<script type="text/javascript" src="../../fckeditor.js"></script>
 	</head>
 	<body>
@@ -44,11 +42,5 @@
 			<FCK:editor id="EditorDefault"
 				toolbarSet="PluginTest"
-				customConfigurationsPath="/jsp/sample06.config.js"
-				imageBrowserURL="/fckeditor/editor/filemanager/browser/default/browser.html?Type=Image&Connector=../../connectors/jsp/connector"
-				linkBrowserURL="/fckeditor/editor/filemanager/browser/default/browser.html?Connector=../../connectors/jsp/connector"
-				flashBrowserURL="/fckeditor/editor/filemanager/browser/default/browser.html?Type=Flash&Connector=../../connectors/jsp/connector"
-				imageUploadURL="/fckeditor/editor/filemanager/upload/simpleuploader?Type=Image"
-				linkUploadURL="/fckeditor/editor/filemanager/upload/simpleuploader?Type=File"
-				flashUploadURL="/fckeditor/editor/filemanager/upload/simpleuploader?Type=Flash">
+				customConfigurationsPath="${pageContext.request.contextPath}/jsp/sample06.config.js">
 				This is some <strong>sample text</strong>. You are using <a href="http://www.fredck.com/fckeditor/">FCKeditor</a>.
 			</FCK:editor>
Index: /FCKeditor.Java/branches/2.4/src/main/webapp/jsp/sample07.jsp
===================================================================
--- /FCKeditor.Java/branches/2.4/src/main/webapp/jsp/sample07.jsp	(revision 1334)
+++ /FCKeditor.Java/branches/2.4/src/main/webapp/jsp/sample07.jsp	(revision 1335)
@@ -1,3 +1,3 @@
-<%@ taglib uri="http://fckeditor.net/tags-fckeditor" prefix="FCK" %>
+<%@ taglib uri="http://www.fckeditor.net/tags" prefix="FCK" %>
 <!--
  * FCKeditor - The text editor for Internet - http://www.fckeditor.net
@@ -30,5 +30,4 @@
 		<meta name="robots" content="noindex, nofollow">
 		<link href="../sample.css" rel="stylesheet" type="text/css" />
-		<script type="text/javascript" src="../../fckeditor.js"></script>
 	</head>
 	<body>
@@ -39,11 +38,5 @@
 		<form action="sampleposteddata.jsp" method="post" target="_blank">
 			<FCK:editor id="EditorDefault"
-				fullPage="true"
-				imageBrowserURL="/fckeditor/editor/filemanager/browser/default/browser.html?Type=Image&Connector=../../connectors/jsp/connector"
-				linkBrowserURL="/fckeditor/editor/filemanager/browser/default/browser.html?Connector=../../connectors/jsp/connector"
-				flashBrowserURL="/fckeditor/editor/filemanager/browser/default/browser.html?Type=Flash&Connector=../../connectors/jsp/connector"
-				imageUploadURL="/fckeditor/editor/filemanager/upload/simpleuploader?Type=Image"
-				linkUploadURL="/fckeditor/editor/filemanager/upload/simpleuploader?Type=File"
-				flashUploadURL="/fckeditor/editor/filemanager/upload/simpleuploader?Type=Flash">
+				fullPage="true">
 				<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"><html><head><title>Full Page Test</title><meta content="text/html; charset=utf-8" http-equiv="Content-Type"/></head><body>This is some <strong>sample text</strong>. You are using <a href="http://www.fckeditor.net/">FCKeditor</a>.</body></html>
 			</FCK:editor>