Index: lams_tool_bbb/web/WEB-INF/lams.tld
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_bbb/web/WEB-INF/Attic/lams.tld,v
diff -u -r1.1 -r1.2
--- lams_tool_bbb/web/WEB-INF/lams.tld	4 May 2011 02:23:42 -0000	1.1
+++ lams_tool_bbb/web/WEB-INF/lams.tld	19 Dec 2011 06:27:32 -0000	1.2
@@ -123,6 +123,26 @@
    </tag>
    <tag>
 
+      <description>Converts role name into form usable as message resources key</description>
+      <display-name>Converts role name into form usable as message resources key</display-name>
+      <icon>    
+      </icon>
+      <name>role</name>
+      <tag-class>org.lamsfoundation.lams.web.tag.RoleTag</tag-class>
+      <body-content>empty</body-content>
+
+      <attribute>
+         <description>Converts role name into form usable as message resources key</description>
+         <name>role</name>
+         <required>true</required>
+
+           <rtexprvalue>true</rtexprvalue>
+
+      </attribute>
+
+   </tag>
+   <tag>
+
       <description>Help tag</description>
       <display-name>Help tag</display-name>
       <icon>    
@@ -167,23 +187,14 @@
    </tag>
    <tag>
 
-      <description>Converts role name into form usable as message resources key</description>
-      <display-name>Converts role name into form usable as message resources key</display-name>
+      <description>Checks whether Flash enabled for learner</description>
+      <display-name>Checks whether Flash enabled for learner</display-name>
       <icon>    
       </icon>
-      <name>role</name>
-      <tag-class>org.lamsfoundation.lams.web.tag.RoleTag</tag-class>
+      <name>LearnerFlashEnabled</name>
+      <tag-class>org.lamsfoundation.lams.web.tag.LearnerFlashEnabledTag</tag-class>
       <body-content>empty</body-content>
 
-      <attribute>
-         <description>Converts role name into form usable as message resources key</description>
-         <name>role</name>
-         <required>true</required>
-
-           <rtexprvalue>true</rtexprvalue>
-
-      </attribute>
-
    </tag>
    <tag>
 
@@ -289,11 +300,6 @@
 			<rtexprvalue>true</rtexprvalue>
 		</attribute>
 		<attribute>
-			<name>index</name>
-			<required>false</required>
-			<rtexprvalue>true</rtexprvalue>
-		</attribute>
-		<attribute>
 			<name>indexed</name>
 			<required>false</required>
 			<rtexprvalue>true</rtexprvalue>
@@ -436,8 +442,8 @@
        <path>/WEB-INF/tags/TabName.tag</path>
    	</tag-file>
    	<tag-file>
-       <name>FCKEditor</name>
-       <path>/WEB-INF/tags/FCKEditor.tag</path>
+       <name>CKEditor</name>
+       <path>/WEB-INF/tags/CKEditor.tag</path>
    	</tag-file>
    	<tag-file>
        <name>AuthoringButton</name>
@@ -466,6 +472,10 @@
    	<tag-file>
 	    <name>ImgButtonWrapper</name>
 		<path>/WEB-INF/tags/ImgButtonWrapper.tag</path>
+   	</tag-file>
+   	<tag-file>
+	    <name>TextSearch</name>
+		<path>/WEB-INF/tags/TextSearch.tag</path>
    	</tag-file>  
    	<tag>
     <name>textarea</name>
@@ -497,6 +507,15 @@
         <rtexprvalue>true</rtexprvalue>
     </attribute>
   </tag>
+  	<tag>
+	  	<description>Checks whether Flash enabled for learner</description>
+	  	<display-name>Checks whether Flash enabled for learner</display-name>
+	 	<icon>    
+	 	</icon>
+	 	<name>LearnerFlashEnabled</name>
+	 	<tag-class>org.lamsfoundation.lams.web.tag.LearnerFlashEnabledTag</tag-class>
+	 	<body-content>empty</body-content>
+ 	</tag> 
 	<tag-file>
 		<name>head</name>
 	    <path>/WEB-INF/tags/Head.tag</path>
@@ -505,9 +524,5 @@
 	    <name>ProgressOutput</name>
 		<path>/WEB-INF/tags/ProgressOutput.tag</path>
    	</tag-file>  
-	<tag-file>
-	    <name>LearnerFlashEnabled</name>
-		<path>/WEB-INF/tags/LearnerFlashEnabled.tag</path>
-   	</tag-file>  
 
 </taglib>
Index: lams_tool_bbb/web/WEB-INF/web.xml
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_bbb/web/WEB-INF/Attic/web.xml,v
diff -u -r1.1 -r1.2
--- lams_tool_bbb/web/WEB-INF/web.xml	4 May 2011 02:23:42 -0000	1.1
+++ lams_tool_bbb/web/WEB-INF/web.xml	19 Dec 2011 06:27:32 -0000	1.2
@@ -8,13 +8,17 @@
   	<param-value>org.lamsfoundation.lams.tool.bbb.ApplicationResources</param-value>
 </context-param>
 
+<context-param>
+    <param-name>contextClass</param-name>
+    <param-value>org.jboss.spring.factory.VFSXmlWebApplicationContext</param-value>
+</context-param> 
 <context-param> 
 	<param-name>contextConfigLocation</param-name>
 	<param-value>classpath:/org/lamsfoundation/lams/tool/bbb/dbupdates/autopatchContext.xml</param-value>
 </context-param>
 <context-param>
    <param-name>locatorFactorySelector</param-name>
-   <param-value>classpath*:/org/lamsfoundation/lams/**/beanRefContext.xml</param-value>
+   <param-value>classpath:/org/lamsfoundation/lams/beanRefContext.xml</param-value>
 </context-param>
 <context-param>
 	<param-name>parentContextKey</param-name>
@@ -90,7 +94,7 @@
 	<load-on-startup>1</load-on-startup>
 </servlet>
 
-<!--  FCKEditor Connector Configuration -->
+<!--  CKEditor Connector Configuration -->
 
 <servlet>
 	<servlet-name>Connector</servlet-name>
@@ -129,10 +133,10 @@
 	<url-pattern>*.do</url-pattern>
 </servlet-mapping>
 
-<!--  FCKEditor Connector Configuration -->
+<!--  CKEditor Connector Configuration -->
 <servlet-mapping>
 	<servlet-name>Connector</servlet-name>
-	<url-pattern>/fckeditor/editor/filemanager/browser/default/connectors/jsp/connector</url-pattern>
+	<url-pattern>/ckeditor/filemanager/browser/default/connectors/jsp/connector</url-pattern>
 </servlet-mapping>
 
 <servlet-mapping>
@@ -223,10 +227,6 @@
 		<!--  ======================================================== -->	
 		<!--   Customized Tag Library -->
 		<!--  ======================================================== -->	
-		<taglib>
-		    <taglib-uri>fck-editor</taglib-uri>
-		    <taglib-location>/WEB-INF/fckeditor/tlds/FCKeditor.tld</taglib-location>
-		</taglib>
 		 <taglib>
 		   <taglib-uri>tags-lams</taglib-uri>
 		   <taglib-location>/WEB-INF/lams.tld</taglib-location>