You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@roller.apache.org by ag...@apache.org on 2006/07/18 03:15:32 UTC

svn commit: r422937 - /incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/rendering/velocity/deprecated/ContextLoader.java

Author: agilliland
Date: Mon Jul 17 18:15:31 2006
New Revision: 422937

URL: http://svn.apache.org/viewvc?rev=422937&view=rev
Log:
need to reconcile what to do with old configs that used PlanetPageModel.  until that's decided we need to force the use of the standard, old page model.


Modified:
    incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/rendering/velocity/deprecated/ContextLoader.java

Modified: incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/rendering/velocity/deprecated/ContextLoader.java
URL: http://svn.apache.org/viewvc/incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/rendering/velocity/deprecated/ContextLoader.java?rev=422937&r1=422936&r2=422937&view=diff
==============================================================================
--- incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/rendering/velocity/deprecated/ContextLoader.java (original)
+++ incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/rendering/velocity/deprecated/ContextLoader.java Mon Jul 17 18:15:31 2006
@@ -180,10 +180,11 @@
         try {
             // Add default page model object to context
             // TODO 3.0: what to do about old PlanetPageModel?
-            String pageModelClassName =
-                    RollerConfig.getProperty("velocity.pagemodel.classname");
-            Class pageModelClass = Class.forName(pageModelClassName);
-            OldWeblogPageModel pageModel = (OldWeblogPageModel)pageModelClass.newInstance();
+            //String pageModelClassName =
+            //        RollerConfig.getProperty("velocity.pagemodel.classname");
+            //Class pageModelClass = Class.forName(pageModelClassName);
+            //OldWeblogPageModel pageModel = (OldWeblogPageModel)pageModelClass.newInstance();
+            OldWeblogPageModel pageModel = new OldWeblogPageModel();
             pageModel.init(request,
                     weblog,
                     entry,