svn commit: r414684 - in /incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/rendering: model/ velocity/ velocity/deprecated/

[ag...@apache.org]

Author: agilliland
Date: Thu Jun 15 14:24:00 2006
New Revision: 414684

URL: http://svn.apache.org/viewvc?rev=414684&view=rev
Log:
renaming deprecated weblog page model to OldWeblogPageModel, just to make it totally obvious that it's the old and deprecated version.


Added:
    incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/rendering/velocity/deprecated/OldWeblogPageModel.java
      - copied, changed from r414682, incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/rendering/velocity/deprecated/WeblogPageModel.java
Removed:
    incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/rendering/velocity/deprecated/WeblogPageModel.java
Modified:
    incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/rendering/model/SitePageModel.java
    incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/rendering/velocity/FlavorServlet.java
    incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/rendering/velocity/deprecated/PageHelper.java

Modified: incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/rendering/model/SitePageModel.java
URL: http://svn.apache.org/viewvc/incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/rendering/model/SitePageModel.java?rev=414684&r1=414683&r2=414684&view=diff
==============================================================================
--- incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/rendering/model/SitePageModel.java (original)
+++ incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/rendering/model/SitePageModel.java Thu Jun 15 14:24:00 2006
@@ -41,7 +41,7 @@
 import org.apache.roller.pojos.wrapper.UserDataWrapper;
 import org.apache.roller.pojos.wrapper.WeblogEntryDataWrapper;
 import org.apache.roller.pojos.wrapper.WebsiteDataWrapper;
-import org.apache.roller.ui.rendering.velocity.deprecated.WeblogPageModel;
+import org.apache.roller.ui.rendering.velocity.deprecated.OldWeblogPageModel;
 
 /**
  * Page model that provides access to site-wide users, weblogs and entries for
@@ -187,9 +187,9 @@
      */
     public List getWeblogEntries(String handle, String userName, String cat, int sinceDays, int offset, int length) {
         List results = new ArrayList();
-        if (handle.equals(WeblogPageModel.VELOCITY_NULL)) handle = null;
-        if (userName.equals(WeblogPageModel.VELOCITY_NULL)) userName = null;
-        if (cat.equals(WeblogPageModel.VELOCITY_NULL)) cat = null;
+        if (handle.equals(OldWeblogPageModel.VELOCITY_NULL)) handle = null;
+        if (userName.equals(OldWeblogPageModel.VELOCITY_NULL)) userName = null;
+        if (cat.equals(OldWeblogPageModel.VELOCITY_NULL)) cat = null;
         Calendar cal = Calendar.getInstance();
         cal.setTime(new Date());
         cal.add(Calendar.DATE, -1 * sinceDays);

Modified: incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/rendering/velocity/FlavorServlet.java
URL: http://svn.apache.org/viewvc/incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/rendering/velocity/FlavorServlet.java?rev=414684&r1=414683&r2=414684&view=diff
==============================================================================
--- incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/rendering/velocity/FlavorServlet.java (original)
+++ incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/rendering/velocity/FlavorServlet.java Thu Jun 15 14:24:00 2006
@@ -21,7 +21,7 @@
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.apache.roller.ui.rendering.velocity.deprecated.ContextLoader;
-import org.apache.roller.ui.rendering.velocity.deprecated.WeblogPageModel;
+import org.apache.roller.ui.rendering.velocity.deprecated.OldWeblogPageModel;
 import org.apache.velocity.Template;
 import org.apache.velocity.context.Context;
 import org.apache.velocity.servlet.VelocityServlet;
@@ -127,7 +127,7 @@
             }
                 
             String useTemplate;
-            WeblogPageModel pageModel = (WeblogPageModel)ctx.get("pageModel");
+            OldWeblogPageModel pageModel = (OldWeblogPageModel)ctx.get("pageModel");
             if (request.getServletPath().endsWith("rss")) {
                 if (pageModel.getPageByName("_rss") != null)
                     // If the request specified the "/rss" mapping and the

Copied: incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/rendering/velocity/deprecated/OldWeblogPageModel.java (from r414682, incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/rendering/velocity/deprecated/WeblogPageModel.java)
URL: http://svn.apache.org/viewvc/incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/rendering/velocity/deprecated/OldWeblogPageModel.java?p2=incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/rendering/velocity/deprecated/OldWeblogPageModel.java&p1=incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/rendering/velocity/deprecated/WeblogPageModel.java&r1=414682&r2=414684&rev=414684&view=diff
==============================================================================
--- incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/rendering/velocity/deprecated/WeblogPageModel.java (original)
+++ incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/rendering/velocity/deprecated/OldWeblogPageModel.java Thu Jun 15 14:24:00 2006
@@ -62,11 +62,11 @@
 /**
  * Provides Roller page templates with access to Roller domain model objects.
  */
-public class WeblogPageModel implements PageModel {
+public class OldWeblogPageModel implements PageModel {
     public final static String VELOCITY_NULL = "nil";
     
     protected static Log mLogger =
-            LogFactory.getFactory().getInstance(WeblogPageModel.class);
+            LogFactory.getFactory().getInstance(OldWeblogPageModel.class);
     
     private BookmarkManager      mBookmarkMgr = null;
     private WeblogManager        mWeblogMgr = null;
@@ -86,7 +86,7 @@
     //------------------------------------------------------------------------
     
     /** init() must be called to complete construction */
-    public WeblogPageModel() {}
+    public OldWeblogPageModel() {}
     
     public String getModelName() {
         return "pageModel";

Modified: incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/rendering/velocity/deprecated/PageHelper.java
URL: http://svn.apache.org/viewvc/incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/rendering/velocity/deprecated/PageHelper.java?rev=414684&r1=414683&r2=414684&view=diff
==============================================================================
--- incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/rendering/velocity/deprecated/PageHelper.java (original)
+++ incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/rendering/velocity/deprecated/PageHelper.java Thu Jun 15 14:24:00 2006
@@ -301,7 +301,7 @@
      */
     public String showWeblogCalendar( boolean big, String cat )
     {
-        if (WeblogPageModel.VELOCITY_NULL.equals(cat)) cat = null;
+        if (OldWeblogPageModel.VELOCITY_NULL.equals(cat)) cat = null;
         String ret = null;
         try
         {