roller-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From snoopd...@apache.org
Subject svn commit: r514804 - in /incubator/roller/branches/roller_4.0_newbackend: src/org/apache/roller/business/hibernate/ src/org/apache/roller/ui/authoring/struts/actions/ src/org/apache/roller/ui/rendering/servlets/ web/WEB-INF/jsps/tiles/
Date Mon, 05 Mar 2007 18:50:19 GMT
Author: snoopdave
Date: Mon Mar  5 10:50:17 2007
New Revision: 514804

URL: http://svn.apache.org/viewvc?view=rev&rev=514804
Log:
Merging changes from trunk

Modified:
    incubator/roller/branches/roller_4.0_newbackend/src/org/apache/roller/business/hibernate/HibernateThreadManagerImpl.java
    incubator/roller/branches/roller_4.0_newbackend/src/org/apache/roller/ui/authoring/struts/actions/WeblogEntryPageModel.java
    incubator/roller/branches/roller_4.0_newbackend/src/org/apache/roller/ui/rendering/servlets/CommentServlet.java
    incubator/roller/branches/roller_4.0_newbackend/web/WEB-INF/jsps/tiles/bannerStatus.jsp

Modified: incubator/roller/branches/roller_4.0_newbackend/src/org/apache/roller/business/hibernate/HibernateThreadManagerImpl.java
URL: http://svn.apache.org/viewvc/incubator/roller/branches/roller_4.0_newbackend/src/org/apache/roller/business/hibernate/HibernateThreadManagerImpl.java?view=diff&rev=514804&r1=514803&r2=514804
==============================================================================
--- incubator/roller/branches/roller_4.0_newbackend/src/org/apache/roller/business/hibernate/HibernateThreadManagerImpl.java
(original)
+++ incubator/roller/branches/roller_4.0_newbackend/src/org/apache/roller/business/hibernate/HibernateThreadManagerImpl.java
Mon Mar  5 10:50:17 2007
@@ -98,7 +98,7 @@
                     "and :leaseends < current_timestamp()";
             Query query = session.createQuery(queryHQL);
             query.setString("client", task.getClientId());
-            query.setString("timeleased", ""+task.getLeaseTime());
+            query.setInteger("timeleased", task.getLeaseTime());
             query.setString("name", task.getName());
             query.setTimestamp("timeacquired", taskLock.getTimeAquired());
             query.setTimestamp("leaseends", new Date(leaseExpireTime));
@@ -145,7 +145,7 @@
             String queryHQL = "update TaskLockData set timeLeased=:interval "+
                     "where name=:name and client=:client";
             Query query = session.createQuery(queryHQL);
-            query.setString("interval", ""+task.getInterval());
+            query.setInteger("interval", task.getInterval());
             query.setString("name", task.getName());
             query.setString("client", task.getClientId());
             int result = query.executeUpdate();

Modified: incubator/roller/branches/roller_4.0_newbackend/src/org/apache/roller/ui/authoring/struts/actions/WeblogEntryPageModel.java
URL: http://svn.apache.org/viewvc/incubator/roller/branches/roller_4.0_newbackend/src/org/apache/roller/ui/authoring/struts/actions/WeblogEntryPageModel.java?view=diff&rev=514804&r1=514803&r2=514804
==============================================================================
--- incubator/roller/branches/roller_4.0_newbackend/src/org/apache/roller/ui/authoring/struts/actions/WeblogEntryPageModel.java
(original)
+++ incubator/roller/branches/roller_4.0_newbackend/src/org/apache/roller/ui/authoring/struts/actions/WeblogEntryPageModel.java
Mon Mar  5 10:50:17 2007
@@ -323,8 +323,7 @@
     
     public String getPermaLink() throws RollerException
     {
-        String context = RollerRuntimeConfig.getAbsoluteContextURL();
-        return context + getWeblogEntry().getPermaLink();
+        return getWeblogEntry().getPermalink();
     }
     
     public static String makeSelect(String word, List words)

Modified: incubator/roller/branches/roller_4.0_newbackend/src/org/apache/roller/ui/rendering/servlets/CommentServlet.java
URL: http://svn.apache.org/viewvc/incubator/roller/branches/roller_4.0_newbackend/src/org/apache/roller/ui/rendering/servlets/CommentServlet.java?view=diff&rev=514804&r1=514803&r2=514804
==============================================================================
--- incubator/roller/branches/roller_4.0_newbackend/src/org/apache/roller/ui/rendering/servlets/CommentServlet.java
(original)
+++ incubator/roller/branches/roller_4.0_newbackend/src/org/apache/roller/ui/rendering/servlets/CommentServlet.java
Mon Mar  5 10:50:17 2007
@@ -626,8 +626,8 @@
             msg.append("\n\n");
             
             // Build link back to comment
-            StringBuffer commentURL = new StringBuffer(rootURL);
-            commentURL.append(entry.getPermaLink());
+            StringBuffer commentURL = new StringBuffer();
+            commentURL.append(entry.getPermalink());
             commentURL.append("#comments");
             msg.append(commentURL.toString());
             

Modified: incubator/roller/branches/roller_4.0_newbackend/web/WEB-INF/jsps/tiles/bannerStatus.jsp
URL: http://svn.apache.org/viewvc/incubator/roller/branches/roller_4.0_newbackend/web/WEB-INF/jsps/tiles/bannerStatus.jsp?view=diff&rev=514804&r1=514803&r2=514804
==============================================================================
--- incubator/roller/branches/roller_4.0_newbackend/web/WEB-INF/jsps/tiles/bannerStatus.jsp
(original)
+++ incubator/roller/branches/roller_4.0_newbackend/web/WEB-INF/jsps/tiles/bannerStatus.jsp
Mon Mar  5 10:50:17 2007
@@ -48,7 +48,7 @@
         
         <c:if test="${!empty model.website}" >
            - <fmt:message key="mainPage.currentWebsite" />
-           <b><a href='<c:out value="${model.website.URL}" />'>
+           <b><a href='<c:out value="${model.website.absoluteURL}" />'>
                <c:out value="${model.website.handle}" />
            </a></b>
    



Mime
View raw message