Index: lams_admin/conf/xdoclet/servlets.xml =================================================================== RCS file: /usr/local/cvsroot/lams_admin/conf/xdoclet/servlets.xml,v diff -u -r1.3 -r1.4 --- lams_admin/conf/xdoclet/servlets.xml 24 Apr 2007 01:59:33 -0000 1.3 +++ lams_admin/conf/xdoclet/servlets.xml 6 Feb 2009 02:12:04 -0000 1.4 @@ -22,7 +22,7 @@ Connector - com.fredck.FCKeditor.connector.ConnectorServlet + net.fckeditor.connector.ConnectorServlet

baseDir

/UserFiles/ Index: lams_admin/web/WEB-INF/web.xml =================================================================== RCS file: /usr/local/cvsroot/lams_admin/web/WEB-INF/Attic/web.xml,v diff -u -r1.23 -r1.24 --- lams_admin/web/WEB-INF/web.xml 28 Jan 2009 00:05:11 -0000 1.23 +++ lams_admin/web/WEB-INF/web.xml 6 Feb 2009 02:12:04 -0000 1.24 @@ -123,7 +123,7 @@ Connector - com.fredck.FCKeditor.connector.ConnectorServlet + net.fckeditor.connector.ConnectorServlet

baseDir

/UserFiles/ Index: lams_admin/web/WEB-INF/fckeditor/tlds/FCKeditor.tld =================================================================== RCS file: /usr/local/cvsroot/lams_admin/web/WEB-INF/fckeditor/tlds/Attic/FCKeditor.tld,v diff -u -r1.1 -r1.2 --- lams_admin/web/WEB-INF/fckeditor/tlds/FCKeditor.tld 17 Aug 2006 02:42:24 -0000 1.1 +++ lams_admin/web/WEB-INF/fckeditor/tlds/FCKeditor.tld 6 Feb 2009 02:12:04 -0000 1.2 @@ -1,214 +1,129 @@ - - - - - 2.3 - 1.1 - FCKeditor - http://fckeditor.net/tags-fckeditor - FCKeditor taglib + + + + The FCKeditor Tag Library offers a very convenient way to create + several FCKeditor instances with different configurations. + Additionally, you can check for user-based capabilities. + + FCKeditor Tag Library + 2.4 + FCK + http://java.fckeditor.net + + Creates a FCKeditor instance with the given parameters. Any + parameter except instanceName which is empty or contains + whitespaces only will be ignored. + + editor editor - com.fredck.FCKeditor.tags.FCKeditorTag - JSP + net.fckeditor.tags.EditorTag + JSP - id + + The unique instance name under which the editor can be + retrieved through the API. + + instanceName true - - - basePath - false true - + java.lang.String + - toolbarSet - false - true - - + + Width of the FCKeditor instance in the browser window. + width - false true - + java.lang.String + + + Height of the FCKeditor instance in the browser window. + height - false true - + java.lang.String + - customConfigurationsPath - false + + The toolbar set which shall be displayed to the user. + + toolbarSet true - + java.lang.String + - editorAreaCSS - false + + The path/folder in which the editor is deployed under + the given context. The context path will be attached + automatically. (e.g. '/fckeditor') + + basePath true - + java.lang.String + - baseHref - false + + Passes any content to the FCKeditor document. Use the + jsp:attribute tag for large inline content. \r, \n, and + \t will be truncated. + + value true - + java.lang.String + + ]]> + + + + + Sets a config property of the editor to the supplied value. + You may provide any attribute you want for the editor. Set + at least one attribute per tag or several attributes with + one tag. This tag can only be nested within an editor tag. + For all configuration options click + here]]>. + + config + config + net.fckeditor.tags.ConfigTag + empty + true + + ]]> + + + + + Displays session-dependent and compatibility-related + information. This tag is intended for developers only. + Response messages cannot be localized, they are English + only. + + check + check + net.fckeditor.tags.CheckTag + empty - skinPath - false - true - - - pluginsPath - false - true - - - fullPage - false - true - - - debug - false - true - - - autoDetectLanguage - false - true - - - defaultLanguage - false - true - - - contentLangDirection - false - true - - - enableXHTML - false - true - - - enableSourceXHTML - false - true - - - fillEmptyBlocks - false - true - - - formatSource - false - true - - - formatOutput - false - true - - - formatIndentator - false - true - - - geckoUseSPAN - false - true - - - startupFocus - false - true - - - forcePasteAsPlainText - false - true - - - forceSimpleAmpersand - false - true - - - tabSpaces - false - true - - - useBROnCarriageReturn - false - true - - - toolbarStartExpanded - false - true - - - toolbarCanCollapse - false - true - - - fontColors - false - true - - - fontNames - false - true - - - fontSizes - false - true - - - fontFormats - false - true - - - stylesXmlPath - false - true - - - linkBrowserURL - false - true - - - imageBrowserURL - false - true - - - flashBrowserURL - false - true - - - linkUploadURL - false - true - - - imageUploadURL - false - true - - - flashUploadURL - false - true - + + Provide the feature name you want to check. Valid + features are [FileUpload, FileBrowsing, + CompatibleBrowser] + + command + true + java.lang.String + + +]]> + \ No newline at end of file Index: lams_admin/web/WEB-INF/tags/FCKEditor.tag =================================================================== RCS file: /usr/local/cvsroot/lams_admin/web/WEB-INF/tags/Attic/FCKEditor.tag,v diff -u -r1.5 -r1.6 --- lams_admin/web/WEB-INF/tags/FCKEditor.tag 4 Feb 2009 02:02:29 -0000 1.5 +++ lams_admin/web/WEB-INF/tags/FCKEditor.tag 6 Feb 2009 02:12:04 -0000 1.6 @@ -10,7 +10,6 @@ <%@ attribute name="contentFolderID" required="false" rtexprvalue="true"%> <%@ attribute name="displayExpanded" required="false" rtexprvalue="true"%> - @@ -20,7 +19,7 @@ - + @@ -52,21 +51,22 @@ --> - - ${value} + toolbarSet="${toolbarSet}"> +${value} + Index: lams_build/3rdParty.userlibraries =================================================================== RCS file: /usr/local/cvsroot/lams_build/3rdParty.userlibraries,v diff -u -r1.36 -r1.37 --- lams_build/3rdParty.userlibraries 30 Oct 2008 00:50:20 -0000 1.36 +++ lams_build/3rdParty.userlibraries 6 Feb 2009 02:11:23 -0000 1.37 @@ -90,7 +90,7 @@ - + @@ -109,5 +109,7 @@ + + Index: lams_build/build.xml =================================================================== RCS file: /usr/local/cvsroot/lams_build/build.xml,v diff -u -r1.70 -r1.71 --- lams_build/build.xml 16 Dec 2008 01:47:17 -0000 1.70 +++ lams_build/build.xml 6 Feb 2009 02:11:22 -0000 1.71 @@ -143,7 +143,8 @@ - + + @@ -482,17 +483,28 @@ + + + + + + + + + + + Index: lams_build/shared.properties =================================================================== RCS file: /usr/local/cvsroot/lams_build/shared.properties,v diff -u -r1.30 -r1.31 --- lams_build/shared.properties 16 Dec 2008 01:47:17 -0000 1.30 +++ lams_build/shared.properties 6 Feb 2009 02:11:23 -0000 1.31 @@ -57,3 +57,7 @@ tool_daco_dir=lams_tool_daco tool_wiki_dir=lams_tool_wiki tool_images_dir=lams_tool_images +tool_pixlr_dir=lams_tool_pixlr +tool_assessment_dir=lams_tool_assessment +tool_videorecorder_dir=lams_tool_videorecorder +tool_dimdim_dir=lams_tool_dimdim Index: lams_build/conf/j2ee/lams.application.xml =================================================================== RCS file: /usr/local/cvsroot/lams_build/conf/j2ee/lams.application.xml,v diff -u -r1.6 -r1.7 --- lams_build/conf/j2ee/lams.application.xml 16 Oct 2008 06:08:49 -0000 1.6 +++ lams_build/conf/j2ee/lams.application.xml 6 Feb 2009 02:11:22 -0000 1.7 @@ -130,7 +130,7 @@ commons-validator.jar - FCKeditor-2.3.jar + FCKeditor-2.4.1.jar poi-2.5.1-final-20040804.jar @@ -163,6 +163,12 @@ log4j-1.2.13.jar + slf4j-api-1.5.2.jar + + + slf4j-log4j12-1.5.2.jar + + mysql-connector-java-3.1.12-bin.jar Index: lams_build/conf/j2ee/rams.application.xml =================================================================== RCS file: /usr/local/cvsroot/lams_build/conf/j2ee/Attic/rams.application.xml,v diff -u -r1.6 -r1.7 --- lams_build/conf/j2ee/rams.application.xml 16 Oct 2008 06:08:49 -0000 1.6 +++ lams_build/conf/j2ee/rams.application.xml 6 Feb 2009 02:11:22 -0000 1.7 @@ -130,7 +130,7 @@ commons-validator.jar - FCKeditor-2.3.jar + FCKeditor-2.4.1.jar poi-2.5.1-final-20040804.jar @@ -163,6 +163,12 @@ log4j-1.2.13.jar + slf4j-api-1.5.2.jar + + + slf4j-log4j12-1.5.2.jar + + mysql-connector-java-3.1.12-bin.jar Index: lams_build/lib/fckeditor/FCKeditor-2.4.1.jar =================================================================== RCS file: /usr/local/cvsroot/lams_build/lib/fckeditor/Attic/FCKeditor-2.4.1.jar,v diff -u Binary files differ Index: lams_build/lib/slf4j/slf4j-api-1.5.2.jar =================================================================== RCS file: /usr/local/cvsroot/lams_build/lib/slf4j/Attic/slf4j-api-1.5.2.jar,v diff -u Binary files differ Index: lams_build/lib/slf4j/slf4j-log4j12-1.5.2.jar =================================================================== RCS file: /usr/local/cvsroot/lams_build/lib/slf4j/Attic/slf4j-log4j12-1.5.2.jar,v diff -u Binary files differ Index: lams_central/web/WEB-INF/tags/FCKEditor.tag =================================================================== RCS file: /usr/local/cvsroot/lams_central/web/WEB-INF/tags/Attic/FCKEditor.tag,v diff -u -r1.5 -r1.6 --- lams_central/web/WEB-INF/tags/FCKEditor.tag 4 Feb 2009 02:02:52 -0000 1.5 +++ lams_central/web/WEB-INF/tags/FCKEditor.tag 6 Feb 2009 02:14:52 -0000 1.6 @@ -10,7 +10,6 @@ <%@ attribute name="contentFolderID" required="false" rtexprvalue="true"%> <%@ attribute name="displayExpanded" required="false" rtexprvalue="true"%> - @@ -20,7 +19,7 @@ - + @@ -52,21 +51,24 @@ --> - - ${value} + toolbarSet="${toolbarSet}"> +${value} + + + Index: lams_learning/web/WEB-INF/tags/FCKEditor.tag =================================================================== RCS file: /usr/local/cvsroot/lams_learning/web/WEB-INF/tags/Attic/FCKEditor.tag,v diff -u -r1.5 -r1.6 --- lams_learning/web/WEB-INF/tags/FCKEditor.tag 4 Feb 2009 02:05:35 -0000 1.5 +++ lams_learning/web/WEB-INF/tags/FCKEditor.tag 6 Feb 2009 02:15:48 -0000 1.6 @@ -10,7 +10,6 @@ <%@ attribute name="contentFolderID" required="false" rtexprvalue="true"%> <%@ attribute name="displayExpanded" required="false" rtexprvalue="true"%> - @@ -20,7 +19,7 @@ - + @@ -52,21 +51,22 @@ --> - - ${value} + toolbarSet="${toolbarSet}"> +${value} + Index: lams_monitoring/web/WEB-INF/tags/FCKEditor.tag =================================================================== RCS file: /usr/local/cvsroot/lams_monitoring/web/WEB-INF/tags/Attic/FCKEditor.tag,v diff -u -r1.4 -r1.5 --- lams_monitoring/web/WEB-INF/tags/FCKEditor.tag 4 Feb 2009 02:00:16 -0000 1.4 +++ lams_monitoring/web/WEB-INF/tags/FCKEditor.tag 6 Feb 2009 02:16:21 -0000 1.5 @@ -10,7 +10,6 @@ <%@ attribute name="contentFolderID" required="false" rtexprvalue="true"%> <%@ attribute name="displayExpanded" required="false" rtexprvalue="true"%> - @@ -20,7 +19,7 @@ - + @@ -52,21 +51,22 @@ --> - - ${value} + toolbarSet="${toolbarSet}"> +${value} + Index: lams_tool_assessment/web/WEB-INF/tags/FCKEditor.tag =================================================================== RCS file: /usr/local/cvsroot/lams_tool_assessment/web/WEB-INF/tags/Attic/FCKEditor.tag,v diff -u -r1.2 -r1.3 --- lams_tool_assessment/web/WEB-INF/tags/FCKEditor.tag 4 Feb 2009 17:48:29 -0000 1.2 +++ lams_tool_assessment/web/WEB-INF/tags/FCKEditor.tag 6 Feb 2009 02:17:36 -0000 1.3 @@ -10,7 +10,6 @@ <%@ attribute name="contentFolderID" required="false" rtexprvalue="true"%> <%@ attribute name="displayExpanded" required="false" rtexprvalue="true"%> - @@ -20,7 +19,7 @@ - + @@ -52,21 +51,22 @@ --> - - ${value} + toolbarSet="${toolbarSet}"> +${value} + Index: lams_tool_assessment/web/WEB-INF/tlds/fckeditor/FCKeditor.tld =================================================================== RCS file: /usr/local/cvsroot/lams_tool_assessment/web/WEB-INF/tlds/fckeditor/Attic/FCKeditor.tld,v diff -u -r1.1 -r1.2 --- lams_tool_assessment/web/WEB-INF/tlds/fckeditor/FCKeditor.tld 29 Jan 2009 05:59:05 -0000 1.1 +++ lams_tool_assessment/web/WEB-INF/tlds/fckeditor/FCKeditor.tld 6 Feb 2009 02:17:49 -0000 1.2 @@ -1,215 +1,129 @@ - - - - - 2.3 - 1.1 - FCKeditor - http://fckeditor.net/tags-fckeditor - FCKeditor taglib + + + + The FCKeditor Tag Library offers a very convenient way to create + several FCKeditor instances with different configurations. + Additionally, you can check for user-based capabilities. + + FCKeditor Tag Library + 2.4 + FCK + http://java.fckeditor.net + + Creates a FCKeditor instance with the given parameters. Any + parameter except instanceName which is empty or contains + whitespaces only will be ignored. + + editor editor - com.fredck.FCKeditor.tags.FCKeditorTag - JSP + net.fckeditor.tags.EditorTag + JSP - id + + The unique instance name under which the editor can be + retrieved through the API. + + instanceName true true - + java.lang.String + - basePath - false - true - - - toolbarSet - false - true - - + + Width of the FCKeditor instance in the browser window. + width - false true - + java.lang.String + + + Height of the FCKeditor instance in the browser window. + height - false true - + java.lang.String + - customConfigurationsPath - false + + The toolbar set which shall be displayed to the user. + + toolbarSet true - + java.lang.String + - editorAreaCSS - false + + The path/folder in which the editor is deployed under + the given context. The context path will be attached + automatically. (e.g. '/fckeditor') + + basePath true - + java.lang.String + - baseHref - false + + Passes any content to the FCKeditor document. Use the + jsp:attribute tag for large inline content. \r, \n, and + \t will be truncated. + + value true - + java.lang.String + + ]]> + + + + + Sets a config property of the editor to the supplied value. + You may provide any attribute you want for the editor. Set + at least one attribute per tag or several attributes with + one tag. This tag can only be nested within an editor tag. + For all configuration options click + here]]>. + + config + config + net.fckeditor.tags.ConfigTag + empty + true + + ]]> + + + + + Displays session-dependent and compatibility-related + information. This tag is intended for developers only. + Response messages cannot be localized, they are English + only. + + check + check + net.fckeditor.tags.CheckTag + empty - skinPath - false - true - - - pluginsPath - false - true - - - fullPage - false - true - - - debug - false - true - - - autoDetectLanguage - false - true - - - defaultLanguage - false - true - - - contentLangDirection - false - true - - - enableXHTML - false - true - - - enableSourceXHTML - false - true - - - fillEmptyBlocks - false - true - - - formatSource - false - true - - - formatOutput - false - true - - - formatIndentator - false - true - - - geckoUseSPAN - false - true - - - startupFocus - false - true - - - forcePasteAsPlainText - false - true - - - forceSimpleAmpersand - false - true - - - tabSpaces - false - true - - - useBROnCarriageReturn - false - true - - - toolbarStartExpanded - false - true - - - toolbarCanCollapse - false - true - - - fontColors - false - true - - - fontNames - false - true - - - fontSizes - false - true - - - fontFormats - false - true - - - stylesXmlPath - false - true - - - linkBrowserURL - false - true - - - imageBrowserURL - false - true - - - flashBrowserURL - false - true - - - linkUploadURL - false - true - - - imageUploadURL - false - true - - - flashUploadURL - false - true - + + Provide the feature name you want to check. Valid + features are [FileUpload, FileBrowsing, + CompatibleBrowser] + + command + true + java.lang.String + + +]]> + - + \ No newline at end of file Index: lams_tool_chat/conf/xdoclet/servlets.xml =================================================================== RCS file: /usr/local/cvsroot/lams_tool_chat/conf/xdoclet/servlets.xml,v diff -u -r1.5 -r1.6 --- lams_tool_chat/conf/xdoclet/servlets.xml 30 Jun 2006 07:04:05 -0000 1.5 +++ lams_tool_chat/conf/xdoclet/servlets.xml 6 Feb 2009 02:18:31 -0000 1.6 @@ -24,7 +24,7 @@ Connector - com.fredck.FCKeditor.connector.ConnectorServlet + net.fckeditor.connector.ConnectorServlet

baseDir

/UserFiles/ Index: lams_tool_chat/web/WEB-INF/web.xml =================================================================== RCS file: /usr/local/cvsroot/lams_tool_chat/web/WEB-INF/Attic/web.xml,v diff -u -r1.20 -r1.21 --- lams_tool_chat/web/WEB-INF/web.xml 22 Sep 2008 05:29:19 -0000 1.20 +++ lams_tool_chat/web/WEB-INF/web.xml 6 Feb 2009 02:18:31 -0000 1.21 @@ -16,7 +16,8 @@ classpath:/org/lamsfoundation/lams/toolApplicationContext.xml classpath:/org/lamsfoundation/lams/learning/learningApplicationContext.xml classpath:/org/lamsfoundation/lams/contentrepository/applicationContext.xml - classpath:/org/lamsfoundation/lams/tool/chat/chatApplicationContext.xml + classpath:/org/lamsfoundation/lams/tool/chat/chatApplicationContext.xml + classpath:/org/lamsfoundation/lams/tool/chat/dbupdates/autopatchContext.xml @@ -63,8 +64,8 @@ - org.lamsfoundation.lams.web.SessionListener - + org.lamsfoundation.lams.web.session.SetMaxTimeoutListener + @@ -93,7 +94,7 @@ Connector - com.fredck.FCKeditor.connector.ConnectorServlet + net.fckeditor.connector.ConnectorServlet

baseDir

/UserFiles/ @@ -156,6 +157,10 @@ /exportPortfolio + + 120 + + - - ${value} + toolbarSet="${toolbarSet}"> +${value} + Index: lams_tool_daco/web/WEB-INF/web.xml =================================================================== RCS file: /usr/local/cvsroot/lams_tool_daco/web/WEB-INF/web.xml,v diff -u -r1.4 -r1.5 --- lams_tool_daco/web/WEB-INF/web.xml 4 Oct 2008 02:33:04 -0000 1.4 +++ lams_tool_daco/web/WEB-INF/web.xml 6 Feb 2009 02:19:03 -0000 1.5 @@ -109,7 +109,7 @@ Connector - com.fredck.FCKeditor.connector.ConnectorServlet + net.fckeditor.connector.ConnectorServlet

baseDir

/UserFiles/ Index: lams_tool_daco/web/WEB-INF/tags/FCKEditor.tag =================================================================== RCS file: /usr/local/cvsroot/lams_tool_daco/web/WEB-INF/tags/Attic/FCKEditor.tag,v diff -u -r1.2 -r1.3 --- lams_tool_daco/web/WEB-INF/tags/FCKEditor.tag 4 Feb 2009 02:05:17 -0000 1.2 +++ lams_tool_daco/web/WEB-INF/tags/FCKEditor.tag 6 Feb 2009 02:19:03 -0000 1.3 @@ -10,7 +10,6 @@ <%@ attribute name="contentFolderID" required="false" rtexprvalue="true"%> <%@ attribute name="displayExpanded" required="false" rtexprvalue="true"%> - @@ -20,7 +19,7 @@

- + @@ -52,21 +51,22 @@ --> - - ${value} + toolbarSet="${toolbarSet}"> +${value} + Index: lams_tool_daco/web/WEB-INF/tlds/fckeditor/FCKeditor.tld =================================================================== RCS file: /usr/local/cvsroot/lams_tool_daco/web/WEB-INF/tlds/fckeditor/Attic/FCKeditor.tld,v diff -u -r1.1 -r1.2 --- lams_tool_daco/web/WEB-INF/tlds/fckeditor/FCKeditor.tld 3 Jul 2008 06:12:09 -0000 1.1 +++ lams_tool_daco/web/WEB-INF/tlds/fckeditor/FCKeditor.tld 6 Feb 2009 02:19:03 -0000 1.2 @@ -1,215 +1,129 @@ - - - - - 2.3 - 1.1 - FCKeditor - http://fckeditor.net/tags-fckeditor - FCKeditor taglib + + + + The FCKeditor Tag Library offers a very convenient way to create + several FCKeditor instances with different configurations. + Additionally, you can check for user-based capabilities. + + FCKeditor Tag Library + 2.4 + FCK + http://java.fckeditor.net + + Creates a FCKeditor instance with the given parameters. Any + parameter except instanceName which is empty or contains + whitespaces only will be ignored. + + editor editor - com.fredck.FCKeditor.tags.FCKeditorTag - JSP + net.fckeditor.tags.EditorTag + JSP - id + + The unique instance name under which the editor can be + retrieved through the API. + + instanceName true true - + java.lang.String + - basePath - false - true - - - toolbarSet - false - true - - + + Width of the FCKeditor instance in the browser window. + width - false true - + java.lang.String + + + Height of the FCKeditor instance in the browser window. + height - false true - + java.lang.String + - customConfigurationsPath - false + + The toolbar set which shall be displayed to the user. + + toolbarSet true - + java.lang.String + - editorAreaCSS - false + + The path/folder in which the editor is deployed under + the given context. The context path will be attached + automatically. (e.g. '/fckeditor') + + basePath true - + java.lang.String + - baseHref - false + + Passes any content to the FCKeditor document. Use the + jsp:attribute tag for large inline content. \r, \n, and + \t will be truncated. + + value true - + java.lang.String + + ]]> + + + + + Sets a config property of the editor to the supplied value. + You may provide any attribute you want for the editor. Set + at least one attribute per tag or several attributes with + one tag. This tag can only be nested within an editor tag. + For all configuration options click + here]]>. + + config + config + net.fckeditor.tags.ConfigTag + empty + true + + ]]> + + + + + Displays session-dependent and compatibility-related + information. This tag is intended for developers only. + Response messages cannot be localized, they are English + only. + + check + check + net.fckeditor.tags.CheckTag + empty - skinPath - false - true - - - pluginsPath - false - true - - - fullPage - false - true - - - debug - false - true - - - autoDetectLanguage - false - true - - - defaultLanguage - false - true - - - contentLangDirection - false - true - - - enableXHTML - false - true - - - enableSourceXHTML - false - true - - - fillEmptyBlocks - false - true - - - formatSource - false - true - - - formatOutput - false - true - - - formatIndentator - false - true - - - geckoUseSPAN - false - true - - - startupFocus - false - true - - - forcePasteAsPlainText - false - true - - - forceSimpleAmpersand - false - true - - - tabSpaces - false - true - - - useBROnCarriageReturn - false - true - - - toolbarStartExpanded - false - true - - - toolbarCanCollapse - false - true - - - fontColors - false - true - - - fontNames - false - true - - - fontSizes - false - true - - - fontFormats - false - true - - - stylesXmlPath - false - true - - - linkBrowserURL - false - true - - - imageBrowserURL - false - true - - - flashBrowserURL - false - true - - - linkUploadURL - false - true - - - imageUploadURL - false - true - - - flashUploadURL - false - true - + + Provide the feature name you want to check. Valid + features are [FileUpload, FileBrowsing, + CompatibleBrowser] + + command + true + java.lang.String + + +]]> + - + \ No newline at end of file Index: lams_tool_dimdim/conf/xdoclet/servlets.xml =================================================================== RCS file: /usr/local/cvsroot/lams_tool_dimdim/conf/xdoclet/Attic/servlets.xml,v diff -u -r1.1 -r1.2 --- lams_tool_dimdim/conf/xdoclet/servlets.xml 15 Aug 2008 08:42:42 -0000 1.1 +++ lams_tool_dimdim/conf/xdoclet/servlets.xml 6 Feb 2009 02:19:26 -0000 1.2 @@ -24,7 +24,7 @@ Connector - com.fredck.FCKeditor.connector.ConnectorServlet + net.fckeditor.connector.ConnectorServlet

baseDir

/UserFiles/ Index: lams_tool_dimdim/web/WEB-INF/web.xml =================================================================== RCS file: /usr/local/cvsroot/lams_tool_dimdim/web/WEB-INF/web.xml,v diff -u -r1.4 -r1.5 --- lams_tool_dimdim/web/WEB-INF/web.xml 21 Nov 2008 06:32:54 -0000 1.4 +++ lams_tool_dimdim/web/WEB-INF/web.xml 6 Feb 2009 02:19:26 -0000 1.5 @@ -94,7 +94,7 @@ Connector - com.fredck.FCKeditor.connector.ConnectorServlet + net.fckeditor.connector.ConnectorServlet

baseDir

/UserFiles/ Index: lams_tool_dimdim/web/WEB-INF/fckeditor/tlds/FCKeditor.tld =================================================================== RCS file: /usr/local/cvsroot/lams_tool_dimdim/web/WEB-INF/fckeditor/tlds/Attic/FCKeditor.tld,v diff -u -r1.1 -r1.2 --- lams_tool_dimdim/web/WEB-INF/fckeditor/tlds/FCKeditor.tld 15 Aug 2008 08:42:42 -0000 1.1 +++ lams_tool_dimdim/web/WEB-INF/fckeditor/tlds/FCKeditor.tld 6 Feb 2009 02:19:27 -0000 1.2 @@ -1,215 +1,129 @@ - - - - - 2.3 - 1.1 - FCKeditor - http://fckeditor.net/tags-fckeditor - FCKeditor taglib + + + + The FCKeditor Tag Library offers a very convenient way to create + several FCKeditor instances with different configurations. + Additionally, you can check for user-based capabilities. + + FCKeditor Tag Library + 2.4 + FCK + http://java.fckeditor.net + + Creates a FCKeditor instance with the given parameters. Any + parameter except instanceName which is empty or contains + whitespaces only will be ignored. + + editor editor - com.fredck.FCKeditor.tags.FCKeditorTag - JSP + net.fckeditor.tags.EditorTag + JSP - id + + The unique instance name under which the editor can be + retrieved through the API. + + instanceName true true - + java.lang.String + - basePath - false - true - - - toolbarSet - false - true - - + + Width of the FCKeditor instance in the browser window. + width - false true - + java.lang.String + + + Height of the FCKeditor instance in the browser window. + height - false true - + java.lang.String + - customConfigurationsPath - false + + The toolbar set which shall be displayed to the user. + + toolbarSet true - + java.lang.String + - editorAreaCSS - false + + The path/folder in which the editor is deployed under + the given context. The context path will be attached + automatically. (e.g. '/fckeditor') + + basePath true - + java.lang.String + - baseHref - false + + Passes any content to the FCKeditor document. Use the + jsp:attribute tag for large inline content. \r, \n, and + \t will be truncated. + + value true - + java.lang.String + + ]]> + + + + + Sets a config property of the editor to the supplied value. + You may provide any attribute you want for the editor. Set + at least one attribute per tag or several attributes with + one tag. This tag can only be nested within an editor tag. + For all configuration options click + here]]>. + + config + config + net.fckeditor.tags.ConfigTag + empty + true + + ]]> + + + + + Displays session-dependent and compatibility-related + information. This tag is intended for developers only. + Response messages cannot be localized, they are English + only. + + check + check + net.fckeditor.tags.CheckTag + empty - skinPath - false - true - - - pluginsPath - false - true - - - fullPage - false - true - - - debug - false - true - - - autoDetectLanguage - false - true - - - defaultLanguage - false - true - - - contentLangDirection - false - true - - - enableXHTML - false - true - - - enableSourceXHTML - false - true - - - fillEmptyBlocks - false - true - - - formatSource - false - true - - - formatOutput - false - true - - - formatIndentator - false - true - - - geckoUseSPAN - false - true - - - startupFocus - false - true - - - forcePasteAsPlainText - false - true - - - forceSimpleAmpersand - false - true - - - tabSpaces - false - true - - - useBROnCarriageReturn - false - true - - - toolbarStartExpanded - false - true - - - toolbarCanCollapse - false - true - - - fontColors - false - true - - - fontNames - false - true - - - fontSizes - false - true - - - fontFormats - false - true - - - stylesXmlPath - false - true - - - linkBrowserURL - false - true - - - imageBrowserURL - false - true - - - flashBrowserURL - false - true - - - linkUploadURL - false - true - - - imageUploadURL - false - true - - - flashUploadURL - false - true - + + Provide the feature name you want to check. Valid + features are [FileUpload, FileBrowsing, + CompatibleBrowser] + + command + true + java.lang.String + + +]]> + - + \ No newline at end of file Index: lams_tool_dimdim/web/WEB-INF/tags/FCKEditor.tag =================================================================== RCS file: /usr/local/cvsroot/lams_tool_dimdim/web/WEB-INF/tags/Attic/FCKEditor.tag,v diff -u -r1.1 -r1.2 --- lams_tool_dimdim/web/WEB-INF/tags/FCKEditor.tag 15 Aug 2008 08:42:42 -0000 1.1 +++ lams_tool_dimdim/web/WEB-INF/tags/FCKEditor.tag 6 Feb 2009 02:19:26 -0000 1.2 @@ -5,7 +5,10 @@ <%@ attribute name="id" required="true" rtexprvalue="true"%> <%@ attribute name="value" required="true" rtexprvalue="true"%> <%@ attribute name="toolbarSet" required="false" rtexprvalue="true"%> +<%@ attribute name="height" required="false" rtexprvalue="true"%> +<%@ attribute name="width" required="false" rtexprvalue="true"%> <%@ attribute name="contentFolderID" required="false" rtexprvalue="true"%> +<%@ attribute name="displayExpanded" required="false" rtexprvalue="true"%> @@ -15,6 +18,14 @@

+ + + + + + + + /fckeditor/ - - ${value} + toolbarSet="${toolbarSet}"> +${value} + Index: lams_tool_example/conf/xdoclet/servlets.xml =================================================================== RCS file: /usr/local/cvsroot/lams_tool_example/conf/xdoclet/servlets.xml,v diff -u -r1.2 -r1.3 --- lams_tool_example/conf/xdoclet/servlets.xml 30 Jun 2006 07:04:04 -0000 1.2 +++ lams_tool_example/conf/xdoclet/servlets.xml 6 Feb 2009 02:19:41 -0000 1.3 @@ -24,7 +24,7 @@ Connector - com.fredck.FCKeditor.connector.ConnectorServlet + net.fckeditor.connector.ConnectorServlett

baseDir

/UserFiles/ Index: lams_tool_example/web/WEB-INF/web.xml =================================================================== RCS file: /usr/local/cvsroot/lams_tool_example/web/WEB-INF/web.xml,v diff -u -r1.5 -r1.6 --- lams_tool_example/web/WEB-INF/web.xml 22 Sep 2008 05:29:24 -0000 1.5 +++ lams_tool_example/web/WEB-INF/web.xml 6 Feb 2009 02:19:41 -0000 1.6 @@ -5,7 +5,7 @@ javax.servlet.jsp.jstl.fmt.localizationContext - org.lamsfoundation.lams.applicationResources + org.lamsfoundation.lams.tool.example.ApplicationResources

@@ -63,17 +63,11 @@ - org.lamsfoundation.lams.web.SessionListener - + org.lamsfoundation.lams.web.session.SetMaxTimeoutListener + - context - org.springframework.web.context.ContextLoaderServlet - 1 - - -

action

org.apache.struts.action.ActionServlet

@@ -99,7 +93,7 @@ Connector - com.fredck.FCKeditor.connector.ConnectorServlet + net.fckeditor.connector.ConnectorServlett

baseDir

/UserFiles/ @@ -122,6 +116,10 @@ /fckeditor/editor/filemanager/browser/default/connectors/jsp/connector + + 120 + + - - ${value} + toolbarSet="${toolbarSet}"> +${value} + Index: lams_tool_gmap/conf/xdoclet/servlets.xml =================================================================== RCS file: /usr/local/cvsroot/lams_tool_gmap/conf/xdoclet/servlets.xml,v diff -u -r1.1 -r1.2 --- lams_tool_gmap/conf/xdoclet/servlets.xml 23 May 2008 06:29:10 -0000 1.1 +++ lams_tool_gmap/conf/xdoclet/servlets.xml 6 Feb 2009 02:20:44 -0000 1.2 @@ -24,7 +24,7 @@ Connector - com.fredck.FCKeditor.connector.ConnectorServlet + net.fckeditor.connector.ConnectorServlet

baseDir

/UserFiles/ Index: lams_tool_gmap/web/WEB-INF/web.xml =================================================================== RCS file: /usr/local/cvsroot/lams_tool_gmap/web/WEB-INF/Attic/web.xml,v diff -u -r1.15 -r1.16 --- lams_tool_gmap/web/WEB-INF/web.xml 16 Jan 2009 04:36:44 -0000 1.15 +++ lams_tool_gmap/web/WEB-INF/web.xml 6 Feb 2009 02:20:44 -0000 1.16 @@ -94,7 +94,7 @@ Connector - com.fredck.FCKeditor.connector.ConnectorServlet + net.fckeditor.connector.ConnectorServlet

baseDir

/UserFiles/ Index: lams_tool_gmap/web/WEB-INF/fckeditor/tlds/FCKeditor.tld =================================================================== RCS file: /usr/local/cvsroot/lams_tool_gmap/web/WEB-INF/fckeditor/tlds/Attic/FCKeditor.tld,v diff -u -r1.1 -r1.2 --- lams_tool_gmap/web/WEB-INF/fckeditor/tlds/FCKeditor.tld 23 May 2008 06:29:11 -0000 1.1 +++ lams_tool_gmap/web/WEB-INF/fckeditor/tlds/FCKeditor.tld 6 Feb 2009 02:20:44 -0000 1.2 @@ -1,215 +1,129 @@ - - - - - 2.3 - 1.1 - FCKeditor - http://fckeditor.net/tags-fckeditor - FCKeditor taglib + + + + The FCKeditor Tag Library offers a very convenient way to create + several FCKeditor instances with different configurations. + Additionally, you can check for user-based capabilities. + + FCKeditor Tag Library + 2.4 + FCK + http://java.fckeditor.net + + Creates a FCKeditor instance with the given parameters. Any + parameter except instanceName which is empty or contains + whitespaces only will be ignored. + + editor editor - com.fredck.FCKeditor.tags.FCKeditorTag - JSP + net.fckeditor.tags.EditorTag + JSP - id + + The unique instance name under which the editor can be + retrieved through the API. + + instanceName true true - + java.lang.String + - basePath - false - true - - - toolbarSet - false - true - - + + Width of the FCKeditor instance in the browser window. + width - false true - + java.lang.String + + + Height of the FCKeditor instance in the browser window. + height - false true - + java.lang.String + - customConfigurationsPath - false + + The toolbar set which shall be displayed to the user. + + toolbarSet true - + java.lang.String + - editorAreaCSS - false + + The path/folder in which the editor is deployed under + the given context. The context path will be attached + automatically. (e.g. '/fckeditor') + + basePath true - + java.lang.String + - baseHref - false + + Passes any content to the FCKeditor document. Use the + jsp:attribute tag for large inline content. \r, \n, and + \t will be truncated. + + value true - + java.lang.String + + ]]> + + + + + Sets a config property of the editor to the supplied value. + You may provide any attribute you want for the editor. Set + at least one attribute per tag or several attributes with + one tag. This tag can only be nested within an editor tag. + For all configuration options click + here]]>. + + config + config + net.fckeditor.tags.ConfigTag + empty + true + + ]]> + + + + + Displays session-dependent and compatibility-related + information. This tag is intended for developers only. + Response messages cannot be localized, they are English + only. + + check + check + net.fckeditor.tags.CheckTag + empty - skinPath - false - true - - - pluginsPath - false - true - - - fullPage - false - true - - - debug - false - true - - - autoDetectLanguage - false - true - - - defaultLanguage - false - true - - - contentLangDirection - false - true - - - enableXHTML - false - true - - - enableSourceXHTML - false - true - - - fillEmptyBlocks - false - true - - - formatSource - false - true - - - formatOutput - false - true - - - formatIndentator - false - true - - - geckoUseSPAN - false - true - - - startupFocus - false - true - - - forcePasteAsPlainText - false - true - - - forceSimpleAmpersand - false - true - - - tabSpaces - false - true - - - useBROnCarriageReturn - false - true - - - toolbarStartExpanded - false - true - - - toolbarCanCollapse - false - true - - - fontColors - false - true - - - fontNames - false - true - - - fontSizes - false - true - - - fontFormats - false - true - - - stylesXmlPath - false - true - - - linkBrowserURL - false - true - - - imageBrowserURL - false - true - - - flashBrowserURL - false - true - - - linkUploadURL - false - true - - - imageUploadURL - false - true - - - flashUploadURL - false - true - + + Provide the feature name you want to check. Valid + features are [FileUpload, FileBrowsing, + CompatibleBrowser] + + command + true + java.lang.String + + +]]> + - + \ No newline at end of file Index: lams_tool_gmap/web/WEB-INF/tags/FCKEditor.tag =================================================================== RCS file: /usr/local/cvsroot/lams_tool_gmap/web/WEB-INF/tags/Attic/FCKEditor.tag,v diff -u -r1.2 -r1.3 --- lams_tool_gmap/web/WEB-INF/tags/FCKEditor.tag 4 Feb 2009 02:07:54 -0000 1.2 +++ lams_tool_gmap/web/WEB-INF/tags/FCKEditor.tag 6 Feb 2009 02:20:44 -0000 1.3 @@ -10,7 +10,6 @@ <%@ attribute name="contentFolderID" required="false" rtexprvalue="true"%> <%@ attribute name="displayExpanded" required="false" rtexprvalue="true"%> - @@ -20,7 +19,7 @@ - + @@ -52,21 +51,22 @@ --> - - ${value} + toolbarSet="${toolbarSet}"> +${value} + Index: lams_tool_images/web/WEB-INF/web.xml =================================================================== RCS file: /usr/local/cvsroot/lams_tool_images/web/WEB-INF/web.xml,v diff -u -r1.2 -r1.3 --- lams_tool_images/web/WEB-INF/web.xml 4 Dec 2008 12:01:36 -0000 1.2 +++ lams_tool_images/web/WEB-INF/web.xml 6 Feb 2009 02:21:10 -0000 1.3 @@ -110,7 +110,7 @@ Connector - com.fredck.FCKeditor.connector.ConnectorServlet + net.fckeditor.connector.ConnectorServlet

baseDir

/UserFiles/ Index: lams_tool_images/web/WEB-INF/tags/FCKEditor.tag =================================================================== RCS file: /usr/local/cvsroot/lams_tool_images/web/WEB-INF/tags/Attic/FCKEditor.tag,v diff -u -r1.2 -r1.3 --- lams_tool_images/web/WEB-INF/tags/FCKEditor.tag 4 Feb 2009 01:55:24 -0000 1.2 +++ lams_tool_images/web/WEB-INF/tags/FCKEditor.tag 6 Feb 2009 02:21:10 -0000 1.3 @@ -10,7 +10,6 @@ <%@ attribute name="contentFolderID" required="false" rtexprvalue="true"%> <%@ attribute name="displayExpanded" required="false" rtexprvalue="true"%> - @@ -20,7 +19,7 @@

- + @@ -52,21 +51,22 @@ --> - - ${value} + toolbarSet="${toolbarSet}"> +${value} + Index: lams_tool_images/web/WEB-INF/tlds/fckeditor/FCKeditor.tld =================================================================== RCS file: /usr/local/cvsroot/lams_tool_images/web/WEB-INF/tlds/fckeditor/Attic/FCKeditor.tld,v diff -u -r1.1 -r1.2 --- lams_tool_images/web/WEB-INF/tlds/fckeditor/FCKeditor.tld 11 Oct 2008 12:04:14 -0000 1.1 +++ lams_tool_images/web/WEB-INF/tlds/fckeditor/FCKeditor.tld 6 Feb 2009 02:21:10 -0000 1.2 @@ -1,215 +1,129 @@ - - - - - 2.3 - 1.1 - FCKeditor - http://fckeditor.net/tags-fckeditor - FCKeditor taglib + + + + The FCKeditor Tag Library offers a very convenient way to create + several FCKeditor instances with different configurations. + Additionally, you can check for user-based capabilities. + + FCKeditor Tag Library + 2.4 + FCK + http://java.fckeditor.net + + Creates a FCKeditor instance with the given parameters. Any + parameter except instanceName which is empty or contains + whitespaces only will be ignored. + + editor editor - com.fredck.FCKeditor.tags.FCKeditorTag - JSP + net.fckeditor.tags.EditorTag + JSP - id + + The unique instance name under which the editor can be + retrieved through the API. + + instanceName true true - + java.lang.String + - basePath - false - true - - - toolbarSet - false - true - - + + Width of the FCKeditor instance in the browser window. + width - false true - + java.lang.String + + + Height of the FCKeditor instance in the browser window. + height - false true - + java.lang.String + - customConfigurationsPath - false + + The toolbar set which shall be displayed to the user. + + toolbarSet true - + java.lang.String + - editorAreaCSS - false + + The path/folder in which the editor is deployed under + the given context. The context path will be attached + automatically. (e.g. '/fckeditor') + + basePath true - + java.lang.String + - baseHref - false + + Passes any content to the FCKeditor document. Use the + jsp:attribute tag for large inline content. \r, \n, and + \t will be truncated. + + value true - + java.lang.String + + ]]> + + + + + Sets a config property of the editor to the supplied value. + You may provide any attribute you want for the editor. Set + at least one attribute per tag or several attributes with + one tag. This tag can only be nested within an editor tag. + For all configuration options click + here]]>. + + config + config + net.fckeditor.tags.ConfigTag + empty + true + + ]]> + + + + + Displays session-dependent and compatibility-related + information. This tag is intended for developers only. + Response messages cannot be localized, they are English + only. + + check + check + net.fckeditor.tags.CheckTag + empty - skinPath - false - true - - - pluginsPath - false - true - - - fullPage - false - true - - - debug - false - true - - - autoDetectLanguage - false - true - - - defaultLanguage - false - true - - - contentLangDirection - false - true - - - enableXHTML - false - true - - - enableSourceXHTML - false - true - - - fillEmptyBlocks - false - true - - - formatSource - false - true - - - formatOutput - false - true - - - formatIndentator - false - true - - - geckoUseSPAN - false - true - - - startupFocus - false - true - - - forcePasteAsPlainText - false - true - - - forceSimpleAmpersand - false - true - - - tabSpaces - false - true - - - useBROnCarriageReturn - false - true - - - toolbarStartExpanded - false - true - - - toolbarCanCollapse - false - true - - - fontColors - false - true - - - fontNames - false - true - - - fontSizes - false - true - - - fontFormats - false - true - - - stylesXmlPath - false - true - - - linkBrowserURL - false - true - - - imageBrowserURL - false - true - - - flashBrowserURL - false - true - - - linkUploadURL - false - true - - - imageUploadURL - false - true - - - flashUploadURL - false - true - + + Provide the feature name you want to check. Valid + features are [FileUpload, FileBrowsing, + CompatibleBrowser] + + command + true + java.lang.String + + +]]> + - + \ No newline at end of file