manifoldcf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From kwri...@apache.org
Subject svn commit: r1409633 - in /manifoldcf/trunk: CHANGES.txt framework/combined-service/src/main/webapp/WEB-INF/web.xml
Date Thu, 15 Nov 2012 01:36:53 GMT
Author: kwright
Date: Thu Nov 15 01:36:53 2012
New Revision: 1409633

URL: http://svn.apache.org/viewvc?rev=1409633&view=rev
Log:
Fix for CONNECTORS-568. Committed on behalf of Swami Rajamohan.

Modified:
    manifoldcf/trunk/CHANGES.txt
    manifoldcf/trunk/framework/combined-service/src/main/webapp/WEB-INF/web.xml

Modified: manifoldcf/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/manifoldcf/trunk/CHANGES.txt?rev=1409633&r1=1409632&r2=1409633&view=diff
==============================================================================
--- manifoldcf/trunk/CHANGES.txt (original)
+++ manifoldcf/trunk/CHANGES.txt Thu Nov 15 01:36:53 2012
@@ -3,6 +3,9 @@ $Id$
 
 ======================= 1.1-dev =====================
 
+CONNECTORS-568: Combined web.xml file contains wrong declarations.
+(Swami Rajamohan)
+
 CONNECTORS-562: Some web.xml files contain wrong declarations
 (Alex Ott, Erlend GarĂ¥sen)
 

Modified: manifoldcf/trunk/framework/combined-service/src/main/webapp/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/manifoldcf/trunk/framework/combined-service/src/main/webapp/WEB-INF/web.xml?rev=1409633&r1=1409632&r2=1409633&view=diff
==============================================================================
--- manifoldcf/trunk/framework/combined-service/src/main/webapp/WEB-INF/web.xml (original)
+++ manifoldcf/trunk/framework/combined-service/src/main/webapp/WEB-INF/web.xml Thu Nov 15
01:36:53 2012
@@ -20,7 +20,10 @@
      limitations under the License.
 -->
 
-<web-app>
+<web-app xmlns="http://java.sun.com/xml/ns/javaee"
+  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  xsi:schemaLocation="http://java.sun.com/xml/ns/javaee
+  http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd" version="2.5">
   <display-name>ManifoldCF Combined WebApp</display-name>
 
   <description>ManifoldCF Combined WebApp</description>
@@ -49,6 +52,28 @@
     <session-timeout>5</session-timeout>
   </session-config>
 
+  <jsp-config>
+    <taglib>
+    <taglib-uri>http://java.sun.com/jstl/core</taglib-uri>
+    <taglib-location>/WEB-INF/jsp/c.tld</taglib-location>
+    </taglib>
+
+    <taglib>
+    <taglib-uri>http://java.sun.com/jstl/fmt</taglib-uri>
+    <taglib-location>/WEB-INF/jsp/fmt.tld</taglib-location>
+    </taglib>
+
+    <taglib>
+    <taglib-uri>http://java.sun.com/jstl/xml</taglib-uri>
+    <taglib-location>/WEB-INF/jsp/x.tld</taglib-location>
+    </taglib>
+
+    <taglib>
+    <taglib-uri>http://java.sun.com/jstl/sql</taglib-uri>
+    <taglib-location>/WEB-INF/jsp/sql.tld</taglib-location>
+    </taglib>
+  </jsp-config>
+
   <listener>
     <listener-class>org.apache.manifoldcf.combinedservice.ServletListener</listener-class>
   </listener>



Mime
View raw message