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 2005/07/22 21:23:26 UTC

svn commit: r224388 - in /incubator/roller/trunk/src/org/roller/pojos: BookmarkData.java CommentData.java EntryAttributeData.java FolderData.java RefererData.java Template.java UserData.java WeblogCategoryData.java WeblogEntryData.java WebsiteData.java

Author: agilliland
Date: Fri Jul 22 12:23:20 2005
New Revision: 224388

URL: http://svn.apache.org/viewcvs?rev=224388&view=rev
Log:
adding initial pojo wrapper xdoclet markup

Modified:
    incubator/roller/trunk/src/org/roller/pojos/BookmarkData.java
    incubator/roller/trunk/src/org/roller/pojos/CommentData.java
    incubator/roller/trunk/src/org/roller/pojos/EntryAttributeData.java
    incubator/roller/trunk/src/org/roller/pojos/FolderData.java
    incubator/roller/trunk/src/org/roller/pojos/RefererData.java
    incubator/roller/trunk/src/org/roller/pojos/Template.java
    incubator/roller/trunk/src/org/roller/pojos/UserData.java
    incubator/roller/trunk/src/org/roller/pojos/WeblogCategoryData.java
    incubator/roller/trunk/src/org/roller/pojos/WeblogEntryData.java
    incubator/roller/trunk/src/org/roller/pojos/WebsiteData.java

Modified: incubator/roller/trunk/src/org/roller/pojos/BookmarkData.java
URL: http://svn.apache.org/viewcvs/incubator/roller/trunk/src/org/roller/pojos/BookmarkData.java?rev=224388&r1=224387&r2=224388&view=diff
==============================================================================
--- incubator/roller/trunk/src/org/roller/pojos/BookmarkData.java (original)
+++ incubator/roller/trunk/src/org/roller/pojos/BookmarkData.java Fri Jul 22 12:23:20 2005
@@ -74,6 +74,8 @@
     //------------------------------------------------------------- Attributes
     
     /** 
+     * @roller.wrapPojoMethod type="simple"
+     *
      * @ejb:persistent-field 
      * 
      * @hibernate.id column="id" type="string"
@@ -93,6 +95,8 @@
     /** 
      * Name of bookmark.
      * 
+     * @roller.wrapPojoMethod type="simple"
+     *
      * @struts.validator type="required" msgkey="errors.required"
      * @struts.validator-args arg0resource="bookmarkForm.name"
      * 
@@ -113,6 +117,8 @@
 
     /** 
      * Description of bookmark.
+     *
+     * @roller.wrapPojoMethod type="simple"
      * 
      * @ejb:persistent-field 
      * 
@@ -131,6 +137,8 @@
 
     /** 
      * URL of bookmark.
+     *
+     * @roller.wrapPojoMethod type="simple"
      * 
      * @ejb:persistent-field 
      * 
@@ -149,6 +157,8 @@
 
     /** 
      * Weight indicates prominence of link
+     *
+     * @roller.wrapPojoMethod type="simple"
      * 
      * @struts.validator type="required" msgkey="errors.required"
      * @struts.validator type="integer" msgkey="errors.integer"
@@ -171,6 +181,8 @@
 
     /** 
      * Priority determines order of display 
+     *
+     * @roller.wrapPojoMethod type="simple"
      * 
      * @struts.validator type="required" msgkey="errors.required"
      * @struts.validator type="integer" msgkey="errors.integer"
@@ -193,6 +205,8 @@
 
     /** 
      * @ejb:persistent-field 
+     *
+     * @roller.wrapPojoMethod type="simple"
      * 
      * @hibernate.property column="image" non-null="true" unique="false"
      */
@@ -209,6 +223,8 @@
 
     /** 
      * @ejb:persistent-field 
+     *
+     * @roller.wrapPojoMethod type="simple"
      * 
      * @hibernate.property column="feedurl" non-null="true" unique="false"
      */
@@ -226,6 +242,7 @@
     //---------------------------------------------------------- Relationships
     
     /** 
+     * @roller.wrapPojoMethod type="pojo"
      * @ejb:persistent-field 
      * @hibernate.many-to-one column="folderid" cascade="none" not-null="true"
      */

Modified: incubator/roller/trunk/src/org/roller/pojos/CommentData.java
URL: http://svn.apache.org/viewcvs/incubator/roller/trunk/src/org/roller/pojos/CommentData.java?rev=224388&r1=224387&r2=224388&view=diff
==============================================================================
--- incubator/roller/trunk/src/org/roller/pojos/CommentData.java (original)
+++ incubator/roller/trunk/src/org/roller/pojos/CommentData.java Fri Jul 22 12:23:20 2005
@@ -65,6 +65,7 @@
     }
 
     /** 
+     * @roller.wrapPojoMethod type="simple"
      * @ejb:persistent-field 
      * @hibernate.id column="id" type="string"
      *  generator-class="uuid.hex" unsaved-value="null"
@@ -81,6 +82,7 @@
     }
 
     /** 
+     * @roller.wrapPojoMethod type="pojo"
      * @ejb:persistent-field 
      * @hibernate.many-to-one column="entryid" cascade="none" not-null="true"
      */
@@ -96,6 +98,7 @@
     }
 
     /** 
+     * @roller.wrapPojoMethod type="simple"
      * @ejb:persistent-field 
      * @hibernate.property column="name" non-null="true" unique="false"
      */
@@ -112,6 +115,8 @@
 
     /** 
      * Email
+     *
+     * @roller.wrapPojoMethod type="simple"
      * @ejb:persistent-field 
      * @hibernate.property column="email" non-null="true" unique="false"
      */
@@ -127,6 +132,7 @@
     }
 
     /** 
+     * @roller.wrapPojoMethod type="simple"
      * @ejb:persistent-field 
      * @hibernate.property column="url" non-null="true" unique="false"
      */
@@ -142,6 +148,7 @@
     }
 
     /** 
+     * @roller.wrapPojoMethod type="simple"
      * @ejb:persistent-field 
      * @hibernate.property column="content" non-null="true" unique="false"
      */
@@ -157,6 +164,7 @@
     }
 
     /** 
+     * @roller.wrapPojoMethod type="simple"
      * @ejb:persistent-field 
      * @hibernate.property column="posttime" non-null="true" unique="false"
      */
@@ -172,6 +180,7 @@
     }
 
     /**
+     * @roller.wrapPojoMethod type="simple"
      * @ejb:persistent-field
      * @hibernate.property column="spam" non-null="false" unique="false"
      */
@@ -187,6 +196,7 @@
     }
 
     /**
+     * @roller.wrapPojoMethod type="simple"
      * @ejb:persistent-field
      * @hibernate.property column="notify" non-null="false" unique="false"
      */
@@ -209,6 +219,7 @@
     }
 	
 	/**
+         * @roller.wrapPojoMethod type="simple"
      * @ejb:persistent-field 
      * @hibernate.property column="remotehost" non-null="true" unique="false"
 	 */

Modified: incubator/roller/trunk/src/org/roller/pojos/EntryAttributeData.java
URL: http://svn.apache.org/viewcvs/incubator/roller/trunk/src/org/roller/pojos/EntryAttributeData.java?rev=224388&r1=224387&r2=224388&view=diff
==============================================================================
--- incubator/roller/trunk/src/org/roller/pojos/EntryAttributeData.java (original)
+++ incubator/roller/trunk/src/org/roller/pojos/EntryAttributeData.java Fri Jul 22 12:23:20 2005
@@ -36,6 +36,7 @@
     }
 
     /**
+     * @roller.wrapPojoMethod type="simple"
      * @ejb:persistent-field 
      * @hibernate.id column="id" type="string" 
      *    generator-class="uuid.hex" unsaved-value="null"
@@ -51,7 +52,7 @@
     }
 
     /**
-    	* Setter is needed in RollerImpl.storePersistentObject()
+     * Setter is needed in RollerImpl.storePersistentObject()
      */
     public void setData(org.roller.pojos.PersistentObject otherData)
     {
@@ -62,6 +63,7 @@
     }
 
     /** 
+     * @roller.wrapPojoMethod type="pojo"
      * @ejb:persistent-field 
      * @hibernate.many-to-one column="entryid" cascade="none" not-null="true"
      */
@@ -76,6 +78,7 @@
     }
 
     /** 
+     * @roller.wrapPojoMethod type="simple"
      * @ejb:persistent-field 
      * @hibernate.property column="name" non-null="true" unique="false"
      */
@@ -90,6 +93,7 @@
     }
     
     /** 
+     * @roller.wrapPojoMethod type="simple"
      * @ejb:persistent-field 
      * @hibernate.property column="value" non-null="true" unique="false"
      */

Modified: incubator/roller/trunk/src/org/roller/pojos/FolderData.java
URL: http://svn.apache.org/viewcvs/incubator/roller/trunk/src/org/roller/pojos/FolderData.java?rev=224388&r1=224387&r2=224388&view=diff
==============================================================================
--- incubator/roller/trunk/src/org/roller/pojos/FolderData.java (original)
+++ incubator/roller/trunk/src/org/roller/pojos/FolderData.java Fri Jul 22 12:23:20 2005
@@ -88,6 +88,8 @@
 
     /** 
      * @see org.roller.pojos.HierarchicalPersistentObject#getObjectPropertyName()
+     *
+     * @roller.wrapPojoMethod type="simple"
      */
     public String getObjectPropertyName()
     {
@@ -96,12 +98,17 @@
 
     /** 
      * @see org.roller.pojos.HierarchicalPersistentObject#getAncestorPropertyName()
+     *
+     * @roller.wrapPojoMethod type="simple"
      */
     public String getAncestorPropertyName()
     {
         return "ancestorFolder";
     }
 
+    /**
+     * @roller.wrapPojoMethod type="simple"
+     */
     public boolean isInUse()
     {
         try
@@ -114,6 +121,9 @@
         }
     }
     
+    /**
+     * @roller.wrapPojoMethod type="simple"
+     */
     public boolean descendentOf(FolderData ancestor) 
         throws RollerException
     {
@@ -123,6 +133,8 @@
     //------------------------------------------------------------- Attributes
     
     /** 
+     * @roller.wrapPojoMethod type="simple"
+     * 
      * @ejb:persistent-field 
      * 
      * @hibernate.id column="id" type="string"
@@ -140,6 +152,8 @@
     }
 
     /** 
+     * @roller.wrapPojoMethod type="simple"
+     *
      * @struts.validator type="required" msgkey="errors.required"
      * @struts.validator type="mask" msgkey="errors.noslashes"
      * @struts.validator-var name="mask" value="${noslashes}"
@@ -162,6 +176,8 @@
 
     /** 
      * Description
+     *
+     * @roller.wrapPojoMethod type="simple"
      * 
      * @ejb:persistent-field 
      * 
@@ -180,7 +196,11 @@
 
     //---------------------------------------------------------- Relationships
     
-    /** Get path to this bookmark folder. */
+    /**
+     * Get path to this bookmark folder.
+     *
+     * @roller.wrapPojoMethod type="simple"
+     */
     public String getPath() throws RollerException
     {
         if (mNewParent != null) 
@@ -197,6 +217,8 @@
     }
         
     /** 
+     * @roller.wrapPojoMethod type="pojo"
+     *
      * @ejb:persistent-field 
      * 
      * @hibernate.many-to-one column="websiteid" cascade="none" not-null="true"
@@ -212,7 +234,11 @@
         this.website = website;
     }
 
-    /** Return parent category, or null if category is root of hierarchy. */
+    /**
+     * Return parent category, or null if category is root of hierarchy.
+     *
+     * @roller.wrapPojoMethod type="pojo"
+     */
     public FolderData getParent() throws RollerException
     {
         if (mNewParent != null)
@@ -237,7 +263,11 @@
         mNewParent = parent;
     }
 
-    /** Query to get child categories of this category. */
+    /**
+     * Query to get child categories of this category.
+     *
+     * @roller.wrapPojoMethod type="pojo-collection" class="org.roller.pojos.FolderData"
+     */
     public List getFolders() throws RollerException
     {
         if (folders == null)
@@ -258,7 +288,9 @@
     //------------------------------------------------------ Bookmark children
     
     /** 
-      * @ejb:persistent-field
+     * @roller.wrapPojoMethod type="pojo-collection" class="org.roller.pojos.BookmarkData"
+     *
+     * @ejb:persistent-field
      * 
      * @hibernate.set lazy="true" order-by="name" inverse="true" cascade="delete" 
      * @hibernate.collection-key column="folderid" 
@@ -291,6 +323,8 @@
     }
 
     /**
+     * @roller.wrapPojoMethod type="pojo-collection" class="org.roller.pojos.BookmarkData"
+     *
      * @param subfolders
      */
     public List retrieveBookmarks(boolean subfolders) throws RollerException

Modified: incubator/roller/trunk/src/org/roller/pojos/RefererData.java
URL: http://svn.apache.org/viewcvs/incubator/roller/trunk/src/org/roller/pojos/RefererData.java?rev=224388&r1=224387&r2=224388&view=diff
==============================================================================
--- incubator/roller/trunk/src/org/roller/pojos/RefererData.java (original)
+++ incubator/roller/trunk/src/org/roller/pojos/RefererData.java Fri Jul 22 12:23:20 2005
@@ -83,6 +83,8 @@
 
     /** 
      * Unique ID and primary key of this Referer.
+     *
+     * @roller.wrapPojoMethod type="simple"
      * @hibernate.id column="id" type="string"
      *  generator-class="uuid.hex" unsaved-value="null"
      */
@@ -98,6 +100,8 @@
 
     /** 
      * ID of website that this referer refers to.
+     *
+     * @roller.wrapPojoMethod type="pojo"
      * @hibernate.many-to-one column="websiteid" cascade="none" not-null="true"
      */
     public org.roller.pojos.WebsiteData getWebsite()
@@ -111,6 +115,7 @@
     }
 
     /**
+     * @roller.wrapPojoMethod type="pojo"
      * @hibernate.many-to-one column="entryid" cascade="none"
      */
     public org.roller.pojos.WeblogEntryData getWeblogEntry()
@@ -128,6 +133,8 @@
 
     /** 
      * Date string in YYYYMMDD format.
+     *
+     * @roller.wrapPojoMethod type="simple"
      * @hibernate.property column="datestr" non-null="true" unique="false"
      */
     public java.lang.String getDateString()
@@ -142,6 +149,8 @@
 
     /** 
      * URL of the refering page.
+     *
+     * @roller.wrapPojoMethod type="simple"
      * @hibernate.property column="refurl" non-null="true" unique="false"
      */
     public java.lang.String getRefererUrl()
@@ -156,6 +165,8 @@
 
     /** 
      * Requested URL, the URL linked to by the refering page.
+     *
+     * @roller.wrapPojoMethod type="simple"
      * @hibernate.property column="refpermalink" non-null="true" unique="false"
      */
     public java.lang.String getRefererPermalink()
@@ -170,6 +181,8 @@
 
     /** 
      * Requested URL, the URL linked to by the refering page.
+     *
+     * @roller.wrapPojoMethod type="simple"
      * @hibernate.property column="requrl" non-null="true" unique="false"
      */
     public java.lang.String getRequestUrl()
@@ -183,7 +196,9 @@
     }
 
     /** 
-     * The text on the refering page that surrounds the refering link.  
+     * The text on the refering page that surrounds the refering link. 
+     *
+     * @roller.wrapPojoMethod type="simple" 
      * @hibernate.property column="title" non-null="true" unique="false"
      */
     public java.lang.String getTitle()
@@ -198,6 +213,8 @@
 
     /** 
      * The text on the refering page that surrounds the refering link.  
+     *
+     * @roller.wrapPojoMethod type="simple"
      * @hibernate.property column="excerpt" non-null="true" unique="false"
      */
     public java.lang.String getExcerpt()
@@ -212,6 +229,8 @@
 
     /** 
      * Should this referer be displayed?
+     *
+     * @roller.wrapPojoMethod type="simple"
      * @hibernate.property column="visible" non-null="true" unique="false"
      */
     public java.lang.Boolean getVisible()
@@ -226,6 +245,8 @@
 
     /** 
      * Is this referer a duplicate?
+     *
+     * @roller.wrapPojoMethod type="simple"
      * @hibernate.property column="duplicate" non-null="true" unique="false"
      */
     public java.lang.Boolean getDuplicate()
@@ -240,6 +261,8 @@
 
     /** 
      * Hits received today from this referer.
+     *
+     * @roller.wrapPojoMethod type="simple"
      * @hibernate.property column="dayhits" non-null="true" unique="false"
      */
     public java.lang.Integer getDayHits()
@@ -254,6 +277,8 @@
 
     /** 
      * Total hits received from this referer.
+     *
+     * @roller.wrapPojoMethod type="simple"
      * @hibernate.property column="totalhits" non-null="true" unique="false"
      */
     public java.lang.Integer getTotalHits()
@@ -267,6 +292,10 @@
     }
 
     //-------------------------------------------------------------------------
+    
+    /**
+     * @roller.wrapPojoMethod type="simple"
+     */
     public String getDisplayUrl(int maxWidth, boolean includeHits)
     {
         StringBuffer sb = new StringBuffer();
@@ -323,6 +352,10 @@
     }
 
     //-------------------------------------------------------------------------
+    
+    /**
+     * @roller.wrapPojoMethod type="simple"
+     */
     public String getUrl()
     {
         if (getRefererPermalink() != null)
@@ -336,6 +369,10 @@
     }
 
     //-------------------------------------------------------------------------
+    
+    /**
+     * @roller.wrapPojoMethod type="simple"
+     */
     public String getDisplayUrl()
     {
         return getDisplayUrl(50, false);

Modified: incubator/roller/trunk/src/org/roller/pojos/Template.java
URL: http://svn.apache.org/viewcvs/incubator/roller/trunk/src/org/roller/pojos/Template.java?rev=224388&r1=224387&r2=224388&view=diff
==============================================================================
--- incubator/roller/trunk/src/org/roller/pojos/Template.java (original)
+++ incubator/roller/trunk/src/org/roller/pojos/Template.java Fri Jul 22 12:23:20 2005
@@ -19,11 +19,34 @@
  */
 public interface Template {
     
+    /**
+     * @roller.wrapPojoMethod type="simple"
+     */
     public String getId();
+    
+    /**
+     * @roller.wrapPojoMethod type="simple"
+     */
     public String getName();
+    
+    /**
+     * @roller.wrapPojoMethod type="simple"
+     */
     public String getDescription();
+    
+    /**
+     * @roller.wrapPojoMethod type="simple"
+     */
     public String getContents();
+    
+    /**
+     * @roller.wrapPojoMethod type="simple"
+     */
     public String getLink();
+    
+    /**
+     * @roller.wrapPojoMethod type="simple"
+     */
     public Date getLastModified();
     
     /*

Modified: incubator/roller/trunk/src/org/roller/pojos/UserData.java
URL: http://svn.apache.org/viewcvs/incubator/roller/trunk/src/org/roller/pojos/UserData.java?rev=224388&r1=224387&r2=224388&view=diff
==============================================================================
--- incubator/roller/trunk/src/org/roller/pojos/UserData.java (original)
+++ incubator/roller/trunk/src/org/roller/pojos/UserData.java Fri Jul 22 12:23:20 2005
@@ -47,64 +47,68 @@
    {
    }
 
-	public UserData( java.lang.String id, java.lang.String userName,
-                     java.lang.String password, java.lang.String fullName,
-                     java.lang.String emailAddress, java.util.Date dateCreated)
-	{
-		this.id = id;
-		this.userName = userName;
-		this.password = password;
-		this.fullName = fullName;
-		this.emailAddress = emailAddress;
-		this.dateCreated = (Date)dateCreated.clone();
-	}
-
-	public UserData( UserData otherData )
-	{
-		this.id = otherData.id;
-		this.userName = otherData.userName;
-		this.password = otherData.password;
-		this.fullName = otherData.fullName;
-		this.emailAddress = otherData.emailAddress;
-		this.dateCreated = (Date)otherData.dateCreated.clone();
-
-	}
-
-   /** Id of the User.
-     * Not remote since primary key may be extracted by other means.
-     * 
-     * @struts.validator type="required" msgkey="errors.required"
-     * @ejb:persistent-field 
-     * @hibernate.id column="id" type="string"
-     *  generator-class="uuid.hex" unsaved-value="null"
-     */
+   public UserData( java.lang.String id, java.lang.String userName,
+           java.lang.String password, java.lang.String fullName,
+           java.lang.String emailAddress, java.util.Date dateCreated) {
+       this.id = id;
+       this.userName = userName;
+       this.password = password;
+       this.fullName = fullName;
+       this.emailAddress = emailAddress;
+       this.dateCreated = (Date)dateCreated.clone();
+   }
+   
+   public UserData( UserData otherData ) {
+       this.id = otherData.id;
+       this.userName = otherData.userName;
+       this.password = otherData.password;
+       this.fullName = otherData.fullName;
+       this.emailAddress = otherData.emailAddress;
+       this.dateCreated = (Date)otherData.dateCreated.clone();
+       
+   }
+   
+   /** 
+    * Id of the User.
+    * Not remote since primary key may be extracted by other means.
+    *
+    * @roller.wrapPojoMethod type="simple"
+    * @struts.validator type="required" msgkey="errors.required"
+    * @ejb:persistent-field
+    * @hibernate.id column="id" type="string"
+    *  generator-class="uuid.hex" unsaved-value="null"
+    */
    public java.lang.String getId()
    {
       return this.id;
    }
-   /** @ejb:persistent-field */ 
-   public void setId( java.lang.String id )
-   {
-      this.id = id;
-   }
-
-   /** User name of the user.
-     * @ejb:persistent-field 
-     * @hibernate.property column="username" non-null="true" unique="true"
-     */
-   public java.lang.String getUserName()
-   {
-      return this.userName;
+   
+   /** @ejb:persistent-field */
+   public void setId( java.lang.String id ) {
+       this.id = id;
+   }
+   
+   /**
+    * User name of the user.
+    *
+    * @roller.wrapPojoMethod type="simple"
+    * @ejb:persistent-field
+    * @hibernate.property column="username" non-null="true" unique="true"
+    */
+   public java.lang.String getUserName() {
+       return this.userName;
    }
-   /** @ejb:persistent-field */ 
-   public void setUserName( java.lang.String userName )
-   {
-      this.userName = userName;
+   
+   /** @ejb:persistent-field */
+   public void setUserName( java.lang.String userName ) {
+       this.userName = userName;
    }
 
    /** 
     * Get password.
     * If password encryption is enabled, will return encrypted password.
+    *
+    * @roller.wrapPojoMethod type="simple"
     * @ejb:persistent-field 
     * @hibernate.property column="passphrase" non-null="true"
     */
@@ -122,10 +126,13 @@
       this.password = password;
    }
 
-   /** Full name of the user.
-     * @ejb:persistent-field 
-     * @hibernate.property column="fullname" non-null="true" unique="true"
-     */
+   /** 
+    * Full name of the user.
+    *
+    * @roller.wrapPojoMethod type="simple"
+    * @ejb:persistent-field
+    * @hibernate.property column="fullname" non-null="true" unique="true"
+    */
    public java.lang.String getFullName()
    {
       return this.fullName;
@@ -136,10 +143,13 @@
       this.fullName = fullName;
    }
 
-   /** E-mail address of the user.
-     * @ejb:persistent-field 
-     * @hibernate.property column="emailaddress" non-null="true" unique="true"
-     */
+   /**
+    * E-mail address of the user.
+    *
+    * @roller.wrapPojoMethod type="simple"
+    * @ejb:persistent-field
+    * @hibernate.property column="emailaddress" non-null="true" unique="true"
+    */
    public java.lang.String getEmailAddress()
    {
       return this.emailAddress;
@@ -151,9 +161,10 @@
    }
 
    /** 
-	* @ejb:persistent-field 
-	* @hibernate.property column="datecreated" non-null="true" unique="false"
-	*/
+    * @roller.wrapPojoMethod type="simple"
+    * @ejb:persistent-field
+    * @hibernate.property column="datecreated" non-null="true" unique="false"
+    */
    public java.util.Date getDateCreated()
    {
        if (dateCreated == null) 

Modified: incubator/roller/trunk/src/org/roller/pojos/WeblogCategoryData.java
URL: http://svn.apache.org/viewcvs/incubator/roller/trunk/src/org/roller/pojos/WeblogCategoryData.java?rev=224388&r1=224387&r2=224388&view=diff
==============================================================================
--- incubator/roller/trunk/src/org/roller/pojos/WeblogCategoryData.java (original)
+++ incubator/roller/trunk/src/org/roller/pojos/WeblogCategoryData.java Fri Jul 22 12:23:20 2005
@@ -125,6 +125,8 @@
 
     /** 
      * @see org.roller.pojos.HierarchicalPersistentObject#getObjectPropertyName()
+     *
+     * @roller.wrapPojoMethod type="simple"
      */
     public String getObjectPropertyName()
     {
@@ -133,6 +135,8 @@
 
     /** 
      * @see org.roller.pojos.HierarchicalPersistentObject#getAncestorPropertyName()
+     *
+     * @roller.wrapPojoMethod type="simple"
      */
     public String getAncestorPropertyName()
     {
@@ -142,9 +146,10 @@
     //------------------------------------------------------- Simple properties
 
     /**
+     * @roller.wrapPojoMethod type="simple"
      * @ejb:persistent-field 
-      * @hibernate.id column="id" type="string"
-      *  generator-class="uuid.hex" unsaved-value="null"
+     * @hibernate.id column="id" type="string"
+     *  generator-class="uuid.hex" unsaved-value="null"
      */
     public java.lang.String getId()
     {
@@ -157,6 +162,7 @@
     }
 
     /** 
+     * @roller.wrapPojoMethod type="simple"
      * @ejb:persistent-field 
      * @hibernate.property column="name" non-null="true" unique="false"
      */
@@ -172,6 +178,8 @@
 
     /** 
      * Description
+     * 
+     * @roller.wrapPojoMethod type="simple"
      * @ejb:persistent-field 
      * @hibernate.property column="description" non-null="true" unique="false"
      */
@@ -186,6 +194,7 @@
     }
 
     /** 
+     * @roller.wrapPojoMethod type="simple"
      * @ejb:persistent-field 
      * @hibernate.property column="image" non-null="true" unique="false"
      */
@@ -201,6 +210,8 @@
 
     /**
      * Get path in category hierarhcy.
+     *
+     * @roller.wrapPojoMethod type="simple"
      */
     public String getPath()
     {
@@ -221,6 +232,7 @@
     //------------------------------------------------------------ Associations
 
     /** 
+     * @roller.wrapPojoMethod type="pojo"
      * @ejb:persistent-field
      *  
      * @hibernate.many-to-one column="websiteid" cascade="none" not-null="true"
@@ -250,7 +262,11 @@
 //        WeblogCategoryAssoc = weblogCategoryAssoc;
 //    }
 
-    /** Return parent category, or null if category is root of hierarchy. */
+    /** 
+     * Return parent category, or null if category is root of hierarchy.
+     *
+     * @roller.wrapPojoMethod type="pojo"
+     */
     public WeblogCategoryData getParent() throws RollerException
     {
         if (mNewParent != null)
@@ -275,7 +291,11 @@
         mNewParent = parent;
     }
 
-    /** Query to get child categories of this category. */
+    /**
+     * Query to get child categories of this category.
+     *
+     * @roller.wrapPojoMethod type="pojo-collection" class="org.roller.pojos.WeblogCategoryData"
+     */
     public List getWeblogCategories() throws RollerException
     {
         if (mWeblogCategories == null)
@@ -293,6 +313,9 @@
         return mWeblogCategories;
     }
 
+    /**
+     * @roller.wrapPojoMethod type="simple"
+     */
     public boolean descendentOf(WeblogCategoryData ancestor) 
         throws RollerException
     {
@@ -302,6 +325,8 @@
     /** 
      * Determine if category is in use. Returns true if any weblog entries 
      * use this category or any of it's subcategories.
+     *
+     * @roller.wrapPojoMethod type="simple"
      */
     public boolean isInUse() 
     {
@@ -357,6 +382,9 @@
     /** 
      * Retrieve all weblog entries in this category and, optionally, include
      * weblog entries all sub-categories.
+     *
+     * @roller.wrapPojoMethod type="pojo-collection" class="org.roller.pojos.WeblogEntryData"
+     *
      * @param subcats True if entries from sub-categories are to be returned.
      * @return List of WeblogEntryData objects.
      * @throws RollerException

Modified: incubator/roller/trunk/src/org/roller/pojos/WeblogEntryData.java
URL: http://svn.apache.org/viewcvs/incubator/roller/trunk/src/org/roller/pojos/WeblogEntryData.java?rev=224388&r1=224387&r2=224388&view=diff
==============================================================================
--- incubator/roller/trunk/src/org/roller/pojos/WeblogEntryData.java (original)
+++ incubator/roller/trunk/src/org/roller/pojos/WeblogEntryData.java Fri Jul 22 12:23:20 2005
@@ -127,6 +127,7 @@
     //------------------------------------------------------ Simple properties
     
     /** 
+     * @roller.wrapPojoMethod type="simple"
      * @ejb:persistent-field 
      * @hibernate.id column="id" type="string"
      *  generator-class="uuid.hex" unsaved-value="null"
@@ -143,6 +144,7 @@
     }
 
     /** 
+     * @roller.wrapPojoMethod type="pojo"
      * @ejb:persistent-field 
      * @hibernate.many-to-one column="categoryid" cascade="none" not-null="true"
      */
@@ -168,6 +170,7 @@
     }
 
     /** 
+     * @roller.wrapPojoMethod type="pojo"
      * @ejb:persistent-field 
      * @hibernate.many-to-one column="websiteid" cascade="none" not-null="true"
      */
@@ -183,6 +186,7 @@
     }
 
     /** 
+     * @roller.wrapPojoMethod type="simple"
      * @ejb:persistent-field 
      * @hibernate.property column="title" non-null="true" unique="false"
      */
@@ -198,6 +202,7 @@
     }
 
     /** 
+     * @roller.wrapPojoMethod type="simple"
      * @ejb:persistent-field 
      * @hibernate.property column="text" non-null="true" unique="false"
      */
@@ -213,6 +218,7 @@
     }
 
     /** 
+     * @roller.wrapPojoMethod type="simple"
      * @ejb:persistent-field 
      * @hibernate.property column="anchor" non-null="true" unique="false"
      */
@@ -229,7 +235,9 @@
 
     //-------------------------------------------------------------------------
     /** 
-     * Map attributes as set because XDoclet 1.2b4 map support is broken. 
+     * Map attributes as set because XDoclet 1.2b4 map support is broken.
+     *
+     * @roller.wrapPojoMethod type="pojo-collection" class="org.roller.pojos.EntryAttributeData"
      * @ejb:persistent-field
      * @hibernate.set lazy="true" order-by="name" inverse="true" cascade="all" 
      * @hibernate.collection-key column="entryid" type="String"
@@ -262,12 +270,20 @@
             this.attMap = new HashMap();
         }
     }
-    /** Would be named getEntryAttribute, but that would set off XDoclet */
+    
+    
+    /** 
+     * Would be named getEntryAttribute, but that would set off XDoclet
+     *
+     * @roller.wrapPojoMethod type="simple"
+     */
     public String findEntryAttribute(String name)
     {
         EntryAttributeData att = ((EntryAttributeData)attMap.get(name));
         return (att != null) ? att.getValue() : null;
     }
+    
+    
     public void putEntryAttribute(String name, String value) throws Exception
     {
         EntryAttributeData att = (EntryAttributeData)attMap.get(name);
@@ -307,6 +323,7 @@
      * <p>NOTE: Times are stored using the SQL TIMESTAMP datatype, which on 
      * MySQL has only a one-second resolution.</p>
      *
+     * @roller.wrapPojoMethod type="simple"
      * @ejb:persistent-field 
      * @hibernate.property column="pubtime" non-null="true" unique="false"
      */
@@ -332,6 +349,7 @@
      * <p>NOTE: Times are stored using the SQL TIMESTAMP datatype, which on 
      * MySQL has only a one-second resolution.</p>
      *
+     * @roller.wrapPojoMethod type="simple"
      * @ejb:persistent-field 
      * @hibernate.property column="updatetime" non-null="true" unique="false"
      */
@@ -347,6 +365,7 @@
     }
 
     /** 
+     * @roller.wrapPojoMethod type="simple"
      * @ejb:persistent-field 
      * @hibernate.property column="publishentry" non-null="true" unique="false"
      */
@@ -365,6 +384,7 @@
      * Some weblog entries are about one specific link.
      * @return Returns the link.
      *
+     * @roller.wrapPojoMethod type="simple"
      * @ejb:persistent-field 
      * @hibernate.property column="link" non-null="false" unique="false"
      */
@@ -384,6 +404,8 @@
 
     /**
      * Comma-delimited list of this entry's Plugins.
+     *
+     * @roller.wrapPojoMethod type="simple"
      * @ejb:persistent-field
      * @hibernate.property column="plugins" non-null="false" unique="false"
      */
@@ -399,58 +421,65 @@
     }
 
     
-	/**
-	 * True if comments are allowed on this weblog entry.
-     * @ejb:persistent-field 
+    /**
+     * True if comments are allowed on this weblog entry.
+     *
+     * @roller.wrapPojoMethod type="simple"
+     * @ejb:persistent-field
      * @hibernate.property column="allowcomments" non-null="true" unique="false"
-	 */
-	public Boolean getAllowComments() {
-		return allowComments;
-	}
-	/**
-	 * True if comments are allowed on this weblog entry.
-     * @ejb:persistent-field 
-	 */
-	public void setAllowComments(Boolean allowComments) {
-		this.allowComments = allowComments;
-	}
-	
-	/**
-	 * Number of days after pubTime that comments should be allowed, or 0 for no limit.
-     * @ejb:persistent-field 
+     */
+    public Boolean getAllowComments() {
+        return allowComments;
+    }
+    /**
+     * True if comments are allowed on this weblog entry.
+     * @ejb:persistent-field
+     */
+    public void setAllowComments(Boolean allowComments) {
+        this.allowComments = allowComments;
+    }
+    
+    /**
+     * Number of days after pubTime that comments should be allowed, or 0 for no limit.
+     *
+     * @roller.wrapPojoMethod type="simple"
+     * @ejb:persistent-field
      * @hibernate.property column="commentdays" non-null="true" unique="false"
-	 */
-	public Integer getCommentDays() {
-		return commentDays;
-	}
-	/**
-	 * Number of days after pubTime that comments should be allowed, or 0 for no limit.
-     * @ejb:persistent-field 
-	 */
-	public void setCommentDays(Integer commentDays) {
-		this.commentDays = commentDays;
-	}
-	
-	/**
-	 * True if this entry should be rendered right to left.
-     * @ejb:persistent-field 
+     */
+    public Integer getCommentDays() {
+        return commentDays;
+    }
+    /**
+     * Number of days after pubTime that comments should be allowed, or 0 for no limit.
+     * @ejb:persistent-field
+     */
+    public void setCommentDays(Integer commentDays) {
+        this.commentDays = commentDays;
+    }
+    
+    /**
+     * True if this entry should be rendered right to left.
+     *
+     * @roller.wrapPojoMethod type="simple"
+     * @ejb:persistent-field
      * @hibernate.property column="righttoleft" non-null="true" unique="false"
-	 */
-	public Boolean getRightToLeft() {
-		return rightToLeft;
-	}
-	/**
-	 * True if this entry should be rendered right to left.
-     * @ejb:persistent-field 
-	 */
-	public void setRightToLeft(Boolean rightToLeft) {
-		this.rightToLeft = rightToLeft;
-	}
+     */
+    public Boolean getRightToLeft() {
+        return rightToLeft;
+    }
+    /**
+     * True if this entry should be rendered right to left.
+     * @ejb:persistent-field
+     */
+    public void setRightToLeft(Boolean rightToLeft) {
+        this.rightToLeft = rightToLeft;
+    }
 
     /**
      * True if story should be pinned to the top of the Roller site main blog.
      * @return Returns the pinned.
      * 
+     * @roller.wrapPojoMethod type="simple"
      * @ejb:persistent-field 
      * @hibernate.property column="pinnedtomain" non-null="true" unique="false"
      */
@@ -493,7 +522,9 @@
     
     /** 
      * True if comments are still allowed on this entry considering the 
-     * allowComments and commentDays fields. 
+     * allowComments and commentDays fields.
+     *
+     * @roller.wrapPojoMethod type="simple"
      */
     public boolean getCommentsStillAllowed() 
     {
@@ -529,6 +560,8 @@
     /** 
      * Format the publish time of this weblog entry using the specified pattern.
      * See java.text.SimpleDateFormat for more information on this format.
+     *
+     * @roller.wrapPojoMethod type="simple"
      * @see java.text.SimpleDateFormat
      * @return Publish time formatted according to pattern.
      */
@@ -554,6 +587,8 @@
     /** 
      * Format the update time of this weblog entry using the specified pattern.
      * See java.text.SimpleDateFormat for more information on this format.
+     *
+     * @roller.wrapPojoMethod type="simple"
      * @see java.text.SimpleDateFormat
      * @return Update time formatted according to pattern.
      */
@@ -575,11 +610,17 @@
 
     //------------------------------------------------------------------------
     
+    /**
+     * @roller.wrapPojoMethod type="pojo-collection" class="org.roller.pojos.CommentData"
+     */
     public List getComments()
     {
         return getComments(true);
     }
     
+    /**
+     * @roller.wrapPojoMethod type="pojo-collection" class="org.roller.pojos.CommentData"
+     */
     public List getComments(boolean ignoreSpam)
     {
         List list = new ArrayList();
@@ -593,6 +634,9 @@
 
     //------------------------------------------------------------------------
     
+    /**
+     * @roller.wrapPojoMethod type="pojo-collection" class="org.roller.pojos.RefererData"
+     */
     public List getReferers()
     {
         List referers = null;
@@ -653,6 +697,8 @@
     /**
      * Convenience method for getPermalink(category)
      * where no category is necessary.
+     * 
+     * @roller.wrapPojoMethod type="simple"
      * @return
      */
     public String getPermaLink()
@@ -680,6 +726,8 @@
      * require prepending the baseURL (either the full root 
      * [http://server.com/context] or at least the context
      * [/context]) in order to generate a functional link.
+     *
+     * @roller.wrapPojoMethod type="simple"
      * @param category The category name to insert into the permalink.
      * @return String
      */
@@ -690,7 +738,10 @@
         
         return this.getPermaLink();
     }
-        
+    
+    /**
+     * @roller.wrapPojoMethod type="simple"
+     */
     public String getCommentsLink()
     {
         String dayString = DateUtil.format8chars(this.getPubTime());
@@ -713,6 +764,7 @@
      * Return the Title of this post, or the first 255 characters of the
      * entry's text.
      * 
+     * @roller.wrapPojoMethod type="simple"
      * @return String
      */
     public String getDisplayTitle()
@@ -884,13 +936,21 @@
         return result;
     }
     
-    /** Return RSS 09x style description (escaped HTML version of entry text) */
+    /**
+     * Return RSS 09x style description (escaped HTML version of entry text)
+     *
+     * @roller.wrapPojoMethod type="simple"
+     */
     public String getRss09xDescription()
     {
         return getRss09xDescription(-1);
     }
     
-    /** Return RSS 09x style description (escaped HTML version of entry text) */
+    /** 
+     * Return RSS 09x style description (escaped HTML version of entry text)
+     *
+     * @roller.wrapPojoMethod type="simple"
+     */
     public String getRss09xDescription(int maxLength)
     {
         String ret = Utilities.escapeHTML(text);
@@ -981,6 +1041,8 @@
     
     /**
      * Convenience method to transform mPlugins to a List
+     *
+     * @roller.wrapPojoMethod type="simple"
      * @return
      */
     public List getPluginsList()

Modified: incubator/roller/trunk/src/org/roller/pojos/WebsiteData.java
URL: http://svn.apache.org/viewcvs/incubator/roller/trunk/src/org/roller/pojos/WebsiteData.java?rev=224388&r1=224387&r2=224388&view=diff
==============================================================================
--- incubator/roller/trunk/src/org/roller/pojos/WebsiteData.java (original)
+++ incubator/roller/trunk/src/org/roller/pojos/WebsiteData.java Fri Jul 22 12:23:20 2005
@@ -312,6 +312,8 @@
     
     /**
      * Id of the Website.
+     *
+     * @roller.wrapPojoMethod type="simple"
      * @ejb:persistent-field
      * @hibernate.id column="id" type="string"
      *  generator-class="uuid.hex" unsaved-value="null"
@@ -329,6 +331,8 @@
 
     /**
      * Name of the Website.
+     *
+     * @roller.wrapPojoMethod type="simple"
      * @ejb:persistent-field
      * @hibernate.property column="name" non-null="true" unique="false"
      */
@@ -345,6 +349,8 @@
 
     /**
      * Description
+     *
+     * @roller.wrapPojoMethod type="simple"
      * @ejb:persistent-field
      * @hibernate.property column="description" non-null="true" unique="false"
      */
@@ -361,6 +367,8 @@
 
     /**
      * Id of owner.
+     *
+     * @roller.wrapPojoMethod type="pojo"
      * @ejb:persistent-field
      * @hibernate.many-to-one column="userid" cascade="none" not-null="true"
      */
@@ -376,6 +384,7 @@
     }
 
     /**
+     * @roller.wrapPojoMethod type="simple"
      * @ejb:persistent-field
      * @hibernate.property column="defaultpageid" non-null="true" unique="false"
      */
@@ -393,6 +402,7 @@
     }
 
     /**
+     * @roller.wrapPojoMethod type="simple"
      * @deprecated
      * @ejb:persistent-field
      * @hibernate.property column="weblogdayid" non-null="true" unique="false"
@@ -412,6 +422,7 @@
     }
 
     /**
+     * @roller.wrapPojoMethod type="simple"
      * @ejb:persistent-field
      * @hibernate.property column="enablebloggerapi" non-null="true" unique="false"
      */
@@ -427,8 +438,8 @@
     }
 
     /**
+     * @roller.wrapPojoMethod type="simple"
      * @ejb:persistent-field
-     * 
      * @hibernate.many-to-one column="bloggercatid" non-null="false"
      */
     public WeblogCategoryData getBloggerCategory()
@@ -447,8 +458,8 @@
      * work with the top level categories that are immediately under the root.
      * Setting a different default category allows you to partition your weblog.
      * 
+     * @roller.wrapPojoMethod type="pojo"
      * @ejb:persistent-field
-     * 
      * @hibernate.many-to-one column="defaultcatid" non-null="false"
      */
     public WeblogCategoryData getDefaultCategory() 
@@ -463,6 +474,7 @@
     }
 
     /**
+     * @roller.wrapPojoMethod type="simple"
      * @ejb:persistent-field
      * @hibernate.property column="editorpage" non-null="true" unique="false"
      */
@@ -478,6 +490,7 @@
     }
 
     /**
+     * @roller.wrapPojoMethod type="simple"
      * @ejb:persistent-field
      * @hibernate.property column="ignorewords" non-null="true" unique="false"
      */
@@ -493,6 +506,7 @@
     }
 
     /**
+     * @roller.wrapPojoMethod type="simple"
      * @ejb:persistent-field
      * @hibernate.property column="allowcomments" non-null="true" unique="false"
      */
@@ -508,6 +522,7 @@
     }
 
     /**
+     * @roller.wrapPojoMethod type="simple"
      * @ejb:persistent-field
      * @hibernate.property column="emailcomments" non-null="true" unique="false"
      */
@@ -523,6 +538,7 @@
     }
     
     /**
+     * @roller.wrapPojoMethod type="simple"
      * @ejb:persistent-field
      * @hibernate.property column="emailfromaddress" non-null="true" unique="false"
      */
@@ -538,7 +554,9 @@
     }
     
     /**
-     * EditorTheme of the Website.
+     * Theme of the Website.
+     *
+     * @roller.wrapPojoMethod type="simple"
      * @ejb:persistent-field
      * @hibernate.property column="editortheme" non-null="true" unique="false"
      */
@@ -555,6 +573,8 @@
 
     /**
      * Locale of the Website.
+     *
+     * @roller.wrapPojoMethod type="simple"
      * @ejb:persistent-field
      * @hibernate.property column="locale" non-null="true" unique="false"
      */
@@ -571,6 +591,8 @@
 
     /**
      * Timezone of the Website.
+     *
+     * @roller.wrapPojoMethod type="simple"
      * @ejb:persistent-field
      * @hibernate.property column="timezone" non-null="true" unique="false"
      */
@@ -587,6 +609,8 @@
 
     /**
      * Comma-delimited list of user's default Plugins.
+     *
+     * @roller.wrapPojoMethod type="simple"
      * @ejb:persistent-field
      * @hibernate.property column="defaultplugins" non-null="false" unique="false"
      */
@@ -602,6 +626,7 @@
     }
 
     /**
+     * @roller.wrapPojoMethod type="simple"
      * @ejb:persistent-field
      * @hibernate.property column="isenabled" non-null="true" unique="false"
      */
@@ -748,6 +773,8 @@
     /**
      * Parse locale value and instantiate a Locale object,
      * otherwise return default Locale.
+     *
+     * @roller.wrapPojoMethod type="simple"
      * @return Locale
      */
     public Locale getLocaleInstance()
@@ -780,6 +807,8 @@
     /**
      * Return TimeZone instance for value of timezone,
      * otherwise return system default instance.
+     *
+     * @roller.wrapPojoMethod type="simple"
      * @return TimeZone
      */
     public TimeZone getTimeZoneInstance()