Index: lams_tool_laqa/web/WEB-INF/web.xml
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_laqa/web/WEB-INF/web.xml,v
diff -u -r1.34 -r1.35
--- lams_tool_laqa/web/WEB-INF/web.xml	20 Feb 2012 16:26:35 -0000	1.34
+++ lams_tool_laqa/web/WEB-INF/web.xml	30 Jul 2012 18:50:33 -0000	1.35
@@ -188,56 +188,97 @@
 
    <!ELEMENT error-page ((error-code | exception-type), location)>
    -->
+   
+	<jsp-config>
 
-  	<jsp-config>
 		<!--  ======================================================== -->	
 		<!-- Struts Tag Library Descriptors -->
 		<!--  ======================================================== -->	
 		<taglib>
 		    <taglib-uri>tags-bean</taglib-uri>
-		    <taglib-location>/WEB-INF/struts/tlds/struts-bean.tld</taglib-location>
+		    <taglib-location>/WEB-INF/tlds/struts/struts-bean.tld</taglib-location>
 		</taglib>
+		
 		<taglib>
 		    <taglib-uri>tags-html</taglib-uri>
-		    <taglib-location>/WEB-INF/struts/tlds/struts-html.tld</taglib-location>
+		    <taglib-location>/WEB-INF/tlds/struts/struts-html.tld</taglib-location>
 		</taglib>
+		
 		<taglib>
 		    <taglib-uri>tags-logic</taglib-uri>
-		    <taglib-location>/WEB-INF/struts/tlds/struts-logic.tld</taglib-location>
+		    <taglib-location>/WEB-INF/tlds/struts/struts-logic.tld</taglib-location>
 		</taglib>
+		
 		<taglib>
 		    <taglib-uri>tags-tiles</taglib-uri>
-		    <taglib-location>/WEB-INF/struts/tlds/struts-tiles.tld</taglib-location>
+		    <taglib-location>/WEB-INF/tlds/struts/struts-tiles.tld</taglib-location>
 		</taglib>
+				
+		<taglib>
+		    <taglib-uri>tags-bean-el</taglib-uri>
+		    <taglib-location>/WEB-INF/tlds/struts/struts-bean-el.tld</taglib-location>
+		</taglib>
+		<taglib>
+		    <taglib-uri>tags-html-el</taglib-uri>
+		    <taglib-location>/WEB-INF/tlds/struts/struts-html-el.tld</taglib-location>
+		</taglib>
+		<taglib>
+		    <taglib-uri>tags-logic-el</taglib-uri>
+		    <taglib-location>/WEB-INF/tlds/struts/struts-logic-el.tld</taglib-location>
+		</taglib>
+		<taglib>
+		    <taglib-uri>tags-tiles-el</taglib-uri>
+		    <taglib-location>/WEB-INF/tlds/struts/struts-tiles-el.tld</taglib-location>
+		</taglib>
+		
 		<!--  ======================================================== -->	
 		<!--  JSTL 1.2 Tag Library 									   -->
 		<!--  ======================================================== -->	
 		  <taglib>
 		    <taglib-uri>tags-fmt</taglib-uri>
-		    <taglib-location>/WEB-INF/jstl/tlds/fmt.tld</taglib-location>
+		    <taglib-location>/WEB-INF/tlds/jstl/fmt.tld</taglib-location>
 		  </taglib>
+		
 		  <taglib>
 		    <taglib-uri>tags-core</taglib-uri>
-		    <taglib-location>/WEB-INF/jstl/tlds/c.tld</taglib-location>
+		    <taglib-location>/WEB-INF/tlds/jstl/c.tld</taglib-location>
 		  </taglib>
+		
 		  <taglib>
 		    <taglib-uri>tags-function</taglib-uri>
-		    <taglib-location>/WEB-INF/jstl/tlds/fn.tld</taglib-location>
+		    <taglib-location>/WEB-INF/tlds/jstl/fn.tld</taglib-location>
 		  </taglib>
+		
 		  <taglib>
 		    <taglib-uri>tags-xml</taglib-uri>
-		    <taglib-location>/WEB-INF/jstl/tlds/x.tld</taglib-location>
+		    <taglib-location>/WEB-INF/tlds/jstl/x.tld</taglib-location>
 		  </taglib>
-			<!--  ======================================================== -->	
-			<!--   Customized Tag Library -->
-			<!--  ======================================================== -->	
-			<taglib>
-			   <taglib-uri>tags-lams</taglib-uri>
-			   <taglib-location>/WEB-INF/lams.tld</taglib-location>
-			</taglib>
+		
+		<!--  ======================================================== -->	
+		<!--  JSTL 1.2 Tag Library: Apache implementation of TLV	   -->
+		<!--  ======================================================== -->	
+		  <taglib>
+		    <taglib-uri>tags-permittedTaglibs</taglib-uri>
+		    <taglib-location>/WEB-INF/tlds/jstl/permittedTaglibs.tld</taglib-location>
+		  </taglib>
+		
+		  <taglib>
+		    <taglib-uri>tags-scriptfree</taglib-uri>
+		    <taglib-location>/WEB-INF/tlds/jstl/scriptfree.tld</taglib-location>
+		  </taglib>
+		   
+		<!--  ======================================================== -->	
+		<!--   Customized Tag Library -->
+		<!--  ======================================================== -->	
+		
+		 <taglib>
+		   <taglib-uri>tags-lams</taglib-uri>
+		   <taglib-location>/WEB-INF/tlds/lams/lams.tld</taglib-location>
+		</taglib>
+
 	</jsp-config>
+		
 
-
   	<!--  Security Constraint -->
 	<security-constraint>
 	   	<web-resource-collection>