roller-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From gma...@apache.org
Subject svn commit: r1584254 - in /roller/trunk/app/src/main: java/org/apache/roller/weblogger/ui/tags/ java/org/apache/roller/weblogger/util/ java/org/apache/roller/weblogger/webservices/tagdata/ webapp/WEB-INF/ webapp/WEB-INF/jsps/
Date Thu, 03 Apr 2014 03:30:01 GMT
Author: gmazza
Date: Thu Apr  3 03:30:00 2014
New Revision: 1584254

URL: http://svn.apache.org/r1584254
Log:
Removed no longer used TrimTag (similar functionality already in JSTL.)

Removed:
    roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/tags/TrimTag.java
Modified:
    roller/trunk/app/src/main/java/org/apache/roller/weblogger/util/MailUtil.java
    roller/trunk/app/src/main/java/org/apache/roller/weblogger/webservices/tagdata/TagDataServlet.java
    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/java/org/apache/roller/weblogger/util/MailUtil.java
URL: http://svn.apache.org/viewvc/roller/trunk/app/src/main/java/org/apache/roller/weblogger/util/MailUtil.java?rev=1584254&r1=1584253&r2=1584254&view=diff
==============================================================================
--- roller/trunk/app/src/main/java/org/apache/roller/weblogger/util/MailUtil.java (original)
+++ roller/trunk/app/src/main/java/org/apache/roller/weblogger/util/MailUtil.java Thu Apr
 3 03:30:00 2014
@@ -75,8 +75,7 @@ public class MailUtil {
     /**
      * Send an email notice that a new pending entry has been submitted.
      */
-    public static void sendPendingEntryNotice(WeblogEntry entry) 
-            throws WebloggerException {
+    public static void sendPendingEntryNotice(WeblogEntry entry) throws WebloggerException
{
         
         Session mailSession = WebloggerStartup.getMailProvider() != null
                 ? WebloggerStartup.getMailProvider().getSession() : null;
@@ -143,8 +142,7 @@ public class MailUtil {
     /**
      * Send a weblog invitation email.
      */
-    public static void sendWeblogInvitation(Weblog website, 
-                                            User user)
+    public static void sendWeblogInvitation(Weblog website, User user)
             throws WebloggerException {
         
         Session mailSession = WebloggerStartup.getMailProvider() != null
@@ -511,8 +509,7 @@ public class MailUtil {
      *
      * TODO: Make the addressing options configurable on a per-website basis.
      */
-    public static void sendEmailApprovalNotification(WeblogEntryComment cd, 
-                                                     I18nMessages resources) 
+    public static void sendEmailApprovalNotification(WeblogEntryComment cd, I18nMessages
resources)
             throws MailingException {
         
         WeblogEntry entry = cd.getWeblogEntry();
@@ -546,13 +543,7 @@ public class MailUtil {
         
         // send message to author of approved comment
         try {
-            sendTextMessage(
-                    from,
-                    new String[] {cd.getEmail()}, // to
-                    null, // cc
-                    null, // bcc
-                    subject,
-                    msg.toString());
+            sendTextMessage(from, new String[] {cd.getEmail()}, null, null, subject, msg.toString());
         } catch (Exception e) {
             log.warn("Exception sending comment mail: " + e.getMessage());
             // This will log the stack trace if debug is enabled
@@ -578,17 +569,8 @@ public class MailUtil {
      * @param mimeType type of message, i.e. text/plain or text/html
      * @throws MessagingException the exception to indicate failure
      */
-    public static void sendMessage
-            (
-            String from,
-            String[] to,
-            String[] cc,
-            String[] bcc,
-            String subject,
-            String content,
-            String mimeType
-            )
-            throws MessagingException {
+    public static void sendMessage(String from, String[] to, String[] cc, String[] bcc, String
subject,
+            String content, String mimeType) throws MessagingException {
         
         MailProvider mailProvider = WebloggerStartup.getMailProvider();
         if (mailProvider == null) {
@@ -693,16 +675,8 @@ public class MailUtil {
      * @param content the body of the e-mail
      * @throws MessagingException the exception to indicate failure
      */
-    public static void sendTextMessage
-            (
-            String from,
-            String[] to,
-            String[] cc,
-            String[] bcc,
-            String subject,
-            String content
-            )
-            throws MessagingException {
+    public static void sendTextMessage(String from, String[] to, String[] cc, String[] bcc,
+                                       String subject, String content) throws MessagingException
{
         sendMessage(from, to, cc, bcc, subject, content, "text/plain; charset=utf-8");
     }
     
@@ -717,21 +691,12 @@ public class MailUtil {
      * @param content the body of the e-mail
      * @throws MessagingException the exception to indicate failure
      */
-    public static void sendTextMessage
-            (
-            String from,
-            String to,
-            String[] cc,
-            String[] bcc,
-            String subject,
-            String content
-            )
-            throws MessagingException {
+    public static void sendTextMessage(String from, String to, String[] cc, String[] bcc,
String subject,
+                                       String content) throws MessagingException {
         String[] recipient = null;
         if (to != null) {
             recipient = new String[] {to};
         }
-        
         sendMessage(from, recipient, cc, bcc, subject, content, "text/plain; charset=utf-8");
     }
     
@@ -748,16 +713,8 @@ public class MailUtil {
      * @param content the body of the e-mail
      * @throws MessagingException the exception to indicate failure
      */
-    public static void sendTextMessage
-            (
-            String from,
-            String to,
-            String cc,
-            String bcc,
-            String subject,
-            String content
-            )
-            throws MessagingException {
+    public static void sendTextMessage(String from, String to, String cc, String bcc, String
subject,
+            String content) throws MessagingException {
         String[] recipient = null;
         String[] copy = null;
         String[] bcopy = null;
@@ -785,16 +742,8 @@ public class MailUtil {
      * @param content the body of the e-mail
      * @throws MessagingException the exception to indicate failure
      */
-    public static void sendHTMLMessage
-            (
-            String from,
-            String[] to,
-            String[] cc,
-            String[] bcc,
-            String subject,
-            String content
-            )
-            throws MessagingException {
+    public static void sendHTMLMessage(String from, String[] to, String[] cc, String[] bcc,
String subject,
+                                       String content) throws MessagingException {
         sendMessage(from, to, cc, bcc, subject, content, "text/html; charset=utf-8");
     }
     
@@ -809,16 +758,8 @@ public class MailUtil {
      * @param content the body of the e-mail
      * @throws MessagingException the exception to indicate failure
      */
-    public static void sendHTMLMessage
-            (
-            String from,
-            String to,
-            String cc,
-            String bcc,
-            String subject,
-            String content
-            )
-            throws MessagingException {
+    public static void sendHTMLMessage(String from, String to, String cc, String bcc, String
subject,
+                                       String content) throws MessagingException {
         String[] recipient = null;
         String[] copy = null;
         String[] bcopy = null;
@@ -848,16 +789,8 @@ public class MailUtil {
      * @param content the body of the e-mail
      * @throws MessagingException the exception to indicate failure
      */
-    public static void sendHTMLMessage
-            (
-            String from,
-            String to,
-            String[] cc,
-            String[] bcc,
-            String subject,
-            String content
-            )
-            throws MessagingException {
+    public static void sendHTMLMessage(String from, String to, String[] cc, String[] bcc,
String subject,
+                                       String content) throws MessagingException {
         String[] recipient = null;
         if (to != null) {
             recipient = new String[] {to};

Modified: roller/trunk/app/src/main/java/org/apache/roller/weblogger/webservices/tagdata/TagDataServlet.java
URL: http://svn.apache.org/viewvc/roller/trunk/app/src/main/java/org/apache/roller/weblogger/webservices/tagdata/TagDataServlet.java?rev=1584254&r1=1584253&r2=1584254&view=diff
==============================================================================
--- roller/trunk/app/src/main/java/org/apache/roller/weblogger/webservices/tagdata/TagDataServlet.java
(original)
+++ roller/trunk/app/src/main/java/org/apache/roller/weblogger/webservices/tagdata/TagDataServlet.java
Thu Apr  3 03:30:00 2014
@@ -151,13 +151,11 @@ public class TagDataServlet extends Http
             int count = 0;
             for (TagStat stat : tags) {
                 String term = stat.getName();
+                // gWCURL fields: weblog, locale, category, dateString, tags, pageNum, absolute
                 String viewURI = urlstrat.getWeblogCollectionURL(weblog,
-                        null,  // locale
-                        null,  // category
-                        null,  // date string
+                        null, null, null,
                         Collections.singletonList(stat.getName()),
-                        0,     // page
-                        true); // absolute
+                        0, true);
                 int frequency = stat.getCount();
                 pw.print("<atom:category term=\"" + term + "\" tagdata:frequency=\"" +
frequency + "\" ");
                 pw.println("tagdata:href=\"" + viewURI + "\" />");

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=1584254&r1=1584253&r2=1584254&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 Thu Apr  3 03:30:00
2014
@@ -21,4 +21,4 @@
 <%@ taglib uri="http://java.sun.com/jsp/jstl/fmt"  prefix="fmt" %>
 <%@ taglib uri="http://tiles.apache.org/tags-tiles" prefix="tiles" %>
 <%@ taglib uri="/struts-tags" prefix="s" %>
-<%@ taglib uri="http://jakarta.apache.org/taglibs/string-1.1" prefix="str" %>
\ No newline at end of file
+<%@ 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=1584254&r1=1584253&r2=1584254&view=diff
==============================================================================
--- roller/trunk/app/src/main/webapp/WEB-INF/taglib.tld (original)
+++ roller/trunk/app/src/main/webapp/WEB-INF/taglib.tld Thu Apr  3 03:30:00 2014
@@ -9,16 +9,6 @@
     Tags needed from the old Jakarta String Taglib, which has been retired.
     </info>
     <tag>
-        <name>trim</name>
-        <tagclass>org.apache.roller.weblogger.ui.tags.TrimTag</tagclass>
-        <bodycontent>JSP</bodycontent>
-        <attribute>
-            <name>var</name>
-            <required>false</required>
-            <rtexprvalue>true</rtexprvalue>
-        </attribute>
-    </tag>
-    <tag>
         <name>wordWrap</name>
         <tagclass>org.apache.roller.weblogger.ui.tags.WordWrapTag</tagclass>
         <bodycontent>JSP</bodycontent>



Mime
View raw message