roller-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From agillil...@apache.org
Subject svn commit: r414403 - in /incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/rendering: model/ velocity/
Date Wed, 14 Jun 2006 22:39:23 GMT
Author: agilliland
Date: Wed Jun 14 15:39:22 2006
New Revision: 414403

URL: http://svn.apache.org/viewvc?rev=414403&view=rev
Log:
move PageModel classes into their own package under ui.rendering.model.  again, these classes
are no longer velocity specific, so this makes more sense.


Added:
    incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/rendering/model/
    incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/rendering/model/PageModel.java
      - copied, changed from r413926, incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/rendering/velocity/PageModel.java
    incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/rendering/model/PlanetPageModel.java
      - copied, changed from r413926, incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/rendering/velocity/PlanetPageModel.java
    incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/rendering/model/SitePageModel.java
      - copied, changed from r413926, incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/rendering/velocity/SitePageModel.java
    incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/rendering/model/WeblogPageModel.java
      - copied, changed from r413926, incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/rendering/velocity/WeblogPageModel.java
Removed:
    incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/rendering/velocity/PageModel.java
    incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/rendering/velocity/PlanetPageModel.java
    incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/rendering/velocity/SitePageModel.java
    incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/rendering/velocity/WeblogPageModel.java
Modified:
    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/FlavorServlet.java
    incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/rendering/velocity/PageHelper.java

Copied: incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/rendering/model/PageModel.java
(from r413926, incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/rendering/velocity/PageModel.java)
URL: http://svn.apache.org/viewvc/incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/rendering/model/PageModel.java?p2=incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/rendering/model/PageModel.java&p1=incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/rendering/velocity/PageModel.java&r1=413926&r2=414403&rev=414403&view=diff
==============================================================================
--- incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/rendering/velocity/PageModel.java
(original)
+++ incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/rendering/model/PageModel.java
Wed Jun 14 15:39:22 2006
@@ -15,7 +15,7 @@
 * copyright in this work, please see the NOTICE file in the top level
 * directory of this distribution.
 */
-package org.apache.roller.ui.rendering.velocity;
+package org.apache.roller.ui.rendering.model;
 
 import javax.servlet.http.HttpServletRequest;
 

Copied: incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/rendering/model/PlanetPageModel.java
(from r413926, incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/rendering/velocity/PlanetPageModel.java)
URL: http://svn.apache.org/viewvc/incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/rendering/model/PlanetPageModel.java?p2=incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/rendering/model/PlanetPageModel.java&p1=incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/rendering/velocity/PlanetPageModel.java&r1=413926&r2=414403&rev=414403&view=diff
==============================================================================
--- incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/rendering/velocity/PlanetPageModel.java
(original)
+++ incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/rendering/model/PlanetPageModel.java
Wed Jun 14 15:39:22 2006
@@ -15,7 +15,7 @@
  * copyright in this work, please see the NOTICE file in the top level
  * directory of this distribution.
  */
-package org.apache.roller.ui.rendering.velocity;
+package org.apache.roller.ui.rendering.model;
 
 import java.util.ArrayList;
 import java.util.Calendar;

Copied: incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/rendering/model/SitePageModel.java
(from r413926, incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/rendering/velocity/SitePageModel.java)
URL: http://svn.apache.org/viewvc/incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/rendering/model/SitePageModel.java?p2=incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/rendering/model/SitePageModel.java&p1=incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/rendering/velocity/SitePageModel.java&r1=413926&r2=414403&rev=414403&view=diff
==============================================================================
--- incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/rendering/velocity/SitePageModel.java
(original)
+++ incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/rendering/model/SitePageModel.java
Wed Jun 14 15:39:22 2006
@@ -15,7 +15,7 @@
  * copyright in this work, please see the NOTICE file in the top level
  * directory of this distribution.
  */
-package org.apache.roller.ui.rendering.velocity;
+package org.apache.roller.ui.rendering.model;
 
 import java.util.ArrayList;
 import java.util.Calendar;

Copied: incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/rendering/model/WeblogPageModel.java
(from r413926, incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/rendering/velocity/WeblogPageModel.java)
URL: http://svn.apache.org/viewvc/incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/rendering/model/WeblogPageModel.java?p2=incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/rendering/model/WeblogPageModel.java&p1=incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/rendering/velocity/WeblogPageModel.java&r1=413926&r2=414403&rev=414403&view=diff
==============================================================================
--- incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/rendering/velocity/WeblogPageModel.java
(original)
+++ incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/rendering/model/WeblogPageModel.java
Wed Jun 14 15:39:22 2006
@@ -15,7 +15,7 @@
 * copyright in this work, please see the NOTICE file in the top level
 * directory of this distribution.
 */
-package org.apache.roller.ui.rendering.velocity;
+package org.apache.roller.ui.rendering.model;
 
 import java.util.ArrayList;
 import java.util.Calendar;

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=414403&r1=414402&r2=414403&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 14 15:39:22 2006
@@ -31,6 +31,9 @@
 import javax.servlet.http.HttpSession;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
+import org.apache.roller.ui.rendering.model.PageModel;
+import org.apache.roller.ui.rendering.model.PlanetPageModel;
+import org.apache.roller.ui.rendering.model.SitePageModel;
 import org.apache.struts.util.RequestUtils;
 import org.apache.velocity.tools.view.context.ChainedContext;
 import org.apache.velocity.tools.view.context.ToolboxContext;

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=414403&r1=414402&r2=414403&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
Wed Jun 14 15:39:22 2006
@@ -20,6 +20,7 @@
 import org.apache.commons.lang.StringUtils;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
+import org.apache.roller.ui.rendering.model.WeblogPageModel;
 import org.apache.velocity.Template;
 import org.apache.velocity.context.Context;
 import org.apache.velocity.servlet.VelocityServlet;

Modified: incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/rendering/velocity/PageHelper.java
URL: http://svn.apache.org/viewvc/incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/rendering/velocity/PageHelper.java?rev=414403&r1=414402&r2=414403&view=diff
==============================================================================
--- incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/rendering/velocity/PageHelper.java
(original)
+++ incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/rendering/velocity/PageHelper.java
Wed Jun 14 15:39:22 2006
@@ -31,6 +31,7 @@
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
+import org.apache.roller.ui.rendering.model.WeblogPageModel;
 import org.apache.struts.Globals;
 import org.apache.struts.util.RequestUtils;
 import org.apache.roller.RollerException;



Mime
View raw message