roller-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From agillil...@apache.org
Subject svn commit: r542688 [5/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/runnable/ src...
Date Tue, 29 May 2007 22:47:24 GMT
Modified: roller/trunk/src/org/apache/roller/ui/struts2/core/ProfileBean.java
URL: http://svn.apache.org/viewvc/roller/trunk/src/org/apache/roller/ui/struts2/core/ProfileBean.java?view=diff&rev=542688&r1=542687&r2=542688
==============================================================================
--- roller/trunk/src/org/apache/roller/ui/struts2/core/ProfileBean.java (original)
+++ roller/trunk/src/org/apache/roller/ui/struts2/core/ProfileBean.java Tue May 29 15:47:17 2007
@@ -18,7 +18,7 @@
 
 package org.apache.roller.ui.struts2.core;
 
-import org.apache.roller.pojos.UserData;
+import org.apache.roller.pojos.User;
 
 
 /**
@@ -120,7 +120,7 @@
     }
     
     
-    public void copyTo(UserData dataHolder) {
+    public void copyTo(User dataHolder) {
         
         dataHolder.setScreenName(this.screenName);
         dataHolder.setFullName(this.fullName);
@@ -130,7 +130,7 @@
     }
     
     
-    public void copyFrom(UserData dataHolder) {
+    public void copyFrom(User dataHolder) {
         
         this.id = dataHolder.getId();
         this.userName = dataHolder.getUserName();

Modified: roller/trunk/src/org/apache/roller/ui/struts2/core/Register.java
URL: http://svn.apache.org/viewvc/roller/trunk/src/org/apache/roller/ui/struts2/core/Register.java?view=diff&rev=542688&r1=542687&r2=542688
==============================================================================
--- roller/trunk/src/org/apache/roller/ui/struts2/core/Register.java (original)
+++ roller/trunk/src/org/apache/roller/ui/struts2/core/Register.java Tue May 29 15:47:17 2007
@@ -31,7 +31,7 @@
 import org.apache.roller.business.UserManager;
 import org.apache.roller.config.RollerConfig;
 import org.apache.roller.config.RollerRuntimeConfig;
-import org.apache.roller.pojos.UserData;
+import org.apache.roller.pojos.User;
 import org.apache.roller.ui.core.security.CustomUserRegistry;
 import org.apache.roller.ui.struts2.util.UIAction;
 import org.apache.roller.util.MailUtil;
@@ -90,7 +90,7 @@
             // and retrieve custom user data to pre-populate form.
             boolean usingSSO = RollerConfig.getBooleanProperty("users.sso.enabled");
             if(usingSSO) {
-                UserData fromSSO = CustomUserRegistry.getUserDetailsFromAuthentication();
+                User fromSSO = CustomUserRegistry.getUserDetailsFromAuthentication();
                 if(fromSSO != null) {
                     getBean().copyFrom(fromSSO);
                     setFromSS0(true);
@@ -125,7 +125,7 @@
             UserManager mgr = RollerFactory.getRoller().getUserManager();
             
             // copy form data into new user pojo
-            UserData ud = new UserData();
+            User ud = new User();
             getBean().copyTo(ud); // doesn't copy password
             ud.setId(null);
             ud.setUserName(getBean().getUserName());
@@ -214,7 +214,7 @@
             if (getActivationCode() == null) {
                 addError("error.activate.user.missingActivationCode");
             } else {
-                UserData user = mgr.getUserByActivationCode(getActivationCode());
+                User user = mgr.getUserByActivationCode(getActivationCode());
                 
                 if (user != null) {
                     // enable user account
@@ -253,7 +253,7 @@
         boolean usingSSO = RollerConfig.getBooleanProperty("users.sso.enabled");
         if(usingSSO) {
             boolean storePassword = RollerConfig.getBooleanProperty("users.sso.passwords.saveInRollerDb");
-            UserData fromSSO = CustomUserRegistry.getUserDetailsFromAuthentication();
+            User fromSSO = CustomUserRegistry.getUserDetailsFromAuthentication();
             if(fromSSO != null) {
                 String password = RollerConfig.getProperty("users.sso.passwords.defaultValue", "<unknown>");
                 if(storePassword) {

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=542688&r1=542687&r2=542688
==============================================================================
--- 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 15:47:17 2007
@@ -30,7 +30,7 @@
 import org.apache.roller.business.RollerFactory;
 import org.apache.roller.business.WeblogManager;
 import org.apache.roller.pojos.WeblogPermission;
-import org.apache.roller.pojos.WeblogCategoryData;
+import org.apache.roller.pojos.WeblogCategory;
 import org.apache.roller.pojos.WeblogCategoryPathComparator;
 import org.apache.roller.ui.struts2.util.UIAction;
 
@@ -46,7 +46,7 @@
     private String categoryId = null;
     
     // the category we are viewing
-    private WeblogCategoryData category = null;
+    private WeblogCategory category = null;
     
     // list of category ids to move
     private String[] selectedCategories = null;
@@ -97,15 +97,15 @@
         try {
             // Build list of all categories, except for current one, sorted by path.
             WeblogManager wmgr = RollerFactory.getRoller().getWeblogManager();
-            List<WeblogCategoryData> cats = wmgr.getWeblogCategories(getActionWeblog(), true);
-            for(WeblogCategoryData cat : cats) {
+            List<WeblogCategory> cats = wmgr.getWeblogCategories(getActionWeblog(), true);
+            for(WeblogCategory cat : cats) {
                 if (!cat.getId().equals(getCategoryId())) {
                     allCategories.add(cat);
                 }
             }
             
             // build category path
-            WeblogCategoryData parent = getCategory().getParent();
+            WeblogCategory parent = getCategory().getParent();
             if(parent != null) {
                 List categoryPath = new LinkedList();
                 categoryPath.add(0, getCategory());
@@ -138,10 +138,10 @@
             
             // Move subCategories to new category.
             String[] cats = getSelectedCategories();
-            WeblogCategoryData parent = wmgr.getWeblogCategory(getTargetCategoryId());
+            WeblogCategory parent = wmgr.getWeblogCategory(getTargetCategoryId());
             if(cats != null) {
                 for (int i = 0; i < cats.length; i++) {
-                    WeblogCategoryData cd =
+                    WeblogCategory cd =
                             wmgr.getWeblogCategory(cats[i]);
                     
                     // Don't move category into itself.
@@ -174,11 +174,11 @@
         this.categoryId = categoryId;
     }
 
-    public WeblogCategoryData getCategory() {
+    public WeblogCategory getCategory() {
         return category;
     }
 
-    public void setCategory(WeblogCategoryData category) {
+    public void setCategory(WeblogCategory category) {
         this.category = category;
     }
 

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=542688&r1=542687&r2=542688
==============================================================================
--- 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 15:47:17 2007
@@ -24,7 +24,7 @@
 import org.apache.roller.RollerException;
 import org.apache.roller.business.RollerFactory;
 import org.apache.roller.business.WeblogManager;
-import org.apache.roller.pojos.WeblogCategoryData;
+import org.apache.roller.pojos.WeblogCategory;
 import org.apache.roller.pojos.WeblogPermission;
 import org.apache.roller.ui.struts2.util.UIAction;
 import org.apache.roller.util.cache.CacheManager;
@@ -42,7 +42,7 @@
     private String categoryId = null;
     
     // the category we are adding the new subcategory into
-    private WeblogCategoryData category = null;
+    private WeblogCategory category = null;
     
     // bean for managing form data
     private CategoryBean bean = new CategoryBean();
@@ -105,7 +105,7 @@
         
         if(!hasActionErrors()) try {
             
-            WeblogCategoryData newCategory = new WeblogCategoryData(
+            WeblogCategory newCategory = new WeblogCategory(
                     getActionWeblog(),
                     getCategory(),
                     getBean().getName(),
@@ -158,11 +158,11 @@
         this.categoryId = categoryId;
     }
 
-    public WeblogCategoryData getCategory() {
+    public WeblogCategory getCategory() {
         return category;
     }
 
-    public void setCategory(WeblogCategoryData category) {
+    public void setCategory(WeblogCategory category) {
         this.category = category;
     }
 

Modified: roller/trunk/src/org/apache/roller/ui/struts2/editor/CategoryBean.java
URL: http://svn.apache.org/viewvc/roller/trunk/src/org/apache/roller/ui/struts2/editor/CategoryBean.java?view=diff&rev=542688&r1=542687&r2=542688
==============================================================================
--- roller/trunk/src/org/apache/roller/ui/struts2/editor/CategoryBean.java (original)
+++ roller/trunk/src/org/apache/roller/ui/struts2/editor/CategoryBean.java Tue May 29 15:47:17 2007
@@ -19,7 +19,7 @@
 package org.apache.roller.ui.struts2.editor;
 
 import org.apache.roller.RollerException;
-import org.apache.roller.pojos.WeblogCategoryData;
+import org.apache.roller.pojos.WeblogCategory;
 
 
 /**
@@ -66,7 +66,7 @@
     }
     
     
-    public void copyTo(WeblogCategoryData dataHolder) throws RollerException {
+    public void copyTo(WeblogCategory dataHolder) throws RollerException {
         
         if(!dataHolder.getName().equals(this.name)) {
             dataHolder.updateName(this.name);
@@ -77,7 +77,7 @@
     }
     
     
-    public void copyFrom(WeblogCategoryData dataHolder) {
+    public void copyFrom(WeblogCategory dataHolder) {
         this.id = dataHolder.getId();
         this.name = dataHolder.getName();
         this.description = dataHolder.getDescription();

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=542688&r1=542687&r2=542688
==============================================================================
--- 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 15:47:17 2007
@@ -24,7 +24,7 @@
 import org.apache.roller.RollerException;
 import org.apache.roller.business.RollerFactory;
 import org.apache.roller.business.WeblogManager;
-import org.apache.roller.pojos.WeblogCategoryData;
+import org.apache.roller.pojos.WeblogCategory;
 import org.apache.roller.pojos.WeblogPermission;
 import org.apache.roller.ui.struts2.util.UIAction;
 import org.apache.roller.util.cache.CacheManager;
@@ -39,7 +39,7 @@
     private static Log log = LogFactory.getLog(CategoryEdit.class);
     
     // the category we are editing
-    private WeblogCategoryData category = null;
+    private WeblogCategory category = null;
     
     // bean for managing form data
     private CategoryBean bean = new CategoryBean();
@@ -136,7 +136,7 @@
         
         // make sure new name is not a duplicate of an existing category
         if(!getCategory().getName().equals(getBean().getName())) {
-            WeblogCategoryData parent = getCategory().getParent();
+            WeblogCategory parent = getCategory().getParent();
             if(parent != null && parent.hasCategory(getBean().getName())) {
                 addError("categoryForm.error.duplicateName", getBean().getName());
             }
@@ -144,11 +144,11 @@
     }
 
 
-    public WeblogCategoryData getCategory() {
+    public WeblogCategory getCategory() {
         return category;
     }
 
-    public void setCategory(WeblogCategoryData category) {
+    public void setCategory(WeblogCategory category) {
         this.category = category;
     }
 

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=542688&r1=542687&r2=542688
==============================================================================
--- 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 15:47:17 2007
@@ -29,7 +29,7 @@
 import org.apache.roller.business.RollerFactory;
 import org.apache.roller.business.WeblogManager;
 import org.apache.roller.pojos.WeblogPermission;
-import org.apache.roller.pojos.WeblogCategoryData;
+import org.apache.roller.pojos.WeblogCategory;
 import org.apache.roller.pojos.WeblogCategoryPathComparator;
 import org.apache.roller.ui.struts2.util.UIAction;
 import org.apache.roller.util.cache.CacheManager;
@@ -46,7 +46,7 @@
     private String removeId = null;
     
     // category object that we will remove
-    private WeblogCategoryData category = null;
+    private WeblogCategory category = null;
     
     // category id of the category to move to
     private String targetCategoryId = null;
@@ -90,8 +90,8 @@
         try {
             // Build list of all categories, except for current one, sorted by path.
             WeblogManager wmgr = RollerFactory.getRoller().getWeblogManager();
-            List<WeblogCategoryData> cats = wmgr.getWeblogCategories(getActionWeblog(), true);
-            for(WeblogCategoryData cat : cats) {
+            List<WeblogCategory> cats = wmgr.getWeblogCategories(getActionWeblog(), true);
+            for(WeblogCategory cat : cats) {
                 if (!cat.getId().equals(getRemoveId())) {
                     allCategories.add(cat);
                 }
@@ -119,7 +119,7 @@
             WeblogManager wmgr = RollerFactory.getRoller().getWeblogManager();
             
             if(getTargetCategoryId() != null) {
-                WeblogCategoryData target = wmgr.getWeblogCategory(getTargetCategoryId());
+                WeblogCategory target = wmgr.getWeblogCategory(getTargetCategoryId());
                 wmgr.moveWeblogCategoryContents(getCategory(), target);
                 RollerFactory.getRoller().flush();
             }
@@ -153,11 +153,11 @@
         this.removeId = categoryId;
     }
 
-    public WeblogCategoryData getCategory() {
+    public WeblogCategory getCategory() {
         return category;
     }
 
-    public void setCategory(WeblogCategoryData category) {
+    public void setCategory(WeblogCategory category) {
         this.category = category;
     }
 

Modified: roller/trunk/src/org/apache/roller/ui/struts2/editor/Entries.java
URL: http://svn.apache.org/viewvc/roller/trunk/src/org/apache/roller/ui/struts2/editor/Entries.java?view=diff&rev=542688&r1=542687&r2=542688
==============================================================================
--- roller/trunk/src/org/apache/roller/ui/struts2/editor/Entries.java (original)
+++ roller/trunk/src/org/apache/roller/ui/struts2/editor/Entries.java Tue May 29 15:47:17 2007
@@ -27,7 +27,7 @@
 import org.apache.roller.business.RollerFactory;
 import org.apache.roller.business.WeblogManager;
 import org.apache.roller.pojos.WeblogPermission;
-import org.apache.roller.pojos.WeblogEntryData;
+import org.apache.roller.pojos.WeblogEntry;
 import org.apache.roller.ui.struts2.util.KeyValueObject;
 import org.apache.roller.ui.struts2.util.UIAction;
 
@@ -43,13 +43,13 @@
     private EntriesBean bean = new EntriesBean();
     
     // list of entries to display
-    private List<WeblogEntryData> entries = Collections.EMPTY_LIST;
+    private List<WeblogEntry> entries = Collections.EMPTY_LIST;
     
     // first entry in the list
-    private WeblogEntryData firstEntry = null;
+    private WeblogEntry firstEntry = null;
     
     // last entry in the list
-    private WeblogEntryData lastEntry = null;
+    private WeblogEntry lastEntry = null;
     
     // are there more results for the query?
     private boolean moreResults = false;
@@ -78,7 +78,7 @@
             String status = getBean().getStatus();
             
             WeblogManager wmgr = RollerFactory.getRoller().getWeblogManager();
-            List<WeblogEntryData> entries = wmgr.getWeblogEntries(
+            List<WeblogEntry> entries = wmgr.getWeblogEntries(
                     getActionWeblog(),
                     null,
                     getBean().getStartDate(),
@@ -102,8 +102,8 @@
                 }
                 
                 setEntries(entries);
-                setFirstEntry((WeblogEntryData)entries.get(0));
-                setLastEntry((WeblogEntryData)entries.get(entries.size()-1));
+                setFirstEntry((WeblogEntry)entries.get(0));
+                setLastEntry((WeblogEntry)entries.get(entries.size()-1));
             }
         } catch (RollerException ex) {
             log.error("Error looking up entries", ex);
@@ -145,27 +145,27 @@
         this.bean = bean;
     }
 
-    public List<WeblogEntryData> getEntries() {
+    public List<WeblogEntry> getEntries() {
         return entries;
     }
 
-    public void setEntries(List<WeblogEntryData> entries) {
+    public void setEntries(List<WeblogEntry> entries) {
         this.entries = entries;
     }
 
-    public WeblogEntryData getFirstEntry() {
+    public WeblogEntry getFirstEntry() {
         return firstEntry;
     }
 
-    public void setFirstEntry(WeblogEntryData firstEntry) {
+    public void setFirstEntry(WeblogEntry firstEntry) {
         this.firstEntry = firstEntry;
     }
 
-    public WeblogEntryData getLastEntry() {
+    public WeblogEntry getLastEntry() {
         return lastEntry;
     }
 
-    public void setLastEntry(WeblogEntryData lastEntry) {
+    public void setLastEntry(WeblogEntry lastEntry) {
         this.lastEntry = lastEntry;
     }
 

Modified: roller/trunk/src/org/apache/roller/ui/struts2/editor/EntryAdd.java
URL: http://svn.apache.org/viewvc/roller/trunk/src/org/apache/roller/ui/struts2/editor/EntryAdd.java?view=diff&rev=542688&r1=542687&r2=542688
==============================================================================
--- roller/trunk/src/org/apache/roller/ui/struts2/editor/EntryAdd.java (original)
+++ roller/trunk/src/org/apache/roller/ui/struts2/editor/EntryAdd.java Tue May 29 15:47:17 2007
@@ -26,7 +26,7 @@
 import org.apache.roller.business.RollerFactory;
 import org.apache.roller.business.WeblogManager;
 import org.apache.roller.pojos.WeblogPermission;
-import org.apache.roller.pojos.WeblogEntryData;
+import org.apache.roller.pojos.WeblogEntry;
 import org.apache.roller.util.MediacastException;
 import org.apache.roller.util.cache.CacheManager;
 import org.apache.roller.util.MailUtil;
@@ -70,9 +70,9 @@
         
         // if user is an author then post status defaults to PUBLISHED, otherwise PENDING
         if(getActionWeblog().hasUserPermissions(getAuthenticatedUser(),WeblogPermission.AUTHOR)) {
-            getBean().setStatus(WeblogEntryData.PUBLISHED);
+            getBean().setStatus(WeblogEntry.PUBLISHED);
         } else {
-            getBean().setStatus(WeblogEntryData.PENDING);
+            getBean().setStatus(WeblogEntry.PENDING);
         }
         
         // set entry locale based on weblog locale
@@ -101,7 +101,7 @@
         if(!hasActionErrors()) try {
             WeblogManager weblogMgr = RollerFactory.getRoller().getWeblogManager();
             
-            WeblogEntryData entry = new WeblogEntryData();
+            WeblogEntry entry = new WeblogEntry();
             entry.setCreator(getAuthenticatedUser());
             entry.setWebsite(getActionWeblog());
             
@@ -121,7 +121,7 @@
                 
                 // if user does not have author perms then force PENDING status
                 if(!getActionWeblog().hasUserPermissions(getAuthenticatedUser(),WeblogPermission.AUTHOR)) {
-                    entry.setStatus(WeblogEntryData.PENDING);
+                    entry.setStatus(WeblogEntry.PENDING);
                 }
             }
             
@@ -187,6 +187,7 @@
             // TODO: i18n
             addError("Error saving new entry");
         }
+
 
         
         return INPUT;

Modified: roller/trunk/src/org/apache/roller/ui/struts2/editor/EntryBase.java
URL: http://svn.apache.org/viewvc/roller/trunk/src/org/apache/roller/ui/struts2/editor/EntryBase.java?view=diff&rev=542688&r1=542687&r2=542688
==============================================================================
--- roller/trunk/src/org/apache/roller/ui/struts2/editor/EntryBase.java (original)
+++ roller/trunk/src/org/apache/roller/ui/struts2/editor/EntryBase.java Tue May 29 15:47:17 2007
@@ -30,7 +30,7 @@
 import org.apache.roller.business.WeblogEntryPlugin;
 import org.apache.roller.business.search.IndexManager;
 import org.apache.roller.pojos.WeblogPermission;
-import org.apache.roller.pojos.WeblogEntryData;
+import org.apache.roller.pojos.WeblogEntry;
 import org.apache.roller.ui.core.RollerContext;
 import org.apache.roller.ui.core.plugins.UIPluginManager;
 import org.apache.roller.ui.core.plugins.WeblogEntryEditor;
@@ -49,7 +49,7 @@
     /**
      * Trigger reindexing of modified entry.
      */
-    protected void reindexEntry(WeblogEntryData entry) {
+    protected void reindexEntry(WeblogEntry entry) {
         IndexManager manager = RollerFactory.getRoller().getIndexManager();
         
         // if published, index the entry
@@ -69,17 +69,17 @@
      * @return List of WeblogEntryData objects.
      * @throws RollerException
      */
-    public List<WeblogEntryData> getRecentPublishedEntries() {
-        List<WeblogEntryData> entries = Collections.EMPTY_LIST;
+    public List<WeblogEntry> getRecentPublishedEntries() {
+        List<WeblogEntry> entries = Collections.EMPTY_LIST;
         try {
             entries = RollerFactory.getRoller().getWeblogManager().getWeblogEntries(
+                    
                     getActionWeblog(), // userName
                     null,
                     null,              // startDate
                     null,              // endDate
                     null,              // catName
-                    null,              // tags
-                    WeblogEntryData.PUBLISHED, // status
+                    null,WeblogEntry.PUBLISHED, // status
                     null,              // text
                     null,              // sortby (null for pubTime)
                     null,
@@ -98,17 +98,17 @@
      * @return List of WeblogEntryData objects.
      * @throws RollerException
      */
-    public List<WeblogEntryData> getRecentScheduledEntries() {
-        List<WeblogEntryData> entries = Collections.EMPTY_LIST;
+    public List<WeblogEntry> getRecentScheduledEntries() {
+        List<WeblogEntry> entries = Collections.EMPTY_LIST;
         try {
             entries = RollerFactory.getRoller().getWeblogManager().getWeblogEntries(
+                    
                     getActionWeblog(), // userName
                     null,
                     null,              // startDate
                     null,              // endDate
                     null,              // catName
-                    null,              // tags
-                    WeblogEntryData.SCHEDULED, // status
+                    null,WeblogEntry.SCHEDULED, // status
                     null,              // text
                     null,              // sortby (null for pubTime)
                     null,
@@ -126,17 +126,17 @@
      * @return List of WeblogEntryData objects.
      * @throws RollerException
      */
-    public List<WeblogEntryData> getRecentDraftEntries() {
-        List<WeblogEntryData> entries = Collections.EMPTY_LIST;
+    public List<WeblogEntry> getRecentDraftEntries() {
+        List<WeblogEntry> entries = Collections.EMPTY_LIST;
         try {
             entries = RollerFactory.getRoller().getWeblogManager().getWeblogEntries(
+                    
                     getActionWeblog(),
                     null,
                     null,              // startDate
                     null,              // endDate
                     null,              // catName
-                    null,              // tags
-                    WeblogEntryData.DRAFT, // status
+                    null,WeblogEntry.DRAFT, // status
                     null,              // text
                     "updateTime",      // sortby
                     null,
@@ -154,17 +154,17 @@
      * @return List of WeblogEntryData objects.
      * @throws RollerException
      */
-    public List<WeblogEntryData> getRecentPendingEntries() {
-        List<WeblogEntryData> entries = Collections.EMPTY_LIST;
+    public List<WeblogEntry> getRecentPendingEntries() {
+        List<WeblogEntry> entries = Collections.EMPTY_LIST;
         try {
             entries = RollerFactory.getRoller().getWeblogManager().getWeblogEntries(
+                    
                     getActionWeblog(),
                     null,
                     null,              // startDate
                     null,              // endDate
                     null,              // catName
-                    null,              // tags
-                    WeblogEntryData.PENDING, // status
+                    null,WeblogEntry.PENDING, // status
                     null,              // text
                     "updateTime",      // sortby
                     null,

Modified: roller/trunk/src/org/apache/roller/ui/struts2/editor/EntryBean.java
URL: http://svn.apache.org/viewvc/roller/trunk/src/org/apache/roller/ui/struts2/editor/EntryBean.java?view=diff&rev=542688&r1=542687&r2=542688
==============================================================================
--- roller/trunk/src/org/apache/roller/ui/struts2/editor/EntryBean.java (original)
+++ roller/trunk/src/org/apache/roller/ui/struts2/editor/EntryBean.java Tue May 29 15:47:17 2007
@@ -32,8 +32,8 @@
 import org.apache.roller.business.RollerFactory;
 import org.apache.roller.business.WeblogManager;
 import org.apache.roller.pojos.WeblogEntryAttribute;
-import org.apache.roller.pojos.WeblogCategoryData;
-import org.apache.roller.pojos.WeblogEntryData;
+import org.apache.roller.pojos.WeblogCategory;
+import org.apache.roller.pojos.WeblogEntry;
 
 
 /**
@@ -241,19 +241,19 @@
     }
     
     public boolean isDraft() {
-        return status.equals(WeblogEntryData.DRAFT);
+        return status.equals(WeblogEntry.DRAFT);
     }
     
     public boolean isPending() {
-        return status.equals(WeblogEntryData.PENDING);
+        return status.equals(WeblogEntry.PENDING);
     }
     
     public boolean isPublished() {
-        return status.equals(WeblogEntryData.PUBLISHED);
+        return status.equals(WeblogEntry.PUBLISHED);
     }
     
     
-    public void copyTo(WeblogEntryData entry) throws RollerException {
+    public void copyTo(WeblogEntry entry) throws RollerException {
         
         entry.setTitle(getTitle());
         entry.setStatus(getStatus());
@@ -264,7 +264,7 @@
         
         // figure out the category selected
         if (getCategoryId() != null) {
-            WeblogCategoryData cat = null;
+            WeblogCategory cat = null;
             try {
                 WeblogManager wmgr = RollerFactory.getRoller().getWeblogManager();
                 cat = wmgr.getWeblogCategory(getCategoryId());
@@ -298,7 +298,7 @@
     /**
      * Copy values from WeblogEntryData to this Form.
      */
-    public void copyFrom(WeblogEntryData entry, Locale locale) {
+    public void copyFrom(WeblogEntry entry, Locale locale) {
         
         setId(entry.getId());
         setTitle(entry.getTitle());

Modified: roller/trunk/src/org/apache/roller/ui/struts2/editor/EntryEdit.java
URL: http://svn.apache.org/viewvc/roller/trunk/src/org/apache/roller/ui/struts2/editor/EntryEdit.java?view=diff&rev=542688&r1=542687&r2=542688
==============================================================================
--- roller/trunk/src/org/apache/roller/ui/struts2/editor/EntryEdit.java (original)
+++ roller/trunk/src/org/apache/roller/ui/struts2/editor/EntryEdit.java Tue May 29 15:47:17 2007
@@ -29,7 +29,7 @@
 import org.apache.roller.business.RollerFactory;
 import org.apache.roller.business.WeblogManager;
 import org.apache.roller.pojos.WeblogPermission;
-import org.apache.roller.pojos.WeblogEntryData;
+import org.apache.roller.pojos.WeblogEntry;
 import org.apache.roller.util.cache.CacheManager;
 import org.apache.roller.util.MailUtil;
 import org.apache.commons.lang.StringUtils;
@@ -51,7 +51,7 @@
     private EntryBean bean = new EntryBean();
     
     // the entry we are editing
-    private WeblogEntryData entry = null;
+    private WeblogEntry entry = null;
     
     // url to send trackback to
     private String trackbackUrl = null;
@@ -121,7 +121,7 @@
         if(!hasActionErrors()) try {
             WeblogManager weblogMgr = RollerFactory.getRoller().getWeblogManager();
             
-            WeblogEntryData entry = getEntry();
+            WeblogEntry entry = getEntry();
             
             // set updatetime & pubtime
             entry.setUpdateTime(new Timestamp(new Date().getTime()));
@@ -139,7 +139,7 @@
                 
                 // if user does not have author perms then force PENDING status
                 if(!getActionWeblog().hasUserPermissions(getAuthenticatedUser(),WeblogPermission.AUTHOR)) {
-                    entry.setStatus(WeblogEntryData.PENDING);
+                    entry.setStatus(WeblogEntry.PENDING);
                 }
             }
             
@@ -196,6 +196,7 @@
             addError("Error saving new entry");
         }
 
+
         
         return INPUT;
     }
@@ -269,11 +270,11 @@
         this.bean = bean;
     }
 
-    public WeblogEntryData getEntry() {
+    public WeblogEntry getEntry() {
         return entry;
     }
 
-    public void setEntry(WeblogEntryData entry) {
+    public void setEntry(WeblogEntry entry) {
         this.entry = entry;
     }
 

Modified: roller/trunk/src/org/apache/roller/ui/struts2/editor/EntryRemove.java
URL: http://svn.apache.org/viewvc/roller/trunk/src/org/apache/roller/ui/struts2/editor/EntryRemove.java?view=diff&rev=542688&r1=542687&r2=542688
==============================================================================
--- roller/trunk/src/org/apache/roller/ui/struts2/editor/EntryRemove.java (original)
+++ roller/trunk/src/org/apache/roller/ui/struts2/editor/EntryRemove.java Tue May 29 15:47:17 2007
@@ -24,7 +24,7 @@
 import org.apache.roller.business.RollerFactory;
 import org.apache.roller.business.WeblogManager;
 import org.apache.roller.business.search.IndexManager;
-import org.apache.roller.pojos.WeblogEntryData;
+import org.apache.roller.pojos.WeblogEntry;
 import org.apache.roller.ui.struts2.util.UIAction;
 import org.apache.roller.util.cache.CacheManager;
 
@@ -40,7 +40,7 @@
     private String removeId = null;
     
     // entry object to remove
-    private WeblogEntryData removeEntry = null;
+    private WeblogEntry removeEntry = null;
     
     
     public EntryRemove() {
@@ -71,12 +71,12 @@
         
         if(getRemoveEntry() != null) try {
             
-            WeblogEntryData entry = getRemoveEntry();
+            WeblogEntry entry = getRemoveEntry();
             
             try {
                 // remove the entry from the search index
                 // TODO: can we do this in a better way?
-                entry.setStatus(WeblogEntryData.DRAFT);
+                entry.setStatus(WeblogEntry.DRAFT);
                 IndexManager manager = RollerFactory.getRoller().getIndexManager();
                 manager.addEntryReIndexOperation(entry);
             } catch (RollerException ex) {
@@ -117,11 +117,11 @@
         this.removeId = removeId;
     }
 
-    public WeblogEntryData getRemoveEntry() {
+    public WeblogEntry getRemoveEntry() {
         return removeEntry;
     }
 
-    public void setRemoveEntry(WeblogEntryData removeEntry) {
+    public void setRemoveEntry(WeblogEntry removeEntry) {
         this.removeEntry = removeEntry;
     }
     

Modified: roller/trunk/src/org/apache/roller/ui/struts2/editor/Members.java
URL: http://svn.apache.org/viewvc/roller/trunk/src/org/apache/roller/ui/struts2/editor/Members.java?view=diff&rev=542688&r1=542687&r2=542688
==============================================================================
--- roller/trunk/src/org/apache/roller/ui/struts2/editor/Members.java (original)
+++ roller/trunk/src/org/apache/roller/ui/struts2/editor/Members.java Tue May 29 15:47:17 2007
@@ -26,7 +26,7 @@
 import org.apache.roller.business.RollerFactory;
 import org.apache.roller.business.UserManager;
 import org.apache.roller.pojos.WeblogPermission;
-import org.apache.roller.pojos.UserData;
+import org.apache.roller.pojos.User;
 import org.apache.roller.ui.struts2.util.UIAction;
 import org.apache.struts2.interceptor.ParameterAware;
 
@@ -84,7 +84,7 @@
                 String sval = getParameter("perm-" + perms.getId());
                 if (sval != null) {
                     short val = Short.parseShort(sval);
-                    UserData user = getAuthenticatedUser();
+                    User user = getAuthenticatedUser();
                     if (perms.getUser().getId().equals(user.getId()) && 
                             val < perms.getPermissionMask()) {
                         addError("memberPermissions.noSelfDemotions");

Modified: roller/trunk/src/org/apache/roller/ui/struts2/editor/MembersInvite.java
URL: http://svn.apache.org/viewvc/roller/trunk/src/org/apache/roller/ui/struts2/editor/MembersInvite.java?view=diff&rev=542688&r1=542687&r2=542688
==============================================================================
--- roller/trunk/src/org/apache/roller/ui/struts2/editor/MembersInvite.java (original)
+++ roller/trunk/src/org/apache/roller/ui/struts2/editor/MembersInvite.java Tue May 29 15:47:17 2007
@@ -25,7 +25,7 @@
 import org.apache.roller.business.RollerFactory;
 import org.apache.roller.business.UserManager;
 import org.apache.roller.pojos.WeblogPermission;
-import org.apache.roller.pojos.UserData;
+import org.apache.roller.pojos.User;
 import org.apache.roller.ui.struts2.util.UIAction;
 import org.apache.roller.util.MailUtil;
 
@@ -91,7 +91,7 @@
         UserManager umgr = RollerFactory.getRoller().getUserManager();
         
         // user being invited
-        UserData user = null;
+        User user = null;
         try {
             user = umgr.getUserByUserName(getUserName());
             if (user == null) {

Modified: roller/trunk/src/org/apache/roller/ui/struts2/editor/WeblogConfigBean.java
URL: http://svn.apache.org/viewvc/roller/trunk/src/org/apache/roller/ui/struts2/editor/WeblogConfigBean.java?view=diff&rev=542688&r1=542687&r2=542688
==============================================================================
--- roller/trunk/src/org/apache/roller/ui/struts2/editor/WeblogConfigBean.java (original)
+++ roller/trunk/src/org/apache/roller/ui/struts2/editor/WeblogConfigBean.java Tue May 29 15:47:17 2007
@@ -24,7 +24,7 @@
 import org.apache.roller.RollerException;
 import org.apache.roller.business.RollerFactory;
 import org.apache.roller.business.WeblogManager;
-import org.apache.roller.pojos.WeblogCategoryData;
+import org.apache.roller.pojos.WeblogCategory;
 import org.apache.roller.pojos.Weblog;
 import org.apache.roller.util.DateUtil;
 

Modified: roller/trunk/src/org/apache/roller/ui/struts2/util/UIAction.java
URL: http://svn.apache.org/viewvc/roller/trunk/src/org/apache/roller/ui/struts2/util/UIAction.java?view=diff&rev=542688&r1=542687&r2=542688
==============================================================================
--- roller/trunk/src/org/apache/roller/ui/struts2/util/UIAction.java (original)
+++ roller/trunk/src/org/apache/roller/ui/struts2/util/UIAction.java Tue May 29 15:47:17 2007
@@ -25,7 +25,7 @@
 import java.util.List;
 import org.apache.roller.config.RollerConfig;
 import org.apache.roller.config.RollerRuntimeConfig;
-import org.apache.roller.pojos.UserData;
+import org.apache.roller.pojos.User;
 import org.apache.roller.pojos.Weblog;
 import org.apache.roller.ui.core.util.UIUtils;
 import org.apache.roller.ui.core.util.menu.Menu;
@@ -51,7 +51,7 @@
     public static final String LIST = "list";
     
     // the authenticated user accessing this action, or null if client is not logged in
-    private UserData authenticatedUser = null;
+    private User authenticatedUser = null;
     
     // the weblog this action is intended to work on, or null if no weblog specified
     private Weblog actionWeblog = null;
@@ -183,11 +183,11 @@
     }
     
 
-    public UserData getAuthenticatedUser() {
+    public User getAuthenticatedUser() {
         return authenticatedUser;
     }
 
-    public void setAuthenticatedUser(UserData authenticatedUser) {
+    public void setAuthenticatedUser(User authenticatedUser) {
         this.authenticatedUser = authenticatedUser;
     }
 

Modified: roller/trunk/src/org/apache/roller/ui/struts2/util/UISecurityInterceptor.java
URL: http://svn.apache.org/viewvc/roller/trunk/src/org/apache/roller/ui/struts2/util/UISecurityInterceptor.java?view=diff&rev=542688&r1=542687&r2=542688
==============================================================================
--- roller/trunk/src/org/apache/roller/ui/struts2/util/UISecurityInterceptor.java (original)
+++ roller/trunk/src/org/apache/roller/ui/struts2/util/UISecurityInterceptor.java Tue May 29 15:47:17 2007
@@ -25,7 +25,7 @@
 import org.apache.commons.logging.LogFactory;
 import org.apache.roller.business.RollerFactory;
 import org.apache.roller.business.UserManager;
-import org.apache.roller.pojos.UserData;
+import org.apache.roller.pojos.User;
 import org.apache.roller.pojos.Weblog;
 import org.apache.roller.ui.core.RequestConstants;
 import org.apache.roller.ui.core.RollerSession;
@@ -56,7 +56,7 @@
             // are we requiring an authenticated user?
             if(theAction.isUserRequired()) {
                 
-                UserData authenticatedUser = ((UIAction)theAction).getAuthenticatedUser();
+                User authenticatedUser = ((UIAction)theAction).getAuthenticatedUser();
                 if(authenticatedUser == null) {
                     log.debug("DENIED: required user not found");
                     return "access-denied";

Modified: roller/trunk/src/org/apache/roller/util/MailUtil.java
URL: http://svn.apache.org/viewvc/roller/trunk/src/org/apache/roller/util/MailUtil.java?view=diff&rev=542688&r1=542687&r2=542688
==============================================================================
--- roller/trunk/src/org/apache/roller/util/MailUtil.java (original)
+++ roller/trunk/src/org/apache/roller/util/MailUtil.java Tue May 29 15:47:17 2007
@@ -41,8 +41,8 @@
 import org.apache.roller.business.UserManager;
 import org.apache.roller.config.RollerRuntimeConfig;
 import org.apache.roller.pojos.WeblogPermission;
-import org.apache.roller.pojos.UserData;
-import org.apache.roller.pojos.WeblogEntryData;
+import org.apache.roller.pojos.User;
+import org.apache.roller.pojos.WeblogEntry;
 import org.apache.roller.pojos.Weblog;
 
 
@@ -65,7 +65,7 @@
     /**
      * Send an email notice that a new pending entry has been submitted.
      */
-    public static void sendPendingEntryNotice(WeblogEntryData entry) 
+    public static void sendPendingEntryNotice(WeblogEntry entry) 
             throws RollerException {
         
         Session mailSession = MailProvider.getMailProvider().getSession();
@@ -92,7 +92,7 @@
             // build list of reviewers (website users with author permission)
             Iterator websiteUserIter = websiteUsers.iterator();
             while (websiteUserIter.hasNext()) {
-                UserData websiteUser = (UserData)websiteUserIter.next();
+                User websiteUser = (User)websiteUserIter.next();
                 if (entry.getWebsite().hasUserPermissions(
                         
                         websiteUser,WeblogPermission.AUTHOR)
@@ -135,7 +135,7 @@
      * Send a weblog invitation email.
      */
     public static void sendWeblogInvitation(Weblog website, 
-                                            UserData user)
+                                            User user)
             throws RollerException {
         
         Session mailSession = MailProvider.getMailProvider().getSession();
@@ -192,7 +192,7 @@
     /**
      * Send a weblog invitation email.
      */
-    public static void sendUserActivationEmail(UserData user)
+    public static void sendUserActivationEmail(User user)
             throws RollerException {
         
         Session mailSession = MailProvider.getMailProvider().getSession();

Modified: roller/trunk/src/org/apache/roller/util/Trackback.java
URL: http://svn.apache.org/viewvc/roller/trunk/src/org/apache/roller/util/Trackback.java?view=diff&rev=542688&r1=542687&r2=542688
==============================================================================
--- roller/trunk/src/org/apache/roller/util/Trackback.java (original)
+++ roller/trunk/src/org/apache/roller/util/Trackback.java Tue May 29 15:47:17 2007
@@ -36,7 +36,7 @@
 import org.apache.commons.logging.LogFactory;
 import org.apache.roller.RollerException;
 import org.apache.roller.config.RollerConfig;
-import org.apache.roller.pojos.WeblogEntryData;
+import org.apache.roller.pojos.WeblogEntry;
 import org.jdom.Document;
 import org.jdom.Element;
 import org.jdom.JDOMException;
@@ -50,11 +50,11 @@
     
     private static final Log mLogger = LogFactory.getLog(Trackback.class);
     
-    private final WeblogEntryData entry;
+    private final WeblogEntry entry;
     private final String trackbackURL;
     
     
-    public Trackback(WeblogEntryData tEntry, String tURL)
+    public Trackback(WeblogEntry tEntry, String tURL)
             throws TrackbackNotAllowedException {
         
         // Make sure trackback to URL is allowed

Modified: roller/trunk/src/org/apache/roller/util/URLUtilities.java
URL: http://svn.apache.org/viewvc/roller/trunk/src/org/apache/roller/util/URLUtilities.java?view=diff&rev=542688&r1=542687&r2=542688
==============================================================================
--- roller/trunk/src/org/apache/roller/util/URLUtilities.java (original)
+++ roller/trunk/src/org/apache/roller/util/URLUtilities.java Tue May 29 15:47:17 2007
@@ -26,7 +26,6 @@
 import java.util.List;
 import java.util.Map;
 import org.apache.roller.config.RollerRuntimeConfig;
-import org.apache.roller.pojos.WeblogEntryData;
 import org.apache.roller.pojos.WeblogTheme;
 import org.apache.roller.pojos.Weblog;
 

Modified: roller/trunk/src/org/apache/roller/util/cache/CacheHandler.java
URL: http://svn.apache.org/viewvc/roller/trunk/src/org/apache/roller/util/cache/CacheHandler.java?view=diff&rev=542688&r1=542687&r2=542688
==============================================================================
--- roller/trunk/src/org/apache/roller/util/cache/CacheHandler.java (original)
+++ roller/trunk/src/org/apache/roller/util/cache/CacheHandler.java Tue May 29 15:47:17 2007
@@ -23,9 +23,9 @@
 import org.apache.roller.pojos.WeblogEntryComment;
 import org.apache.roller.pojos.WeblogBookmarkFolder;
 import org.apache.roller.pojos.WeblogReferrer;
-import org.apache.roller.pojos.UserData;
-import org.apache.roller.pojos.WeblogCategoryData;
-import org.apache.roller.pojos.WeblogEntryData;
+import org.apache.roller.pojos.User;
+import org.apache.roller.pojos.WeblogCategory;
+import org.apache.roller.pojos.WeblogEntry;
 import org.apache.roller.pojos.WeblogTemplate;
 import org.apache.roller.pojos.Weblog;
 
@@ -41,7 +41,7 @@
  */
 public interface CacheHandler {
     
-    public void invalidate(WeblogEntryData entry);
+    public void invalidate(WeblogEntry entry);
     
     public void invalidate(Weblog website);
     
@@ -53,9 +53,9 @@
 
     public void invalidate(WeblogReferrer referer);
 
-    public void invalidate(UserData user);
+    public void invalidate(User user);
 
-    public void invalidate(WeblogCategoryData category);
+    public void invalidate(WeblogCategory category);
 
     public void invalidate(WeblogTemplate template);
     

Modified: roller/trunk/src/org/apache/roller/util/cache/CacheManager.java
URL: http://svn.apache.org/viewvc/roller/trunk/src/org/apache/roller/util/cache/CacheManager.java?view=diff&rev=542688&r1=542687&r2=542688
==============================================================================
--- roller/trunk/src/org/apache/roller/util/cache/CacheManager.java (original)
+++ roller/trunk/src/org/apache/roller/util/cache/CacheManager.java Tue May 29 15:47:17 2007
@@ -36,9 +36,9 @@
 import org.apache.roller.pojos.WeblogEntryComment;
 import org.apache.roller.pojos.WeblogBookmarkFolder;
 import org.apache.roller.pojos.WeblogReferrer;
-import org.apache.roller.pojos.UserData;
-import org.apache.roller.pojos.WeblogCategoryData;
-import org.apache.roller.pojos.WeblogEntryData;
+import org.apache.roller.pojos.User;
+import org.apache.roller.pojos.WeblogCategory;
+import org.apache.roller.pojos.WeblogEntry;
 import org.apache.roller.pojos.WeblogTemplate;
 import org.apache.roller.pojos.Weblog;
 
@@ -214,7 +214,7 @@
     }
     
     
-    public static void invalidate(WeblogEntryData entry) {
+    public static void invalidate(WeblogEntry entry) {
         
         log.debug("invalidating entry = "+entry.getAnchor());
         
@@ -284,7 +284,7 @@
     }
     
     
-    public static void invalidate(UserData user) {
+    public static void invalidate(User user) {
         
         log.debug("invalidating user = "+user.getUserName());
         
@@ -295,7 +295,7 @@
     }
     
     
-    public static void invalidate(WeblogCategoryData category) {
+    public static void invalidate(WeblogCategory category) {
         
         log.debug("invalidating category = "+category.getId());
         

Modified: roller/trunk/src/org/apache/roller/webservices/adminprotocol/Authenticator.java
URL: http://svn.apache.org/viewvc/roller/trunk/src/org/apache/roller/webservices/adminprotocol/Authenticator.java?view=diff&rev=542688&r1=542687&r2=542688
==============================================================================
--- roller/trunk/src/org/apache/roller/webservices/adminprotocol/Authenticator.java (original)
+++ roller/trunk/src/org/apache/roller/webservices/adminprotocol/Authenticator.java Tue May 29 15:47:17 2007
@@ -20,7 +20,7 @@
 import org.apache.roller.business.Roller;
 import org.apache.roller.business.RollerFactory;
 import org.apache.roller.business.UserManager;
-import org.apache.roller.pojos.UserData;
+import org.apache.roller.pojos.User;
 
 /**
  * TODO
@@ -45,7 +45,7 @@
      * implementation of authenticate().
      */
     protected void verifyUser(String userName, String password) throws HandlerException {
-        UserData ud = getUserData(userName);
+        User ud = getUserData(userName);
         String realpassword = ud.getPassword();
 
         if (!userName.trim().equals(ud.getUserName())) {
@@ -87,10 +87,10 @@
         this.roller = roller;
     }
     
-    protected UserData getUserData(String name) throws NotFoundException, InternalException {
+    protected User getUserData(String name) throws NotFoundException, InternalException {
         try {
             UserManager mgr = getRoller().getUserManager();
-            UserData ud = mgr.getUserByUserName(name, Boolean.TRUE);
+            User ud = mgr.getUserByUserName(name, Boolean.TRUE);
             if (ud == null) {
                 ud = mgr.getUserByUserName(name, Boolean.FALSE);
             }

Modified: roller/trunk/src/org/apache/roller/webservices/adminprotocol/BasicAuthenticator.java
URL: http://svn.apache.org/viewvc/roller/trunk/src/org/apache/roller/webservices/adminprotocol/BasicAuthenticator.java?view=diff&rev=542688&r1=542687&r2=542688
==============================================================================
--- roller/trunk/src/org/apache/roller/webservices/adminprotocol/BasicAuthenticator.java (original)
+++ roller/trunk/src/org/apache/roller/webservices/adminprotocol/BasicAuthenticator.java Tue May 29 15:47:17 2007
@@ -21,7 +21,7 @@
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.apache.roller.RollerException;
-import org.apache.roller.pojos.UserData;
+import org.apache.roller.pojos.User;
 
 /**
  * This class implements HTTP basic authentication for roller.

Modified: roller/trunk/src/org/apache/roller/webservices/adminprotocol/Handler.java
URL: http://svn.apache.org/viewvc/roller/trunk/src/org/apache/roller/webservices/adminprotocol/Handler.java?view=diff&rev=542688&r1=542687&r2=542688
==============================================================================
--- roller/trunk/src/org/apache/roller/webservices/adminprotocol/Handler.java (original)
+++ roller/trunk/src/org/apache/roller/webservices/adminprotocol/Handler.java Tue May 29 15:47:17 2007
@@ -31,7 +31,7 @@
 import org.apache.roller.RollerException;
 import org.apache.roller.config.RollerRuntimeConfig;
 import org.apache.roller.business.UserManager;
-import org.apache.roller.pojos.UserData;
+import org.apache.roller.pojos.User;
 import org.apache.roller.pojos.Weblog;
 import org.apache.roller.webservices.adminprotocol.sdk.UnexpectedRootElementException;
 import org.jdom.Document;
@@ -213,10 +213,10 @@
         }
     }
 
-    protected UserData getUserData(String name) throws NotFoundException, InternalException {
+    protected User getUserData(String name) throws NotFoundException, InternalException {
         try {
             UserManager mgr = getRoller().getUserManager();
-            UserData ud = mgr.getUserByUserName(name, Boolean.TRUE);
+            User ud = mgr.getUserByUserName(name, Boolean.TRUE);
             if (ud == null) {
                 ud = mgr.getUserByUserName(name, Boolean.FALSE);
             }

Modified: roller/trunk/src/org/apache/roller/webservices/adminprotocol/RollerMemberHandler.java
URL: http://svn.apache.org/viewvc/roller/trunk/src/org/apache/roller/webservices/adminprotocol/RollerMemberHandler.java?view=diff&rev=542688&r1=542687&r2=542688
==============================================================================
--- roller/trunk/src/org/apache/roller/webservices/adminprotocol/RollerMemberHandler.java (original)
+++ roller/trunk/src/org/apache/roller/webservices/adminprotocol/RollerMemberHandler.java Tue May 29 15:47:17 2007
@@ -29,7 +29,7 @@
 import org.apache.roller.RollerException;
 import org.apache.roller.business.UserManager;
 import org.apache.roller.pojos.WeblogPermission;
-import org.apache.roller.pojos.UserData;
+import org.apache.roller.pojos.User;
 import org.apache.roller.pojos.Weblog;
 import org.apache.roller.util.cache.CacheManager;
 import org.apache.roller.webservices.adminprotocol.sdk.Entry;
@@ -142,7 +142,7 @@
             List users = getRoller().getUserManager().getUsers(null, null, null, null, 0, -1);
             List perms = new ArrayList();
             for (Iterator i = users.iterator(); i.hasNext(); ) {
-                UserData user = (UserData)i.next();
+                User user = (User)i.next();
                 List permissions = getRoller().getUserManager().getAllPermissions(user);
                 for (Iterator j = permissions.iterator(); j.hasNext(); ) {
                     WeblogPermission pd = (WeblogPermission)j.next();
@@ -176,7 +176,7 @@
                 if (wd == null) {
                     throw new NotFoundException("ERROR: Unknown weblog handle: " + handle);
                 }
-                UserData ud = getUserData(username);
+                User ud = getUserData(username);
                 if (ud == null) {
                     throw new NotFoundException("ERROR: Unknown user name: " + username);
                 }
@@ -279,7 +279,7 @@
     }
     
     private WeblogPermission toPermissionsData(MemberEntry entry) throws HandlerException {
-        UserData ud = getUserData(entry.getName());
+        User ud = getUserData(entry.getName());
         Weblog wd = getWebsiteData(entry.getHandle());
         WeblogPermission pd = new WeblogPermission();
         pd.setUser(ud);
@@ -296,7 +296,7 @@
     
     private WeblogPermission getPermissionsData(String handle, String username) throws HandlerException {
         try {
-            UserData ud = getUserData(username);
+            User ud = getUserData(username);
             Weblog wd = getWebsiteData(handle);
             WeblogPermission pd = getRoller().getUserManager().getPermissions(wd, ud);
             
@@ -329,7 +329,7 @@
         }
         
         try {
-            UserData ud = getUserData(entry.getName());
+            User ud = getUserData(entry.getName());
             Weblog wd = getWebsiteData(entry.getHandle());
             
             UserManager mgr = getRoller().getUserManager();
@@ -364,7 +364,7 @@
             mgr.removePermissions(pd);
             getRoller().flush();
             
-            UserData ud = getUserData(username);
+            User ud = getUserData(username);
             CacheManager.invalidate(ud);
             Weblog wd = getWebsiteData(handle);
             CacheManager.invalidate(wd);

Modified: roller/trunk/src/org/apache/roller/webservices/adminprotocol/RollerUserHandler.java
URL: http://svn.apache.org/viewvc/roller/trunk/src/org/apache/roller/webservices/adminprotocol/RollerUserHandler.java?view=diff&rev=542688&r1=542687&r2=542688
==============================================================================
--- roller/trunk/src/org/apache/roller/webservices/adminprotocol/RollerUserHandler.java (original)
+++ roller/trunk/src/org/apache/roller/webservices/adminprotocol/RollerUserHandler.java Tue May 29 15:47:17 2007
@@ -27,7 +27,7 @@
 import org.jdom.JDOMException;
 import org.apache.roller.RollerException;
 import org.apache.roller.business.UserManager;
-import org.apache.roller.pojos.UserData;
+import org.apache.roller.pojos.User;
 import org.apache.roller.util.cache.CacheManager;
 import org.apache.roller.webservices.adminprotocol.sdk.Entry;
 import org.apache.roller.webservices.adminprotocol.sdk.EntrySet;
@@ -91,7 +91,7 @@
             if (users == null) {
                 users = java.util.Collections.EMPTY_LIST;
             }
-            EntrySet es = toUserEntrySet((UserData[])users.toArray(new UserData[0]));
+            EntrySet es = toUserEntrySet((User[])users.toArray(new User[0]));
             
             return es;
         } catch (RollerException re) {
@@ -100,8 +100,8 @@
     }
     
     private EntrySet getEntry() throws HandlerException {
-        UserData ud = getUserData(getUri().getEntryId());
-        UserData[] uds = new UserData[] { ud };
+        User ud = getUserData(getUri().getEntryId());
+        User[] uds = new User[] { ud };
         
         EntrySet c = toUserEntrySet(uds);
         return c;
@@ -157,13 +157,13 @@
                     // if no creation date supplied, add it
                     entry.setDateCreated(new Date());
                 }
-                UserData ud = toUserData(entry);
+                User ud = toUserData(entry);
                 mgr.addUser(ud);
                 getRoller().flush();
                 CacheManager.invalidate(ud);
                 userDatas.add(ud);
             }
-            return toUserEntrySet((UserData[])userDatas.toArray(new UserData[0]));
+            return toUserEntrySet((User[])userDatas.toArray(new User[0]));
         } catch (RollerException re) {
             throw new InternalException("ERROR: Could not create users: " + c, re);
         }
@@ -173,14 +173,14 @@
         List userDatas = new ArrayList();
         for (int i = 0; i < c.getEntries().length; i++) {
             UserEntry entry = (UserEntry)c.getEntries()[i];
-            UserData ud = getUserData(entry.getName());
+            User ud = getUserData(entry.getName());
             updateUserData(ud, entry);
             userDatas.add(ud);
         }
-        return toUserEntrySet((UserData[])userDatas.toArray(new UserData[0]));
+        return toUserEntrySet((User[])userDatas.toArray(new User[0]));
     }
     
-    private void updateUserData(UserData ud, UserEntry entry) throws HandlerException {
+    private void updateUserData(User ud, UserEntry entry) throws HandlerException {
         // user name cannot be updated
 
         if (entry.getScreenName() != null) {
@@ -216,14 +216,14 @@
     }
     
     private EntrySet deleteEntry() throws HandlerException {
-        UserData ud = getUserData(getUri().getEntryId());
+        User ud = getUserData(getUri().getEntryId());
         
         // don't allow deletion of the currently authenticated user
         if (ud.getUserName().equals(getUserName())) {
             throw new NotAllowedException("ERROR: Can't delete authenticated user: " + getUserName());
         }
         
-        UserData[] uds = new UserData[] { ud };
+        User[] uds = new User[] { ud };
         
         try {
             getRoller().getUserManager().removeUser(ud);
@@ -237,7 +237,7 @@
         return es;
     }
     
-    private UserEntry toUserEntry(UserData ud) {
+    private UserEntry toUserEntry(User ud) {
         if (ud == null) {
             throw new NullPointerException("ERROR: Null user data not allowed");
         }
@@ -257,7 +257,7 @@
         return ue;
     }
     
-    private UserEntrySet toUserEntrySet(UserData[] uds) {
+    private UserEntrySet toUserEntrySet(User[] uds) {
         if (uds == null) {
             throw new NullPointerException("ERROR: Null user data not allowed");
         }
@@ -265,7 +265,7 @@
         
         List entries = new ArrayList();
         for (int i = 0; i < uds.length; i++) {
-            UserData ud = uds[i];
+            User ud = uds[i];
             Entry entry = toUserEntry(ud);
             entries.add(entry);
         }
@@ -274,8 +274,10 @@
         return ues;
     }
     
-    /** This object, as a Roller UserData object. */
-    public UserData toUserData(UserEntry ue) {
+    /**
+     * This object, as a Roller User object.
+     */
+    public User toUserData(UserEntry ue) {
         if (ue == null) {
             throw new NullPointerException("ERROR: Null user entry not allowed");
         }
@@ -284,7 +286,7 @@
         // if any of the entry fields are null, the set below amounts
         // to a no-op.
         //
-        UserData ud = new UserData();
+        User ud = new User();
         ud.setUserName(ue.getName());
 
         if (ue.getScreenName() != null) {

Modified: roller/trunk/src/org/apache/roller/webservices/adminprotocol/RollerWeblogHandler.java
URL: http://svn.apache.org/viewvc/roller/trunk/src/org/apache/roller/webservices/adminprotocol/RollerWeblogHandler.java?view=diff&rev=542688&r1=542687&r2=542688
==============================================================================
--- roller/trunk/src/org/apache/roller/webservices/adminprotocol/RollerWeblogHandler.java (original)
+++ roller/trunk/src/org/apache/roller/webservices/adminprotocol/RollerWeblogHandler.java Tue May 29 15:47:17 2007
@@ -34,7 +34,7 @@
 import org.apache.roller.config.RollerRuntimeConfig;
 import org.apache.roller.business.UserManager;
 import org.apache.roller.pojos.WeblogPermission;
-import org.apache.roller.pojos.UserData;
+import org.apache.roller.pojos.User;
 import org.apache.roller.pojos.Weblog;
 import org.apache.roller.util.cache.CacheManager;
 import org.apache.roller.util.Utilities;
@@ -104,7 +104,7 @@
             if (users == null) {
                 users = Collections.EMPTY_LIST;
             }
-            EntrySet c = toWeblogEntrySet((UserData[])users.toArray(new UserData[0]));
+            EntrySet c = toWeblogEntrySet((User[])users.toArray(new User[0]));
             
             return c;
         } catch (RollerException re) {
@@ -168,7 +168,7 @@
             List websiteDatas = new ArrayList();
             for (int i = 0; i < c.getEntries().length; i++) {
                 WeblogEntry entry = (WeblogEntry)c.getEntries()[i];
-                UserData user = mgr.getUserByUserName(entry.getCreatingUser());
+                User user = mgr.getUserByUserName(entry.getCreatingUser());
                 Weblog wd = new Weblog(
                         entry.getHandle(),
                         user,
@@ -303,7 +303,7 @@
         return we;
     }
     
-    private WeblogEntrySet toWeblogEntrySet(UserData[] uds) throws HandlerException {
+    private WeblogEntrySet toWeblogEntrySet(User[] uds) throws HandlerException {
         if (uds == null) {
             throw new NullPointerException("ERROR: Null user data not allowed");
         }
@@ -311,7 +311,7 @@
         WeblogEntrySet wes = new WeblogEntrySet(getUrlPrefix());
         List entries = new ArrayList();
         for (int i = 0; i < uds.length; i++) {
-            UserData ud = uds[i];
+            User ud = uds[i];
             List permissions = ud.getPermissions();
             for (Iterator j = permissions.iterator(); j.hasNext(); ) {
                 WeblogPermission pd = (WeblogPermission)j.next();

Modified: roller/trunk/src/org/apache/roller/webservices/atomprotocol/RollerAtomHandler.java
URL: http://svn.apache.org/viewvc/roller/trunk/src/org/apache/roller/webservices/atomprotocol/RollerAtomHandler.java?view=diff&rev=542688&r1=542687&r2=542688
==============================================================================
--- roller/trunk/src/org/apache/roller/webservices/atomprotocol/RollerAtomHandler.java (original)
+++ roller/trunk/src/org/apache/roller/webservices/atomprotocol/RollerAtomHandler.java Tue May 29 15:47:17 2007
@@ -37,10 +37,10 @@
 import org.apache.roller.business.FilePathException;
 import org.apache.roller.business.Roller;
 import org.apache.roller.business.RollerFactory;
-import org.apache.roller.pojos.UserData;
+import org.apache.roller.pojos.User;
 import org.apache.roller.pojos.WeblogPermission;
-import org.apache.roller.pojos.WeblogCategoryData;
-import org.apache.roller.pojos.WeblogEntryData;
+import org.apache.roller.pojos.WeblogCategory;
+import org.apache.roller.pojos.WeblogEntry;
 import org.apache.roller.pojos.Weblog;
 import org.apache.roller.util.Utilities;
 import org.apache.roller.util.WSSEUtilities;
@@ -65,7 +65,7 @@
 import org.apache.roller.business.WeblogManager;
 import org.apache.roller.business.search.IndexManager;
 import org.apache.roller.pojos.RollerPropertyData;
-import org.apache.roller.pojos.WeblogEntryTagData;
+import org.apache.roller.pojos.WeblogEntryTag;
 import org.apache.roller.pojos.ThemeResource;
 import org.apache.roller.util.URLUtilities;
 import org.apache.roller.util.cache.CacheManager;
@@ -111,7 +111,7 @@
  */
 public class RollerAtomHandler implements AtomHandler {
     private Roller   roller;
-    private UserData user;
+    private User user;
     private int      maxEntries = 20;
     
     private static Log log =
@@ -193,7 +193,7 @@
                     cats.setScheme(getWeblogCategoryScheme(perm.getWebsite()));
                     List rollerCats = roller.getWeblogManager().getWeblogCategories(perm.getWebsite(), false);
                     for (Iterator it = rollerCats.iterator(); it.hasNext();) {
-                        WeblogCategoryData rollerCat = (WeblogCategoryData)it.next();
+                        WeblogCategory rollerCat = (WeblogCategory)it.next();
                         Category cat = new Category();
                         cat.setTerm(rollerCat.getPath().substring(1));
                         cat.setLabel(rollerCat.getName());
@@ -335,7 +335,7 @@
             List atomEntries = new ArrayList();
             int count = 0;
             for (Iterator iter = entries.iterator(); iter.hasNext() && count < maxEntries; count++) {
-                WeblogEntryData rollerEntry = (WeblogEntryData)iter.next();
+                WeblogEntry rollerEntry = (WeblogEntry)iter.next();
                 Entry entry = createAtomEntry(rollerEntry);
                 atomEntries.add(entry);
                 if (count == 0) {
@@ -501,7 +501,7 @@
             }
             // Save it and commit it
             WeblogManager mgr = roller.getWeblogManager();
-            WeblogEntryData rollerEntry = new WeblogEntryData();
+            WeblogEntry rollerEntry = new WeblogEntry();
             rollerEntry.setWebsite(website);
             rollerEntry.setCreator(this.user);
             copyToRollerEntry(entry, rollerEntry);
@@ -531,7 +531,7 @@
             if (pathInfo.length > 2) // URI is /blogname/entries/entryid
             {
                 if (pathInfo[1].equals("entry")) {
-                    WeblogEntryData entry = 
+                    WeblogEntry entry = 
                         roller.getWeblogManager().getWeblogEntry(pathInfo[2]);
                     if (entry == null) {
                         throw new AtomNotFoundException("Cannot find specified entry/resource");
@@ -568,7 +568,7 @@
         try {
             if (pathInfo.length == 3) // URI is /blogname/entries/entryid
             {
-                WeblogEntryData rollerEntry =
+                WeblogEntry rollerEntry =
                     roller.getWeblogManager().getWeblogEntry(pathInfo[2]);
                 if (rollerEntry == null) {
                     throw new AtomNotFoundException(
@@ -603,7 +603,7 @@
             if (pathInfo.length > 2) {
                 if (pathInfo[1].equals("entry")) // URI is /blogname/entry/entryid
                 {                    
-                    WeblogEntryData rollerEntry = roller.getWeblogManager().getWeblogEntry(pathInfo[2]);
+                    WeblogEntry rollerEntry = roller.getWeblogManager().getWeblogEntry(pathInfo[2]);
                     if (rollerEntry == null) {
                         throw new AtomNotFoundException("cannot find specified entry/resource");
                     }
@@ -838,7 +838,7 @@
     /**
      * Return true if user is allowed to edit an entry.
      */
-    private boolean canEdit(WeblogEntryData entry) {
+    private boolean canEdit(WeblogEntry entry) {
         try {
             return entry.hasWritePermissions(this.user);
         } catch (Exception e) {
@@ -862,7 +862,7 @@
     /**
      * Return true if user is allowed to view an entry.
      */
-    private boolean canView(WeblogEntryData entry) {
+    private boolean canView(WeblogEntry entry) {
         return canEdit(entry);
     }
     
@@ -908,7 +908,7 @@
         }
         String digest = null;
         try {
-            UserData user = roller.getUserManager().getUserByUserName(userName);
+            User user = roller.getUserManager().getUserByUserName(userName);
             digest = WSSEUtilities.generateDigest(
                     WSSEUtilities.base64Decode(nonce),
                     created.getBytes("UTF-8"),
@@ -941,7 +941,7 @@
                         int p = userPass.indexOf(":");
                         if (p != -1) {
                             userID = userPass.substring(0, p);
-                            UserData user = roller.getUserManager().getUserByUserName(userID);
+                            User user = roller.getUserManager().getUserByUserName(userID);
                             boolean enabled = user.getEnabled().booleanValue();
                             if (enabled) {
                                 // are passwords encrypted?
@@ -972,7 +972,7 @@
      * Content is escaped.
      * Link is stored as rel=alternate link.
      */
-    private Entry createAtomEntry(WeblogEntryData entry) {
+    private Entry createAtomEntry(WeblogEntry entry) {
         Entry atomEntry = new Entry();
         
         Content content = new Content();
@@ -993,7 +993,7 @@
         atomEntry.setPublished( entry.getPubTime());
         atomEntry.setUpdated(   entry.getUpdateTime());
         
-        UserData creator = entry.getCreator();
+        User creator = entry.getCreator();
         Person author = new Person();
         author.setName(         creator.getUserName());
         author.setEmail(        creator.getEmailAddress());
@@ -1008,7 +1008,7 @@
         
         // Add Atom categories for each Roller tag with null scheme
         for (Iterator tagit = entry.getTags().iterator(); tagit.hasNext();) {
-            WeblogEntryTagData tag = (WeblogEntryTagData) tagit.next();
+            WeblogEntryTag tag = (WeblogEntryTag) tagit.next();
             Category newcat = new Category();
             newcat.setTerm(tag.getName());
             categories.add(newcat);
@@ -1034,7 +1034,7 @@
         List modules = new ArrayList();
         PubControlModule pubControl = new PubControlModuleImpl();
         pubControl.setDraft(
-                !WeblogEntryData.PUBLISHED.equals(entry.getStatus()));
+                !WeblogEntry.PUBLISHED.equals(entry.getStatus()));
         modules.add(pubControl);
         atomEntry.setModules(modules);
         
@@ -1091,7 +1091,7 @@
     /**
      * Copy fields from ROME entry to Roller entry.
      */
-    private void copyToRollerEntry(Entry entry, WeblogEntryData rollerEntry) throws RollerException {
+    private void copyToRollerEntry(Entry entry,WeblogEntry rollerEntry) throws RollerException {
         
         Timestamp current = new Timestamp(System.currentTimeMillis());
         Timestamp pubTime = current;
@@ -1116,9 +1116,9 @@
         PubControlModule control =
                 (PubControlModule)entry.getModule("http://purl.org/atom/app#");
         if (control!=null && control.getDraft()) {
-            rollerEntry.setStatus(WeblogEntryData.DRAFT);
+            rollerEntry.setStatus(WeblogEntry.DRAFT);
         } else {
-            rollerEntry.setStatus(WeblogEntryData.PUBLISHED);
+            rollerEntry.setStatus(WeblogEntry.PUBLISHED);
         }
                 
         // Process incoming categories:
@@ -1133,7 +1133,7 @@
                 if (cat.getScheme() != null && cat.getScheme().equals(getWeblogCategoryScheme(rollerEntry.getWebsite()))) {                
                     String catString = cat.getTerm();
                     if (catString != null) {
-                        WeblogCategoryData rollerCat =
+                        WeblogCategory rollerCat =
                                 roller.getWeblogManager().getWeblogCategoryByPath(
                                 rollerEntry.getWebsite(), catString);
                         if (rollerCat != null) {
@@ -1181,7 +1181,7 @@
         return path;
     }
     
-    private void reindexEntry(WeblogEntryData entry) throws RollerException {
+    private void reindexEntry(WeblogEntry entry) throws RollerException {
         IndexManager manager = roller.getIndexManager();
         
         // TODO: figure out what's up here and at WeblogEntryFormAction line 696

Modified: roller/trunk/src/org/apache/roller/webservices/xmlrpc/BaseAPIHandler.java
URL: http://svn.apache.org/viewvc/roller/trunk/src/org/apache/roller/webservices/xmlrpc/BaseAPIHandler.java?view=diff&rev=542688&r1=542687&r2=542688
==============================================================================
--- roller/trunk/src/org/apache/roller/webservices/xmlrpc/BaseAPIHandler.java (original)
+++ roller/trunk/src/org/apache/roller/webservices/xmlrpc/BaseAPIHandler.java Tue May 29 15:47:17 2007
@@ -28,7 +28,7 @@
 import org.apache.roller.config.RollerConfig;
 import org.apache.roller.business.RollerFactory;
 import org.apache.roller.business.UserManager;
-import org.apache.roller.pojos.UserData;
+import org.apache.roller.pojos.User;
 import org.apache.roller.pojos.Weblog;
 import org.apache.roller.util.cache.CacheManager;
 import org.apache.roller.util.Utilities;
@@ -113,7 +113,7 @@
         boolean apiEnabled = false;
         boolean weblogFound = false;
         Weblog website = null;
-        UserData user = null;
+        User user = null;
         try {
             UserManager userMgr = RollerFactory.getRoller().getUserManager();
             user = userMgr.getUserByUserName(username);
@@ -174,7 +174,7 @@
     throws Exception {
         boolean authenticated = false;
         boolean enabled = false;
-        UserData user = null;
+        User user = null;
         try {
             
             UserManager userMgr = RollerFactory.getRoller().getUserManager();

Modified: roller/trunk/src/org/apache/roller/webservices/xmlrpc/BloggerAPIHandler.java
URL: http://svn.apache.org/viewvc/roller/trunk/src/org/apache/roller/webservices/xmlrpc/BloggerAPIHandler.java?view=diff&rev=542688&r1=542687&r2=542688
==============================================================================
--- roller/trunk/src/org/apache/roller/webservices/xmlrpc/BloggerAPIHandler.java (original)
+++ roller/trunk/src/org/apache/roller/webservices/xmlrpc/BloggerAPIHandler.java Tue May 29 15:47:17 2007
@@ -39,8 +39,8 @@
 import org.apache.roller.business.RollerFactory;
 import org.apache.roller.business.UserManager;
 import org.apache.roller.business.WeblogManager;
-import org.apache.roller.pojos.UserData;
-import org.apache.roller.pojos.WeblogEntryData;
+import org.apache.roller.pojos.User;
+import org.apache.roller.pojos.WeblogEntry;
 import org.apache.roller.pojos.WeblogTemplate;
 import org.apache.roller.pojos.Weblog;
 import org.apache.roller.util.Utilities;
@@ -86,7 +86,7 @@
         
         Roller roller = RollerFactory.getRoller();
         WeblogManager weblogMgr = roller.getWeblogManager();
-        WeblogEntryData entry = weblogMgr.getWeblogEntry(postid);
+        WeblogEntry entry = weblogMgr.getWeblogEntry(postid);
         
         // Return false if entry not found
         if (entry == null) return false;
@@ -221,7 +221,7 @@
         try {
             Roller roller = RollerFactory.getRoller();
             UserManager userMgr = roller.getUserManager();
-            UserData user = userMgr.getUserByUserName(userid);
+            User user = userMgr.getUserByUserName(userid);
             
             // parses full name into two strings, firstname and lastname
             String firstname = "", lastname = "";
@@ -278,7 +278,7 @@
                 String contextUrl = RollerRuntimeConfig.getAbsoluteContextURL();
                 
                 UserManager umgr = RollerFactory.getRoller().getUserManager();
-                UserData user = umgr.getUserByUserName(userid);
+                User user = umgr.getUserByUserName(userid);
                 // get list of user's enabled websites
                 List websites = umgr.getWebsites(user, Boolean.TRUE, null, null, null, 0, -1);
                 Iterator iter = websites.iterator();
@@ -329,13 +329,13 @@
                 
                 Roller roller = RollerFactory.getRoller();
                 WeblogManager weblogMgr = roller.getWeblogManager();
-                WeblogEntryData entry = weblogMgr.getWeblogEntry(postid);
+                WeblogEntry entry = weblogMgr.getWeblogEntry(postid);
                 entry.setText(content);
                 entry.setUpdateTime(current);
                 if (Boolean.valueOf(publish).booleanValue()) {
-                    entry.setStatus(WeblogEntryData.PUBLISHED);
+                    entry.setStatus(WeblogEntry.PUBLISHED);
                 } else {
-                    entry.setStatus(WeblogEntryData.DRAFT);
+                    entry.setStatus(WeblogEntry.DRAFT);
                 }
                 
                 // save the entry
@@ -400,20 +400,20 @@
             
             Timestamp current = new Timestamp(System.currentTimeMillis());
             
-            WeblogEntryData entry = new WeblogEntryData();
+            WeblogEntry entry = new WeblogEntry();
             entry.setTitle(title);
             entry.setText(content);
             entry.setPubTime(current);
             entry.setUpdateTime(current);
-            UserData user = roller.getUserManager().getUserByUserName(userid);
+            User user = roller.getUserManager().getUserByUserName(userid);
             entry.setCreator(user);
             entry.setWebsite(website);
             entry.setCategory(website.getBloggerCategory());
             entry.setCommentDays(new Integer(website.getDefaultCommentDays()));
             if (Boolean.valueOf(publish).booleanValue()) {
-                entry.setStatus(WeblogEntryData.PUBLISHED);
+                entry.setStatus(WeblogEntry.PUBLISHED);
             } else {
-                entry.setStatus(WeblogEntryData.DRAFT);
+                entry.setStatus(WeblogEntry.DRAFT);
             }
             
             // save the entry
@@ -476,7 +476,7 @@
                     ArrayList list = (ArrayList) iter.next();
                     Iterator i = list.iterator();
                     while (i.hasNext()) {
-                        WeblogEntryData entry = (WeblogEntryData) i.next();
+                        WeblogEntry entry = (WeblogEntry) i.next();
                         Hashtable result = new Hashtable();
                         if (entry.getPubTime() != null) {
                             result.put("dateCreated", entry.getPubTime());

Modified: roller/trunk/src/org/apache/roller/webservices/xmlrpc/MetaWeblogAPIHandler.java
URL: http://svn.apache.org/viewvc/roller/trunk/src/org/apache/roller/webservices/xmlrpc/MetaWeblogAPIHandler.java?view=diff&rev=542688&r1=542687&r2=542688
==============================================================================
--- roller/trunk/src/org/apache/roller/webservices/xmlrpc/MetaWeblogAPIHandler.java (original)
+++ roller/trunk/src/org/apache/roller/webservices/xmlrpc/MetaWeblogAPIHandler.java Tue May 29 15:47:17 2007
@@ -34,9 +34,9 @@
 import org.apache.roller.business.Roller;
 import org.apache.roller.business.RollerFactory;
 import org.apache.roller.business.WeblogManager;
-import org.apache.roller.pojos.UserData;
-import org.apache.roller.pojos.WeblogCategoryData;
-import org.apache.roller.pojos.WeblogEntryData;
+import org.apache.roller.pojos.User;
+import org.apache.roller.pojos.WeblogCategory;
+import org.apache.roller.pojos.WeblogEntry;
 import org.apache.roller.pojos.Weblog;
 import org.apache.roller.util.RollerMessages;
 import org.apache.roller.util.URLUtilities;
@@ -85,7 +85,7 @@
             WeblogManager weblogMgr = roller.getWeblogManager();
             List cats = weblogMgr.getWeblogCategories(website, false);
             for (Iterator wbcItr = cats.iterator(); wbcItr.hasNext();) {
-                WeblogCategoryData category = (WeblogCategoryData) wbcItr.next();
+                WeblogCategory category = (WeblogCategory) wbcItr.next();
                 result.put(category.getPath(),
                         createCategoryStruct(category, userid));
             }
@@ -126,7 +126,7 @@
         
         Roller roller = RollerFactory.getRoller();
         WeblogManager weblogMgr = roller.getWeblogManager();
-        WeblogEntryData entry = weblogMgr.getWeblogEntry(postid);
+        WeblogEntry entry = weblogMgr.getWeblogEntry(postid);
         
         validate(entry.getWebsite().getHandle(), userid,password);
         
@@ -155,9 +155,9 @@
             entry.setText(description);
             entry.setUpdateTime(current);
             if (Boolean.valueOf(publish).booleanValue()) {
-                entry.setStatus(WeblogEntryData.PUBLISHED);
+                entry.setStatus(WeblogEntry.PUBLISHED);
             } else {
-                entry.setStatus(WeblogEntryData.DRAFT);
+                entry.setStatus(WeblogEntry.DRAFT);
             }
             if (dateCreated != null) {
                 entry.setPubTime(new Timestamp(dateCreated.getTime()));
@@ -165,7 +165,7 @@
             
             if ( cat != null ) {
                 // Use first category specified by request
-                WeblogCategoryData cd =
+                WeblogCategory cd =
                         weblogMgr.getWeblogCategoryByPath(entry.getWebsite(), cat);
                 entry.setCategory(cd);
             }
@@ -237,11 +237,11 @@
         try {
             Roller roller = RollerFactory.getRoller();
             WeblogManager weblogMgr = roller.getWeblogManager();
-            UserData user = roller.getUserManager().getUserByUserName(userid);
+            User user = roller.getUserManager().getUserByUserName(userid);
             Timestamp current =
                     new Timestamp(System.currentTimeMillis());
             
-            WeblogEntryData entry = new WeblogEntryData();
+            WeblogEntry entry = new WeblogEntry();
             entry.setTitle(title);
             entry.setText(description);
             entry.setPubTime(new Timestamp(dateCreated.getTime()));
@@ -250,14 +250,14 @@
             entry.setCreator(user);
             entry.setCommentDays(new Integer(website.getDefaultCommentDays()));
             if (Boolean.valueOf(publish).booleanValue()) {
-                entry.setStatus(WeblogEntryData.PUBLISHED);
+                entry.setStatus(WeblogEntry.PUBLISHED);
             } else {
-                entry.setStatus(WeblogEntryData.DRAFT);
+                entry.setStatus(WeblogEntry.DRAFT);
             }
             
             // MetaWeblog supports multiple cats, Roller supports one/entry
             // so here we take accept the first category that exists
-            WeblogCategoryData rollerCat = null;
+            WeblogCategory rollerCat = null;
             if ( postcontent.get("categories") != null ) {
                 Vector cats = (Vector)postcontent.get("categories");
                 if (cats != null && cats.size() > 0) {
@@ -313,7 +313,7 @@
         
         Roller roller = RollerFactory.getRoller();
         WeblogManager weblogMgr = roller.getWeblogManager();
-        WeblogEntryData entry = weblogMgr.getWeblogEntry(postid);
+        WeblogEntry entry = weblogMgr.getWeblogEntry(postid);
         
         validate(entry.getWebsite().getHandle(), userid,password);
         
@@ -413,7 +413,7 @@
                 
                 Iterator iter = entries.iterator();
                 while (iter.hasNext()) {
-                    WeblogEntryData entry = (WeblogEntryData)iter.next();
+                    WeblogEntry entry = (WeblogEntry)iter.next();
                     results.addElement(createPostStruct(entry, userid));
                 }
             }
@@ -427,7 +427,7 @@
     }
     
     
-    private Hashtable createPostStruct(WeblogEntryData entry, String userid) {
+    private Hashtable createPostStruct(WeblogEntry entry, String userid) {
         
         String permalink =
                 RollerRuntimeConfig.getAbsoluteContextURL() + entry.getPermaLink();
@@ -457,7 +457,7 @@
     }
     
     
-    private Hashtable createCategoryStruct(WeblogCategoryData category, String userid) {
+    private Hashtable createCategoryStruct(WeblogCategory category, String userid) {
         
         String contextUrl = RollerRuntimeConfig.getAbsoluteContextURL();
         



Mime
View raw message