You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@roller.apache.org by sn...@apache.org on 2006/06/07 22:19:50 UTC
svn commit: r412521 - in
/incubator/roller/branches/roller_3.0/src/org/apache/roller:
business/hibernate/ pojos/ ui/rendering/velocity/
Author: snoopdave
Date: Wed Jun 7 13:19:49 2006
New Revision: 412521
URL: http://svn.apache.org/viewvc?rev=412521&view=rev
Log:
Removing WeblogEntry interface, fixing 1.4.2 compile problems
Removed:
incubator/roller/branches/roller_3.0/src/org/apache/roller/pojos/WeblogEntry.java
Modified:
incubator/roller/branches/roller_3.0/src/org/apache/roller/business/hibernate/HibernateRefererManagerImpl.java
incubator/roller/branches/roller_3.0/src/org/apache/roller/business/hibernate/HibernateUserManagerImpl.java
incubator/roller/branches/roller_3.0/src/org/apache/roller/business/hibernate/HibernateWeblogManagerImpl.java
incubator/roller/branches/roller_3.0/src/org/apache/roller/pojos/PlanetEntryData.java
incubator/roller/branches/roller_3.0/src/org/apache/roller/pojos/PlanetSubscriptionData.java
incubator/roller/branches/roller_3.0/src/org/apache/roller/pojos/UserData.java
incubator/roller/branches/roller_3.0/src/org/apache/roller/pojos/WeblogCategoryData.java
incubator/roller/branches/roller_3.0/src/org/apache/roller/pojos/WeblogEntryData.java
incubator/roller/branches/roller_3.0/src/org/apache/roller/pojos/WebsiteData.java
incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/rendering/velocity/ContextLoader.java
incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/rendering/velocity/PageServlet.java
Modified: incubator/roller/branches/roller_3.0/src/org/apache/roller/business/hibernate/HibernateRefererManagerImpl.java
URL: http://svn.apache.org/viewvc/incubator/roller/branches/roller_3.0/src/org/apache/roller/business/hibernate/HibernateRefererManagerImpl.java?rev=412521&r1=412520&r2=412521&view=diff
==============================================================================
--- incubator/roller/branches/roller_3.0/src/org/apache/roller/business/hibernate/HibernateRefererManagerImpl.java (original)
+++ incubator/roller/branches/roller_3.0/src/org/apache/roller/business/hibernate/HibernateRefererManagerImpl.java Wed Jun 7 13:19:49 2006
@@ -303,7 +303,7 @@
websiteHandle,
websiteName,
"statCount.weblogDayHits",
- (long)hits));
+ hits.longValue()));
}
return result;
Modified: incubator/roller/branches/roller_3.0/src/org/apache/roller/business/hibernate/HibernateUserManagerImpl.java
URL: http://svn.apache.org/viewvc/incubator/roller/branches/roller_3.0/src/org/apache/roller/business/hibernate/HibernateUserManagerImpl.java?rev=412521&r1=412520&r2=412521&view=diff
==============================================================================
--- incubator/roller/branches/roller_3.0/src/org/apache/roller/business/hibernate/HibernateUserManagerImpl.java (original)
+++ incubator/roller/branches/roller_3.0/src/org/apache/roller/business/hibernate/HibernateUserManagerImpl.java Wed Jun 7 13:19:49 2006
@@ -921,7 +921,7 @@
(String)row[2],
(String)row[3],
"statCount.weblogCommentCountType",
- new Long((Integer)row[0]).longValue()));
+ new Long(((Integer)row[0]).intValue()).longValue()));
}
return results;
} catch (Throwable pe) {
Modified: incubator/roller/branches/roller_3.0/src/org/apache/roller/business/hibernate/HibernateWeblogManagerImpl.java
URL: http://svn.apache.org/viewvc/incubator/roller/branches/roller_3.0/src/org/apache/roller/business/hibernate/HibernateWeblogManagerImpl.java?rev=412521&r1=412520&r2=412521&view=diff
==============================================================================
--- incubator/roller/branches/roller_3.0/src/org/apache/roller/business/hibernate/HibernateWeblogManagerImpl.java (original)
+++ incubator/roller/branches/roller_3.0/src/org/apache/roller/business/hibernate/HibernateWeblogManagerImpl.java Wed Jun 7 13:19:49 2006
@@ -1068,7 +1068,7 @@
(String)row[2],
(String)row[3],
"statCount.weblogEntryCommentCountType",
- new Long((Integer)row[0]).longValue()));
+ new Long(((Integer)row[0]).intValue()).longValue()));
}
return results;
} catch (Throwable pe) {
Modified: incubator/roller/branches/roller_3.0/src/org/apache/roller/pojos/PlanetEntryData.java
URL: http://svn.apache.org/viewvc/incubator/roller/branches/roller_3.0/src/org/apache/roller/pojos/PlanetEntryData.java?rev=412521&r1=412520&r2=412521&view=diff
==============================================================================
--- incubator/roller/branches/roller_3.0/src/org/apache/roller/pojos/PlanetEntryData.java (original)
+++ incubator/roller/branches/roller_3.0/src/org/apache/roller/pojos/PlanetEntryData.java Wed Jun 7 13:19:49 2006
@@ -51,7 +51,7 @@
* @hibernate.class lazy="false" table="rag_entry"
*/
public class PlanetEntryData extends PersistentObject
- implements WeblogEntry, Serializable, Comparable {
+ implements Serializable, Comparable {
protected String id;
protected String handle;
protected String title;
Modified: incubator/roller/branches/roller_3.0/src/org/apache/roller/pojos/PlanetSubscriptionData.java
URL: http://svn.apache.org/viewvc/incubator/roller/branches/roller_3.0/src/org/apache/roller/pojos/PlanetSubscriptionData.java?rev=412521&r1=412520&r2=412521&view=diff
==============================================================================
--- incubator/roller/branches/roller_3.0/src/org/apache/roller/pojos/PlanetSubscriptionData.java (original)
+++ incubator/roller/branches/roller_3.0/src/org/apache/roller/pojos/PlanetSubscriptionData.java Wed Jun 7 13:19:49 2006
@@ -27,7 +27,7 @@
* @hibernate.class lazy="false" table="rag_subscription"
*/
public class PlanetSubscriptionData extends PersistentObject
- implements WeblogEntry.Website, Serializable, Comparable
+ implements Serializable, Comparable
{
/** Database ID */
protected String id;
Modified: incubator/roller/branches/roller_3.0/src/org/apache/roller/pojos/UserData.java
URL: http://svn.apache.org/viewvc/incubator/roller/branches/roller_3.0/src/org/apache/roller/pojos/UserData.java?rev=412521&r1=412520&r2=412521&view=diff
==============================================================================
--- incubator/roller/branches/roller_3.0/src/org/apache/roller/pojos/UserData.java (original)
+++ incubator/roller/branches/roller_3.0/src/org/apache/roller/pojos/UserData.java Wed Jun 7 13:19:49 2006
@@ -18,6 +18,7 @@
package org.apache.roller.pojos;
+import java.io.Serializable;
import java.util.ArrayList;
import java.util.Date;
import java.util.HashSet;
@@ -43,7 +44,7 @@
*/
public class UserData
extends org.apache.roller.pojos.PersistentObject
- implements WeblogEntry.User, java.io.Serializable {
+ implements Serializable {
public static final UserData SYSTEM_USER = new UserData(
"n/a","systemuser","n/a","systemuser","n/a",
"en_US_WIN", "America/Los_Angeles", new Date(), Boolean.TRUE);
Modified: incubator/roller/branches/roller_3.0/src/org/apache/roller/pojos/WeblogCategoryData.java
URL: http://svn.apache.org/viewvc/incubator/roller/branches/roller_3.0/src/org/apache/roller/pojos/WeblogCategoryData.java?rev=412521&r1=412520&r2=412521&view=diff
==============================================================================
--- incubator/roller/branches/roller_3.0/src/org/apache/roller/pojos/WeblogCategoryData.java (original)
+++ incubator/roller/branches/roller_3.0/src/org/apache/roller/pojos/WeblogCategoryData.java Wed Jun 7 13:19:49 2006
@@ -36,8 +36,7 @@
* @hibernate.class lazy="false" table="weblogcategory"
* @hibernate.cache usage="read-write"
*/
-public class WeblogCategoryData
- extends HierarchicalPersistentObject implements WeblogEntry.WeblogCategory
+public class WeblogCategoryData extends HierarchicalPersistentObject
{
public static final long serialVersionUID = 1435782148712018954L;
Modified: incubator/roller/branches/roller_3.0/src/org/apache/roller/pojos/WeblogEntryData.java
URL: http://svn.apache.org/viewvc/incubator/roller/branches/roller_3.0/src/org/apache/roller/pojos/WeblogEntryData.java?rev=412521&r1=412520&r2=412521&view=diff
==============================================================================
--- incubator/roller/branches/roller_3.0/src/org/apache/roller/pojos/WeblogEntryData.java (original)
+++ incubator/roller/branches/roller_3.0/src/org/apache/roller/pojos/WeblogEntryData.java Wed Jun 7 13:19:49 2006
@@ -54,7 +54,7 @@
* @hibernate.class lazy="false" table="weblogentry"
* @hibernate.cache usage="read-write"
*/
-public class WeblogEntryData extends PersistentObject implements Serializable, WeblogEntry {
+public class WeblogEntryData extends PersistentObject implements Serializable {
private static Log mLogger =
LogFactory.getFactory().getInstance(WeblogEntryData.class);
Modified: incubator/roller/branches/roller_3.0/src/org/apache/roller/pojos/WebsiteData.java
URL: http://svn.apache.org/viewvc/incubator/roller/branches/roller_3.0/src/org/apache/roller/pojos/WebsiteData.java?rev=412521&r1=412520&r2=412521&view=diff
==============================================================================
--- incubator/roller/branches/roller_3.0/src/org/apache/roller/pojos/WebsiteData.java (original)
+++ incubator/roller/branches/roller_3.0/src/org/apache/roller/pojos/WebsiteData.java Wed Jun 7 13:19:49 2006
@@ -18,6 +18,7 @@
package org.apache.roller.pojos;
+import java.io.Serializable;
import java.util.ArrayList;
import java.util.Date;
import java.util.HashMap;
@@ -52,7 +53,7 @@
* @hibernate.cache usage="read-write"
*/
public class WebsiteData extends org.apache.roller.pojos.PersistentObject
- implements WeblogEntry.Website, java.io.Serializable {
+ implements Serializable {
public static final long serialVersionUID = 206437645033737127L;
private static Log mLogger = LogFactory.getLog(WebsiteData.class);
Modified: incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/rendering/velocity/ContextLoader.java
URL: http://svn.apache.org/viewvc/incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/rendering/velocity/ContextLoader.java?rev=412521&r1=412520&r2=412521&view=diff
==============================================================================
--- incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/rendering/velocity/ContextLoader.java (original)
+++ incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/rendering/velocity/ContextLoader.java Wed Jun 7 13:19:49 2006
@@ -215,11 +215,12 @@
Template entryPage = weblog.getPageByName("_entry");
if (entryPage != null) {
ctx.put("entryPage", TemplateWrapper.wrap(entryPage));
- }
- Template descPage = weblog.getPageByName("_desc");
- if (descPage != null) {
- ctx.put("descPage", TemplateWrapper.wrap(descPage));
- }
+ }
+ // TODO: ATLAS: no templates use this, should be safe to remove
+ // Template descPage = weblog.getPageByName("_desc");
+ //if (descPage != null) {
+ //ctx.put("descPage", TemplateWrapper.wrap(descPage));
+ //}
}
boolean commentsEnabled =
Modified: incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/rendering/velocity/PageServlet.java
URL: http://svn.apache.org/viewvc/incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/rendering/velocity/PageServlet.java?rev=412521&r1=412520&r2=412521&view=diff
==============================================================================
--- incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/rendering/velocity/PageServlet.java (original)
+++ incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/rendering/velocity/PageServlet.java Wed Jun 7 13:19:49 2006
@@ -60,8 +60,7 @@
public class PageServlet extends VelocityServlet {
private static Log mLogger = LogFactory.getLog(PageServlet.class);
-
-
+
/**
* Sets servletContext for WebappResourceLoader.
*/