roller-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From snoopd...@apache.org
Subject svn commit: r1546816 [3/4] - in /roller/branches/rome2: ./ app/src/main/java/org/apache/roller/planet/business/ app/src/main/java/org/apache/roller/planet/business/fetcher/ app/src/main/java/org/apache/roller/weblogger/business/ app/src/main/java/org/a...
Date Sun, 01 Dec 2013 14:39:52 GMT
Modified: roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/Bookmarks.java
URL: http://svn.apache.org/viewvc/roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/Bookmarks.java?rev=1546816&r1=1546815&r2=1546816&view=diff
==============================================================================
--- roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/Bookmarks.java
(original)
+++ roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/Bookmarks.java
Sun Dec  1 14:39:51 2013
@@ -176,8 +176,9 @@ public class Bookmarks extends UIAction 
                             + " bookmarks.");
                 }
 				for (int j = 0; j < bookmarks.length; j++) {
-					if (log.isDebugEnabled())
+					if (log.isDebugEnabled()) {
 						log.debug("Deleting bookmark - " + bookmarks[j]);
+                    }
 					bookmark = bmgr.getBookmark(bookmarks[j]);
 					if (bookmark != null) {
 						bmgr.removeBookmark(bookmark);

Modified: roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/EntryBean.java
URL: http://svn.apache.org/viewvc/roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/EntryBean.java?rev=1546816&r1=1546815&r2=1546816&view=diff
==============================================================================
--- roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/EntryBean.java
(original)
+++ roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/EntryBean.java
Sun Dec  1 14:39:51 2013
@@ -391,7 +391,7 @@ public class EntryBean {
     
     
     public String toString() {
-        StringBuffer buf = new StringBuffer();
+        StringBuilder buf = new StringBuilder();
         
         //title,locale,catId,tags,text,summary,dateString,status,comments,plugins
         buf.append("title = ").append(getTitle()).append("\n");

Modified: roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/EntryRemove.java
URL: http://svn.apache.org/viewvc/roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/EntryRemove.java?rev=1546816&r1=1546815&r2=1546816&view=diff
==============================================================================
--- roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/EntryRemove.java
(original)
+++ roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/EntryRemove.java
Sun Dec  1 14:39:51 2013
@@ -68,7 +68,7 @@ public class EntryRemove extends EntryBa
 
 	public String remove() {
 
-		if (getRemoveEntry() != null)
+		if (getRemoveEntry() != null) {
 			try {
 
 				WeblogEntry entry = getRemoveEntry();
@@ -110,7 +110,7 @@ public class EntryRemove extends EntryBa
 				// TODO: i18n
 				addError("Error removing entry");
 			}
-		else {
+        } else {
 			addError("weblogEntry.notFound");
 			return ERROR;
 		}

Modified: roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/TemplateEdit.java
URL: http://svn.apache.org/viewvc/roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/TemplateEdit.java?rev=1546816&r1=1546815&r2=1546816&view=diff
==============================================================================
--- roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/TemplateEdit.java
(original)
+++ roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/TemplateEdit.java
Sun Dec  1 14:39:51 2013
@@ -126,7 +126,7 @@ public class TemplateEdit extends UIActi
                 templateToSave.setLastModified(new Date());
 
                 if (getBean().getAutoContentType() == null ||
-                        !getBean().getAutoContentType().booleanValue()) {
+                        !getBean().getAutoContentType()) {
                     templateToSave.setOutputContentType(getBean().getManualContentType());
                 } else {
                     // empty content-type indicates that template uses auto content-type
detection

Modified: roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/WeblogExport.java
URL: http://svn.apache.org/viewvc/roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/WeblogExport.java?rev=1546816&r1=1546815&r2=1546816&view=diff
==============================================================================
--- roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/WeblogExport.java
(original)
+++ roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/WeblogExport.java
Sun Dec  1 14:39:51 2013
@@ -63,7 +63,7 @@ public final class WeblogExport extends 
         implements ServletResponseAware {
 
     // Static Variables --------------------------------------------------------
-    private static final Log log = LogFactory.getLog(WeblogExport.class);
+    private static final Log LOG = LogFactory.getLog(WeblogExport.class);
 
     private static final Pattern SC_TAG_PATTERN =
             Pattern.compile("(([\\S])(/>))");
@@ -265,9 +265,9 @@ public final class WeblogExport extends 
                 outputStream.close();
             }
         } catch (WebloggerException e) {
-            log.error("Error looking up entries: ", e);
+            LOG.error("Error looking up entries: ", e);
         } catch (IOException e) {
-            log.error("Error getting output stream: ", e);
+            LOG.error("Error getting output stream: ", e);
         }
     }
 
@@ -338,7 +338,7 @@ public final class WeblogExport extends 
                 zipOutput.flush();
                 zipOutput.close();
             } catch (Exception e) {
-                log.error("Error exporting resources: " + e.getMessage());
+                LOG.error("Error exporting resources: " + e.getMessage());
             }
         }
     }
@@ -363,7 +363,7 @@ public final class WeblogExport extends 
             hostname = absoluteUrl.getHost();
         }
         catch (MalformedURLException e) {
-            log.error("Unable to parse the absolute URL: " + e.getMessage());
+            LOG.error("Unable to parse the absolute URL: " + e.getMessage());
             hostname = "unknown";
         }
 
@@ -456,7 +456,7 @@ public final class WeblogExport extends 
                                     "att_mediacast_length"));
                 }
                 catch (NumberFormatException e) {
-                    log.error("Unable to parse 'att_mediacast_length': " +
+                    LOG.error("Unable to parse 'att_mediacast_length': " +
                             e.getMessage());
                     enclosureLength = (long) 0;
                 }
@@ -693,7 +693,7 @@ public final class WeblogExport extends 
             try {
                 result = baseUrlMatcher.replaceAll("$1" + baseUrl);
             } catch (IllegalArgumentException e) {
-                log.error("Invalid base URL submitted: " + baseUrl + ": " +
+                LOG.error("Invalid base URL submitted: " + baseUrl + ": " +
                         e.getMessage());
             }
         }
@@ -713,7 +713,7 @@ public final class WeblogExport extends 
             // Load the non-directory files
             mfiles.addAll(mdir.getMediaFiles());
         } catch (Exception e) {
-            log.error("Error loading resources: " + e.getMessage());
+            LOG.error("Error loading resources: " + e.getMessage());
         }
     }
 }

Modified: roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/util/I18nMessages.java
URL: http://svn.apache.org/viewvc/roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/util/I18nMessages.java?rev=1546816&r1=1546815&r2=1546816&view=diff
==============================================================================
--- roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/util/I18nMessages.java
(original)
+++ roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/util/I18nMessages.java
Sun Dec  1 14:39:51 2013
@@ -37,7 +37,7 @@ import org.apache.commons.logging.LogFac
  */
 public class I18nMessages {
     
-    private static final Log log = LogFactory.getLog(I18nMessages.class);
+    private static final Log LOG = LogFactory.getLog(I18nMessages.class);
     
     // locale and bundle we are using for messaging
     private final Locale locale;
@@ -65,7 +65,7 @@ public class I18nMessages {
      */
     public static I18nMessages getMessages(String locale) {
         
-        log.debug("request for messages in locale = "+locale);
+        LOG.debug("request for messages in locale = " + locale);
         
         // check if we already have a message utils created for that locale
         I18nMessages messages = messagesMap.get(locale);
@@ -87,7 +87,7 @@ public class I18nMessages {
      */
     public static I18nMessages getMessages(Locale locale) {
         
-        log.debug("request for messages in locale = "+locale.toString());
+        LOG.debug("request for messages in locale = " + locale.toString());
         
         // check if we already have a message utils created for that locale
         I18nMessages messages = messagesMap.get(locale);
@@ -121,7 +121,7 @@ public class I18nMessages {
             return bundle.getString(key);
         } catch (Exception e) {
             // send a warning in the logs
-            log.warn("Error getting key "+key);
+            LOG.warn("Error getting key " + key);
             return key;
         }
     }
@@ -138,7 +138,7 @@ public class I18nMessages {
             return MessageFormat.format(msg, args.toArray());
         } catch (Exception e) {
             // send a warning in the logs
-            log.warn("Error getting key "+key, e);
+            LOG.warn("Error getting key " + key, e);
             return key;
         }
     }
@@ -155,7 +155,7 @@ public class I18nMessages {
             return MessageFormat.format(msg, args);
         } catch (Exception e) {
             // send a warning in the logs
-            log.warn("Error getting key "+key, e);
+            LOG.warn("Error getting key " + key, e);
             return key;
         }
     }
@@ -184,7 +184,7 @@ public class I18nMessages {
 			messagesMap.remove(key);
 
 		} catch (Exception e) {
-			log.error("Error clearing message resource bundles", e);
+			LOG.error("Error clearing message resource bundles", e);
 		}
 
 	}
@@ -205,13 +205,13 @@ public class I18nMessages {
 					.getName())) {
 				clearMap(cl, loader, "resourceEntries");
 			} else {
-				if (log.isDebugEnabled()) {
-					log.debug("class loader " + cl.getName()
+				if (LOG.isDebugEnabled()) {
+					LOG.debug("class loader " + cl.getName()
 							+ " is not tomcat loader.");
 				}
 			}
 		} catch (Exception e) {
-			log.warn("couldn't clear tomcat cache", e);
+			LOG.warn("couldn't clear tomcat cache", e);
 		}
 	}
 

Modified: roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/util/MailUtil.java
URL: http://svn.apache.org/viewvc/roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/util/MailUtil.java?rev=1546816&r1=1546815&r2=1546816&view=diff
==============================================================================
--- roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/util/MailUtil.java
(original)
+++ roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/util/MailUtil.java
Sun Dec  1 14:39:51 2013
@@ -41,7 +41,6 @@ import org.apache.commons.logging.LogFac
 import org.apache.roller.weblogger.WebloggerException;
 import org.apache.roller.weblogger.business.MailProvider;
 import org.apache.roller.weblogger.business.WebloggerFactory;
-import org.apache.roller.weblogger.business.UserManager;
 import org.apache.roller.weblogger.business.WeblogManager;
 import org.apache.roller.weblogger.business.startup.WebloggerStartup;
 import org.apache.roller.weblogger.config.WebloggerConfig;
@@ -118,7 +117,7 @@ public class MailUtil {
             
             ResourceBundle resources = ResourceBundle.getBundle(
                     "ApplicationResources", entry.getWebsite().getLocaleInstance());
-            StringBuffer sb = new StringBuffer();
+            StringBuilder sb = new StringBuilder();
             sb.append(
                     MessageFormat.format(
                     resources.getString("weblogEntry.pendingEntrySubject"),
@@ -127,7 +126,7 @@ public class MailUtil {
                 entry.getWebsite().getHandle()
             }));
             subject = sb.toString();
-            sb = new StringBuffer();
+            sb = new StringBuilder();
             sb.append(
                     MessageFormat.format(
                     resources.getString("weblogEntry.pendingEntryContent"),
@@ -172,7 +171,7 @@ public class MailUtil {
             ResourceBundle resources = ResourceBundle.getBundle(
                     "ApplicationResources",
                     website.getLocaleInstance());
-            StringBuffer sb = new StringBuffer();
+            StringBuilder sb = new StringBuilder();
             sb.append(MessageFormat.format(
                     resources.getString("inviteMember.notificationSubject"),
                     new Object[] {
@@ -180,7 +179,7 @@ public class MailUtil {
                 website.getHandle()})
                 );
             subject = sb.toString();
-            sb = new StringBuffer();
+            sb = new StringBuilder();
             sb.append(MessageFormat.format(
                     resources.getString("inviteMember.notificationContent"),
                     new Object[] {
@@ -229,7 +228,7 @@ public class MailUtil {
             
             String rootURL = WebloggerRuntimeConfig.getAbsoluteContextURL();
             
-            StringBuffer sb = new StringBuffer();
+            StringBuilder sb = new StringBuilder();
             
             // activationURL=
             String activationURL = rootURL
@@ -269,7 +268,7 @@ public class MailUtil {
         
         // Only send email if email notificaiton is enabled
         boolean notify = WebloggerRuntimeConfig.getBooleanProperty("users.comments.emailnotify");
-        if (!notify || !weblog.getEmailComments().booleanValue()) {
+        if (!notify || !weblog.getEmailComments()) {
             // notifications disabled, just bail
             return;
         }
@@ -325,8 +324,8 @@ public class MailUtil {
         // Build separate owner and commenter (aka subscriber) messages
         
         // Determine with mime type to use for e-mail
-        StringBuffer msg = new StringBuffer();
-        StringBuffer ownermsg = new StringBuffer();
+        StringBuilder msg = new StringBuilder();
+        StringBuilder ownermsg = new StringBuilder();
         boolean escapeHtml = !WebloggerRuntimeConfig.getBooleanProperty("users.comments.htmlenabled");
         
         // first the commenter message
@@ -524,7 +523,7 @@ public class MailUtil {
         
         // Only send email if email notificaiton is enabled
         boolean notify = WebloggerRuntimeConfig.getBooleanProperty("users.comments.emailnotify");
-        if (!notify || !weblog.getEmailComments().booleanValue()) {
+        if (!notify || !weblog.getEmailComments()) {
             // notifications disabled, just bail
             return;
         }
@@ -541,7 +540,7 @@ public class MailUtil {
         // form the message to be sent
         String subject = resources.getString("email.comment.commentApproved");
         
-        StringBuffer msg = new StringBuffer();
+        StringBuilder msg = new StringBuilder();
         msg.append(resources.getString("email.comment.commentApproved"));
         msg.append("\n\n");
         msg.append(WebloggerFactory.getWeblogger().getUrlStrategy()

Modified: roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/util/MediacastResource.java
URL: http://svn.apache.org/viewvc/roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/util/MediacastResource.java?rev=1546816&r1=1546815&r2=1546816&view=diff
==============================================================================
--- roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/util/MediacastResource.java
(original)
+++ roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/util/MediacastResource.java
Sun Dec  1 14:39:51 2013
@@ -65,7 +65,7 @@ public class MediacastResource {
     
     
     public String toString() {
-        StringBuffer buf = new StringBuffer();
+        StringBuilder buf = new StringBuilder();
         
         buf.append("url = ").append(getUrl()).append("\n");
         buf.append("contentType = ").append(getContentType()).append("\n");

Modified: roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/util/Trackback.java
URL: http://svn.apache.org/viewvc/roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/util/Trackback.java?rev=1546816&r1=1546815&r2=1546816&view=diff
==============================================================================
--- roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/util/Trackback.java
(original)
+++ roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/util/Trackback.java
Sun Dec  1 14:39:51 2013
@@ -48,7 +48,7 @@ import org.jdom2.input.SAXBuilder;
  */
 public class Trackback {
     
-    private static final Log log = LogFactory.getLog(Trackback.class);
+    private static final Log LOG = LogFactory.getLog(Trackback.class);
     
     private final WeblogEntry entry;
     private final String trackbackURL;
@@ -100,7 +100,7 @@ public class Trackback {
         
         RollerMessages messages = new RollerMessages();
         
-        log.debug("Sending trackback to url - "+trackbackURL);
+        LOG.debug("Sending trackback to url - " + trackbackURL);
         
         // Construct data
         String title = entry.getTitle();
@@ -116,7 +116,7 @@ public class Trackback {
         params.put("blog_name", URLUtilities.encode(blog_name));
         String queryString = URLUtilities.getQueryString(params);
         
-        log.debug("query string - "+queryString);
+        LOG.debug("query string - " + queryString);
         
         // prepare http request
         HttpClient client = new HttpClient();
@@ -132,8 +132,8 @@ public class Trackback {
             byte[] response = method.getResponseBody();
             String responseString = Utilities.escapeHTML(new String(response, "UTF-8"));
             
-            log.debug("result = "+statusCode+" "+method.getStatusText());
-            log.debug("response:\n"+responseString);
+            LOG.debug("result = " + statusCode + " " + method.getStatusText());
+            LOG.debug("response:\n" + responseString);
             
             if(statusCode == HttpStatus.SC_OK) {
                 // trackback request succeeded, message will give details
@@ -155,7 +155,7 @@ public class Trackback {
             
         } catch (IOException e) {
             // some kind of transport error sending trackback post
-            log.debug("Error sending trackback", e);
+            LOG.debug("Error sending trackback", e);
             messages.addError("weblogEdit.trackbackErrorTransport");
         } finally {
             // release used connection

Modified: roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/util/WSSEUtilities.java
URL: http://svn.apache.org/viewvc/roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/util/WSSEUtilities.java?rev=1546816&r1=1546815&r2=1546816&view=diff
==============================================================================
--- roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/util/WSSEUtilities.java
(original)
+++ roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/util/WSSEUtilities.java
Sun Dec  1 14:39:51 2013
@@ -39,7 +39,7 @@ public class WSSEUtilities {
             digester.update(created);
             digester.update(password);
             byte[] digest = digester.digest();
-            result = new String(base64Encode(digest));
+            result = base64Encode(digest);
         }
         catch (NoSuchAlgorithmException e) {
             result = null;
@@ -56,7 +56,7 @@ public class WSSEUtilities {
     throws UnsupportedEncodingException {  
        
         byte[] nonceBytes = Long.toString(new Date().getTime()).getBytes();
-        String nonce = new String(WSSEUtilities.base64Encode(nonceBytes));
+        String nonce = WSSEUtilities.base64Encode(nonceBytes);
         
         SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss'Z'");
         String created = sdf.format(new Date());
@@ -64,7 +64,7 @@ public class WSSEUtilities {
         String digest = WSSEUtilities.generateDigest(
                 nonceBytes, created.getBytes("UTF-8"), password.getBytes("UTF-8"));
         
-        StringBuffer header = new StringBuffer("UsernameToken Username=\"");
+        StringBuilder header = new StringBuilder("UsernameToken Username=\"");
         header.append(userName);
         header.append("\", ");
         header.append("PasswordDigest=\"");

Modified: roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/webservices/adminprotocol/Authenticator.java
URL: http://svn.apache.org/viewvc/roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/webservices/adminprotocol/Authenticator.java?rev=1546816&r1=1546815&r2=1546816&view=diff
==============================================================================
--- roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/webservices/adminprotocol/Authenticator.java
(original)
+++ roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/webservices/adminprotocol/Authenticator.java
Sun Dec  1 14:39:51 2013
@@ -71,7 +71,7 @@ abstract class Authenticator {
             if (!WebloggerFactory.getWeblogger().getUserManager().checkPermission(adminPerm,
ud)) {
                 throw new UnauthorizedException("ERROR: User must have the admin role to
use the RAP endpoint: " + userName);
             }
-            if (!ud.getEnabled().booleanValue()) {
+            if (!ud.getEnabled()) {
                 throw new UnauthorizedException("ERROR: User is disabled: " + userName);
             }
         } catch (WebloggerException ex) {

Modified: roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/webservices/adminprotocol/Handler.java
URL: http://svn.apache.org/viewvc/roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/webservices/adminprotocol/Handler.java?rev=1546816&r1=1546815&r2=1546816&view=diff
==============================================================================
--- roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/webservices/adminprotocol/Handler.java
(original)
+++ roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/webservices/adminprotocol/Handler.java
Sun Dec  1 14:39:51 2013
@@ -20,8 +20,6 @@ package org.apache.roller.weblogger.webs
 import java.io.IOException;
 import java.io.Reader;
 import javax.servlet.http.HttpServletRequest;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
 import org.apache.roller.weblogger.config.WebloggerConfig;
 import org.apache.roller.weblogger.business.Weblogger;
 import org.apache.roller.weblogger.business.WebloggerFactory;
@@ -45,7 +43,13 @@ import org.jdom2.input.SAXBuilder;
  */
 abstract class Handler {
     protected static final String ENDPOINT = "/rap";
-    
+
+    private HttpServletRequest request;
+    private Weblogger roller;
+    private String userName;
+    private URI uri;
+    private String urlPrefix;
+
     static class URI {
         private static Pattern PATHINFO_PATTERN = Pattern.compile("^/(users|weblogs|members)(?:/(.*))?$");
         
@@ -89,15 +93,7 @@ abstract class Handler {
             return getEntryId() != null && type != null;
         }
     }
-    
-    protected static final Log logger = LogFactory.getFactory().getInstance(Handler.class);
-    
-    private HttpServletRequest request;
-    private Weblogger roller;
-    private String userName;
-    private URI uri;
-    private String urlPrefix;
-    
+
     /** Get a Handler object implementation based on the given request. */
     public static Handler getHandler(HttpServletRequest req) throws HandlerException {
         boolean enabled = WebloggerConfig.getBooleanProperty("webservices.adminprotocol.enabled");

Modified: roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/webservices/adminprotocol/RollerMemberHandler.java
URL: http://svn.apache.org/viewvc/roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/webservices/adminprotocol/RollerMemberHandler.java?rev=1546816&r1=1546815&r2=1546816&view=diff
==============================================================================
--- roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/webservices/adminprotocol/RollerMemberHandler.java
(original)
+++ roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/webservices/adminprotocol/RollerMemberHandler.java
Sun Dec  1 14:39:51 2013
@@ -281,9 +281,13 @@ class RollerMemberHandler extends Handle
     
     private List<String> toActionList(String perm) throws HandlerException {
         List<String> actions = new ArrayList<String>();
-        if ("ADMIN".equals(perm))       actions.add(WeblogPermission.ADMIN);
-        else if ("AUTHOR".equals(perm)) actions.add(WeblogPermission.POST);
-        else                            actions.add(WeblogPermission.EDIT_DRAFT);
+        if ("ADMIN".equals(perm)) {
+            actions.add(WeblogPermission.ADMIN);
+        } else if ("AUTHOR".equals(perm)) {
+            actions.add(WeblogPermission.POST);
+        } else {
+            actions.add(WeblogPermission.EDIT_DRAFT);
+        }
         return actions;       
     }
     

Modified: roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/webservices/adminprotocol/sdk/UserEntry.java
URL: http://svn.apache.org/viewvc/roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/webservices/adminprotocol/sdk/UserEntry.java?rev=1546816&r1=1546815&r2=1546816&view=diff
==============================================================================
--- roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/webservices/adminprotocol/sdk/UserEntry.java
(original)
+++ roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/webservices/adminprotocol/sdk/UserEntry.java
Sun Dec  1 14:39:51 2013
@@ -129,7 +129,7 @@ public class UserEntry extends Entry {
         // created (optional)
         Element createdElement = e.getChild(Tags.DATE_CREATED, Service.NAMESPACE);
         if (createdElement != null) {
-            setDateCreated(new Date(Long.valueOf(createdElement.getText()).longValue()));
+            setDateCreated(new Date(Long.valueOf(createdElement.getText())));
         }
         
         // enabled

Modified: roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/webservices/adminprotocol/sdk/WeblogEntry.java
URL: http://svn.apache.org/viewvc/roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/webservices/adminprotocol/sdk/WeblogEntry.java?rev=1546816&r1=1546815&r2=1546816&view=diff
==============================================================================
--- roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/webservices/adminprotocol/sdk/WeblogEntry.java
(original)
+++ roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/webservices/adminprotocol/sdk/WeblogEntry.java
Sun Dec  1 14:39:51 2013
@@ -128,7 +128,7 @@ public class WeblogEntry extends Entry {
         // created
         Element createdElement = e.getChild(Tags.DATE_CREATED, Service.NAMESPACE);
         if (createdElement != null) {
-            setDateCreated(new Date(Long.valueOf(createdElement.getText()).longValue()));
+            setDateCreated(new Date(Long.valueOf(createdElement.getText())));
         }
         
         // APP entries URL

Modified: roller/branches/rome2/app/src/main/resources/ApplicationResources.properties
URL: http://svn.apache.org/viewvc/roller/branches/rome2/app/src/main/resources/ApplicationResources.properties?rev=1546816&r1=1546815&r2=1546816&view=diff
==============================================================================
--- roller/branches/rome2/app/src/main/resources/ApplicationResources.properties (original)
+++ roller/branches/rome2/app/src/main/resources/ApplicationResources.properties Sun Dec 
1 14:39:51 2013
@@ -573,7 +573,7 @@ does not permit sending tracbacks to the
 error.title.403=Access Denied
 error.text.403=You do not have the privileges necessary to access the requested page.
 
-error.title.404=Sorry! We couldn''t find your document
+error.title.404=Sorry! We couldn't find your document
 error.text.404=The file that you requested could not be found on this server. 
 
 error.permissions.deniedSave=Access Denied (you logged in as a different user?)
@@ -927,6 +927,7 @@ macro.weblog.allcategories=All
 macro.weblog.nolanguages=This site does not support multiple languages.
 macro.weblog.notifyMeOfComments=Notify me by email of new comments
 macro.weblog.noEntriesForDate=No entries found for specified date
+macro.weblog.noEntriesForCategory=No entries found for specified category
 
 # -------------------------------------------------------------------- Main page
 



Mime
View raw message