Return-Path: 
 <commits-return-8312-apmail-roller-commits-archive=roller.apache.org@roller.apache.org>
X-Original-To: apmail-roller-commits-archive@www.apache.org
Delivered-To: apmail-roller-commits-archive@www.apache.org
Received: from mail.apache.org (hermes.apache.org [140.211.11.3])
	by minotaur.apache.org (Postfix) with SMTP id 586CE11B47
	for <apmail-roller-commits-archive@www.apache.org>;
 Fri,  4 Apr 2014 00:53:46 +0000 (UTC)
Received: (qmail 25195 invoked by uid 500); 4 Apr 2014 00:53:45 -0000
Delivered-To: apmail-roller-commits-archive@roller.apache.org
Received: (qmail 25161 invoked by uid 500); 4 Apr 2014 00:53:45 -0000
Mailing-List: contact commits-help@roller.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:commits-help@roller.apache.org>
List-Unsubscribe: <mailto:commits-unsubscribe@roller.apache.org>
List-Post: <mailto:commits@roller.apache.org>
List-Id: <commits.roller.apache.org>
Reply-To: dev@roller.apache.org
Delivered-To: mailing list commits@roller.apache.org
Received: (qmail 25139 invoked by uid 99); 4 Apr 2014 00:53:45 -0000
Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136)
    by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 04 Apr 2014 00:53:45 +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; Fri, 04 Apr 2014 00:53:43 +0000
Received: from eris.apache.org (localhost [127.0.0.1])
	by eris.apache.org (Postfix) with ESMTP id A963423888D7;
	Fri,  4 Apr 2014 00:53:23 +0000 (UTC)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r1584485 - in /roller/trunk/app/src/main:
 java/org/apache/roller/weblogger/ui/tags/LeftTag.java
 webapp/WEB-INF/jsps/admin/PlanetSubscriptions.jsp
 webapp/WEB-INF/jsps/taglibs-struts2.jsp webapp/WEB-INF/taglib.tld
Date: Fri, 04 Apr 2014 00:53:23 -0000
To: commits@roller.apache.org
From: gmazza@apache.org
X-Mailer: svnmailer-1.0.9
Message-Id: <20140404005323.A963423888D7@eris.apache.org>
X-Virus-Checked: Checked by ClamAV on apache.org

Author: gmazza
Date: Fri Apr  4 00:53:23 2014
New Revision: 1584485

URL: http://svn.apache.org/r1584485
Log:
Removed no longer needed Jakarta taglib LeftTag, replaced with JSTL substring() equivalent.

Removed:
    roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/tags/LeftTag.java
Modified:
    roller/trunk/app/src/main/webapp/WEB-INF/jsps/admin/PlanetSubscriptions.jsp
    roller/trunk/app/src/main/webapp/WEB-INF/jsps/taglibs-struts2.jsp
    roller/trunk/app/src/main/webapp/WEB-INF/taglib.tld

Modified: roller/trunk/app/src/main/webapp/WEB-INF/jsps/admin/PlanetSubscriptions.jsp
URL: http://svn.apache.org/viewvc/roller/trunk/app/src/main/webapp/WEB-INF/jsps/admin/PlanetSubscriptions.jsp?rev=1584485&r1=1584484&r2=1584485&view=diff
==============================================================================
--- roller/trunk/app/src/main/webapp/WEB-INF/jsps/admin/PlanetSubscriptions.jsp (original)
+++ roller/trunk/app/src/main/webapp/WEB-INF/jsps/admin/PlanetSubscriptions.jsp Fri Apr  4 00:53:23 2014
@@ -85,9 +85,8 @@ function confirmSubDelete(subUrl) {
         </td>
         
         <td class="rollertable">
-            <str:left count="100" >
-                <s:property value="#sub.feedURL" />
-            </str:left>
+            <s:set name="feedURL" value="#sub.feedURL" />
+            ${fn:substring(feedURL, 0, 100)}
         </td>
         
         <td class="rollertable">

Modified: roller/trunk/app/src/main/webapp/WEB-INF/jsps/taglibs-struts2.jsp
URL: http://svn.apache.org/viewvc/roller/trunk/app/src/main/webapp/WEB-INF/jsps/taglibs-struts2.jsp?rev=1584485&r1=1584484&r2=1584485&view=diff
==============================================================================
--- roller/trunk/app/src/main/webapp/WEB-INF/jsps/taglibs-struts2.jsp (original)
+++ roller/trunk/app/src/main/webapp/WEB-INF/jsps/taglibs-struts2.jsp Fri Apr  4 00:53:23 2014
@@ -20,5 +20,6 @@
 <%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
 <%@ taglib uri="http://java.sun.com/jsp/jstl/fmt"  prefix="fmt" %>
 <%@ taglib uri="http://tiles.apache.org/tags-tiles" prefix="tiles" %>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/functions" prefix="fn" %>
 <%@ taglib uri="/struts-tags" prefix="s" %>
 <%@ taglib uri="http://jakarta.apache.org/taglibs/string-1.1" prefix="str" %>

Modified: roller/trunk/app/src/main/webapp/WEB-INF/taglib.tld
URL: http://svn.apache.org/viewvc/roller/trunk/app/src/main/webapp/WEB-INF/taglib.tld?rev=1584485&r1=1584484&r2=1584485&view=diff
==============================================================================
--- roller/trunk/app/src/main/webapp/WEB-INF/taglib.tld (original)
+++ roller/trunk/app/src/main/webapp/WEB-INF/taglib.tld Fri Apr  4 00:53:23 2014
@@ -39,21 +39,6 @@
         </attribute>
     </tag>
     <tag>
-        <name>left</name>
-        <tagclass>org.apache.roller.weblogger.ui.tags.LeftTag</tagclass>
-        <bodycontent>JSP</bodycontent>
-        <attribute>
-            <name>var</name>
-            <required>false</required>
-            <rtexprvalue>true</rtexprvalue>
-        </attribute>
-        <attribute>
-            <name>count</name>
-            <required>true</required>
-            <rtexprvalue>true</rtexprvalue>
-        </attribute>
-    </tag>
-    <tag>
         <name>truncateNicely</name>
         <tagclass>org.apache.roller.weblogger.ui.tags.TruncateNicelyTag</tagclass>
         <bodycontent>JSP</bodycontent>