roller-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From gma...@apache.org
Subject svn commit: r1520777 [2/2] - in /roller/trunk/app/src/main: java/org/apache/roller/planet/pojos/ java/org/apache/roller/planet/tasks/ java/org/apache/roller/util/ java/org/apache/roller/weblogger/business/ java/org/apache/roller/weblogger/business/jpa/...
Date Sat, 07 Sep 2013 14:25:19 GMT
Modified: roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/EntriesBean.java
URL: http://svn.apache.org/viewvc/roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/EntriesBean.java?rev=1520777&r1=1520776&r2=1520777&view=diff
==============================================================================
--- roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/EntriesBean.java
(original)
+++ roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/EntriesBean.java
Sat Sep  7 14:25:18 2013
@@ -54,18 +54,22 @@ public class EntriesBean {
     }
     
     public Date getStartDate() {
-        if(!StringUtils.isEmpty(getStartDateString())) try {
-            DateFormat df = new SimpleDateFormat("MM/dd/yy");
-            return df.parse(getStartDateString());
-        } catch(Exception e) { }
+        if(!StringUtils.isEmpty(getStartDateString())) {
+            try {
+                DateFormat df = new SimpleDateFormat("MM/dd/yy");
+                return df.parse(getStartDateString());
+            } catch(Exception e) { }
+        }
         return null;
     }
 
     public Date getEndDate() {
-        if(!StringUtils.isEmpty(getEndDateString())) try {
-            DateFormat df = new SimpleDateFormat("MM/dd/yy");
-            return df.parse(getEndDateString());
-        } catch(Exception e) { }
+        if(!StringUtils.isEmpty(getEndDateString())) {
+            try {
+                DateFormat df = new SimpleDateFormat("MM/dd/yy");
+                return df.parse(getEndDateString());
+            } catch(Exception e) { }
+        }
         return null;
     }
     
@@ -120,7 +124,7 @@ public class EntriesBean {
     
     
     public String toString() {
-        StringBuffer buf = new StringBuffer();
+        StringBuilder buf = new StringBuilder();
         
         buf.append("startDate = ").append(getStartDate()).append("\n");
         buf.append("endDate = ").append(getEndDate()).append("\n");

Modified: roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/EntryAdd.java
URL: http://svn.apache.org/viewvc/roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/EntryAdd.java?rev=1520777&r1=1520776&r2=1520777&view=diff
==============================================================================
--- roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/EntryAdd.java
(original)
+++ roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/EntryAdd.java
Sat Sep  7 14:25:18 2013
@@ -94,8 +94,7 @@ public final class EntryAdd extends Entr
 
 		// set comment defaults
 		getBean().setAllowComments(getActionWeblog().getDefaultAllowComments());
-		getBean().setCommentDays(
-				new Integer(getActionWeblog().getDefaultCommentDays()));
+		getBean().setCommentDays(getActionWeblog().getDefaultCommentDays());
 
 		// apply weblog default plugins
 		if (getActionWeblog().getDefaultPlugins() != null) {
@@ -114,112 +113,114 @@ public final class EntryAdd extends Entr
 	 */
 	public String save() {
 
-		if (!hasActionErrors())
-			try {
-				UserManager userMgr = WebloggerFactory.getWeblogger()
-						.getUserManager();
-				WeblogEntryManager weblogMgr = WebloggerFactory.getWeblogger()
-						.getWeblogEntryManager();
-
-				WeblogEntry entry = new WeblogEntry();
-				entry.setCreatorUserName(getAuthenticatedUser().getUserName());
-				entry.setWebsite(getActionWeblog());
-
-				// set updatetime & pubtime if it was specified
-				entry.setUpdateTime(new Timestamp(new Date().getTime()));
-				entry.setPubTime(getBean().getPubTime(getLocale(),
-						getActionWeblog().getTimeZoneInstance()));
-
-				// copy data to new entry pojo
-				getBean().copyTo(entry);
-
-				// handle pubtime auto set
-				if (entry.isPublished()) {
-					if (entry.getPubTime() == null) {
-						// no time specified, use current time
-						entry.setPubTime(entry.getUpdateTime());
-					}
-
-					// if user does not have author perms then force PENDING
-					// status
-					if (!getActionWeblog().hasUserPermission(
-							getAuthenticatedUser(), WeblogPermission.POST)) {
-						entry.setStatus(WeblogEntry.PENDING);
-					}
-				}
-
-				// if user is an admin then apply pinned to main value as well
-				GlobalPermission adminPerm = new GlobalPermission(
-						Collections.singletonList(GlobalPermission.ADMIN));
-				if (userMgr.checkPermission(adminPerm, getAuthenticatedUser())) {
-					entry.setPinnedToMain(getBean().getPinnedToMain());
-				}
-
-				if (!StringUtils.isEmpty(getBean().getEnclosureURL()))
-					try {
-						// Fetch MediaCast resource
-						log.debug("Checking MediaCast attributes");
-						MediacastResource mediacast = MediacastUtil
-								.lookupResource(getBean().getEnclosureURL());
-
-						// set mediacast attributes
-						entry.putEntryAttribute("att_mediacast_url",
-								mediacast.getUrl());
-						entry.putEntryAttribute("att_mediacast_type",
-								mediacast.getContentType());
-						entry.putEntryAttribute("att_mediacast_length", ""
-								+ mediacast.getLength());
-
-					} catch (MediacastException ex) {
-						addMessage(getText(ex.getErrorKey()));
-					}
-
-				if (log.isDebugEnabled()) {
-					log.debug("entry bean is ...\n" + getBean().toString());
-					log.debug("final status = " + entry.getStatus());
-					log.debug("updtime = " + entry.getUpdateTime());
-					log.debug("pubtime = " + entry.getPubTime());
-				}
-
-				log.debug("Saving entry");
-				weblogMgr.saveWeblogEntry(entry);
-				WebloggerFactory.getWeblogger().flush();
-
-				// notify search of the new entry
-				if (entry.isPublished()) {
-					reindexEntry(entry);
-				}
-
-				// notify caches
-				CacheManager.invalidate(entry);
-
-				// Queue applicable pings for this update.
-				if (entry.isPublished()) {
-					WebloggerFactory.getWeblogger().getAutopingManager()
-							.queueApplicableAutoPings(entry);
-				}
-
-				if (entry.isPending()) {
-					// implies that entry just changed to pending
-					if (MailUtil.isMailConfigured()) {
+		if (!hasActionErrors()) {
+            try {
+                UserManager userMgr = WebloggerFactory.getWeblogger()
+                        .getUserManager();
+                WeblogEntryManager weblogMgr = WebloggerFactory.getWeblogger()
+                        .getWeblogEntryManager();
+
+                WeblogEntry entry = new WeblogEntry();
+                entry.setCreatorUserName(getAuthenticatedUser().getUserName());
+                entry.setWebsite(getActionWeblog());
+
+                // set updatetime & pubtime if it was specified
+                entry.setUpdateTime(new Timestamp(new Date().getTime()));
+                entry.setPubTime(getBean().getPubTime(getLocale(),
+                        getActionWeblog().getTimeZoneInstance()));
+
+                // copy data to new entry pojo
+                getBean().copyTo(entry);
+
+                // handle pubtime auto set
+                if (entry.isPublished()) {
+                    if (entry.getPubTime() == null) {
+                        // no time specified, use current time
+                        entry.setPubTime(entry.getUpdateTime());
+                    }
+
+                    // if user does not have author perms then force PENDING
+                    // status
+                    if (!getActionWeblog().hasUserPermission(
+                            getAuthenticatedUser(), WeblogPermission.POST)) {
+                        entry.setStatus(WeblogEntry.PENDING);
+                    }
+                }
+
+                // if user is an admin then apply pinned to main value as well
+                GlobalPermission adminPerm = new GlobalPermission(
+                        Collections.singletonList(GlobalPermission.ADMIN));
+                if (userMgr.checkPermission(adminPerm, getAuthenticatedUser())) {
+                    entry.setPinnedToMain(getBean().getPinnedToMain());
+                }
+
+                if (!StringUtils.isEmpty(getBean().getEnclosureURL())) {
+                    try {
+                        // Fetch MediaCast resource
+                        log.debug("Checking MediaCast attributes");
+                        MediacastResource mediacast = MediacastUtil
+                                .lookupResource(getBean().getEnclosureURL());
+
+                        // set mediacast attributes
+                        entry.putEntryAttribute("att_mediacast_url",
+                                mediacast.getUrl());
+                        entry.putEntryAttribute("att_mediacast_type",
+                                mediacast.getContentType());
+                        entry.putEntryAttribute("att_mediacast_length", ""
+                                + mediacast.getLength());
+
+                    } catch (MediacastException ex) {
+                        addMessage(getText(ex.getErrorKey()));
+                    }
+                }
+
+                if (log.isDebugEnabled()) {
+                    log.debug("entry bean is ...\n" + getBean().toString());
+                    log.debug("final status = " + entry.getStatus());
+                    log.debug("updtime = " + entry.getUpdateTime());
+                    log.debug("pubtime = " + entry.getPubTime());
+                }
+
+                log.debug("Saving entry");
+                weblogMgr.saveWeblogEntry(entry);
+                WebloggerFactory.getWeblogger().flush();
+
+                // notify search of the new entry
+                if (entry.isPublished()) {
+                    reindexEntry(entry);
+                }
+
+                // notify caches
+                CacheManager.invalidate(entry);
+
+                // Queue applicable pings for this update.
+                if (entry.isPublished()) {
+                    WebloggerFactory.getWeblogger().getAutopingManager()
+                            .queueApplicableAutoPings(entry);
+                }
+
+                if (entry.isPending()) {
+                    // implies that entry just changed to pending
+                    if (MailUtil.isMailConfigured()) {
                         MailUtil.sendPendingEntryNotice(entry);
                     }
-					addMessage("weblogEdit.submittedForReview");
-				} else {
-					addMessage("weblogEdit.changesSaved");
-				}
-
-				// now that entry is saved we want to store the id in the bean
-				// so that our success action can use it properly
-				getBean().setId(entry.getId());
-
-				return SUCCESS;
-
-			} catch (Exception e) {
-				log.error("Error saving new entry", e);
-				// TODO: i18n
-				addError("Error saving new entry");
-			}
+                    addMessage("weblogEdit.submittedForReview");
+                } else {
+                    addMessage("weblogEdit.changesSaved");
+                }
+
+                // now that entry is saved we want to store the id in the bean
+                // so that our success action can use it properly
+                getBean().setId(entry.getId());
+
+                return SUCCESS;
+
+            } catch (Exception e) {
+                log.error("Error saving new entry", e);
+                // TODO: i18n
+                addError("Error saving new entry");
+            }
+        }
 
 		return INPUT;
 	}

Modified: roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/MembersInvite.java
URL: http://svn.apache.org/viewvc/roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/MembersInvite.java?rev=1520777&r1=1520776&r2=1520777&view=diff
==============================================================================
--- roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/MembersInvite.java
(original)
+++ roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/MembersInvite.java
Sat Sep  7 14:25:18 2013
@@ -127,30 +127,34 @@ public class MembersInvite extends UIAct
         }
         
         // if no errors then send the invitation
-        if(!hasActionErrors()) try {
-            umgr.grantWeblogPermissionPending(getActionWeblog(), user, 
-                    Collections.singletonList(getPermissionString()));
-            WebloggerFactory.getWeblogger().flush();
-            
-            addMessage("inviteMember.userInvited");
-            
-            if (MailUtil.isMailConfigured()) try {
-                MailUtil.sendWeblogInvitation(getActionWeblog(), user);
-            } catch (WebloggerException e) {
-                // TODO: this should be an error except that struts2 misbehaves
-                // when we chain this action to the next one thinking that an error
-                // means that validation broke during the chain
-                addMessage("error.untranslated", e.getMessage());
+        if(!hasActionErrors()) {
+            try {
+                umgr.grantWeblogPermissionPending(getActionWeblog(), user,
+                        Collections.singletonList(getPermissionString()));
+                WebloggerFactory.getWeblogger().flush();
+
+                addMessage("inviteMember.userInvited");
+
+                if (MailUtil.isMailConfigured()) {
+                    try {
+                        MailUtil.sendWeblogInvitation(getActionWeblog(), user);
+                    } catch (WebloggerException e) {
+                        // TODO: this should be an error except that struts2 misbehaves
+                        // when we chain this action to the next one thinking that an error
+                        // means that validation broke during the chain
+                        addMessage("error.untranslated", e.getMessage());
+                    }
+                }
+
+                log.debug("Invitation successfully recorded");
+
+                return SUCCESS;
+
+            } catch (Exception ex) {
+                log.error("Error creating user invitation", ex);
+                // TODO: i18n
+                addError("Error creating user invitation");
             }
-            
-            log.debug("Invitation successfully recorded");
-            
-            return SUCCESS;
-            
-        } catch (Exception ex) {
-            log.error("Error creating user invitation", ex);
-            // TODO: i18n
-            addError("Error creating user invitation");
         }
         
         log.debug("Invitation had errors, giving user another chance");

Modified: roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/TemplateRemove.java
URL: http://svn.apache.org/viewvc/roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/TemplateRemove.java?rev=1520777&r1=1520776&r2=1520777&view=diff
==============================================================================
--- roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/TemplateRemove.java
(original)
+++ roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/TemplateRemove.java
Sat Sep  7 14:25:18 2013
@@ -59,15 +59,16 @@ public class TemplateRemove extends UIAc
 	}
 
 	public void myPrepare() {
-		if (getRemoveId() != null)
-			try {
-				setTemplate(WebloggerFactory.getWeblogger().getWeblogManager()
-						.getPage(getRemoveId()));
-			} catch (WebloggerException ex) {
-				log.error("Error looking up template by id - " + getRemoveId(),
-						ex);
-				addError("editPages.remove.notFound", getRemoveId());
-			}
+		if (getRemoveId() != null) {
+            try {
+                setTemplate(WebloggerFactory.getWeblogger().getWeblogManager()
+                        .getPage(getRemoveId()));
+            } catch (WebloggerException ex) {
+                log.error("Error looking up template by id - " + getRemoveId(),
+                        ex);
+                addError("editPages.remove.notFound", getRemoveId());
+            }
+        }
 	}
 
 	/**
@@ -82,59 +83,60 @@ public class TemplateRemove extends UIAc
 	 */
 	public String remove() {
 
-		if (getTemplate() != null)
-			try {
-				if (!getTemplate().isRequired()
-						|| !WeblogTheme.CUSTOM.equals(getActionWeblog()
-								.getEditorTheme())) {
-
-					WeblogManager mgr = WebloggerFactory.getWeblogger()
-							.getWeblogManager();
-
-					// if weblog template remove custom style sheet also
-					if (getTemplate().getName().equals(
-							WeblogTemplate.DEFAULT_PAGE)) {
-
-						Weblog weblog = getActionWeblog();
-
-						ThemeTemplate stylesheet = getActionWeblog().getTheme()
-								.getStylesheet();
-
-						// Delete style sheet if the same name
-						if (stylesheet != null
-								&& getActionWeblog().getTheme().getStylesheet() != null
-								&& stylesheet.getLink().equals(
-										getActionWeblog().getTheme()
-												.getStylesheet().getLink())) {
-							// Same so OK to delete
-							WeblogTemplate css = mgr.getPageByLink(
-									getActionWeblog(), stylesheet.getLink());
-
-							if (css != null) {
-								mgr.removePage(css);
-							}
-						}
-
-						// Clear for next custom theme
-						weblog.setCustomStylesheetPath(null);
-						weblog.setDefaultPageId(null);
-
-					}
-
-					// notify cache
-					CacheManager.invalidate(getTemplate());
-					mgr.removePage(getTemplate());
-					WebloggerFactory.getWeblogger().flush();
-
-					return SUCCESS;
-				} else {
-					addError("editPages.remove.requiredTemplate");
-				}
-
-			} catch (Exception ex) {
-				log.error("Error removing page - " + getRemoveId(), ex);
-				addError("editPages.remove.error");
-			}
+		if (getTemplate() != null) {
+            try {
+                if (!getTemplate().isRequired()
+                        || !WeblogTheme.CUSTOM.equals(getActionWeblog()
+                        .getEditorTheme())) {
+
+                    WeblogManager mgr = WebloggerFactory.getWeblogger()
+                            .getWeblogManager();
+
+                    // if weblog template remove custom style sheet also
+                    if (getTemplate().getName().equals(
+                            WeblogTemplate.DEFAULT_PAGE)) {
+
+                        Weblog weblog = getActionWeblog();
+
+                        ThemeTemplate stylesheet = getActionWeblog().getTheme()
+                                .getStylesheet();
+
+                        // Delete style sheet if the same name
+                        if (stylesheet != null
+                                && getActionWeblog().getTheme().getStylesheet() !=
null
+                                && stylesheet.getLink().equals(
+                                getActionWeblog().getTheme()
+                                        .getStylesheet().getLink())) {
+                            // Same so OK to delete
+                            WeblogTemplate css = mgr.getPageByLink(
+                                    getActionWeblog(), stylesheet.getLink());
+
+                            if (css != null) {
+                                mgr.removePage(css);
+                            }
+                        }
+
+                        // Clear for next custom theme
+                        weblog.setCustomStylesheetPath(null);
+                        weblog.setDefaultPageId(null);
+
+                    }
+
+                    // notify cache
+                    CacheManager.invalidate(getTemplate());
+                    mgr.removePage(getTemplate());
+                    WebloggerFactory.getWeblogger().flush();
+
+                    return SUCCESS;
+                } else {
+                    addError("editPages.remove.requiredTemplate");
+                }
+
+            } catch (Exception ex) {
+                log.error("Error removing page - " + getRemoveId(), ex);
+                addError("editPages.remove.error");
+            }
+        }
 
 		return "confirm";
 	}

Modified: roller/trunk/app/src/main/java/org/apache/roller/weblogger/webservices/atomprotocol/EntryCollection.java
URL: http://svn.apache.org/viewvc/roller/trunk/app/src/main/java/org/apache/roller/weblogger/webservices/atomprotocol/EntryCollection.java?rev=1520777&r1=1520776&r2=1520777&view=diff
==============================================================================
--- roller/trunk/app/src/main/java/org/apache/roller/weblogger/webservices/atomprotocol/EntryCollection.java
(original)
+++ roller/trunk/app/src/main/java/org/apache/roller/weblogger/webservices/atomprotocol/EntryCollection.java
Sat Sep  7 14:25:18 2013
@@ -65,7 +65,7 @@ import org.apache.roller.weblogger.util.
 public class EntryCollection {
     private Weblogger      roller;
     private User           user;
-    private int            maxEntries = 20;    
+    private final static int MAX_ENTRIES = 20;
     private final String   atomURL;    
     
     private static Log log =
@@ -153,7 +153,7 @@ public class EntryCollection {
         String[] pathInfo = StringUtils.split(areq.getPathInfo(),"/");
         try {
             int start = 0;
-            int max = maxEntries;
+            int max = MAX_ENTRIES;
             if (pathInfo.length > 2) {
                 try {
                     String s = pathInfo[2].trim();
@@ -184,7 +184,7 @@ public class EntryCollection {
                     null,
                     null,              // locale
                     start,             // offset (for range paging)
-                    max + 1);          // maxEntries
+                    max + 1);          // MAX_ENTRIES
             Feed feed = new Feed();
             feed.setId(atomURL
                 +"/"+website.getHandle() + "/entries/" + start);
@@ -198,7 +198,7 @@ public class EntryCollection {
 
             List atomEntries = new ArrayList();
             int count = 0;
-            for (Iterator iter = entries.iterator(); iter.hasNext() && count <
maxEntries; count++) {
+            for (Iterator iter = entries.iterator(); iter.hasNext() && count <
MAX_ENTRIES; count++) {
                 WeblogEntry rollerEntry = (WeblogEntry)iter.next();
                 Entry entry = createAtomEntry(rollerEntry);
                 atomEntries.add(entry);
@@ -208,7 +208,8 @@ public class EntryCollection {
                 }
             }
             List links = new ArrayList();
-            if (entries.size() > max) { // add next link
+            if (entries.size() > max) {
+                // add next link
                 int nextOffset = start + max;
                 String url = atomURL+"/"
                         + website.getHandle() + "/entries/" + nextOffset;
@@ -217,7 +218,8 @@ public class EntryCollection {
                 nextLink.setHref(url);
                 links.add(nextLink);
             }
-            if (start > 0) { // add previous link
+            if (start > 0) {
+                // add previous link
                 int prevOffset = start > max ? start - max : 0;
                 String url = atomURL+"/"
                         +website.getHandle() + "/entries/" + prevOffset;

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=1520777&r1=1520776&r2=1520777&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
Sat Sep  7 14:25:18 2013
@@ -132,7 +132,9 @@ public class TagDataServlet extends Http
                 if (it.hasNext()) {
                     pw.println(", ");
                 }
-                if (count++ > MAX) break;
+                if (count++ > MAX) {
+                    break;
+                }
             }
             pw.println("\n  ]\n}");
             response.flushBuffer();
@@ -160,7 +162,9 @@ public class TagDataServlet extends Http
                 int frequency = stat.getCount();
                 pw.print("<atom:category term=\"" + term + "\" tagdata:frequency=\"" +
frequency + "\" ");
                 pw.println("tagdata:href=\"" + viewURI + "\" />");
-                if (count++ > MAX) break;
+                if (count++ > MAX) {
+                    break;
+                }
             }
             if (tags.size() > MAX) {
                 // get next URI, if site-wide then don't specify weblog

Modified: roller/trunk/app/src/main/resources/org/apache/roller/weblogger/pojos/TaskLock.orm.xml
URL: http://svn.apache.org/viewvc/roller/trunk/app/src/main/resources/org/apache/roller/weblogger/pojos/TaskLock.orm.xml?rev=1520777&r1=1520776&r2=1520777&view=diff
==============================================================================
--- roller/trunk/app/src/main/resources/org/apache/roller/weblogger/pojos/TaskLock.orm.xml
(original)
+++ roller/trunk/app/src/main/resources/org/apache/roller/weblogger/pojos/TaskLock.orm.xml
Sat Sep  7 14:25:18 2013
@@ -12,7 +12,7 @@
         </named-query>
         
         <named-query name="TaskLock.updateClient&amp;Timeacquired&amp;Timeleased&amp;LastRunByName&amp;Timeacquired">
-            <query> UPDATE TaskLock t SET t.clientId=?1, t.timeAquired= CURRENT_TIMESTAMP,
t.timeLeased= ?2, t.lastRun= ?3 WHERE t.name=?4 AND t.timeAquired=?5 AND ?6 &lt; CURRENT_TIMESTAMP</query>
+            <query> UPDATE TaskLock t SET t.clientId=?1, t.timeAcquired= CURRENT_TIMESTAMP,
t.timeLeased= ?2, t.lastRun= ?3 WHERE t.name=?4 AND t.timeAcquired=?5 AND ?6 &lt; CURRENT_TIMESTAMP</query>
         </named-query>
         
         <named-query name="TaskLock.updateTimeLeasedByName&amp;Client">
@@ -26,7 +26,7 @@
             <basic name="name">
                 <column name="name" insertable="true" updatable="true" unique="true"/>
             </basic>
-            <basic name="timeAquired">
+            <basic name="timeAcquired">
                 <column name="timeacquired" insertable="true" updatable="true" unique="false"/>
                 <temporal>TIMESTAMP</temporal>
             </basic>



Mime
View raw message