You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@manifoldcf.apache.org by kw...@apache.org on 2013/02/18 03:07:45 UTC
svn commit: r1447121 - in /manifoldcf/trunk: ./
framework/combined-service/src/main/webapp/WEB-INF/
framework/crawler-ui/src/main/webapp/
framework/crawler-ui/src/main/webapp/WEB-INF/
Author: kwright
Date: Mon Feb 18 02:07:44 2013
New Revision: 1447121
URL: http://svn.apache.org/r1447121
Log:
Fix for CONNECTORS-648.
Modified:
manifoldcf/trunk/CHANGES.txt
manifoldcf/trunk/framework/combined-service/src/main/webapp/WEB-INF/web.xml
manifoldcf/trunk/framework/crawler-ui/src/main/webapp/WEB-INF/web.xml
manifoldcf/trunk/framework/crawler-ui/src/main/webapp/adminDefaults.jsp
manifoldcf/trunk/framework/crawler-ui/src/main/webapp/adminHeaders.jsp
manifoldcf/trunk/framework/crawler-ui/src/main/webapp/setupAdminProfile.jsp
Modified: manifoldcf/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/manifoldcf/trunk/CHANGES.txt?rev=1447121&r1=1447120&r2=1447121&view=diff
==============================================================================
--- manifoldcf/trunk/CHANGES.txt (original)
+++ manifoldcf/trunk/CHANGES.txt Mon Feb 18 02:07:44 2013
@@ -3,6 +3,10 @@ $Id$
======================= 1.2-dev =====================
+CONNECTORS-648: Revamp how tld's are used, for compatibility with
+Tomcat.
+(Jan Høydahl)
+
CONNECTORS-647: Add the resource.name hint to the Solr output
connector.
(Maciej Li¿ewski, Karl Wright)
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=1447121&r1=1447120&r2=1447121&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 Mon Feb 18 02:07:44 2013
@@ -49,33 +49,11 @@
</servlet-mapping>
<session-config>
- <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>
+ <session-timeout>5</session-timeout>
+ </session-config>
+
+ <listener>
+ <listener-class>org.apache.manifoldcf.combinedservice.ServletListener</listener-class>
+ </listener>
</web-app>
Modified: manifoldcf/trunk/framework/crawler-ui/src/main/webapp/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/manifoldcf/trunk/framework/crawler-ui/src/main/webapp/WEB-INF/web.xml?rev=1447121&r1=1447120&r2=1447121&view=diff
==============================================================================
--- manifoldcf/trunk/framework/crawler-ui/src/main/webapp/WEB-INF/web.xml (original)
+++ manifoldcf/trunk/framework/crawler-ui/src/main/webapp/WEB-INF/web.xml Mon Feb 18 02:07:44 2013
@@ -29,28 +29,6 @@
<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>
-
<context-param>
<param-name>javax.servlet.jsp.jstl.fmt.localizationContext</param-name>
<param-value>messages</param-value>
Modified: manifoldcf/trunk/framework/crawler-ui/src/main/webapp/adminDefaults.jsp
URL: http://svn.apache.org/viewvc/manifoldcf/trunk/framework/crawler-ui/src/main/webapp/adminDefaults.jsp?rev=1447121&r1=1447120&r2=1447121&view=diff
==============================================================================
--- manifoldcf/trunk/framework/crawler-ui/src/main/webapp/adminDefaults.jsp (original)
+++ manifoldcf/trunk/framework/crawler-ui/src/main/webapp/adminDefaults.jsp Mon Feb 18 02:07:44 2013
@@ -31,10 +31,10 @@
<jsp:useBean id="thread" class="org.apache.manifoldcf.ui.beans.ThreadContext" scope="request"/>
<jsp:useBean id="adminprofile" class="org.apache.manifoldcf.ui.beans.AdminProfile" scope="session"/>
-<%@ taglib prefix="c" uri="http://java.sun.com/jstl/core" %>
-<%@ taglib prefix="x" uri="http://java.sun.com/jstl/xml" %>
-<%@ taglib prefix="fmt" uri="http://java.sun.com/jstl/fmt" %>
-<%@ taglib prefix="sql" uri="http://java.sun.com/jstl/sql" %>
+<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %>
+<%@ taglib prefix="x" uri="http://java.sun.com/jsp/jstl/xml" %>
+<%@ taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt" %>
+<%@ taglib prefix="sql" uri="http://java.sun.com/jsp/jstl/sql" %>
<%
Modified: manifoldcf/trunk/framework/crawler-ui/src/main/webapp/adminHeaders.jsp
URL: http://svn.apache.org/viewvc/manifoldcf/trunk/framework/crawler-ui/src/main/webapp/adminHeaders.jsp?rev=1447121&r1=1447120&r2=1447121&view=diff
==============================================================================
--- manifoldcf/trunk/framework/crawler-ui/src/main/webapp/adminHeaders.jsp (original)
+++ manifoldcf/trunk/framework/crawler-ui/src/main/webapp/adminHeaders.jsp Mon Feb 18 02:07:44 2013
@@ -39,10 +39,10 @@ response.setContentType("text/html;chars
<jsp:useBean id="thread" class="org.apache.manifoldcf.ui.beans.ThreadContext" scope="request"/>
<jsp:useBean id="adminprofile" class="org.apache.manifoldcf.ui.beans.AdminProfile" scope="session"/>
-<%@ taglib prefix="c" uri="http://java.sun.com/jstl/core" %>
-<%@ taglib prefix="x" uri="http://java.sun.com/jstl/xml" %>
-<%@ taglib prefix="fmt" uri="http://java.sun.com/jstl/fmt" %>
-<%@ taglib prefix="sql" uri="http://java.sun.com/jstl/sql" %>
+<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %>
+<%@ taglib prefix="x" uri="http://java.sun.com/jsp/jstl/xml" %>
+<%@ taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt" %>
+<%@ taglib prefix="sql" uri="http://java.sun.com/jsp/jstl/sql" %>
<%
Modified: manifoldcf/trunk/framework/crawler-ui/src/main/webapp/setupAdminProfile.jsp
URL: http://svn.apache.org/viewvc/manifoldcf/trunk/framework/crawler-ui/src/main/webapp/setupAdminProfile.jsp?rev=1447121&r1=1447120&r2=1447121&view=diff
==============================================================================
--- manifoldcf/trunk/framework/crawler-ui/src/main/webapp/setupAdminProfile.jsp (original)
+++ manifoldcf/trunk/framework/crawler-ui/src/main/webapp/setupAdminProfile.jsp Mon Feb 18 02:07:44 2013
@@ -20,9 +20,9 @@
*/
%>
-<%@ taglib prefix="c" uri="http://java.sun.com/jstl/core" %>
-<%@ taglib prefix="sql" uri="http://java.sun.com/jstl/sql" %>
-<%@ taglib prefix="fmt" uri="http://java.sun.com/jstl/fmt" %>
+<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %>
+<%@ taglib prefix="sql" uri="http://java.sun.com/jsp/jstl/sql" %>
+<%@ taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt" %>
<jsp:useBean id="adminprofile" class="org.apache.manifoldcf.ui.beans.AdminProfile" scope="session"/>