Return-Path: 
 <connectors-commits-return-2688-apmail-incubator-connectors-commits-archive=incubator.apache.org@incubator.apache.org>
X-Original-To: apmail-incubator-connectors-commits-archive@minotaur.apache.org
Delivered-To: apmail-incubator-connectors-commits-archive@minotaur.apache.org
Received: from mail.apache.org (hermes.apache.org [140.211.11.3])
	by minotaur.apache.org (Postfix) with SMTP id B60EC9E5D
	for <apmail-incubator-connectors-commits-archive@minotaur.apache.org>;
 Thu, 26 Apr 2012 08:17:17 +0000 (UTC)
Received: (qmail 1888 invoked by uid 500); 26 Apr 2012 08:17:17 -0000
Delivered-To: apmail-incubator-connectors-commits-archive@incubator.apache.org
Received: (qmail 1757 invoked by uid 500); 26 Apr 2012 08:17:14 -0000
Mailing-List: contact connectors-commits-help@incubator.apache.org;
 run by ezmlm
Precedence: bulk
List-Help: <mailto:connectors-commits-help@incubator.apache.org>
List-Unsubscribe: <mailto:connectors-commits-unsubscribe@incubator.apache.org>
List-Post: <mailto:connectors-commits@incubator.apache.org>
List-Id: <connectors-commits.incubator.apache.org>
Reply-To: connectors-dev@incubator.apache.org
Delivered-To: mailing list connectors-commits@incubator.apache.org
Received: (qmail 1737 invoked by uid 99); 26 Apr 2012 08:17:13 -0000
Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230)
    by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 26 Apr 2012 08:17:13 +0000
X-ASF-Spam-Status: No, hits=-2000.0 required=5.0
	tests=ALL_TRUSTED
X-Spam-Check-By: apache.org
Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4)
    by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 26 Apr 2012 08:17:10 +0000
Received: from eris.apache.org (localhost [127.0.0.1])
	by eris.apache.org (Postfix) with ESMTP id DEA412388860;
	Thu, 26 Apr 2012 08:16:49 +0000 (UTC)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
Subject: svn commit: r1330696 - in /incubator/lcf/trunk: CHANGES.txt
 framework/crawler-ui/src/main/webapp/WEB-INF/web.xml
Date: Thu, 26 Apr 2012 08:16:49 -0000
To: connectors-commits@incubator.apache.org
From: ridder@apache.org
X-Mailer: svnmailer-1.0.8-patched
Message-Id: <20120426081649.DEA412388860@eris.apache.org>

Author: ridder
Date: Thu Apr 26 08:16:49 2012
New Revision: 1330696

URL: http://svn.apache.org/viewvc?rev=1330696&view=rev
Log:
CONNECTORS-467: Remove outdated taglib directives in web.xml

Modified:
    incubator/lcf/trunk/CHANGES.txt
    incubator/lcf/trunk/framework/crawler-ui/src/main/webapp/WEB-INF/web.xml

Modified: incubator/lcf/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/CHANGES.txt?rev=1330696&r1=1330695&r2=1330696&view=diff
==============================================================================
--- incubator/lcf/trunk/CHANGES.txt (original)
+++ incubator/lcf/trunk/CHANGES.txt Thu Apr 26 08:16:49 2012
@@ -3,6 +3,9 @@ $Id$
 
 ======================= 0.6-dev =====================
 
+CONNECTORS-467: Remove outdated taglib directives in web.xml
+(Erlend Garåsen)
+
 CONNECTORS-468: Wrap ResourceBundle class so that missing keys
 in a resource bundle are dealt with in a friendlier way.
 (Karl Wright)

Modified: incubator/lcf/trunk/framework/crawler-ui/src/main/webapp/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/framework/crawler-ui/src/main/webapp/WEB-INF/web.xml?rev=1330696&r1=1330695&r2=1330696&view=diff
==============================================================================
--- incubator/lcf/trunk/framework/crawler-ui/src/main/webapp/WEB-INF/web.xml (original)
+++ incubator/lcf/trunk/framework/crawler-ui/src/main/webapp/WEB-INF/web.xml Thu Apr 26 08:16:49 2012
@@ -29,25 +29,28 @@
 	<session-timeout>5</session-timeout>
   </session-config>
 
-  <taglib>
-	<taglib-uri>http://java.sun.com/jstl/core</taglib-uri>
-	<taglib-location>/WEB-INF/jsp/c.tld</taglib-location>
-  </taglib>
+  <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/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/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>
 
-  <taglib>
-	<taglib-uri>http://java.sun.com/jstl/sql</taglib-uri>
-	<taglib-location>/WEB-INF/jsp/sql.tld</taglib-location>
-  </taglib>
   <context-param>
 	<param-name>javax.servlet.jsp.jstl.fmt.locale</param-name>
 	<param-value>ja_JP</param-value>