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 2007/05/29 23:22:27 UTC

svn commit: r542656 [4/6] - in /roller/trunk: ./ src/META-INF/ src/org/apache/roller/business/ src/org/apache/roller/business/hibernate/ src/org/apache/roller/business/jpa/ src/org/apache/roller/business/pings/ src/org/apache/roller/business/referrers/...

Modified: roller/trunk/src/org/apache/roller/ui/core/util/menu/MenuHelper.java
URL: http://svn.apache.org/viewvc/roller/trunk/src/org/apache/roller/ui/core/util/menu/MenuHelper.java?view=diff&rev=542656&r1=542655&r2=542656
==============================================================================
--- roller/trunk/src/org/apache/roller/ui/core/util/menu/MenuHelper.java (original)
+++ roller/trunk/src/org/apache/roller/ui/core/util/menu/MenuHelper.java Tue May 29 14:22:19 2007
@@ -26,9 +26,9 @@
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.apache.roller.config.RollerConfig;
-import org.apache.roller.pojos.PermissionsData;
+import org.apache.roller.pojos.WeblogPermission;
 import org.apache.roller.pojos.UserData;
-import org.apache.roller.pojos.WebsiteData;
+import org.apache.roller.pojos.Weblog;
 import org.jdom.Document;
 import org.jdom.Element;
 import org.jdom.JDOMException;
@@ -62,7 +62,7 @@
     
     
     public static Menu getMenu(String menuId, String currentAction,
-                               UserData user, WebsiteData weblog) {
+                               UserData user, Weblog weblog) {
         
         if(menuId == null) {
             return null;
@@ -81,7 +81,7 @@
     
     
     private static Menu buildMenu(ParsedMenu menuConfig, String currentAction, 
-                                  UserData user, WebsiteData weblog) {
+                                  UserData user, Weblog weblog) {
         
         log.debug("creating menu for action - "+currentAction);
         
@@ -188,18 +188,18 @@
     }
     
     
-    private static boolean isPermitted(String perm, UserData user, WebsiteData weblog) {
+    private static boolean isPermitted(String perm, UserData user, Weblog weblog) {
         
         // convert permissions string to short
         short permMask = -1;
         if(perm == null) {
             return true;
         } else if("limited".equals(perm)) {
-            permMask = PermissionsData.LIMITED;
+            permMask = WeblogPermission.LIMITED;
         } else if("author".equals(perm)) {
-            permMask = PermissionsData.AUTHOR;
+            permMask = WeblogPermission.AUTHOR;
         } else if("admin".equals(perm)) {
-            permMask = PermissionsData.ADMIN;
+            permMask = WeblogPermission.ADMIN;
         } else {
             // unknown perm
             return false;

Modified: roller/trunk/src/org/apache/roller/ui/rendering/WeblogRequestMapper.java
URL: http://svn.apache.org/viewvc/roller/trunk/src/org/apache/roller/ui/rendering/WeblogRequestMapper.java?view=diff&rev=542656&r1=542655&r2=542656
==============================================================================
--- roller/trunk/src/org/apache/roller/ui/rendering/WeblogRequestMapper.java (original)
+++ roller/trunk/src/org/apache/roller/ui/rendering/WeblogRequestMapper.java Tue May 29 14:22:19 2007
@@ -32,7 +32,7 @@
 import org.apache.roller.config.RollerConfig;
 import org.apache.roller.business.RollerFactory;
 import org.apache.roller.business.UserManager;
-import org.apache.roller.pojos.WebsiteData;
+import org.apache.roller.pojos.Weblog;
 
 
 /**
@@ -384,7 +384,7 @@
         
         try {
             UserManager mgr = RollerFactory.getRoller().getUserManager();
-            WebsiteData weblog = mgr.getWebsiteByHandle(potentialHandle);
+            Weblog weblog = mgr.getWebsiteByHandle(potentialHandle);
             
             if(weblog != null) {
                 isWeblog = true;

Modified: roller/trunk/src/org/apache/roller/ui/rendering/model/FeedModel.java
URL: http://svn.apache.org/viewvc/roller/trunk/src/org/apache/roller/ui/rendering/model/FeedModel.java?view=diff&rev=542656&r1=542655&r2=542656
==============================================================================
--- roller/trunk/src/org/apache/roller/ui/rendering/model/FeedModel.java (original)
+++ roller/trunk/src/org/apache/roller/ui/rendering/model/FeedModel.java Tue May 29 14:22:19 2007
@@ -33,7 +33,7 @@
 import org.apache.roller.business.WeblogManager;
 import org.apache.roller.pojos.CommentData;
 import org.apache.roller.pojos.WeblogEntryData;
-import org.apache.roller.pojos.WebsiteData;
+import org.apache.roller.pojos.Weblog;
 import org.apache.roller.pojos.wrapper.CommentDataWrapper;
 import org.apache.roller.pojos.wrapper.WeblogEntryDataWrapper;
 import org.apache.roller.pojos.wrapper.WebsiteDataWrapper;
@@ -55,7 +55,7 @@
     private static int DEFAULT_ENTRIES = RollerRuntimeConfig.getIntProperty("site.newsfeeds.defaultEntries");
     
     private WeblogFeedRequest feedRequest = null;
-    private WebsiteData weblog = null;
+    private Weblog weblog = null;
     
     
     public void init(Map initData) throws RollerException {

Modified: roller/trunk/src/org/apache/roller/ui/rendering/model/ModelLoader.java
URL: http://svn.apache.org/viewvc/roller/trunk/src/org/apache/roller/ui/rendering/model/ModelLoader.java?view=diff&rev=542656&r1=542655&r2=542656
==============================================================================
--- roller/trunk/src/org/apache/roller/ui/rendering/model/ModelLoader.java (original)
+++ roller/trunk/src/org/apache/roller/ui/rendering/model/ModelLoader.java Tue May 29 14:22:19 2007
@@ -26,7 +26,7 @@
 import org.apache.commons.logging.LogFactory;
 import org.apache.roller.RollerException;
 import org.apache.roller.config.RollerConfig;
-import org.apache.roller.pojos.WebsiteData;
+import org.apache.roller.pojos.Weblog;
 import org.apache.roller.ui.rendering.util.WeblogPageRequest;
 import org.apache.roller.ui.rendering.velocity.deprecated.ContextLoader;
 import org.apache.roller.util.Utilities;
@@ -62,7 +62,7 @@
      *
      * Does not fail if there is a problem with one of the models.
      */
-    public static void loadCustomModels(WebsiteData weblog, Map model, Map initData) {
+    public static void loadCustomModels(Weblog weblog, Map model, Map initData) {
         
         if (weblog.getPageModels() != null) {
             try {

Modified: roller/trunk/src/org/apache/roller/ui/rendering/model/PageModel.java
URL: http://svn.apache.org/viewvc/roller/trunk/src/org/apache/roller/ui/rendering/model/PageModel.java?view=diff&rev=542656&r1=542655&r2=542656
==============================================================================
--- roller/trunk/src/org/apache/roller/ui/rendering/model/PageModel.java (original)
+++ roller/trunk/src/org/apache/roller/ui/rendering/model/PageModel.java Tue May 29 14:22:19 2007
@@ -28,7 +28,7 @@
 import org.apache.roller.business.Roller;
 import org.apache.roller.business.RollerFactory;
 import org.apache.roller.business.WeblogManager;
-import org.apache.roller.pojos.WebsiteData;
+import org.apache.roller.pojos.Weblog;
 import org.apache.roller.pojos.wrapper.TemplateWrapper;
 import org.apache.roller.pojos.wrapper.WeblogCategoryDataWrapper;
 import org.apache.roller.pojos.wrapper.WeblogEntryDataWrapper;
@@ -53,7 +53,7 @@
     private WeblogPageRequest pageRequest = null;
     private WeblogEntryCommentForm commentForm = null;
     private Map requestParameters = null;
-    private WebsiteData weblog = null;
+    private Weblog weblog = null;
     
     
     /** 

Modified: roller/trunk/src/org/apache/roller/ui/rendering/model/PlanetModel.java
URL: http://svn.apache.org/viewvc/roller/trunk/src/org/apache/roller/ui/rendering/model/PlanetModel.java?view=diff&rev=542656&r1=542655&r2=542656
==============================================================================
--- roller/trunk/src/org/apache/roller/ui/rendering/model/PlanetModel.java (original)
+++ roller/trunk/src/org/apache/roller/ui/rendering/model/PlanetModel.java Tue May 29 14:22:19 2007
@@ -31,7 +31,7 @@
 import org.apache.roller.planet.pojos.PlanetGroupData;
 import org.apache.roller.planet.pojos.PlanetSubscriptionData;
 import org.apache.roller.pojos.ThemeTemplate;
-import org.apache.roller.pojos.WebsiteData;
+import org.apache.roller.pojos.Weblog;
 import org.apache.roller.ui.rendering.pagers.Pager;
 import org.apache.roller.ui.rendering.pagers.PlanetEntriesPager;
 import org.apache.roller.ui.rendering.util.WeblogPageRequest;
@@ -49,7 +49,7 @@
     private WeblogRequest  weblogRequest = null;
     private String pageLink = null;
     private int            pageNum = 0;
-    private WebsiteData    weblog = null;
+    private Weblog    weblog = null;
     
     
     public String getModelName() {

Modified: roller/trunk/src/org/apache/roller/ui/rendering/model/PreviewURLModel.java
URL: http://svn.apache.org/viewvc/roller/trunk/src/org/apache/roller/ui/rendering/model/PreviewURLModel.java?view=diff&rev=542656&r1=542655&r2=542656
==============================================================================
--- roller/trunk/src/org/apache/roller/ui/rendering/model/PreviewURLModel.java (original)
+++ roller/trunk/src/org/apache/roller/ui/rendering/model/PreviewURLModel.java Tue May 29 14:22:19 2007
@@ -20,7 +20,7 @@
 
 import java.util.Map;
 import org.apache.roller.RollerException;
-import org.apache.roller.pojos.WebsiteData;
+import org.apache.roller.pojos.Weblog;
 import org.apache.roller.ui.rendering.util.WeblogPreviewRequest;
 import org.apache.roller.ui.rendering.util.WeblogRequest;
 import org.apache.roller.util.URLUtilities;
@@ -33,7 +33,7 @@
 public class PreviewURLModel extends URLModel {
     
     private WeblogPreviewRequest previewRequest = null;
-    private WebsiteData weblog = null;
+    private Weblog weblog = null;
     private String locale = null;
     
     

Modified: roller/trunk/src/org/apache/roller/ui/rendering/model/SearchResultsFeedModel.java
URL: http://svn.apache.org/viewvc/roller/trunk/src/org/apache/roller/ui/rendering/model/SearchResultsFeedModel.java?view=diff&rev=542656&r1=542655&r2=542656
==============================================================================
--- roller/trunk/src/org/apache/roller/ui/rendering/model/SearchResultsFeedModel.java (original)
+++ roller/trunk/src/org/apache/roller/ui/rendering/model/SearchResultsFeedModel.java Tue May 29 14:22:19 2007
@@ -41,7 +41,7 @@
 import org.apache.roller.business.search.operations.SearchOperation;
 import org.apache.roller.config.RollerRuntimeConfig;
 import org.apache.roller.pojos.WeblogEntryData;
-import org.apache.roller.pojos.WebsiteData;
+import org.apache.roller.pojos.Weblog;
 import org.apache.roller.pojos.wrapper.WeblogCategoryDataWrapper;
 import org.apache.roller.pojos.wrapper.WeblogEntryDataWrapper;
 import org.apache.roller.pojos.wrapper.WebsiteDataWrapper;
@@ -63,7 +63,7 @@
     
     private WeblogFeedRequest feedRequest = null;
 
-    private WebsiteData weblog = null;
+    private Weblog weblog = null;
         
     // the pager used by the 3.0+ rendering system
     private SearchResultsFeedPager pager = null;

Modified: roller/trunk/src/org/apache/roller/ui/rendering/model/SiteModel.java
URL: http://svn.apache.org/viewvc/roller/trunk/src/org/apache/roller/ui/rendering/model/SiteModel.java?view=diff&rev=542656&r1=542655&r2=542656
==============================================================================
--- roller/trunk/src/org/apache/roller/ui/rendering/model/SiteModel.java (original)
+++ roller/trunk/src/org/apache/roller/ui/rendering/model/SiteModel.java Tue May 29 14:22:19 2007
@@ -34,12 +34,12 @@
 import org.apache.roller.business.UserManager;
 import org.apache.roller.business.WeblogManager;
 import org.apache.roller.pojos.HitCountData;
-import org.apache.roller.pojos.PermissionsData;
+import org.apache.roller.pojos.WeblogPermission;
 import org.apache.roller.pojos.StatCount;
 import org.apache.roller.pojos.ThemeTemplate;
 import org.apache.roller.pojos.UserData;
 import org.apache.roller.pojos.WeblogEntryData;
-import org.apache.roller.pojos.WebsiteData;
+import org.apache.roller.pojos.Weblog;
 import org.apache.roller.pojos.wrapper.UserDataWrapper;
 import org.apache.roller.pojos.wrapper.WeblogEntryDataWrapper;
 import org.apache.roller.pojos.wrapper.WebsiteDataWrapper;
@@ -61,7 +61,7 @@
     
     private static Log log = LogFactory.getLog(SiteModel.class);   
     
-    private WebsiteData weblog = null;
+    private Weblog weblog = null;
     private WeblogRequest weblogRequest = null;
     private WeblogFeedRequest feedRequest = null;
     private List tags = new ArrayList();
@@ -135,7 +135,7 @@
      * @param sinceDays   Limit to past X days in past (or -1 for no limit)
      * @param length      Max number of results to return
      */   
-    public Pager getWeblogEntriesPager(WebsiteData queryWeblog, int sinceDays, int length) {
+    public Pager getWeblogEntriesPager(Weblog queryWeblog, int sinceDays, int length) {
         return getWeblogEntriesPager(queryWeblog, null, null, sinceDays, length);
     }
 
@@ -147,7 +147,7 @@
      * @param sinceDays   Limit to past X days in past (or -1 for no limit)
      * @param length      Max number of results to return
      */   
-    public Pager getWeblogEntriesPager(WebsiteData queryWeblog, UserData user, int sinceDays, int length) {
+    public Pager getWeblogEntriesPager(Weblog queryWeblog, UserData user, int sinceDays, int length) {
         return getWeblogEntriesPager(queryWeblog, user, null, sinceDays, length);
     }
 
@@ -160,7 +160,7 @@
      * @param sinceDays   Limit to past X days in past (or -1 for no limit)
      * @param length      Max number of results to return
      */   
-    public Pager getWeblogEntriesPager(WebsiteData queryWeblog, UserData user, String cat, int sinceDays, int length) {
+    public Pager getWeblogEntriesPager(Weblog queryWeblog, UserData user, String cat, int sinceDays, int length) {
         
         String pagerUrl = null;
         if (feedRequest != null) {
@@ -310,7 +310,7 @@
             UserData user = umgr.getUserByUserName(userName);
             List perms = umgr.getAllPermissions(user);
             for (Iterator it = perms.iterator(); it.hasNext();) {
-                PermissionsData perm = (PermissionsData) it.next();
+                WeblogPermission perm = (WeblogPermission) it.next();
                 results.add(WebsiteDataWrapper.wrap(perm.getWebsite()));
             }
         } catch (Exception e) {
@@ -328,10 +328,10 @@
         try {            
             Roller roller = RollerFactory.getRoller();
             UserManager umgr = roller.getUserManager();
-            WebsiteData website = umgr.getWebsiteByHandle(handle);
+            Weblog website = umgr.getWebsiteByHandle(handle);
             List perms = umgr.getAllPermissions(website);
             for (Iterator it = perms.iterator(); it.hasNext();) {
-                PermissionsData perm = (PermissionsData) it.next();
+                WeblogPermission perm = (WeblogPermission) it.next();
                 results.add(UserDataWrapper.wrap(perm.getUser()));
             }
         } catch (Exception e) {
@@ -363,7 +363,7 @@
         try {            
             Roller roller = RollerFactory.getRoller();
             UserManager umgr = roller.getUserManager();
-            WebsiteData website = umgr.getWebsiteByHandle(handle);
+            Weblog website = umgr.getWebsiteByHandle(handle);
             wrappedWebsite = WebsiteDataWrapper.wrap(website);
         } catch (Exception e) {
             log.error("ERROR: fetching users by letter", e);
@@ -392,7 +392,7 @@
             List weblogs = umgr.getWebsites(
                 null, Boolean.TRUE, Boolean.TRUE, startDate, null, 0, length);
             for (Iterator it = weblogs.iterator(); it.hasNext();) {
-                WebsiteData website = (WebsiteData) it.next();
+                Weblog website = (Weblog) it.next();
                 results.add(WebsiteDataWrapper.wrap(website));
             }
         } catch (Exception e) {

Modified: roller/trunk/src/org/apache/roller/ui/rendering/model/URLModel.java
URL: http://svn.apache.org/viewvc/roller/trunk/src/org/apache/roller/ui/rendering/model/URLModel.java?view=diff&rev=542656&r1=542655&r2=542656
==============================================================================
--- roller/trunk/src/org/apache/roller/ui/rendering/model/URLModel.java (original)
+++ roller/trunk/src/org/apache/roller/ui/rendering/model/URLModel.java Tue May 29 14:22:19 2007
@@ -29,7 +29,7 @@
 import org.apache.roller.business.WeblogManager;
 import org.apache.roller.config.RollerRuntimeConfig;
 import org.apache.roller.pojos.WeblogEntryData;
-import org.apache.roller.pojos.WebsiteData;
+import org.apache.roller.pojos.Weblog;
 import org.apache.roller.ui.rendering.util.WeblogRequest;
 import org.apache.roller.util.URLUtilities;
 
@@ -50,7 +50,7 @@
     
     private static Log log = LogFactory.getLog(URLModel.class);
     
-    private WebsiteData weblog = null;
+    private Weblog weblog = null;
     private String locale = null;
     
     /** TODO: remove dependency on pageContext */

Modified: roller/trunk/src/org/apache/roller/ui/rendering/pagers/AbstractWeblogEntriesPager.java
URL: http://svn.apache.org/viewvc/roller/trunk/src/org/apache/roller/ui/rendering/pagers/AbstractWeblogEntriesPager.java?view=diff&rev=542656&r1=542655&r2=542656
==============================================================================
--- roller/trunk/src/org/apache/roller/ui/rendering/pagers/AbstractWeblogEntriesPager.java (original)
+++ roller/trunk/src/org/apache/roller/ui/rendering/pagers/AbstractWeblogEntriesPager.java Tue May 29 14:22:19 2007
@@ -29,7 +29,7 @@
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.apache.roller.config.RollerRuntimeConfig;
-import org.apache.roller.pojos.WebsiteData;
+import org.apache.roller.pojos.Weblog;
 import org.apache.roller.util.DateUtil;
 import org.apache.roller.util.I18nMessages;
 import org.apache.roller.util.URLUtilities;
@@ -49,7 +49,7 @@
     // message utils for doing i18n messages
     I18nMessages messageUtils = null;
     
-    WebsiteData weblog = null;
+    Weblog weblog = null;
     String locale = null;
     String pageLink = null;
     String entryAnchor = null;
@@ -62,7 +62,7 @@
     
     
     public AbstractWeblogEntriesPager(
-            WebsiteData        weblog,
+            Weblog        weblog,
             String             locale,
             String             pageLink,
             String             entryAnchor,
@@ -226,7 +226,7 @@
     protected String createURL(
             int                page,
             int                pageAdd,
-            WebsiteData        website,
+            Weblog        website,
             String             locale,
             String             pageLink,
             String             entryAnchor,

Modified: roller/trunk/src/org/apache/roller/ui/rendering/pagers/CommentsPager.java
URL: http://svn.apache.org/viewvc/roller/trunk/src/org/apache/roller/ui/rendering/pagers/CommentsPager.java?view=diff&rev=542656&r1=542655&r2=542656
==============================================================================
--- roller/trunk/src/org/apache/roller/ui/rendering/pagers/CommentsPager.java (original)
+++ roller/trunk/src/org/apache/roller/ui/rendering/pagers/CommentsPager.java Tue May 29 14:22:19 2007
@@ -29,7 +29,7 @@
 import org.apache.roller.business.RollerFactory;
 import org.apache.roller.business.WeblogManager;
 import org.apache.roller.pojos.CommentData;
-import org.apache.roller.pojos.WebsiteData;
+import org.apache.roller.pojos.Weblog;
 import org.apache.roller.pojos.wrapper.CommentDataWrapper;
 
 

Modified: roller/trunk/src/org/apache/roller/ui/rendering/pagers/SearchResultsFeedPager.java
URL: http://svn.apache.org/viewvc/roller/trunk/src/org/apache/roller/ui/rendering/pagers/SearchResultsFeedPager.java?view=diff&rev=542656&r1=542655&r2=542656
==============================================================================
--- roller/trunk/src/org/apache/roller/ui/rendering/pagers/SearchResultsFeedPager.java (original)
+++ roller/trunk/src/org/apache/roller/ui/rendering/pagers/SearchResultsFeedPager.java Tue May 29 14:22:19 2007
@@ -22,7 +22,7 @@
 import java.util.List;
 import java.util.Locale;
 import java.util.Map;
-import org.apache.roller.pojos.WebsiteData;
+import org.apache.roller.pojos.Weblog;
 import org.apache.roller.ui.rendering.util.WeblogFeedRequest;
 import org.apache.roller.util.I18nMessages;
 import org.apache.roller.util.URLUtilities;
@@ -38,7 +38,7 @@
     
     private List entries = null;
     
-    private WebsiteData weblog = null;
+    private Weblog weblog = null;
     private boolean     moreResults = false;
     
     private WeblogFeedRequest feedRequest = null;

Modified: roller/trunk/src/org/apache/roller/ui/rendering/pagers/SearchResultsPager.java
URL: http://svn.apache.org/viewvc/roller/trunk/src/org/apache/roller/ui/rendering/pagers/SearchResultsPager.java?view=diff&rev=542656&r1=542655&r2=542656
==============================================================================
--- roller/trunk/src/org/apache/roller/ui/rendering/pagers/SearchResultsPager.java (original)
+++ roller/trunk/src/org/apache/roller/ui/rendering/pagers/SearchResultsPager.java Tue May 29 14:22:19 2007
@@ -20,7 +20,7 @@
 
 import java.util.Locale;
 import java.util.Map;
-import org.apache.roller.pojos.WebsiteData;
+import org.apache.roller.pojos.Weblog;
 import org.apache.roller.ui.rendering.util.WeblogSearchRequest;
 import org.apache.roller.util.I18nMessages;
 import org.apache.roller.util.URLUtilities;
@@ -36,7 +36,7 @@
     
     private Map entries = null;
     
-    private WebsiteData weblog = null;
+    private Weblog weblog = null;
     private String      locale = null;
     private String      query = null;
     private String      category = null;

Modified: roller/trunk/src/org/apache/roller/ui/rendering/pagers/WeblogEntriesDayPager.java
URL: http://svn.apache.org/viewvc/roller/trunk/src/org/apache/roller/ui/rendering/pagers/WeblogEntriesDayPager.java?view=diff&rev=542656&r1=542655&r2=542656
==============================================================================
--- roller/trunk/src/org/apache/roller/ui/rendering/pagers/WeblogEntriesDayPager.java (original)
+++ roller/trunk/src/org/apache/roller/ui/rendering/pagers/WeblogEntriesDayPager.java Tue May 29 14:22:19 2007
@@ -33,7 +33,7 @@
 import org.apache.roller.business.RollerFactory;
 import org.apache.roller.business.WeblogManager;
 import org.apache.roller.pojos.WeblogEntryData;
-import org.apache.roller.pojos.WebsiteData;
+import org.apache.roller.pojos.Weblog;
 import org.apache.roller.pojos.wrapper.WeblogEntryDataWrapper;
 import org.apache.roller.util.DateUtil;
 import org.apache.roller.util.I18nMessages;
@@ -60,7 +60,7 @@
     
     
     public WeblogEntriesDayPager(
-            WebsiteData        weblog,
+            Weblog        weblog,
             String             locale,
             String             pageLink,
             String             entryAnchor,

Modified: roller/trunk/src/org/apache/roller/ui/rendering/pagers/WeblogEntriesLatestPager.java
URL: http://svn.apache.org/viewvc/roller/trunk/src/org/apache/roller/ui/rendering/pagers/WeblogEntriesLatestPager.java?view=diff&rev=542656&r1=542655&r2=542656
==============================================================================
--- roller/trunk/src/org/apache/roller/ui/rendering/pagers/WeblogEntriesLatestPager.java (original)
+++ roller/trunk/src/org/apache/roller/ui/rendering/pagers/WeblogEntriesLatestPager.java Tue May 29 14:22:19 2007
@@ -33,7 +33,7 @@
 import org.apache.roller.pojos.WeblogCategoryData;
 import org.apache.roller.pojos.WeblogEntryData;
 import org.apache.roller.pojos.WeblogTemplate;
-import org.apache.roller.pojos.WebsiteData;
+import org.apache.roller.pojos.Weblog;
 import org.apache.roller.pojos.wrapper.WeblogEntryDataWrapper;
 
 
@@ -52,7 +52,7 @@
     
     
     public WeblogEntriesLatestPager(
-            WebsiteData        weblog,
+            Weblog        weblog,
             String             locale,
             String             pageLink,
             String             entryAnchor,

Modified: roller/trunk/src/org/apache/roller/ui/rendering/pagers/WeblogEntriesListPager.java
URL: http://svn.apache.org/viewvc/roller/trunk/src/org/apache/roller/ui/rendering/pagers/WeblogEntriesListPager.java?view=diff&rev=542656&r1=542655&r2=542656
==============================================================================
--- roller/trunk/src/org/apache/roller/ui/rendering/pagers/WeblogEntriesListPager.java (original)
+++ roller/trunk/src/org/apache/roller/ui/rendering/pagers/WeblogEntriesListPager.java Tue May 29 14:22:19 2007
@@ -31,7 +31,7 @@
 import org.apache.roller.business.WeblogManager;
 import org.apache.roller.pojos.UserData;
 import org.apache.roller.pojos.WeblogEntryData;
-import org.apache.roller.pojos.WebsiteData;
+import org.apache.roller.pojos.Weblog;
 import org.apache.roller.pojos.wrapper.WeblogEntryDataWrapper;
 
 
@@ -46,7 +46,7 @@
     private int sinceDays = -1;
     private int length = 0;
     
-    private WebsiteData queryWeblog = null;
+    private Weblog queryWeblog = null;
     private UserData queryUser = null;
     private String queryCat = null;
     private List queryTags = null;
@@ -60,7 +60,7 @@
     
     public WeblogEntriesListPager(
             String         baseUrl,
-            WebsiteData    queryWeblog,
+            Weblog    queryWeblog,
             UserData       queryUser,
             String         queryCat,
             List           queryTags,

Modified: roller/trunk/src/org/apache/roller/ui/rendering/pagers/WeblogEntriesMonthPager.java
URL: http://svn.apache.org/viewvc/roller/trunk/src/org/apache/roller/ui/rendering/pagers/WeblogEntriesMonthPager.java?view=diff&rev=542656&r1=542655&r2=542656
==============================================================================
--- roller/trunk/src/org/apache/roller/ui/rendering/pagers/WeblogEntriesMonthPager.java (original)
+++ roller/trunk/src/org/apache/roller/ui/rendering/pagers/WeblogEntriesMonthPager.java Tue May 29 14:22:19 2007
@@ -31,7 +31,7 @@
 import org.apache.commons.logging.LogFactory;
 import org.apache.roller.business.RollerFactory;
 import org.apache.roller.pojos.WeblogEntryData;
-import org.apache.roller.pojos.WebsiteData;
+import org.apache.roller.pojos.Weblog;
 import org.apache.roller.pojos.wrapper.WeblogEntryDataWrapper;
 import org.apache.roller.util.DateUtil;
 import org.apache.roller.util.I18nMessages;
@@ -58,7 +58,7 @@
     
     
     public WeblogEntriesMonthPager(
-            WebsiteData        weblog,
+            Weblog        weblog,
             String             locale,
             String             pageLink,
             String             entryAnchor,

Modified: roller/trunk/src/org/apache/roller/ui/rendering/pagers/WeblogEntriesPermalinkPager.java
URL: http://svn.apache.org/viewvc/roller/trunk/src/org/apache/roller/ui/rendering/pagers/WeblogEntriesPermalinkPager.java?view=diff&rev=542656&r1=542655&r2=542656
==============================================================================
--- roller/trunk/src/org/apache/roller/ui/rendering/pagers/WeblogEntriesPermalinkPager.java (original)
+++ roller/trunk/src/org/apache/roller/ui/rendering/pagers/WeblogEntriesPermalinkPager.java Tue May 29 14:22:19 2007
@@ -31,7 +31,7 @@
 import org.apache.roller.business.RollerFactory;
 import org.apache.roller.business.WeblogManager;
 import org.apache.roller.pojos.WeblogEntryData;
-import org.apache.roller.pojos.WebsiteData;
+import org.apache.roller.pojos.Weblog;
 import org.apache.roller.pojos.wrapper.WeblogEntryDataWrapper;
 import org.apache.roller.util.I18nMessages;
 import org.apache.roller.util.Utilities;
@@ -53,7 +53,7 @@
     
     
     public WeblogEntriesPermalinkPager(
-            WebsiteData        weblog,
+            Weblog        weblog,
             String             locale,
             String             pageLink,
             String             entryAnchor,

Modified: roller/trunk/src/org/apache/roller/ui/rendering/pagers/WeblogEntriesPreviewPager.java
URL: http://svn.apache.org/viewvc/roller/trunk/src/org/apache/roller/ui/rendering/pagers/WeblogEntriesPreviewPager.java?view=diff&rev=542656&r1=542655&r2=542656
==============================================================================
--- roller/trunk/src/org/apache/roller/ui/rendering/pagers/WeblogEntriesPreviewPager.java (original)
+++ roller/trunk/src/org/apache/roller/ui/rendering/pagers/WeblogEntriesPreviewPager.java Tue May 29 14:22:19 2007
@@ -30,7 +30,7 @@
 import org.apache.roller.business.RollerFactory;
 import org.apache.roller.business.WeblogManager;
 import org.apache.roller.pojos.WeblogEntryData;
-import org.apache.roller.pojos.WebsiteData;
+import org.apache.roller.pojos.Weblog;
 import org.apache.roller.pojos.wrapper.WeblogEntryDataWrapper;
 
 
@@ -47,7 +47,7 @@
     
     
     public WeblogEntriesPreviewPager(
-            WebsiteData        weblog,
+            Weblog        weblog,
             String             locale,
             String             pageLink,
             String             entryAnchor,

Modified: roller/trunk/src/org/apache/roller/ui/rendering/pagers/WeblogsPager.java
URL: http://svn.apache.org/viewvc/roller/trunk/src/org/apache/roller/ui/rendering/pagers/WeblogsPager.java?view=diff&rev=542656&r1=542655&r2=542656
==============================================================================
--- roller/trunk/src/org/apache/roller/ui/rendering/pagers/WeblogsPager.java (original)
+++ roller/trunk/src/org/apache/roller/ui/rendering/pagers/WeblogsPager.java Tue May 29 14:22:19 2007
@@ -30,7 +30,7 @@
 import org.apache.roller.business.Roller;
 import org.apache.roller.business.RollerFactory;
 import org.apache.roller.business.UserManager;
-import org.apache.roller.pojos.WebsiteData;
+import org.apache.roller.pojos.Weblog;
 import org.apache.roller.pojos.wrapper.WebsiteDataWrapper;
 
 
@@ -160,7 +160,7 @@
                 
                 // wrap the results
                 for (Iterator it = weblogs.iterator(); it.hasNext();) {
-                    WebsiteData website = (WebsiteData) it.next();
+                    Weblog website = (Weblog) it.next();
                     results.add(WebsiteDataWrapper.wrap(website));
                 }
                 

Modified: roller/trunk/src/org/apache/roller/ui/rendering/plugins/AcronymsPlugin.java
URL: http://svn.apache.org/viewvc/roller/trunk/src/org/apache/roller/ui/rendering/plugins/AcronymsPlugin.java?view=diff&rev=542656&r1=542655&r2=542656
==============================================================================
--- roller/trunk/src/org/apache/roller/ui/rendering/plugins/AcronymsPlugin.java (original)
+++ roller/trunk/src/org/apache/roller/ui/rendering/plugins/AcronymsPlugin.java Tue May 29 14:22:19 2007
@@ -32,7 +32,7 @@
 import org.apache.roller.business.WeblogEntryPlugin;
 import org.apache.roller.pojos.WeblogEntryData;
 import org.apache.roller.pojos.WeblogTemplate;
-import org.apache.roller.pojos.WebsiteData;
+import org.apache.roller.pojos.Weblog;
 
 
 /**
@@ -72,7 +72,7 @@
     }
     
     
-    public void init(WebsiteData website) throws RollerException {}
+    public void init(Weblog website) throws RollerException {}
     
     
     public String render(WeblogEntryData entry, String str) {
@@ -125,7 +125,7 @@
      * @return
      * @throws RollerException
      */
-    private Properties loadAcronyms(WebsiteData website) {
+    private Properties loadAcronyms(Weblog website) {
         Properties acronyms = new Properties();
         try {
             UserManager userMgr = RollerFactory.getRoller().getUserManager();

Modified: roller/trunk/src/org/apache/roller/ui/rendering/plugins/BookmarkPlugin.java
URL: http://svn.apache.org/viewvc/roller/trunk/src/org/apache/roller/ui/rendering/plugins/BookmarkPlugin.java?view=diff&rev=542656&r1=542655&r2=542656
==============================================================================
--- roller/trunk/src/org/apache/roller/ui/rendering/plugins/BookmarkPlugin.java (original)
+++ roller/trunk/src/org/apache/roller/ui/rendering/plugins/BookmarkPlugin.java Tue May 29 14:22:19 2007
@@ -31,10 +31,10 @@
 import org.apache.roller.business.BookmarkManager;
 import org.apache.roller.business.RollerFactory;
 import org.apache.roller.business.WeblogEntryPlugin;
-import org.apache.roller.pojos.BookmarkData;
-import org.apache.roller.pojos.FolderData;
+import org.apache.roller.pojos.WeblogBookmark;
+import org.apache.roller.pojos.WeblogBookmarkFolder;
 import org.apache.roller.pojos.WeblogEntryData;
-import org.apache.roller.pojos.WebsiteData;
+import org.apache.roller.pojos.Weblog;
 
 
 /**
@@ -65,14 +65,14 @@
     }
     
     
-    public void init(WebsiteData website) throws RollerException {}
+    public void init(Weblog website) throws RollerException {}
     
     
     public String render(WeblogEntryData entry, String str) {
         String text = str;
         try {
             BookmarkManager bMgr = RollerFactory.getRoller().getBookmarkManager();
-            FolderData rootFolder = bMgr.getRootFolder(entry.getWebsite());
+            WeblogBookmarkFolder rootFolder = bMgr.getRootFolder(entry.getWebsite());
             text = matchBookmarks(text, rootFolder);
             text = lookInFolders(text, rootFolder.getFolders());
         } catch (RollerException e) {
@@ -96,7 +96,7 @@
         
         Iterator it = folders.iterator();
         while (it.hasNext()) {
-            FolderData folder = (FolderData)it.next();
+            WeblogBookmarkFolder folder = (WeblogBookmarkFolder)it.next();
             text = matchBookmarks(text, folder);
             
             if (!folder.getFolders().isEmpty()) {
@@ -108,11 +108,11 @@
     }
     
     
-    private String matchBookmarks(String text, FolderData folder) {
+    private String matchBookmarks(String text,WeblogBookmarkFolder folder) {
         Iterator bookmarks = folder.getBookmarks().iterator();
         String workingText = text;
         while (bookmarks.hasNext()) {
-            BookmarkData bookmark = (BookmarkData)bookmarks.next();
+            WeblogBookmark bookmark = (WeblogBookmark)bookmarks.next();
             String bkDescription = bookmark.getDescription();
             if (bkDescription == null) bkDescription = "";
             String bookmarkLink = "<a href=\"" +

Modified: roller/trunk/src/org/apache/roller/ui/rendering/plugins/ConvertLineBreaksPlugin.java
URL: http://svn.apache.org/viewvc/roller/trunk/src/org/apache/roller/ui/rendering/plugins/ConvertLineBreaksPlugin.java?view=diff&rev=542656&r1=542655&r2=542656
==============================================================================
--- roller/trunk/src/org/apache/roller/ui/rendering/plugins/ConvertLineBreaksPlugin.java (original)
+++ roller/trunk/src/org/apache/roller/ui/rendering/plugins/ConvertLineBreaksPlugin.java Tue May 29 14:22:19 2007
@@ -25,7 +25,7 @@
 import org.apache.commons.logging.LogFactory;
 import org.apache.roller.RollerException;
 import org.apache.roller.pojos.WeblogEntryData;
-import org.apache.roller.pojos.WebsiteData;
+import org.apache.roller.pojos.Weblog;
 import org.apache.roller.business.WeblogEntryPlugin;
 
 
@@ -67,7 +67,7 @@
     }
     
     
-    public void init(WebsiteData website) throws RollerException {
+    public void init(Weblog website) throws RollerException {
         // we don't need to do any init.
         mLogger.debug("initing");
     }

Modified: roller/trunk/src/org/apache/roller/ui/rendering/plugins/ObfuscateEmailPlugin.java
URL: http://svn.apache.org/viewvc/roller/trunk/src/org/apache/roller/ui/rendering/plugins/ObfuscateEmailPlugin.java?view=diff&rev=542656&r1=542655&r2=542656
==============================================================================
--- roller/trunk/src/org/apache/roller/ui/rendering/plugins/ObfuscateEmailPlugin.java (original)
+++ roller/trunk/src/org/apache/roller/ui/rendering/plugins/ObfuscateEmailPlugin.java Tue May 29 14:22:19 2007
@@ -25,7 +25,7 @@
 import org.apache.roller.RollerException;
 import org.apache.roller.business.WeblogEntryPlugin;
 import org.apache.roller.pojos.WeblogEntryData;
-import org.apache.roller.pojos.WebsiteData;
+import org.apache.roller.pojos.Weblog;
 import org.apache.roller.util.RegexUtil;
 
 
@@ -57,7 +57,7 @@
     }
     
     
-    public void init(WebsiteData website) throws RollerException {}
+    public void init(Weblog website) throws RollerException {}
     
     
     public String render(WeblogEntryData entry, String str) {

Modified: roller/trunk/src/org/apache/roller/ui/rendering/plugins/SearchPluginBase.java
URL: http://svn.apache.org/viewvc/roller/trunk/src/org/apache/roller/ui/rendering/plugins/SearchPluginBase.java?view=diff&rev=542656&r1=542655&r2=542656
==============================================================================
--- roller/trunk/src/org/apache/roller/ui/rendering/plugins/SearchPluginBase.java (original)
+++ roller/trunk/src/org/apache/roller/ui/rendering/plugins/SearchPluginBase.java Tue May 29 14:22:19 2007
@@ -21,7 +21,7 @@
 import org.apache.commons.logging.Log;
 import org.apache.roller.RollerException;
 import org.apache.roller.pojos.WeblogEntryData;
-import org.apache.roller.pojos.WebsiteData;
+import org.apache.roller.pojos.Weblog;
 
 import java.io.UnsupportedEncodingException;
 import java.net.URLEncoder;
@@ -53,7 +53,7 @@
      *
      * @see org.apache.roller.model.PagePlugin#init(WebsiteData, Object, String baseUrl, org.apache.velocity.context.Context)
      */
-    public void init(WebsiteData website) throws RollerException {
+    public void init(Weblog website) throws RollerException {
         if (mLogger.isDebugEnabled()) {
             mLogger.debug(getClass().getName() + "; version:  " + getVersion() + "; base version " + baseVersion);
         }

Modified: roller/trunk/src/org/apache/roller/ui/rendering/plugins/SmileysPlugin.java
URL: http://svn.apache.org/viewvc/roller/trunk/src/org/apache/roller/ui/rendering/plugins/SmileysPlugin.java?view=diff&rev=542656&r1=542655&r2=542656
==============================================================================
--- roller/trunk/src/org/apache/roller/ui/rendering/plugins/SmileysPlugin.java (original)
+++ roller/trunk/src/org/apache/roller/ui/rendering/plugins/SmileysPlugin.java Tue May 29 14:22:19 2007
@@ -30,7 +30,7 @@
 import org.apache.roller.config.RollerRuntimeConfig;
 import org.apache.roller.business.WeblogEntryPlugin;
 import org.apache.roller.pojos.WeblogEntryData;
-import org.apache.roller.pojos.WebsiteData;
+import org.apache.roller.pojos.Weblog;
 
 /**
  * Converts ascii emoticons into HTML image tags.
@@ -77,7 +77,7 @@
      * later use.  Need an HttpServletRequest though so that we can
      * get the ServletContext Path.  But only do it once.
      */
-    public synchronized void init(WebsiteData website) throws RollerException {
+    public synchronized void init(Weblog website) throws RollerException {
         // don't do this work if Smileys already loaded
         if (SmileysPlugin.smileyPatterns.length < 1) {
             String baseURL = RollerRuntimeConfig.getAbsoluteContextURL();

Modified: roller/trunk/src/org/apache/roller/ui/rendering/plugins/TopicTagPlugin.java
URL: http://svn.apache.org/viewvc/roller/trunk/src/org/apache/roller/ui/rendering/plugins/TopicTagPlugin.java?view=diff&rev=542656&r1=542655&r2=542656
==============================================================================
--- roller/trunk/src/org/apache/roller/ui/rendering/plugins/TopicTagPlugin.java (original)
+++ roller/trunk/src/org/apache/roller/ui/rendering/plugins/TopicTagPlugin.java Tue May 29 14:22:19 2007
@@ -25,9 +25,9 @@
 import org.apache.roller.config.RollerConfig;
 import org.apache.roller.business.BookmarkManager;
 import org.apache.roller.business.RollerFactory;
-import org.apache.roller.pojos.BookmarkData;
+import org.apache.roller.pojos.WeblogBookmark;
 import org.apache.roller.pojos.WeblogEntryData;
-import org.apache.roller.pojos.WebsiteData;
+import org.apache.roller.pojos.Weblog;
 import org.apache.roller.business.WeblogEntryPlugin;
 
 import java.io.UnsupportedEncodingException;
@@ -132,7 +132,7 @@
      * @param ctx  Plugins may place objects into the Velocity Context.
      * @see PagWeblogEntryPluginit(org.apache.roller.presentation.RollerRequest, org.apache.velocity.context.Context)
      */
-    public void init(WebsiteData website) throws RollerException
+    public void init(Weblog website) throws RollerException
     {
         if (mLogger.isDebugEnabled())
         {
@@ -146,7 +146,7 @@
         userBookmarks = buildBookmarkMap(website);
 
         // Determine default topic site from bookmark if present
-        BookmarkData defaultTopicBookmark = (BookmarkData) userBookmarks.get(defaultTopicBookmarkName);
+        WeblogBookmark defaultTopicBookmark = (WeblogBookmark) userBookmarks.get(defaultTopicBookmarkName);
         if (defaultTopicBookmark != null) defaultTopicSite = defaultTopicBookmark.getUrl();
 
         // Append / to defaultTopicSite if it doesn't have it
@@ -294,7 +294,7 @@
      */
     protected String getBookmarkSite(String bookmarkName)
     {
-        BookmarkData bookmark = (BookmarkData) getUserBookmarks().get(bookmarkName);
+        WeblogBookmark bookmark = (WeblogBookmark) getUserBookmarks().get(bookmarkName);
         return bookmark == null ? null : bookmark.getUrl();
     }
 
@@ -304,7 +304,7 @@
      * If ignoreBookmarks property is set, an empty map is returned.
      * @return map of the user's bookmarks (type BookmarkData), keyed by name (type String).
      */
-    protected Map buildBookmarkMap(WebsiteData website) throws RollerException
+    protected Map buildBookmarkMap(Weblog website) throws RollerException
     {
         Map bookmarkMap = new HashMap();
         if (RollerConfig.getBooleanProperty("plugins.topictag.ignoreBookmarks")) {
@@ -321,7 +321,7 @@
 
             for (Iterator i = bookmarks.iterator(); i.hasNext();)
             {
-                BookmarkData b = (BookmarkData) i.next();
+                WeblogBookmark b = (WeblogBookmark) i.next();
                 bookmarkMap.put(b.getName(), b);
             }
         }

Modified: roller/trunk/src/org/apache/roller/ui/rendering/servlets/CommentServlet.java
URL: http://svn.apache.org/viewvc/roller/trunk/src/org/apache/roller/ui/rendering/servlets/CommentServlet.java?view=diff&rev=542656&r1=542655&r2=542656
==============================================================================
--- roller/trunk/src/org/apache/roller/ui/rendering/servlets/CommentServlet.java (original)
+++ roller/trunk/src/org/apache/roller/ui/rendering/servlets/CommentServlet.java Tue May 29 14:22:19 2007
@@ -48,7 +48,7 @@
 import org.apache.roller.pojos.CommentData;
 import org.apache.roller.pojos.UserData;
 import org.apache.roller.pojos.WeblogEntryData;
-import org.apache.roller.pojos.WebsiteData;
+import org.apache.roller.pojos.Weblog;
 import org.apache.roller.ui.rendering.model.UtilitiesModel;
 import org.apache.roller.ui.rendering.util.CommentAuthenticator;
 import org.apache.roller.ui.rendering.util.CommentValidationManager;
@@ -174,7 +174,7 @@
         String error = null;
         String dispatch_url = null;
         
-        WebsiteData weblog = null;
+        Weblog weblog = null;
         WeblogEntryData entry = null;
         
         String message = null;
@@ -381,7 +381,7 @@
             RollerMessages messages, String rootURL, I18nMessages resources) {
         
         WeblogEntryData entry = commentObject.getWeblogEntry();
-        WebsiteData site = entry.getWebsite();
+        Weblog site = entry.getWebsite();
         UserData user = entry.getCreator();
         
         // Send e-mail to owner and subscribed users (if enabled)
@@ -583,7 +583,7 @@
     public static void sendEmailApprovalNotification(CommentData cd, String rootURL, I18nMessages resources) {
         
         WeblogEntryData entry = cd.getWeblogEntry();
-        WebsiteData site = entry.getWebsite();
+        Weblog site = entry.getWebsite();
         UserData user = entry.getCreator();
         
         // Only send email if email notificaiton is enabled

Modified: roller/trunk/src/org/apache/roller/ui/rendering/servlets/FeedServlet.java
URL: http://svn.apache.org/viewvc/roller/trunk/src/org/apache/roller/ui/rendering/servlets/FeedServlet.java?view=diff&rev=542656&r1=542655&r2=542656
==============================================================================
--- roller/trunk/src/org/apache/roller/ui/rendering/servlets/FeedServlet.java (original)
+++ roller/trunk/src/org/apache/roller/ui/rendering/servlets/FeedServlet.java Tue May 29 14:22:19 2007
@@ -35,7 +35,7 @@
 import org.apache.roller.config.RollerRuntimeConfig;
 import org.apache.roller.pojos.StaticTemplate;
 import org.apache.roller.pojos.Template;
-import org.apache.roller.pojos.WebsiteData;
+import org.apache.roller.pojos.Weblog;
 import org.apache.roller.ui.rendering.util.WeblogFeedRequest;
 import org.apache.roller.util.cache.CachedContent;
 import org.apache.roller.ui.rendering.Renderer;
@@ -86,7 +86,7 @@
 
         log.debug("Entering");
 
-        WebsiteData weblog = null;
+        Weblog weblog = null;
         boolean isSiteWide = false;
 
         WeblogFeedRequest feedRequest = null;

Modified: roller/trunk/src/org/apache/roller/ui/rendering/servlets/PageServlet.java
URL: http://svn.apache.org/viewvc/roller/trunk/src/org/apache/roller/ui/rendering/servlets/PageServlet.java?view=diff&rev=542656&r1=542655&r2=542656
==============================================================================
--- roller/trunk/src/org/apache/roller/ui/rendering/servlets/PageServlet.java (original)
+++ roller/trunk/src/org/apache/roller/ui/rendering/servlets/PageServlet.java Tue May 29 14:22:19 2007
@@ -44,7 +44,7 @@
 import org.apache.roller.pojos.StaticThemeTemplate;
 import org.apache.roller.pojos.ThemeTemplate;
 import org.apache.roller.pojos.WeblogEntryData;
-import org.apache.roller.pojos.WebsiteData;
+import org.apache.roller.pojos.Weblog;
 import org.apache.roller.ui.core.RollerContext;
 import org.apache.roller.ui.rendering.util.InvalidRequestException;
 import org.apache.roller.ui.rendering.util.WeblogPageRequest;
@@ -140,7 +140,7 @@
         }
         
         
-        WebsiteData weblog = null;
+        Weblog weblog = null;
         boolean isSiteWide = false;
         
         WeblogPageRequest pageRequest = null;
@@ -497,7 +497,7 @@
     /**
      * Notify the hit tracker that it has an incoming page hit.
      */
-    private void processHit(WebsiteData weblog, String url, String referrer) {
+    private void processHit(Weblog weblog, String url, String referrer) {
         
         HitCountQueue counter = HitCountQueue.getInstance();
         counter.processHit(weblog, url, referrer);

Modified: roller/trunk/src/org/apache/roller/ui/rendering/servlets/PreviewResourceServlet.java
URL: http://svn.apache.org/viewvc/roller/trunk/src/org/apache/roller/ui/rendering/servlets/PreviewResourceServlet.java?view=diff&rev=542656&r1=542655&r2=542656
==============================================================================
--- roller/trunk/src/org/apache/roller/ui/rendering/servlets/PreviewResourceServlet.java (original)
+++ roller/trunk/src/org/apache/roller/ui/rendering/servlets/PreviewResourceServlet.java Tue May 29 14:22:19 2007
@@ -35,7 +35,7 @@
 import org.apache.roller.pojos.Theme;
 import org.apache.roller.pojos.ThemeResource;
 import org.apache.roller.pojos.WeblogTheme;
-import org.apache.roller.pojos.WebsiteData;
+import org.apache.roller.pojos.Weblog;
 import org.apache.roller.ui.rendering.util.ModDateHeaderUtil;
 import org.apache.roller.ui.rendering.util.WeblogPreviewResourceRequest;
 
@@ -72,7 +72,7 @@
     public void doGet(HttpServletRequest request, HttpServletResponse response)
             throws ServletException, IOException {
         
-        WebsiteData weblog = null;
+        Weblog weblog = null;
         String context = request.getContextPath();
         String servlet = request.getServletPath();
         String reqURI = request.getRequestURI();

Modified: roller/trunk/src/org/apache/roller/ui/rendering/servlets/PreviewServlet.java
URL: http://svn.apache.org/viewvc/roller/trunk/src/org/apache/roller/ui/rendering/servlets/PreviewServlet.java?view=diff&rev=542656&r1=542655&r2=542656
==============================================================================
--- roller/trunk/src/org/apache/roller/ui/rendering/servlets/PreviewServlet.java (original)
+++ roller/trunk/src/org/apache/roller/ui/rendering/servlets/PreviewServlet.java Tue May 29 14:22:19 2007
@@ -36,7 +36,7 @@
 import org.apache.roller.pojos.Template;
 import org.apache.roller.pojos.Theme;
 import org.apache.roller.pojos.WeblogTheme;
-import org.apache.roller.pojos.WebsiteData;
+import org.apache.roller.pojos.Weblog;
 import org.apache.roller.ui.core.RollerContext;
 import org.apache.roller.util.cache.CachedContent;
 import org.apache.roller.ui.rendering.Renderer;
@@ -79,7 +79,7 @@
         
         log.debug("Entering");
         
-        WebsiteData weblog = null;
+        Weblog weblog = null;
         
         WeblogPreviewRequest previewRequest = null;
         try {
@@ -104,7 +104,7 @@
         
         // construct a temporary Website object for this request
         // and set the EditorTheme to our previewTheme
-        WebsiteData tmpWebsite = new WebsiteData();
+        Weblog tmpWebsite = new Weblog();
         tmpWebsite.setData(weblog);
         if(previewTheme != null && previewTheme.isEnabled()) {
             tmpWebsite.setEditorTheme(previewTheme.getId());

Modified: roller/trunk/src/org/apache/roller/ui/rendering/servlets/RSDServlet.java
URL: http://svn.apache.org/viewvc/roller/trunk/src/org/apache/roller/ui/rendering/servlets/RSDServlet.java?view=diff&rev=542656&r1=542655&r2=542656
==============================================================================
--- roller/trunk/src/org/apache/roller/ui/rendering/servlets/RSDServlet.java (original)
+++ roller/trunk/src/org/apache/roller/ui/rendering/servlets/RSDServlet.java Tue May 29 14:22:19 2007
@@ -31,7 +31,7 @@
 import org.apache.roller.config.RollerRuntimeConfig;
 import org.apache.roller.pojos.StaticTemplate;
 import org.apache.roller.pojos.Template;
-import org.apache.roller.pojos.WebsiteData;
+import org.apache.roller.pojos.Weblog;
 import org.apache.roller.ui.rendering.util.WeblogRequest;
 import org.apache.roller.ui.rendering.util.ModDateHeaderUtil;
 import org.apache.roller.ui.rendering.Renderer;
@@ -72,7 +72,7 @@
         
         log.debug("Entering");
         
-        WebsiteData weblog = null;
+        Weblog weblog = null;
         
         WeblogRequest weblogRequest = null;
         try {

Modified: roller/trunk/src/org/apache/roller/ui/rendering/servlets/ResourceServlet.java
URL: http://svn.apache.org/viewvc/roller/trunk/src/org/apache/roller/ui/rendering/servlets/ResourceServlet.java?view=diff&rev=542656&r1=542655&r2=542656
==============================================================================
--- roller/trunk/src/org/apache/roller/ui/rendering/servlets/ResourceServlet.java (original)
+++ roller/trunk/src/org/apache/roller/ui/rendering/servlets/ResourceServlet.java Tue May 29 14:22:19 2007
@@ -36,7 +36,7 @@
 import org.apache.roller.business.RollerFactory;
 import org.apache.roller.pojos.ThemeResource;
 import org.apache.roller.pojos.WeblogTheme;
-import org.apache.roller.pojos.WebsiteData;
+import org.apache.roller.pojos.Weblog;
 import org.apache.roller.ui.rendering.util.ModDateHeaderUtil;
 import org.apache.roller.ui.rendering.util.WeblogResourceRequest;
 
@@ -74,7 +74,7 @@
     public void doGet(HttpServletRequest request, HttpServletResponse response)
             throws ServletException, IOException {
         
-        WebsiteData weblog = null;
+        Weblog weblog = null;
         String context = request.getContextPath();
         String servlet = request.getServletPath();
         String reqURI = request.getRequestURI();

Modified: roller/trunk/src/org/apache/roller/ui/rendering/servlets/SearchServlet.java
URL: http://svn.apache.org/viewvc/roller/trunk/src/org/apache/roller/ui/rendering/servlets/SearchServlet.java?view=diff&rev=542656&r1=542655&r2=542656
==============================================================================
--- roller/trunk/src/org/apache/roller/ui/rendering/servlets/SearchServlet.java (original)
+++ roller/trunk/src/org/apache/roller/ui/rendering/servlets/SearchServlet.java Tue May 29 14:22:19 2007
@@ -36,7 +36,7 @@
 import org.apache.roller.business.RollerFactory;
 import org.apache.roller.business.UserManager;
 import org.apache.roller.pojos.ThemeTemplate;
-import org.apache.roller.pojos.WebsiteData;
+import org.apache.roller.pojos.Weblog;
 import org.apache.roller.ui.rendering.Renderer;
 import org.apache.roller.ui.rendering.RendererManager;
 import org.apache.roller.ui.rendering.model.Model;
@@ -77,7 +77,7 @@
         
         log.debug("Entering");
         
-        WebsiteData weblog = null;
+        Weblog weblog = null;
         WeblogSearchRequest searchRequest = null;
         
         // first off lets parse the incoming request and validate it

Modified: roller/trunk/src/org/apache/roller/ui/rendering/servlets/TrackbackServlet.java
URL: http://svn.apache.org/viewvc/roller/trunk/src/org/apache/roller/ui/rendering/servlets/TrackbackServlet.java?view=diff&rev=542656&r1=542655&r2=542656
==============================================================================
--- roller/trunk/src/org/apache/roller/ui/rendering/servlets/TrackbackServlet.java (original)
+++ roller/trunk/src/org/apache/roller/ui/rendering/servlets/TrackbackServlet.java Tue May 29 14:22:19 2007
@@ -36,7 +36,7 @@
 import org.apache.roller.business.WeblogManager;
 import org.apache.roller.pojos.CommentData;
 import org.apache.roller.pojos.WeblogEntryData;
-import org.apache.roller.pojos.WebsiteData;
+import org.apache.roller.pojos.Weblog;
 import org.apache.roller.ui.rendering.util.CommentValidationManager;
 import org.apache.roller.ui.rendering.util.TrackbackLinkbackCommentValidator;
 import org.apache.roller.ui.rendering.util.WeblogTrackbackRequest;
@@ -91,7 +91,7 @@
         String error = null;
         PrintWriter pw = response.getWriter();
         
-        WebsiteData weblog = null;
+        Weblog weblog = null;
         WeblogEntryData entry = null;
         
         RollerMessages messages = new RollerMessages();

Modified: roller/trunk/src/org/apache/roller/ui/rendering/util/WeblogRequest.java
URL: http://svn.apache.org/viewvc/roller/trunk/src/org/apache/roller/ui/rendering/util/WeblogRequest.java?view=diff&rev=542656&r1=542655&r2=542656
==============================================================================
--- roller/trunk/src/org/apache/roller/ui/rendering/util/WeblogRequest.java (original)
+++ roller/trunk/src/org/apache/roller/ui/rendering/util/WeblogRequest.java Tue May 29 14:22:19 2007
@@ -25,7 +25,7 @@
 import org.apache.roller.RollerException;
 import org.apache.roller.business.RollerFactory;
 import org.apache.roller.business.UserManager;
-import org.apache.roller.pojos.WebsiteData;
+import org.apache.roller.pojos.Weblog;
 
 
 /**
@@ -57,7 +57,7 @@
     private String pathInfo = null;
     
     // heavyweight attributes
-    private WebsiteData weblog = null;
+    private Weblog weblog = null;
     private Locale localeInstance = null;
     
     
@@ -182,7 +182,7 @@
         this.pathInfo = pathInfo;
     }
 
-    public WebsiteData getWeblog() {
+    public Weblog getWeblog() {
         
         if(weblog == null && weblogHandle != null) {
             try {
@@ -196,7 +196,7 @@
         return weblog;
     }
 
-    public void setWeblog(WebsiteData weblog) {
+    public void setWeblog(Weblog weblog) {
         this.weblog = weblog;
     }
     

Modified: roller/trunk/src/org/apache/roller/ui/rendering/util/cache/SiteWideCache.java
URL: http://svn.apache.org/viewvc/roller/trunk/src/org/apache/roller/ui/rendering/util/cache/SiteWideCache.java?view=diff&rev=542656&r1=542655&r2=542656
==============================================================================
--- roller/trunk/src/org/apache/roller/ui/rendering/util/cache/SiteWideCache.java (original)
+++ roller/trunk/src/org/apache/roller/ui/rendering/util/cache/SiteWideCache.java Tue May 29 14:22:19 2007
@@ -31,15 +31,15 @@
 import org.apache.commons.logging.LogFactory;
 import org.apache.roller.config.RollerConfig;
 import org.apache.roller.config.RollerRuntimeConfig;
-import org.apache.roller.pojos.BookmarkData;
+import org.apache.roller.pojos.WeblogBookmark;
 import org.apache.roller.pojos.CommentData;
-import org.apache.roller.pojos.FolderData;
+import org.apache.roller.pojos.WeblogBookmarkFolder;
 import org.apache.roller.pojos.RefererData;
 import org.apache.roller.pojos.UserData;
 import org.apache.roller.pojos.WeblogCategoryData;
 import org.apache.roller.pojos.WeblogEntryData;
 import org.apache.roller.pojos.WeblogTemplate;
-import org.apache.roller.pojos.WebsiteData;
+import org.apache.roller.pojos.Weblog;
 import org.apache.roller.ui.rendering.util.WeblogFeedRequest;
 import org.apache.roller.ui.rendering.util.WeblogPageRequest;
 import org.apache.roller.util.Utilities;
@@ -333,7 +333,7 @@
     /**
      * A weblog has changed.
      */
-    public void invalidate(WebsiteData website) {
+    public void invalidate(Weblog website) {
         
         if(!cacheEnabled)
             return;
@@ -346,7 +346,7 @@
     /**
      * A bookmark has changed.
      */
-    public void invalidate(BookmarkData bookmark) {
+    public void invalidate(WeblogBookmark bookmark) {
         if(RollerRuntimeConfig.isSiteWideWeblog(bookmark.getWebsite().getHandle())) {
             invalidate(bookmark.getWebsite());
         }
@@ -356,7 +356,7 @@
     /**
      * A folder has changed.
      */
-    public void invalidate(FolderData folder) {
+    public void invalidate(WeblogBookmarkFolder folder) {
         if(RollerRuntimeConfig.isSiteWideWeblog(folder.getWebsite().getHandle())) {
             invalidate(folder.getWebsite());
         }

Modified: roller/trunk/src/org/apache/roller/ui/rendering/util/cache/WeblogCacheWarmupJob.java
URL: http://svn.apache.org/viewvc/roller/trunk/src/org/apache/roller/ui/rendering/util/cache/WeblogCacheWarmupJob.java?view=diff&rev=542656&r1=542655&r2=542656
==============================================================================
--- roller/trunk/src/org/apache/roller/ui/rendering/util/cache/WeblogCacheWarmupJob.java (original)
+++ roller/trunk/src/org/apache/roller/ui/rendering/util/cache/WeblogCacheWarmupJob.java Tue May 29 14:22:19 2007
@@ -31,7 +31,7 @@
 import org.apache.roller.business.UserManager;
 import org.apache.roller.pojos.StaticTemplate;
 import org.apache.roller.pojos.Template;
-import org.apache.roller.pojos.WebsiteData;
+import org.apache.roller.pojos.Weblog;
 import org.apache.roller.ui.rendering.Renderer;
 import org.apache.roller.ui.rendering.RendererManager;
 import org.apache.roller.ui.rendering.model.ModelLoader;

Modified: roller/trunk/src/org/apache/roller/ui/rendering/velocity/deprecated/ContextLoader.java
URL: http://svn.apache.org/viewvc/roller/trunk/src/org/apache/roller/ui/rendering/velocity/deprecated/ContextLoader.java?view=diff&rev=542656&r1=542655&r2=542656
==============================================================================
--- roller/trunk/src/org/apache/roller/ui/rendering/velocity/deprecated/ContextLoader.java (original)
+++ roller/trunk/src/org/apache/roller/ui/rendering/velocity/deprecated/ContextLoader.java Tue May 29 14:22:19 2007
@@ -35,12 +35,12 @@
 import org.apache.roller.config.RollerRuntimeConfig;
 import org.apache.roller.business.Roller;
 import org.apache.roller.business.RollerFactory;
-import org.apache.roller.pojos.FolderData;
+import org.apache.roller.pojos.WeblogBookmarkFolder;
 import org.apache.roller.pojos.RollerPropertyData;
 import org.apache.roller.pojos.ThemeTemplate;
 import org.apache.roller.pojos.WeblogCategoryData;
 import org.apache.roller.pojos.WeblogEntryData;
-import org.apache.roller.pojos.WebsiteData;
+import org.apache.roller.pojos.Weblog;
 import org.apache.roller.pojos.wrapper.TemplateWrapper;
 import org.apache.roller.pojos.wrapper.WeblogEntryDataWrapper;
 import org.apache.roller.pojos.wrapper.WebsiteDataWrapper;
@@ -104,11 +104,11 @@
         
         mLogger.debug("setupContext( ctx = "+ctx+")");
         
-        WebsiteData weblog = null;
+        Weblog weblog = null;
         WeblogEntryData entry = null;
         WeblogCategoryData category = null;
         ThemeTemplate page = null;
-        FolderData folder = null;  // don't even know how this is involved :/
+        WeblogBookmarkFolder folder = null;  // don't even know how this is involved :/
         Date date = null;
         boolean isDay = false;
         boolean isMonth = false;
@@ -205,7 +205,7 @@
      */
     private static void loadWeblogValues(
             Map ctx,
-            WebsiteData weblog,
+            Weblog weblog,
             Locale locale,
             HttpServletRequest request) throws RollerException {
         
@@ -316,7 +316,7 @@
     private static void loadRssValues(
             Map ctx,
             HttpServletRequest request,
-            WebsiteData website,
+            Weblog website,
             WeblogCategoryData category)
             throws RollerException {
         
@@ -358,7 +358,7 @@
     private static void loadUtilityObjects(
             Map ctx,
             HttpServletRequest request,
-            WebsiteData website,
+            Weblog website,
             ThemeTemplate page) throws RollerException {
         
         mLogger.debug("Loading utility objects");
@@ -396,7 +396,7 @@
     private static void loadPathValues(
             Map ctx,
             HttpServletRequest request,
-            WebsiteData   website,
+            Weblog   website,
             String locale) throws RollerException {
         
         mLogger.debug("Loading path values");

Modified: roller/trunk/src/org/apache/roller/ui/rendering/velocity/deprecated/OldPageHelper.java
URL: http://svn.apache.org/viewvc/roller/trunk/src/org/apache/roller/ui/rendering/velocity/deprecated/OldPageHelper.java?view=diff&rev=542656&r1=542655&r2=542656
==============================================================================
--- roller/trunk/src/org/apache/roller/ui/rendering/velocity/deprecated/OldPageHelper.java (original)
+++ roller/trunk/src/org/apache/roller/ui/rendering/velocity/deprecated/OldPageHelper.java Tue May 29 14:22:19 2007
@@ -36,8 +36,8 @@
 import org.apache.roller.business.PluginManager;
 import org.apache.roller.business.Roller;
 import org.apache.roller.business.RollerFactory;
-import org.apache.roller.pojos.FolderData;
-import org.apache.roller.pojos.WebsiteData;
+import org.apache.roller.pojos.WeblogBookmarkFolder;
+import org.apache.roller.pojos.Weblog;
 import org.apache.roller.pojos.wrapper.RefererDataWrapper;
 import org.apache.roller.pojos.wrapper.WeblogEntryDataWrapper;
 import org.apache.roller.ui.core.RequestConstants;
@@ -63,9 +63,9 @@
     private HttpServletResponse mResponse = null;
     
     private Map mPagePlugins = null;  // Plugins keyed by name
-    private WebsiteData mWebsite = null;
+    private Weblog mWebsite = null;
     private Date mDate = null;
-    private FolderData mFolder = null;
+    private WeblogBookmarkFolder mFolder = null;
     private String mPageName = null;
     private WeblogPageRequest mPageRequest = null;
     
@@ -76,9 +76,8 @@
     public OldPageHelper(HttpServletRequest request,
                       HttpServletResponse response,
                       Map ctx,
-                      WebsiteData website,
-                      Date date,
-                      FolderData folder,
+                      Weblog website,
+                      Date date,WeblogBookmarkFolder folder,
                       String pageName,
                       PageContext pageContext,
                       WeblogPageRequest pageRequest) throws RollerException {

Modified: roller/trunk/src/org/apache/roller/ui/rendering/velocity/deprecated/OldWeblogPageModel.java
URL: http://svn.apache.org/viewvc/roller/trunk/src/org/apache/roller/ui/rendering/velocity/deprecated/OldWeblogPageModel.java?view=diff&rev=542656&r1=542655&r2=542656
==============================================================================
--- roller/trunk/src/org/apache/roller/ui/rendering/velocity/deprecated/OldWeblogPageModel.java (original)
+++ roller/trunk/src/org/apache/roller/ui/rendering/velocity/deprecated/OldWeblogPageModel.java Tue May 29 14:22:19 2007
@@ -41,11 +41,11 @@
 import org.apache.roller.business.UserManager;
 import org.apache.roller.business.WeblogManager;
 import org.apache.roller.pojos.CommentData;
-import org.apache.roller.pojos.FolderData;
+import org.apache.roller.pojos.WeblogBookmarkFolder;
 import org.apache.roller.pojos.RefererData;
 import org.apache.roller.pojos.WeblogCategoryData;
 import org.apache.roller.pojos.WeblogEntryData;
-import org.apache.roller.pojos.WebsiteData;
+import org.apache.roller.pojos.Weblog;
 import org.apache.roller.pojos.wrapper.CommentDataWrapper;
 import org.apache.roller.pojos.wrapper.FolderDataWrapper;
 import org.apache.roller.pojos.wrapper.RefererDataWrapper;
@@ -77,7 +77,7 @@
     private Map                  mCategories = new HashMap();
     private HashMap              mPageMap = new HashMap();
     private HttpServletRequest   mRequest = null;
-    private WebsiteData          mWebsite = null;
+    private Weblog          mWebsite = null;
     private WeblogEntryData      mEntry = null;
     private WeblogCategoryData   mCategory = null;
     private Date                 mDate = null;
@@ -102,7 +102,7 @@
      * Initialize PageModel and allow PageModel to initialized VelocityContext.
      */
     public void init(HttpServletRequest request,
-            WebsiteData website,
+            Weblog website,
             WeblogEntryData entry,
             WeblogCategoryData category,
             Date date,
@@ -180,7 +180,7 @@
             Iterator it = mTops.iterator();
             int i=0;
             while(it.hasNext()) {
-                tops.add(i, FolderDataWrapper.wrap((FolderData) it.next()));
+                tops.add(i,FolderDataWrapper.wrap((WeblogBookmarkFolder) it.next()));
                 i++;
             }
         } catch (RollerException e) {
@@ -258,7 +258,7 @@
     
     /** Encapsulates UserManager.getPageByName() */
     public TemplateWrapper getUsersPageByName(WebsiteDataWrapper wrapper, String pageName) {
-        WebsiteData website = wrapper.getPojo();
+        Weblog website = wrapper.getPojo();
         TemplateWrapper page = null;
         try {
             if (website == null)
@@ -771,7 +771,7 @@
     
     public FolderDataWrapper getFolderByPath(String path) {
         try {
-            FolderData folder = mBookmarkMgr.getFolder(mWebsite, path);
+            WeblogBookmarkFolder folder = mBookmarkMgr.getFolder(mWebsite, path);
             
             if(folder != null)
                 return FolderDataWrapper.wrap(folder);

Modified: roller/trunk/src/org/apache/roller/ui/struts2/core/CreateWeblog.java
URL: http://svn.apache.org/viewvc/roller/trunk/src/org/apache/roller/ui/struts2/core/CreateWeblog.java?view=diff&rev=542656&r1=542655&r2=542656
==============================================================================
--- roller/trunk/src/org/apache/roller/ui/struts2/core/CreateWeblog.java (original)
+++ roller/trunk/src/org/apache/roller/ui/struts2/core/CreateWeblog.java Tue May 29 14:22:19 2007
@@ -30,7 +30,7 @@
 import org.apache.roller.business.themes.ThemeManager;
 import org.apache.roller.business.UserManager;
 import org.apache.roller.pojos.UserData;
-import org.apache.roller.pojos.WebsiteData;
+import org.apache.roller.pojos.Weblog;
 import org.apache.roller.ui.struts2.util.UIAction;
 import org.apache.roller.util.Utilities;
 import org.apache.struts2.interceptor.validation.SkipValidation;
@@ -116,7 +116,7 @@
         
         if(!hasActionErrors()) {
             
-            WebsiteData wd = new WebsiteData(
+            Weblog wd = new Weblog(
                     getBean().getHandle(),
                     user,
                     getBean().getName(),

Modified: roller/trunk/src/org/apache/roller/ui/struts2/core/MainMenu.java
URL: http://svn.apache.org/viewvc/roller/trunk/src/org/apache/roller/ui/struts2/core/MainMenu.java?view=diff&rev=542656&r1=542655&r2=542656
==============================================================================
--- roller/trunk/src/org/apache/roller/ui/struts2/core/MainMenu.java (original)
+++ roller/trunk/src/org/apache/roller/ui/struts2/core/MainMenu.java Tue May 29 14:22:19 2007
@@ -25,9 +25,9 @@
 import org.apache.roller.RollerException;
 import org.apache.roller.business.RollerFactory;
 import org.apache.roller.business.UserManager;
-import org.apache.roller.pojos.PermissionsData;
+import org.apache.roller.pojos.WeblogPermission;
 import org.apache.roller.pojos.UserData;
-import org.apache.roller.pojos.WebsiteData;
+import org.apache.roller.pojos.Weblog;
 import org.apache.roller.ui.struts2.util.UIAction;
 
 
@@ -63,7 +63,7 @@
         
         try {
             UserManager userMgr = RollerFactory.getRoller().getUserManager();
-            PermissionsData perms = userMgr.getPermissions(getInviteId());
+            WeblogPermission perms = userMgr.getPermissions(getInviteId());
             if (perms != null) {        
                 // TODO ROLLER_2.0: notify inviter that invitee has accepted invitation
                 // TODO EXCEPTIONS: better exception handling
@@ -89,7 +89,7 @@
         
         try {
             UserManager userMgr = RollerFactory.getRoller().getUserManager();
-            PermissionsData perms = userMgr.getPermissions(getInviteId());
+            WeblogPermission perms = userMgr.getPermissions(getInviteId());
             if (perms != null) {
                 // TODO ROLLER_2.0: notify inviter that invitee has declined invitation
                 // TODO EXCEPTIONS: better exception handling here
@@ -116,10 +116,10 @@
         
         try {
             UserManager mgr = RollerFactory.getRoller().getUserManager();
-            WebsiteData website = mgr.getWebsite(getWebsiteId());
+            Weblog website = mgr.getWebsite(getWebsiteId());
             
             UserManager userMgr = RollerFactory.getRoller().getUserManager();
-            PermissionsData perms = userMgr.getPermissions(website, user);
+            WeblogPermission perms = userMgr.getPermissions(website, user);
             
             if (perms != null) {
                 // TODO ROLLER_2.0: notify website members that user has resigned

Modified: roller/trunk/src/org/apache/roller/ui/struts2/editor/BookmarkAdd.java
URL: http://svn.apache.org/viewvc/roller/trunk/src/org/apache/roller/ui/struts2/editor/BookmarkAdd.java?view=diff&rev=542656&r1=542655&r2=542656
==============================================================================
--- roller/trunk/src/org/apache/roller/ui/struts2/editor/BookmarkAdd.java (original)
+++ roller/trunk/src/org/apache/roller/ui/struts2/editor/BookmarkAdd.java Tue May 29 14:22:19 2007
@@ -26,9 +26,9 @@
 import org.apache.roller.RollerException;
 import org.apache.roller.business.BookmarkManager;
 import org.apache.roller.business.RollerFactory;
-import org.apache.roller.pojos.BookmarkData;
-import org.apache.roller.pojos.FolderData;
-import org.apache.roller.pojos.PermissionsData;
+import org.apache.roller.pojos.WeblogBookmark;
+import org.apache.roller.pojos.WeblogBookmarkFolder;
+import org.apache.roller.pojos.WeblogPermission;
 import org.apache.roller.ui.struts2.util.UIAction;
 import org.apache.roller.util.cache.CacheManager;
 import org.apache.struts2.interceptor.validation.SkipValidation;
@@ -45,7 +45,7 @@
     private String folderId = null;
     
     // the folder we are adding the bookmark into
-    private FolderData folder = null;
+    private WeblogBookmarkFolder folder = null;
     
     // bean for managing form data
     private BookmarkBean bean = new BookmarkBean();
@@ -59,7 +59,7 @@
     
     
     public short requiredWeblogPermissions() {
-        return PermissionsData.ADMIN;
+        return WeblogPermission.ADMIN;
     }
     
     
@@ -101,7 +101,7 @@
         
         if(!hasActionErrors()) try {
             
-            BookmarkData newBookmark = new BookmarkData();
+            WeblogBookmark newBookmark = new WeblogBookmark();
             newBookmark.setFolder(getFolder());
             getBean().copyTo(newBookmark);
             
@@ -121,6 +121,7 @@
             // TODO: i18n
             addError("Error saving new bookmark");
         }
+
         
         return INPUT;
     }
@@ -162,11 +163,11 @@
         this.folderId = folderId;
     }
 
-    public FolderData getFolder() {
+    public WeblogBookmarkFolder getFolder() {
         return folder;
     }
 
-    public void setFolder(FolderData folder) {
+    public void setFolder(WeblogBookmarkFolder folder) {
         this.folder = folder;
     }
 

Modified: roller/trunk/src/org/apache/roller/ui/struts2/editor/BookmarkBean.java
URL: http://svn.apache.org/viewvc/roller/trunk/src/org/apache/roller/ui/struts2/editor/BookmarkBean.java?view=diff&rev=542656&r1=542655&r2=542656
==============================================================================
--- roller/trunk/src/org/apache/roller/ui/struts2/editor/BookmarkBean.java (original)
+++ roller/trunk/src/org/apache/roller/ui/struts2/editor/BookmarkBean.java Tue May 29 14:22:19 2007
@@ -18,7 +18,7 @@
 
 package org.apache.roller.ui.struts2.editor;
 
-import org.apache.roller.pojos.BookmarkData;
+import org.apache.roller.pojos.WeblogBookmark;
 
 
 /**
@@ -101,7 +101,7 @@
     }
     
     
-    public void copyTo(BookmarkData dataHolder) {
+    public void copyTo(WeblogBookmark dataHolder) {
         dataHolder.setName(this.name);
         dataHolder.setDescription(this.description);
         dataHolder.setUrl(this.url);
@@ -112,7 +112,7 @@
     }
     
     
-    public void copyFrom(BookmarkData dataHolder) {
+    public void copyFrom(WeblogBookmark dataHolder) {
         this.id = dataHolder.getId();
         this.name = dataHolder.getName();
         this.description = dataHolder.getDescription();

Modified: roller/trunk/src/org/apache/roller/ui/struts2/editor/BookmarkEdit.java
URL: http://svn.apache.org/viewvc/roller/trunk/src/org/apache/roller/ui/struts2/editor/BookmarkEdit.java?view=diff&rev=542656&r1=542655&r2=542656
==============================================================================
--- roller/trunk/src/org/apache/roller/ui/struts2/editor/BookmarkEdit.java (original)
+++ roller/trunk/src/org/apache/roller/ui/struts2/editor/BookmarkEdit.java Tue May 29 14:22:19 2007
@@ -26,8 +26,8 @@
 import org.apache.roller.RollerException;
 import org.apache.roller.business.BookmarkManager;
 import org.apache.roller.business.RollerFactory;
-import org.apache.roller.pojos.BookmarkData;
-import org.apache.roller.pojos.PermissionsData;
+import org.apache.roller.pojos.WeblogBookmark;
+import org.apache.roller.pojos.WeblogPermission;
 import org.apache.roller.ui.struts2.util.UIAction;
 import org.apache.roller.util.cache.CacheManager;
 import org.apache.struts2.interceptor.validation.SkipValidation;
@@ -41,7 +41,7 @@
     private static Log log = LogFactory.getLog(BookmarkEdit.class);
     
     // the bookmark we are editing
-    private BookmarkData bookmark = null;
+    private WeblogBookmark bookmark = null;
     
     // bean for managing form data
     private BookmarkBean bean = new BookmarkBean();
@@ -55,7 +55,7 @@
     
     
     public short requiredWeblogPermissions() {
-        return PermissionsData.ADMIN;
+        return WeblogPermission.ADMIN;
     }
     
     
@@ -143,11 +143,11 @@
     }
     
     
-    public BookmarkData getBookmark() {
+    public WeblogBookmark getBookmark() {
         return bookmark;
     }
 
-    public void setBookmark(BookmarkData bookmark) {
+    public void setBookmark(WeblogBookmark bookmark) {
         this.bookmark = bookmark;
     }
 

Modified: roller/trunk/src/org/apache/roller/ui/struts2/editor/Bookmarks.java
URL: http://svn.apache.org/viewvc/roller/trunk/src/org/apache/roller/ui/struts2/editor/Bookmarks.java?view=diff&rev=542656&r1=542655&r2=542656
==============================================================================
--- roller/trunk/src/org/apache/roller/ui/struts2/editor/Bookmarks.java (original)
+++ roller/trunk/src/org/apache/roller/ui/struts2/editor/Bookmarks.java Tue May 29 14:22:19 2007
@@ -30,9 +30,9 @@
 import org.apache.roller.RollerException;
 import org.apache.roller.business.BookmarkManager;
 import org.apache.roller.business.RollerFactory;
-import org.apache.roller.pojos.BookmarkData;
-import org.apache.roller.pojos.FolderData;
-import org.apache.roller.pojos.PermissionsData;
+import org.apache.roller.pojos.WeblogBookmark;
+import org.apache.roller.pojos.WeblogBookmarkFolder;
+import org.apache.roller.pojos.WeblogPermission;
 import org.apache.roller.ui.struts2.util.UIAction;
 import org.apache.roller.util.cache.CacheManager;
 
@@ -48,7 +48,7 @@
     private String folderId = null;
     
     // the folder being viewed
-    private FolderData folder = null;
+    private WeblogBookmarkFolder folder = null;
     
     // the list of folders to move/delete
     private String[] selectedFolders = null;
@@ -75,7 +75,7 @@
     
     // admin perms required
     public short requiredWeblogPermissions() {
-        return PermissionsData.ADMIN;
+        return WeblogPermission.ADMIN;
     }
     
     
@@ -106,15 +106,15 @@
         try {
             // Build list of all folders, except for current one, sorted by path.
             BookmarkManager bmgr = RollerFactory.getRoller().getBookmarkManager();
-            List<FolderData> folders = bmgr.getAllFolders(getActionWeblog());
-            for(FolderData fd : folders) {
+            List<WeblogBookmarkFolder> folders = bmgr.getAllFolders(getActionWeblog());
+            for(WeblogBookmarkFolder fd : folders) {
                 if (!fd.getId().equals(getFolderId())) {
                     allFolders.add(fd);
                 }
             }
             
             // build folder path
-            FolderData parent = getFolder().getParent();
+            WeblogBookmarkFolder parent = getFolder().getParent();
             if(parent != null) {
                 List folderPath = new LinkedList();
                 folderPath.add(0, getFolder());
@@ -153,12 +153,12 @@
                 log.debug("Processing delete of "+folders.length+" folders.");
                 for (int i = 0; i < folders.length; i++) {
                     log.debug("Deleting folder - "+folders[i]);
-                    FolderData fd = bmgr.getFolder(folders[i]);
+                    WeblogBookmarkFolder fd = bmgr.getFolder(folders[i]);
                     bmgr.removeFolder(fd); // removes child folders and bookmarks too
                 }
             }
             
-            BookmarkData bookmark = null;
+            WeblogBookmark bookmark = null;
             String bookmarks[] = getSelectedBookmarks();
             if (null != bookmarks) {
                 log.debug("Processing delete of "+bookmarks.length+" bookmarks.");
@@ -197,10 +197,10 @@
             
             // Move folders to new parent folder.
             String folders[] = getSelectedFolders();
-            FolderData parent = bmgr.getFolder(getTargetFolderId());
+            WeblogBookmarkFolder parent = bmgr.getFolder(getTargetFolderId());
             if (null != folders) {
                 for (int i = 0; i < folders.length; i++) {
-                    FolderData fd = bmgr.getFolder(folders[i]);
+                    WeblogBookmarkFolder fd = bmgr.getFolder(folders[i]);
                     
                     // Don't move folder into itself.
                     if (!fd.getId().equals(parent.getId()) && 
@@ -217,7 +217,7 @@
             if (null != bookmarks) {
                 for (int j = 0; j < bookmarks.length; j++) {
                     // maybe we should be using folder.addBookmark()?
-                    BookmarkData bd = bmgr.getBookmark(bookmarks[j]);
+                    WeblogBookmark bd = bmgr.getBookmark(bookmarks[j]);
                     bd.setFolder(parent);
                     bmgr.saveBookmark(bd);
                 }
@@ -240,8 +240,8 @@
     
     private static final class FolderPathComparator implements Comparator {
         public int compare(Object o1, Object o2) {
-            FolderData f1 = (FolderData)o1;
-            FolderData f2 = (FolderData)o2;
+            WeblogBookmarkFolder f1 = (WeblogBookmarkFolder)o1;
+            WeblogBookmarkFolder f2 = (WeblogBookmarkFolder)o2;
             return f1.getPath().compareTo(f2.getPath());
         }
     }
@@ -287,11 +287,11 @@
         this.allFolders = allFolders;
     }
 
-    public FolderData getFolder() {
+    public WeblogBookmarkFolder getFolder() {
         return folder;
     }
 
-    public void setFolder(FolderData folder) {
+    public void setFolder(WeblogBookmarkFolder folder) {
         this.folder = folder;
     }
 

Modified: roller/trunk/src/org/apache/roller/ui/struts2/editor/BookmarksImport.java
URL: http://svn.apache.org/viewvc/roller/trunk/src/org/apache/roller/ui/struts2/editor/BookmarksImport.java?view=diff&rev=542656&r1=542655&r2=542656
==============================================================================
--- roller/trunk/src/org/apache/roller/ui/struts2/editor/BookmarksImport.java (original)
+++ roller/trunk/src/org/apache/roller/ui/struts2/editor/BookmarksImport.java Tue May 29 14:22:19 2007
@@ -28,7 +28,7 @@
 import org.apache.commons.logging.LogFactory;
 import org.apache.roller.business.BookmarkManager;
 import org.apache.roller.business.RollerFactory;
-import org.apache.roller.pojos.PermissionsData;
+import org.apache.roller.pojos.WeblogPermission;
 import org.apache.roller.ui.struts2.util.UIAction;
 import org.apache.roller.util.cache.CacheManager;
 
@@ -59,7 +59,7 @@
     
     // author perms required
     public short requiredWeblogPermissions() {
-        return PermissionsData.AUTHOR;
+        return WeblogPermission.AUTHOR;
     }
     
     

Modified: roller/trunk/src/org/apache/roller/ui/struts2/editor/Categories.java
URL: http://svn.apache.org/viewvc/roller/trunk/src/org/apache/roller/ui/struts2/editor/Categories.java?view=diff&rev=542656&r1=542655&r2=542656
==============================================================================
--- roller/trunk/src/org/apache/roller/ui/struts2/editor/Categories.java (original)
+++ roller/trunk/src/org/apache/roller/ui/struts2/editor/Categories.java Tue May 29 14:22:19 2007
@@ -29,7 +29,7 @@
 import org.apache.roller.RollerException;
 import org.apache.roller.business.RollerFactory;
 import org.apache.roller.business.WeblogManager;
-import org.apache.roller.pojos.PermissionsData;
+import org.apache.roller.pojos.WeblogPermission;
 import org.apache.roller.pojos.WeblogCategoryData;
 import org.apache.roller.pojos.WeblogCategoryPathComparator;
 import org.apache.roller.ui.struts2.util.UIAction;
@@ -70,7 +70,7 @@
     
     // author perms required
     public short requiredWeblogPermissions() {
-        return PermissionsData.AUTHOR;
+        return WeblogPermission.AUTHOR;
     }
     
     

Modified: roller/trunk/src/org/apache/roller/ui/struts2/editor/CategoryAdd.java
URL: http://svn.apache.org/viewvc/roller/trunk/src/org/apache/roller/ui/struts2/editor/CategoryAdd.java?view=diff&rev=542656&r1=542655&r2=542656
==============================================================================
--- roller/trunk/src/org/apache/roller/ui/struts2/editor/CategoryAdd.java (original)
+++ roller/trunk/src/org/apache/roller/ui/struts2/editor/CategoryAdd.java Tue May 29 14:22:19 2007
@@ -25,7 +25,7 @@
 import org.apache.roller.business.RollerFactory;
 import org.apache.roller.business.WeblogManager;
 import org.apache.roller.pojos.WeblogCategoryData;
-import org.apache.roller.pojos.PermissionsData;
+import org.apache.roller.pojos.WeblogPermission;
 import org.apache.roller.ui.struts2.util.UIAction;
 import org.apache.roller.util.cache.CacheManager;
 import org.apache.struts2.interceptor.validation.SkipValidation;
@@ -57,7 +57,7 @@
     
     // author perms required
     public short requiredWeblogPermissions() {
-        return PermissionsData.AUTHOR;
+        return WeblogPermission.AUTHOR;
     }
     
     

Modified: roller/trunk/src/org/apache/roller/ui/struts2/editor/CategoryEdit.java
URL: http://svn.apache.org/viewvc/roller/trunk/src/org/apache/roller/ui/struts2/editor/CategoryEdit.java?view=diff&rev=542656&r1=542655&r2=542656
==============================================================================
--- roller/trunk/src/org/apache/roller/ui/struts2/editor/CategoryEdit.java (original)
+++ roller/trunk/src/org/apache/roller/ui/struts2/editor/CategoryEdit.java Tue May 29 14:22:19 2007
@@ -25,7 +25,7 @@
 import org.apache.roller.business.RollerFactory;
 import org.apache.roller.business.WeblogManager;
 import org.apache.roller.pojos.WeblogCategoryData;
-import org.apache.roller.pojos.PermissionsData;
+import org.apache.roller.pojos.WeblogPermission;
 import org.apache.roller.ui.struts2.util.UIAction;
 import org.apache.roller.util.cache.CacheManager;
 import org.apache.struts2.interceptor.validation.SkipValidation;
@@ -54,7 +54,7 @@
     
     // author perms required
     public short requiredWeblogPermissions() {
-        return PermissionsData.AUTHOR;
+        return WeblogPermission.AUTHOR;
     }
     
     

Modified: roller/trunk/src/org/apache/roller/ui/struts2/editor/CategoryRemove.java
URL: http://svn.apache.org/viewvc/roller/trunk/src/org/apache/roller/ui/struts2/editor/CategoryRemove.java?view=diff&rev=542656&r1=542655&r2=542656
==============================================================================
--- roller/trunk/src/org/apache/roller/ui/struts2/editor/CategoryRemove.java (original)
+++ roller/trunk/src/org/apache/roller/ui/struts2/editor/CategoryRemove.java Tue May 29 14:22:19 2007
@@ -28,7 +28,7 @@
 import org.apache.roller.RollerException;
 import org.apache.roller.business.RollerFactory;
 import org.apache.roller.business.WeblogManager;
-import org.apache.roller.pojos.PermissionsData;
+import org.apache.roller.pojos.WeblogPermission;
 import org.apache.roller.pojos.WeblogCategoryData;
 import org.apache.roller.pojos.WeblogCategoryPathComparator;
 import org.apache.roller.ui.struts2.util.UIAction;
@@ -63,7 +63,7 @@
     
     
     public short requiredWeblogPermissions() {
-        return PermissionsData.AUTHOR;
+        return WeblogPermission.AUTHOR;
     }
     
     

Modified: roller/trunk/src/org/apache/roller/ui/struts2/editor/Comments.java
URL: http://svn.apache.org/viewvc/roller/trunk/src/org/apache/roller/ui/struts2/editor/Comments.java?view=diff&rev=542656&r1=542655&r2=542656
==============================================================================
--- roller/trunk/src/org/apache/roller/ui/struts2/editor/Comments.java (original)
+++ roller/trunk/src/org/apache/roller/ui/struts2/editor/Comments.java Tue May 29 14:22:19 2007
@@ -29,7 +29,7 @@
 import org.apache.roller.business.RollerFactory;
 import org.apache.roller.business.WeblogManager;
 import org.apache.roller.pojos.CommentData;
-import org.apache.roller.pojos.PermissionsData;
+import org.apache.roller.pojos.WeblogPermission;
 import org.apache.roller.ui.struts2.util.KeyValueObject;
 import org.apache.roller.util.cache.CacheManager;
 import org.apache.roller.ui.struts2.util.UIAction;
@@ -78,7 +78,7 @@
     
     @Override
     public short requiredWeblogPermissions() {
-        return PermissionsData.AUTHOR;
+        return WeblogPermission.AUTHOR;
     }
     
     

Modified: roller/trunk/src/org/apache/roller/ui/struts2/editor/CustomPingTargetAdd.java
URL: http://svn.apache.org/viewvc/roller/trunk/src/org/apache/roller/ui/struts2/editor/CustomPingTargetAdd.java?view=diff&rev=542656&r1=542655&r2=542656
==============================================================================
--- roller/trunk/src/org/apache/roller/ui/struts2/editor/CustomPingTargetAdd.java (original)
+++ roller/trunk/src/org/apache/roller/ui/struts2/editor/CustomPingTargetAdd.java Tue May 29 14:22:19 2007
@@ -11,7 +11,7 @@
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
-import org.apache.roller.pojos.PermissionsData;
+import org.apache.roller.pojos.WeblogPermission;
 import org.apache.roller.pojos.PingTargetData;
 import org.apache.roller.ui.struts2.common.PingTargetAddBase;
 
@@ -33,7 +33,7 @@
     
     // admin perms required
     public short requiredWeblogPermission() {
-        return PermissionsData.ADMIN;
+        return WeblogPermission.ADMIN;
     }