roller-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From gma...@apache.org
Subject svn commit: r1545147 - in /roller/trunk: ./ app/src/main/java/org/apache/roller/planet/pojos/ app/src/main/java/org/apache/roller/weblogger/pojos/ app/src/main/java/org/apache/roller/weblogger/pojos/wrapper/
Date Mon, 25 Nov 2013 04:09:54 GMT
Author: gmazza
Date: Mon Nov 25 04:09:53 2013
New Revision: 1545147

URL: http://svn.apache.org/r1545147
Log:
Removed unused @hibernate, @ejb, and @roller comment annotations.  Kept 14 @struts ones as unsure about those.

Modified:
    roller/trunk/app/src/main/java/org/apache/roller/planet/pojos/Planet.java
    roller/trunk/app/src/main/java/org/apache/roller/planet/pojos/PlanetGroup.java
    roller/trunk/app/src/main/java/org/apache/roller/planet/pojos/SubscriptionEntry.java
    roller/trunk/app/src/main/java/org/apache/roller/weblogger/pojos/MediaFile.java
    roller/trunk/app/src/main/java/org/apache/roller/weblogger/pojos/User.java
    roller/trunk/app/src/main/java/org/apache/roller/weblogger/pojos/Weblog.java
    roller/trunk/app/src/main/java/org/apache/roller/weblogger/pojos/WeblogBookmark.java
    roller/trunk/app/src/main/java/org/apache/roller/weblogger/pojos/WeblogBookmarkFolder.java
    roller/trunk/app/src/main/java/org/apache/roller/weblogger/pojos/WeblogCategory.java
    roller/trunk/app/src/main/java/org/apache/roller/weblogger/pojos/WeblogEntry.java
    roller/trunk/app/src/main/java/org/apache/roller/weblogger/pojos/WeblogPermission.java
    roller/trunk/app/src/main/java/org/apache/roller/weblogger/pojos/WeblogReferrer.java
    roller/trunk/app/src/main/java/org/apache/roller/weblogger/pojos/wrapper/WeblogEntryWrapper.java
    roller/trunk/pom.xml

Modified: roller/trunk/app/src/main/java/org/apache/roller/planet/pojos/Planet.java
URL: http://svn.apache.org/viewvc/roller/trunk/app/src/main/java/org/apache/roller/planet/pojos/Planet.java?rev=1545147&r1=1545146&r2=1545147&view=diff
==============================================================================
--- roller/trunk/app/src/main/java/org/apache/roller/planet/pojos/Planet.java (original)
+++ roller/trunk/app/src/main/java/org/apache/roller/planet/pojos/Planet.java Mon Nov 25 04:09:53 2013
@@ -22,11 +22,8 @@ import java.util.Set;
 import org.apache.roller.util.UUIDGenerator;
 import java.util.TreeSet;
 
-
 /**
  * A Roller "Planet".
- * 
- * @hibernate.class lazy="true" table="rag_planet"
  */
 public class Planet implements Comparable {
     
@@ -56,10 +53,6 @@ public class Planet implements Comparabl
         return getTitle().compareTo(other.getTitle());
     }
     
-    
-    /**
-     * @hibernate.id column="id" generator-class="assigned"
-     */
     public String getId() {
         return id;
     }
@@ -68,10 +61,6 @@ public class Planet implements Comparabl
         this.id = id;
     }
     
-    
-    /**
-     * @hibernate.property column="handle" non-null="true" unique="true"
-     */
     public String getHandle() {
         return handle;
     }
@@ -80,10 +69,6 @@ public class Planet implements Comparabl
         this.handle = handle;
     }
     
-       
-    /**
-     * @hibernate.property column="title" non-null="true" unique="false"
-     */
     public String getTitle() {
         return title;
     }
@@ -92,10 +77,6 @@ public class Planet implements Comparabl
         this.title = title;
     }
     
-    
-    /**
-     * @hibernate.property column="description" non-null="false" unique="false"
-     */
     public String getDescription() {
         return description;
     }
@@ -104,12 +85,6 @@ public class Planet implements Comparabl
         this.description = description;
     }
 
-    
-    /** 
-     * @hibernate.set lazy="true" inverse="true" cascade="all" sort="natural"
-     * @hibernate.collection-key column="planet_id"
-     * @hibernate.collection-one-to-many class="org.apache.roller.planet.pojos.PlanetGroup"
-     */
     public Set getGroups() {
         return groups;
     }

Modified: roller/trunk/app/src/main/java/org/apache/roller/planet/pojos/PlanetGroup.java
URL: http://svn.apache.org/viewvc/roller/trunk/app/src/main/java/org/apache/roller/planet/pojos/PlanetGroup.java?rev=1545147&r1=1545146&r2=1545147&view=diff
==============================================================================
--- roller/trunk/app/src/main/java/org/apache/roller/planet/pojos/PlanetGroup.java (original)
+++ roller/trunk/app/src/main/java/org/apache/roller/planet/pojos/PlanetGroup.java Mon Nov 25 04:09:53 2013
@@ -29,8 +29,6 @@ import org.apache.roller.weblogger.busin
 
 /**
  * Planet Group.
- *
- * @hibernate.class lazy="true" table="rag_group"
  */
 public class PlanetGroup implements Serializable, Comparable {
 
@@ -61,7 +59,6 @@ public class PlanetGroup implements Seri
         this.description = desc;
     }
     
-    
     /**
      * For comparing groups and sorting, ordered by Title.
      */
@@ -70,10 +67,6 @@ public class PlanetGroup implements Seri
         return getTitle().compareTo(other.getTitle());
     }
     
-    
-    /**
-     * @hibernate.id column="id" generator-class="assigned"
-     */
     public String getId() {
         return id;
     }
@@ -82,10 +75,6 @@ public class PlanetGroup implements Seri
         this.id = id;
     }
     
-    
-    /**
-     * @hibernate.property column="handle" non-null="false" unique="false"
-     */
     public String getHandle() {
         return handle;
     }
@@ -94,10 +83,6 @@ public class PlanetGroup implements Seri
         this.handle = handle;
     }
     
-    
-    /**
-     * @hibernate.property column="title" non-null="false" unique="false"
-     */
     public String getTitle() {
         return title;
     }
@@ -106,10 +91,6 @@ public class PlanetGroup implements Seri
         this.title = title;
     }
     
-    
-    /**
-     * @hibernate.property column="description" non-null="false" unique="false"
-     */
     public String getDescription() {
         return description;
     }
@@ -118,10 +99,6 @@ public class PlanetGroup implements Seri
         this.description = description;
     }
     
-    
-    /**
-     * @hibernate.property column="max_feed_entries" non-null="false" unique="false"
-     */
     public int getMaxFeedEntries() {
         return maxFeedEntries;
     }
@@ -130,10 +107,6 @@ public class PlanetGroup implements Seri
         this.maxFeedEntries = maxFeedEntries;
     }
     
-    
-    /**
-     * @hibernate.property column="max_page_entries" non-null="false" unique="false"
-     */
     public int getMaxPageEntries() {
         return maxPageEntries;
     }
@@ -142,10 +115,6 @@ public class PlanetGroup implements Seri
         this.maxPageEntries = maxPageEntries;
     }
     
-    
-    /**
-     * @hibernate.property column="cat_restriction" non-null="false" unique="false"
-     */
     public String getCategoryRestriction() {
         return categoryRestriction;
     }
@@ -155,10 +124,6 @@ public class PlanetGroup implements Seri
         catArray = null;
     }
     
-    
-    /**
-     * @hibernate.many-to-one column="planet_id" cascade="none" non-null="false"
-     */
     public Planet getPlanet() {
         return planet;
     }
@@ -167,12 +132,6 @@ public class PlanetGroup implements Seri
         this.planet = planet;
     }
     
-    
-    /**
-     * @hibernate.set table="rag_group_subscription" lazy="true" invert="true" cascade="none" sort="natural"
-     * @hibernate.collection-key column="group_id"
-     * @hibernate.collection-many-to-many column="subscription_id" class="org.apache.roller.planet.pojos.Subscription"
-     */
     public Set getSubscriptions() {
         return subscriptions;
     }

Modified: roller/trunk/app/src/main/java/org/apache/roller/planet/pojos/SubscriptionEntry.java
URL: http://svn.apache.org/viewvc/roller/trunk/app/src/main/java/org/apache/roller/planet/pojos/SubscriptionEntry.java?rev=1545147&r1=1545146&r2=1545147&view=diff
==============================================================================
--- roller/trunk/app/src/main/java/org/apache/roller/planet/pojos/SubscriptionEntry.java (original)
+++ roller/trunk/app/src/main/java/org/apache/roller/planet/pojos/SubscriptionEntry.java Mon Nov 25 04:09:53 2013
@@ -223,7 +223,6 @@ public class SubscriptionEntry implement
        
     /**
      * Return first entry in category collection.
-     * @roller.wrapPojoMethod type="pojo"
      */
     public Category getCategory() {
         Category cat = null;
@@ -249,7 +248,6 @@ public class SubscriptionEntry implement
     
     /** 
      * Returns creator as a UserData object.
-     * @roller.wrapPojoMethod type="pojo"
      * TODO: make planet model entry author name, email, and uri
      */
     public Author getCreator() {
@@ -264,7 +262,6 @@ public class SubscriptionEntry implement
     
     /**
      * Returns summary (always null for planet entry)
-     * @roller.wrapPojoMethod type="simple"
      */
     public String getSummary() {
         return null;
@@ -273,7 +270,6 @@ public class SubscriptionEntry implement
 
     /**
      * Read-only synomym for getSubscription()
-     * @roller.wrapPojoMethod type="pojo"
      */
     public Subscription getWebsite() {
         return getSubscription();

Modified: roller/trunk/app/src/main/java/org/apache/roller/weblogger/pojos/MediaFile.java
URL: http://svn.apache.org/viewvc/roller/trunk/app/src/main/java/org/apache/roller/weblogger/pojos/MediaFile.java?rev=1545147&r1=1545146&r2=1545147&view=diff
==============================================================================
--- roller/trunk/app/src/main/java/org/apache/roller/weblogger/pojos/MediaFile.java (original)
+++ roller/trunk/app/src/main/java/org/apache/roller/weblogger/pojos/MediaFile.java Mon Nov 25 04:09:53 2013
@@ -84,8 +84,6 @@ public class MediaFile implements Serial
 
     /**
      * Database surrogate key.
-     * 
-     * @roller.wrapPojoMethod type="simple"
      */
     public String getId() {
         return id;

Modified: roller/trunk/app/src/main/java/org/apache/roller/weblogger/pojos/User.java
URL: http://svn.apache.org/viewvc/roller/trunk/app/src/main/java/org/apache/roller/weblogger/pojos/User.java?rev=1545147&r1=1545146&r2=1545147&view=diff
==============================================================================
--- roller/trunk/app/src/main/java/org/apache/roller/weblogger/pojos/User.java (original)
+++ roller/trunk/app/src/main/java/org/apache/roller/weblogger/pojos/User.java Mon Nov 25 04:09:53 2013
@@ -33,9 +33,6 @@ import org.apache.roller.weblogger.util.
 
 /**
  * User bean.
- *
- * @hibernate.cache usage="read-write"
- * @hibernate.class lazy="true" table="rolleruser"
  */
 public class User implements Serializable {
     
@@ -76,8 +73,6 @@ public class User implements Serializabl
     
     /**
      * Id of the User.
-     *
-     * @hibernate.id column="id" generator-class="assigned"
      */
     public String getId() {
         return this.id;
@@ -90,7 +85,6 @@ public class User implements Serializabl
     
     /**
      * User name of the user.
-     * @hibernate.property column="username" non-null="true" unique="true"
      */
     public String getUserName() {
         return this.userName;
@@ -103,8 +97,6 @@ public class User implements Serializabl
     /**
      * Get password.
      * If password encryption is enabled, will return encrypted password.
-     *
-     * @hibernate.property column="passphrase" non-null="true"
      */
     public String getPassword() {
         return this.password;
@@ -137,8 +129,6 @@ public class User implements Serializabl
     
     /**
      * Screen name of the user.
-     *
-     * @hibernate.property column="screenname" non-null="true" unique="true"
      */
     public String getScreenName() {
         return this.screenName;
@@ -148,11 +138,8 @@ public class User implements Serializabl
         this.screenName = screenName;
     }
     
-    
     /**
      * Full name of the user.
-     *
-     * @hibernate.property column="fullname" non-null="true" unique="true"
      */
     public String getFullName() {
         return this.fullName;
@@ -161,12 +148,9 @@ public class User implements Serializabl
     public void setFullName( String fullName ) {
         this.fullName = fullName;
     }
-    
-    
+
     /**
      * E-mail address of the user.
-     *
-     * @hibernate.property column="emailaddress" non-null="true" unique="true"
      */
     public String getEmailAddress() {
         return this.emailAddress;
@@ -179,8 +163,6 @@ public class User implements Serializabl
     
     /**
      * The date the user was created.
-     *
-     * @hibernate.property column="datecreated" non-null="true" unique="false"
      */
     public Date getDateCreated() {
         if (dateCreated == null) {
@@ -197,12 +179,9 @@ public class User implements Serializabl
             dateCreated = null;
         }
     }
-    
-    
+
     /**
      * Locale of the user.
-     *
-     * @hibernate.property column="locale" non-null="true" unique="false"
      */
     public String getLocale() {
         return this.locale;
@@ -211,12 +190,9 @@ public class User implements Serializabl
     public void setLocale(String locale) {
         this.locale = locale;
     }
-    
-    
+
     /**
      * Timezone of the user.
-     *
-     * @hibernate.property column="timeZone" non-null="true" unique="false"
      */
     public String getTimeZone() {
         return this.timeZone;
@@ -229,8 +205,6 @@ public class User implements Serializabl
     
     /**
      * Is this user account enabled?  Disabled accounts cannot login.
-     *
-     * @hibernate.property column="isenabled" non-null="true" unique="false"
      */
     public Boolean getEnabled() {
         return this.enabled;
@@ -240,12 +214,6 @@ public class User implements Serializabl
         this.enabled = enabled;
     }
     
-    
-    /** 
-     * Activation code.
-     *
-     * @hibernate.property column="activationcode" non-null="false"
-     */
     public String getActivationCode() {
         return activationCode;
     }

Modified: roller/trunk/app/src/main/java/org/apache/roller/weblogger/pojos/Weblog.java
URL: http://svn.apache.org/viewvc/roller/trunk/app/src/main/java/org/apache/roller/weblogger/pojos/Weblog.java?rev=1545147&r1=1545146&r2=1545147&view=diff
==============================================================================
--- roller/trunk/app/src/main/java/org/apache/roller/weblogger/pojos/Weblog.java (original)
+++ roller/trunk/app/src/main/java/org/apache/roller/weblogger/pojos/Weblog.java Mon Nov 25 04:09:53 2013
@@ -51,7 +51,7 @@ import org.apache.roller.weblogger.util.
 /**
  * Website has many-to-many association with users. Website has one-to-many and
  * one-direction associations with weblog entries, weblog categories, folders and
- * other objects. Use UserManager to create, fetch, update and retreive websites.
+ * other objects. Use UserManager to create, fetch, update and retrieve websites.
  *
  * @author David M Johnson
  */
@@ -160,12 +160,6 @@ public class Weblog implements Serializa
             .toHashCode();
     } 
     
-    /**
-     * @hibernate.bag lazy="true" inverse="true" cascade="delete"
-     * @hibernate.collection-key column="website_id"
-     * @hibernate.collection-one-to-many
-     *    class="org.apache.roller.weblogger.pojos.WeblogPermission"
-     */
     /*public List getPermissions() {
         return permissions;
     }
@@ -208,48 +202,33 @@ public class Weblog implements Serializa
     
     /**
      * Id of the Website.
-     *
-     * @roller.wrapPojoMethod type="simple"
-     * @ejb:persistent-field
-     * @hibernate.id column="id"
-     *  generator-class="assigned"  
      */
     public String getId() {
         return this.id;
     }
     
-    /** @ejb:persistent-field */
     public void setId(String id) {
         this.id = id;
     }
     
     /**
      * Short URL safe string that uniquely identifies the website.
-     * @ejb:persistent-field
-     * @hibernate.property column="handle" non-null="true" unique="true"
-     * @roller.wrapPojoMethod type="simple"
      */
     public String getHandle() {
         return this.handle;
     }
     
-    /** @ejb:persistent-field */
     public void setHandle(String handle) {
         this.handle = handle;
     }
     
     /**
      * Name of the Website.
-     *
-     * @roller.wrapPojoMethod type="simple"
-     * @ejb:persistent-field
-     * @hibernate.property column="name" non-null="true" unique="false"
      */
     public String getName() {
         return this.name;
     }
     
-    /** @ejb:persistent-field */
     public void setName(String name) {
         this.name = name;
     }
@@ -257,22 +236,17 @@ public class Weblog implements Serializa
     /**
      * Description
      *
-     * @roller.wrapPojoMethod type="simple"
-     * @ejb:persistent-field
-     * @hibernate.property column="description" non-null="true" unique="false"
      */
     public String getDescription() {
         return this.description;
     }
     
-    /** @ejb:persistent-field */
     public void setDescription(String description) {
         this.description = description;
     }
     
     /**
      * Original creator of website.
-     * @roller.wrapPojoMethod type="pojo"
      */
     public org.apache.roller.weblogger.pojos.User getCreator() {
         try {
@@ -285,7 +259,6 @@ public class Weblog implements Serializa
     
     /**
      * Username of original creator of website.
-     * @roller.wrapPojoMethod type="pojo"
      */
     public String getCreatorUserName() {
         return creator;
@@ -295,27 +268,16 @@ public class Weblog implements Serializa
         creator = creatorUserName;
     }
     
-    /**
-     * @roller.wrapPojoMethod type="simple"
-     * @ejb:persistent-field
-     * @hibernate.property column="defaultpageid" non-null="true" unique="false"
-     */
     public String getDefaultPageId() {
         return this.defaultPageId;
     }
     
-    /**
-     * @ejb:persistent-field
-     */
     public void setDefaultPageId(String defaultPageId) {
         this.defaultPageId = defaultPageId;
     }
     
     /**
-     * @roller.wrapPojoMethod type="simple"
      * @deprecated
-     * @ejb:persistent-field
-     * @hibernate.property column="weblogdayid" non-null="true" unique="false"
      */
     public String getWeblogDayPageId() {
         return this.weblogDayPageId;
@@ -323,36 +285,23 @@ public class Weblog implements Serializa
     
     /**
      * @deprecated
-     * @ejb:persistent-field
      */
     public void setWeblogDayPageId(String weblogDayPageId) {
         this.weblogDayPageId = weblogDayPageId;
     }
     
-    /**
-     * @roller.wrapPojoMethod type="simple"
-     * @ejb:persistent-field
-     * @hibernate.property column="enablebloggerapi" non-null="true" unique="false"
-     */
     public Boolean getEnableBloggerApi() {
         return this.enableBloggerApi;
     }
     
-    /** @ejb:persistent-field */
     public void setEnableBloggerApi(Boolean enableBloggerApi) {
         this.enableBloggerApi = enableBloggerApi;
     }
     
-    /**
-     * @roller.wrapPojoMethod type="simple"
-     * @ejb:persistent-field
-     * @hibernate.many-to-one column="bloggercatid" non-null="false" cascade="none"
-     */
     public WeblogCategory getBloggerCategory() {
         return bloggerCategory;
     }
     
-    /** @ejb:persistent-field */
     public void setBloggerCategory(WeblogCategory bloggerCategory) {
         this.bloggerCategory = bloggerCategory;
     }
@@ -361,199 +310,120 @@ public class Weblog implements Serializa
      * By default,the default category for a weblog is the root and all macros
      * 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" cascade="none"
      */
     public WeblogCategory getDefaultCategory() {
         return defaultCategory;
     }
     
-    /** @ejb:persistent-field */
     public void setDefaultCategory(WeblogCategory defaultCategory) {
         this.defaultCategory = defaultCategory;
     }
     
-    /**
-     * @roller.wrapPojoMethod type="simple"
-     * @ejb:persistent-field
-     * @hibernate.property column="editorpage" non-null="true" unique="false"
-     */
     public String getEditorPage() {
         return this.editorPage;
     }
     
-    /** @ejb:persistent-field */
     public void setEditorPage(String editorPage) {
         this.editorPage = editorPage;
     }
     
-    /**
-     * @roller.wrapPojoMethod type="simple"
-     * @ejb:persistent-field
-     * @hibernate.property column="blacklist" non-null="true" unique="false"
-     */
     public String getBlacklist() {
         return this.blacklist;
     }
     
-    /** @ejb:persistent-field */
     public void setBlacklist(String blacklist) {
         this.blacklist = blacklist;
     }
     
-    /**
-     * @roller.wrapPojoMethod type="simple"
-     * @ejb:persistent-field
-     * @hibernate.property column="allowcomments" non-null="true" unique="false"
-     */
     public Boolean getAllowComments() {
         return this.allowComments;
     }
     
-    /** @ejb:persistent-field */
     public void setAllowComments(Boolean allowComments) {
         this.allowComments = allowComments;
     }
     
-    /**
-     * @roller.wrapPojoMethod type="simple"
-     * @ejb:persistent-field
-     * @hibernate.property column="defaultallowcomments" non-null="true" unique="false"
-     */
     public Boolean getDefaultAllowComments() {
         return defaultAllowComments;
     }
     
-    /** @ejb:persistent-field */
     public void setDefaultAllowComments(Boolean defaultAllowComments) {
         this.defaultAllowComments = defaultAllowComments;
     }
     
-    /**
-     * @roller.wrapPojoMethod type="simple"
-     * @ejb:persistent-field
-     * @hibernate.property column="defaultcommentdays" non-null="true" unique="false"
-     */
     public int getDefaultCommentDays() {
         return defaultCommentDays;
     }
     
-    /** @ejb:persistent-field */
     public void setDefaultCommentDays(int defaultCommentDays) {
         this.defaultCommentDays = defaultCommentDays;
     }
     
-    /**
-     * @roller.wrapPojoMethod type="simple"
-     * @ejb:persistent-field
-     * @hibernate.property column="commentmod" non-null="true" unique="false"
-     */
     public Boolean getModerateComments() {
         return moderateComments;
     }
     
-    /** @ejb:persistent-field */
     public void setModerateComments(Boolean moderateComments) {
         this.moderateComments = moderateComments;
     }
     
-    /**
-     * @roller.wrapPojoMethod type="simple"
-     * @ejb:persistent-field
-     * @hibernate.property column="emailcomments" non-null="true" unique="false"
-     */
     public Boolean getEmailComments() {
         return this.emailComments;
     }
     
-    /** @ejb:persistent-field */
     public void setEmailComments(Boolean emailComments) {
         this.emailComments = emailComments;
     }
     
-    /**
-     * @roller.wrapPojoMethod type="simple"
-     * @ejb:persistent-field
-     * @hibernate.property column="emailfromaddress" non-null="true" unique="false"
-     */
     public String getEmailFromAddress() {
         return this.emailFromAddress;
     }
     
-    /** @ejb:persistent-field */
     public void setEmailFromAddress(String emailFromAddress) {
         this.emailFromAddress = emailFromAddress;
     }
     
-    /**
-     * @ejb:persistent-field
-     * @roller.wrapPojoMethod type="simple"
-     * @hibernate.property column="emailaddress" non-null="true" unique="false"
-     */
     public String getEmailAddress() {
         return this.emailAddress;
     }
     
-    /** @ejb:persistent-field */
     public void setEmailAddress(String emailAddress) {
         this.emailAddress = emailAddress;
     }
     
     /**
      * EditorTheme of the Website.
-     *
-     * @roller.wrapPojoMethod type="simple"
-     * @ejb:persistent-field
-     * @hibernate.property column="editortheme" non-null="true" unique="false"
      */
     public String getEditorTheme() {
         return this.editorTheme;
     }
     
-    /** @ejb:persistent-field */
     public void setEditorTheme(String editorTheme) {
         this.editorTheme = editorTheme;
     }
     
     /**
      * Locale of the Website.
-     *
-     * @roller.wrapPojoMethod type="simple"
-     * @ejb:persistent-field
-     * @hibernate.property column="locale" non-null="true" unique="false"
      */
     public String getLocale() {
         return this.locale;
     }
     
-    /** @ejb:persistent-field */
     public void setLocale(String locale) {
         this.locale = locale;
     }
     
     /**
      * Timezone of the Website.
-     *
-     * @roller.wrapPojoMethod type="simple"
-     * @ejb:persistent-field
-     * @hibernate.property column="timeZone" non-null="true" unique="false"
      */
     public String getTimeZone() {
         return this.timeZone;
     }
     
-    /** @ejb:persistent-field */
     public void setTimeZone(String timeZone) {
         this.timeZone = timeZone;
     }
     
-    /**
-     * @ejb:persistent-field
-     * @hibernate.property column="datecreated" non-null="true" unique="false"
-     * @roller.wrapPojoMethod type="simple"
-     */
     public Date getDateCreated() {
         if (dateCreated == null) {
             return null;
@@ -561,7 +431,7 @@ public class Weblog implements Serializa
             return (Date)dateCreated.clone();
         }
     }
-    /** @ejb:persistent-field */
+
     public void setDateCreated(final Date date) {
         if (date != null) {
             dateCreated = (Date)date.clone();
@@ -572,21 +442,15 @@ public class Weblog implements Serializa
     
     /**
      * Comma-delimited list of user's default Plugins.
-     *
-     * @roller.wrapPojoMethod type="simple"
-     * @ejb:persistent-field
-     * @hibernate.property column="defaultplugins" non-null="false" unique="false"
      */
     public String getDefaultPlugins() {
         return defaultPlugins;
     }
     
-    /** @ejb:persistent-field */
     public void setDefaultPlugins(String string) {
         defaultPlugins = string;
     }
-    
-    
+
     /**
      * Set bean properties based on other bean.
      */
@@ -634,8 +498,6 @@ public class Weblog implements Serializa
     /**
      * Return TimeZone instance for value of timeZone,
      * otherwise return system default instance.
-     *
-     * @roller.wrapPojoMethod type="simple"
      * @return TimeZone
      */
     public TimeZone getTimeZoneInstance() {
@@ -719,34 +581,21 @@ public class Weblog implements Serializa
         // no-op
     }
 
-    /**
-     * @roller.wrapPojoMethod type="simple"
-     * @ejb:persistent-field
-     * @hibernate.property column="displaycnt" not-null="true"
-     */
     public int getEntryDisplayCount() {
         return entryDisplayCount;
     }
     
-    /**
-     * @ejb:persistent-field
-     */
     public void setEntryDisplayCount(int entryDisplayCount) {
         this.entryDisplayCount = entryDisplayCount;
     }
     
     /**
      * Set to FALSE to completely disable and hide this weblog from public view.
-     *
-     * @roller.wrapPojoMethod type="simple"
-     * @ejb:persistent-field
-     * @hibernate.property column="isenabled" non-null="true" unique="false"
      */
     public Boolean getEnabled() {
         return this.enabled;
     }
     
-    /** @ejb:persistent-field */
     public void setEnabled(Boolean enabled) {
         this.enabled = enabled;
     }
@@ -754,10 +603,6 @@ public class Weblog implements Serializa
     /**
      * Set to FALSE to exclude this weblog from community areas such as the
      * front page and the planet page.
-     *
-     * @roller.wrapPojoMethod type="simple"
-     * @ejb:persistent-field
-     * @hibernate.property column="isactive" not-null="true"
      */
     public Boolean getActive() {
         return active;
@@ -788,9 +633,6 @@ public class Weblog implements Serializa
      * affect visible changes to a weblog, and referrers change so often that
      * it would diminish the usefulness of the attribute.
      *
-     * @roller.wrapPojoMethod type="simple"
-     * @ejb:persistent-field
-     * @hibernate.property column="lastmodified" not-null="true"
      */
     public Date getLastModified() {
         return lastModified;
@@ -805,10 +647,6 @@ public class Weblog implements Serializa
      * Is multi-language blog support enabled for this weblog?
      *
      * If false then urls with various locale restrictions should fail.
-     *
-     * @roller.wrapPojoMethod type="simple"
-     * @ejb:persistent-field
-     * @hibernate.property column="enablemultilang" not-null="true"
      */
     public boolean isEnableMultiLang() {
         return enableMultiLang;
@@ -824,10 +662,6 @@ public class Weblog implements Serializa
      *
      * If false then the default weblog view only shows entry from the
      * default locale chosen for this weblog.
-     *
-     * @roller.wrapPojoMethod type="simple"
-     * @ejb:persistent-field
-     * @hibernate.property column="showalllangs" not-null="true"
      */
     public boolean isShowAllLangs() {
         return showAllLangs;
@@ -837,28 +671,17 @@ public class Weblog implements Serializa
         this.showAllLangs = showAllLangs;
     }
     
-    
-    /** 
-     * @roller.wrapPojoMethod type="simple"
-     */
     public String getURL() {
         return WebloggerFactory.getWeblogger().getUrlStrategy().getWeblogURL(this, null, false);
     }
 
-    /**
-     * @roller.wrapPojoMethod type="simple"
-     */
     public String getAbsoluteURL() {
         return WebloggerFactory.getWeblogger().getUrlStrategy().getWeblogURL(this, null, true);
     }
-    
-    
+
     /**
      * Comma-separated list of additional page models to be created when this
      * weblog is rendered.
-     *
-     * @ejb:persistent-field
-     * @hibernate.property column="pagemodels" not-null="false"
      */
     public String getPageModels() {
         return pageModels;
@@ -870,8 +693,6 @@ public class Weblog implements Serializa
     
     /**
      * The path under the weblog's resources to a stylesheet override.
-     *
-     * @hibernate.property column="customstylesheet" not-null="false"
      */
     public String getCustomStylesheetPath() {
         return customStylesheetPath;
@@ -884,8 +705,6 @@ public class Weblog implements Serializa
     
     /**
      * The path under the weblog's resources to an icon image.
-     *
-     * @hibernate.property column="icon" not-null="false"
      */
     public String getIconPath() {
         return iconPath;
@@ -903,7 +722,6 @@ public class Weblog implements Serializa
      * description is meant to hold more of a tagline, while this attribute is
      * more of a full paragraph (or two) about section.
      *
-     * @hibernate.property column="about" not-null="false"
      */
     public String getAbout() {
         return about;
@@ -934,7 +752,6 @@ public class Weblog implements Serializa
      * Get weblog entry specified by anchor or null if no such entry exists.
      * @param anchor Weblog entry anchor
      * @return Weblog entry specified by anchor
-     * @roller.wrapPojoMethod type="simple"
      */
     public WeblogEntry getWeblogEntry(String anchor) {
         WeblogEntry entry = null;
@@ -950,8 +767,6 @@ public class Weblog implements Serializa
     
     /**
      * Returns categories under the default category of the weblog.
-     * 
-     * @roller.wrapPojoMethod type="pojo-collection" class="org.apache.roller.weblogger.pojos.WeblogCategory"
      */
     public Set getWeblogCategories() {
         WeblogCategory category = this.getDefaultCategory();
@@ -959,11 +774,6 @@ public class Weblog implements Serializa
     }
     
     
-    /**
-     * 
-     * 
-     * @roller.wrapPojoMethod type="pojo-collection" class="org.apache.roller.weblogger.pojosWeblogCategorya"
-     */
     public Set getWeblogCategories(String categoryPath) {
         Set ret = new HashSet();
         try {
@@ -982,12 +792,6 @@ public class Weblog implements Serializa
         return ret;
     }
 
-    
-    /**
-     * 
-     * 
-     * @roller.wrapPojoMethod type="pojo" class="org.apache.roller.weblogger.pojosWeblogCategorya"
-     */
     public WeblogCategory getWeblogCategory(String categoryPath) {
         WeblogCategory category = null;
         try {
@@ -1010,8 +814,6 @@ public class Weblog implements Serializa
      * @param cat Category path or null for no category restriction
      * @param length Max entries to return (1-100)
      * @return List of weblog entry objects.
-     *
-     * @roller.wrapPojoMethod type="pojo-collection" class="org.apache.roller.weblogger.pojos.WeblogEntryData"
      */
     public List getRecentWeblogEntries(String cat, int length) {  
         if (cat != null && "nil".equals(cat)) {
@@ -1051,8 +853,6 @@ public class Weblog implements Serializa
      * @param tag Blog entry tag to query by
      * @param length Max entries to return (1-100)
      * @return List of weblog entry objects.
-     *
-     * @roller.wrapPojoMethod type="pojo-collection" class="org.apache.roller.weblogger.pojos.WeblogEntryData"
      */
     public List getRecentWeblogEntriesByTag(String tag, int length) {  
         if (tag != null && "nil".equals(tag)) {
@@ -1095,8 +895,6 @@ public class Weblog implements Serializa
      * Get up to 100 most recent approved and non-spam comments in weblog.
      * @param length Max entries to return (1-100)
      * @return List of comment objects.
-     *
-     * @roller.wrapPojoMethod type="pojo-collection" class="org.apache.roller.weblogger.pojos.WeblogEntryComment"
      */
     public List getRecentComments(int length) {   
         if (length > 100) {
@@ -1129,8 +927,6 @@ public class Weblog implements Serializa
      * Get bookmark folder by name.
      * @param folderName Name or path of bookmark folder to be returned (null for root)
      * @return Folder object requested.
-     *
-     * @roller.wrapPojoMethod type="pojo" class="org.apache.roller.weblogger.pojos.WeblogBookmarkFolder"
      */
     public WeblogBookmarkFolder getBookmarkFolder(String folderName) {
         WeblogBookmarkFolder ret = null;
@@ -1151,7 +947,6 @@ public class Weblog implements Serializa
     
     /** 
      * Return collection of referrers for current day.
-     * @roller.wrapPojoMethod type="pojo-collection" class="org.apache.roller.weblogger.pojos.WeblogReferrer"
      */
     public List getTodaysReferrers() {
         try {
@@ -1169,7 +964,6 @@ public class Weblog implements Serializa
     
     /**
      * Get number of hits counted today.
-     * @roller.wrapPojoMethod type="simple"
      */
     public int getTodaysHits() {
         try {
@@ -1195,8 +989,6 @@ public class Weblog implements Serializa
      * @param sinceDays Number of days into past (or -1 for all days)
      * @param length    Max number of tags to return.
      * @return          Collection of WeblogEntryTag objects
-     *
-     * @roller.wrapPojoMethod type="simple"
      */
     public List getPopularTags(int sinceDays, int length) {
         List results = new ArrayList();
@@ -1217,9 +1009,6 @@ public class Weblog implements Serializa
         return results;
     }      
 
-    /**
-     * @roller.wrapPojoMethod type="simple"
-     */
     public long getCommentCount() {
         long count = 0;
         try {
@@ -1235,9 +1024,6 @@ public class Weblog implements Serializa
     /** No-op method to please XDoclet */
     public void setCommentCount(int ignored) {}
     
-    /**
-     * @roller.wrapPojoMethod type="simple"
-     */
     public long getEntryCount() {
         long count = 0;
         try {
@@ -1253,12 +1039,9 @@ public class Weblog implements Serializa
     /** No-op method to please XDoclet */
     public void setEntryCount(int ignored) {}
 
-
     /**
-     *
      * @return  mobileTheme
      */
-
     public Theme getTheme(String type){
         WeblogThemeAssoc themeAssoc;
         Theme theme = null;

Modified: roller/trunk/app/src/main/java/org/apache/roller/weblogger/pojos/WeblogBookmark.java
URL: http://svn.apache.org/viewvc/roller/trunk/app/src/main/java/org/apache/roller/weblogger/pojos/WeblogBookmark.java?rev=1545147&r1=1545146&r2=1545147&view=diff
==============================================================================
--- roller/trunk/app/src/main/java/org/apache/roller/weblogger/pojos/WeblogBookmark.java (original)
+++ roller/trunk/app/src/main/java/org/apache/roller/weblogger/pojos/WeblogBookmark.java Mon Nov 25 04:09:53 2013
@@ -71,19 +71,10 @@ public class WeblogBookmark implements S
     
     //------------------------------------------------------------- Attributes
     
-    /**
-     * @roller.wrapPojoMethod type="simple"
-     *
-     * @ejb:persistent-field
-     *
-     * @hibernate.id column="id"
-     *     generator-class="assigned"
-     */
     public String getId() {
         return this.id;
     }
     
-    /** @ejb:persistent-field */
     public void setId(String id) {
         this.id = id;
     }
@@ -91,56 +82,35 @@ public class WeblogBookmark implements S
     /**
      * Name of bookmark.
      *
-     * @roller.wrapPojoMethod type="simple"
-     *
      * @struts.validator type="required" msgkey="errors.required"
      * @struts.validator-args arg0resource="bookmarkForm.name"
-     *
-     * @ejb:persistent-field
-     *
-     * @hibernate.property column="name" non-null="true" unique="false"
      */
     public String getName() {
         return this.name;
     }
     
-    /** @ejb:persistent-field */
     public void setName(String name) {
         this.name = name;
     }
     
     /**
      * Description of bookmark.
-     *
-     * @roller.wrapPojoMethod type="simple"
-     *
-     * @ejb:persistent-field
-     *
-     * @hibernate.property column="description" non-null="true" unique="false"
      */
     public String getDescription() {
         return this.description;
     }
     
-    /** @ejb:persistent-field */
     public void setDescription(String description) {
         this.description = description;
     }
     
     /**
      * URL of bookmark.
-     *
-     * @roller.wrapPojoMethod type="simple"
-     *
-     * @ejb:persistent-field
-     *
-     * @hibernate.property column="url" non-null="true" unique="false"
      */
     public String getUrl() {
         return this.url;
     }
     
-    /** @ejb:persistent-field */
     public void setUrl(String url) {
         this.url = url;
     }
@@ -148,21 +118,14 @@ public class WeblogBookmark implements S
     /**
      * Weight indicates prominence of link
      *
-     * @roller.wrapPojoMethod type="simple"
-     *
      * @struts.validator type="required" msgkey="errors.required"
      * @struts.validator type="integer" msgkey="errors.integer"
      * @struts.validator-args arg0resource="bookmarkForm.weight"
-     *
-     * @ejb:persistent-field
-     *
-     * @hibernate.property column="weight" non-null="true" unique="false"
      */
     public java.lang.Integer getWeight() {
         return this.weight;
     }
     
-    /** @ejb:persistent-field */
     public void setWeight(java.lang.Integer weight) {
         this.weight = weight;
     }
@@ -170,69 +133,40 @@ public class WeblogBookmark implements S
     /**
      * Priority determines order of display
      *
-     * @roller.wrapPojoMethod type="simple"
-     *
      * @struts.validator type="required" msgkey="errors.required"
      * @struts.validator type="integer" msgkey="errors.integer"
      * @struts.validator-args arg0resource="bookmarkForm.priority"
-     *
-     * @ejb:persistent-field
-     *
-     * @hibernate.property column="priority" non-null="true" unique="false"
      */
     public java.lang.Integer getPriority() {
         return this.priority;
     }
     
-    /** @ejb:persistent-field */
     public void setPriority(java.lang.Integer priority) {
         this.priority = priority;
     }
     
-    /**
-     * @ejb:persistent-field
-     *
-     * @roller.wrapPojoMethod type="simple"
-     *
-     * @hibernate.property column="image" non-null="true" unique="false"
-     */
     public String getImage() {
         return this.image;
     }
     
-    /** @ejb:persistent-field */
     public void setImage(String image) {
         this.image = image;
     }
     
-    /**
-     * @ejb:persistent-field
-     *
-     * @roller.wrapPojoMethod type="simple"
-     *
-     * @hibernate.property column="feedurl" non-null="true" unique="false"
-     */
     public String getFeedUrl() {
         return this.feedUrl;
     }
     
-    /** @ejb:persistent-field */
     public void setFeedUrl(String feedUrl) {
         this.feedUrl = feedUrl;
     }
     
     //---------------------------------------------------------- Relationships
-    
-    /**
-     * @roller.wrapPojoMethod type="pojo"
-     * @ejb:persistent-field
-     * @hibernate.many-to-one column="folderid" cascade="none" not-null="true"
-     */
+
     public org.apache.roller.weblogger.pojos.WeblogBookmarkFolder getFolder() {
         return this.folder;
     }
     
-    /** @ejb:persistent-field */
     public void setFolder(org.apache.roller.weblogger.pojos.WeblogBookmarkFolder folder) {
         this.folder = folder;
     }

Modified: roller/trunk/app/src/main/java/org/apache/roller/weblogger/pojos/WeblogBookmarkFolder.java
URL: http://svn.apache.org/viewvc/roller/trunk/app/src/main/java/org/apache/roller/weblogger/pojos/WeblogBookmarkFolder.java?rev=1545147&r1=1545146&r2=1545147&view=diff
==============================================================================
--- roller/trunk/app/src/main/java/org/apache/roller/weblogger/pojos/WeblogBookmarkFolder.java (original)
+++ roller/trunk/app/src/main/java/org/apache/roller/weblogger/pojos/WeblogBookmarkFolder.java Mon Nov 25 04:09:53 2013
@@ -133,11 +133,6 @@ public class WeblogBookmarkFolder implem
     
     /**
      * Database surrogate key.
-     *
-     * @roller.wrapPojoMethod type="simple"
-     *
-     * @hibernate.id column="id"
-     *     generator-class="assigned"  
      */
     public String getId() {
         return this.id;
@@ -155,14 +150,10 @@ public class WeblogBookmarkFolder implem
     /**
      * The short name for this folder.
      *
-     * @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}"
      * @struts.validator-args arg0resource="folderForm.name"
-     *
-     * @hibernate.property column="name" non-null="true" unique="false"
      */
     public String getName() {
         return this.name;
@@ -175,10 +166,6 @@ public class WeblogBookmarkFolder implem
     
     /**
      * A full description for this folder.
-     *
-     * @roller.wrapPojoMethod type="simple"
-     *
-     * @hibernate.property column="description" non-null="true" unique="false"
      */
     public String getDescription() {
         return this.description;
@@ -187,14 +174,9 @@ public class WeblogBookmarkFolder implem
     public void setDescription(String description) {
         this.description = description;
     }
-    
-    
+
     /**
      * The full path to this folder in the hierarchy.
-     *
-     * @roller.wrapPojoMethod type="simple"
-     *
-     * @hibernate.property column="path" non-null="true" unique="false"
      */
     public String getPath() {
         return this.path;
@@ -203,14 +185,9 @@ public class WeblogBookmarkFolder implem
     public void setPath(String path) {
         this.path = path;
     }
-    
-    
+
     /**
      * Get the weblog which owns this folder.
-     *
-     * @roller.wrapPojoMethod type="pojo"
-     *
-     * @hibernate.many-to-one column="websiteid" cascade="none" not-null="true"
      */
     public Weblog getWebsite() {
         return website;
@@ -219,14 +196,9 @@ public class WeblogBookmarkFolder implem
     public void setWebsite( Weblog website ) {
         this.website = website;
     }
-    
-    
+
     /**
      * Return parent folder, or null if folder is root of hierarchy.
-     *
-     * @roller.wrapPojoMethod type="pojo"
-     *
-     * @hibernate.many-to-one column="parentid" cascade="none" not-null="false"
      */
     public WeblogBookmarkFolder getParent() {
         return this.parentFolder;
@@ -239,12 +211,6 @@ public class WeblogBookmarkFolder implem
     
     /**
      * Get child folders of this folder.
-     *
-     * @roller.wrapPojoMethod type="pojo-collection" class="org.apache.roller.weblogger.pojos.WeblogBookmarkFolder"
-     *
-     * @hibernate.set lazy="true" inverse="true" cascade="delete" 
-     * @hibernate.collection-key column="parentid"
-     * @hibernate.collection-one-to-many class="org.apache.roller.weblogger.pojos.WeblogBookmarkFolder"
      */
     public Set getFolders() {
         return this.childFolders;
@@ -257,12 +223,6 @@ public class WeblogBookmarkFolder implem
     
     /**
      * Get bookmarks contained in this folder.
-     *
-     * @roller.wrapPojoMethod type="pojo-collection" class="org.apache.roller.weblogger.pojos.WeblogBookmark"
-     *
-     * @hibernate.set lazy="true" order-by="name" inverse="true" cascade="all"
-     * @hibernate.collection-key column="folderid"
-     * @hibernate.collection-one-to-many class="org.apache.roller.weblogger.pojos.WeblogBookmark"
      */
     public Set getBookmarks() {
         return this.bookmarks;
@@ -307,8 +267,6 @@ public class WeblogBookmarkFolder implem
     
     
     /**
-     * @roller.wrapPojoMethod type="pojo-collection" class="org.apache.roller.weblogger.pojos.WeblogBookmark"
-     *
      * @param subfolders
      */
     public List retrieveBookmarks(boolean subfolders) throws WebloggerException {
@@ -338,8 +296,6 @@ public class WeblogBookmarkFolder implem
     
     /**
      * Is this folder a descendent of the other folder?
-     *
-     * @roller.wrapPojoMethod type="simple"
      */
     public boolean descendentOf(WeblogBookmarkFolder ancestor) {
         

Modified: roller/trunk/app/src/main/java/org/apache/roller/weblogger/pojos/WeblogCategory.java
URL: http://svn.apache.org/viewvc/roller/trunk/app/src/main/java/org/apache/roller/weblogger/pojos/WeblogCategory.java?rev=1545147&r1=1545146&r2=1545147&view=diff
==============================================================================
--- roller/trunk/app/src/main/java/org/apache/roller/weblogger/pojos/WeblogCategory.java (original)
+++ roller/trunk/app/src/main/java/org/apache/roller/weblogger/pojos/WeblogCategory.java Mon Nov 25 04:09:53 2013
@@ -35,9 +35,6 @@ import org.apache.roller.util.UUIDGenera
 
 /**
  * Weblog Category.
- * 
- * @hibernate.cache usage="read-write"
- * @hibernate.class lazy="true" table="weblogcategory"
  */
 public class WeblogCategory implements Serializable, Comparable {
     
@@ -131,8 +128,6 @@ public class WeblogCategory implements S
     
     /**
      * Database surrogate key.
-     *
-     * @hibernate.id column="id" generator-class="assigned"  
      */
     public String getId() {
         return this.id;
@@ -145,8 +140,6 @@ public class WeblogCategory implements S
     
     /**
      * The display name for this category.
-     *
-     * @hibernate.property column="name" non-null="true" unique="false"
      */
     public String getName() {
         return this.name;
@@ -159,8 +152,6 @@ public class WeblogCategory implements S
     
     /**
      * A full description for this category.
-     *
-     * @hibernate.property column="description" non-null="true" unique="false"
      */
     public String getDescription() {
         return this.description;
@@ -173,8 +164,6 @@ public class WeblogCategory implements S
     
     /**
      * An image icon to represent this category.
-     *
-     * @hibernate.property column="image" non-null="true" unique="false"
      */
     public String getImage() {
         return this.image;
@@ -187,8 +176,6 @@ public class WeblogCategory implements S
     
     /**
      * The full path to this category in the hierarchy.
-     *
-     * @hibernate.property column="path" non-null="true" unique="false"
      */
     public String getPath() {
         return this.path;
@@ -201,8 +188,6 @@ public class WeblogCategory implements S
     
     /**
      * Get the weblog which owns this category.
-     *
-     * @hibernate.many-to-one column="websiteid" cascade="none" not-null="true"
      */
     public Weblog getWebsite() {
         return website;
@@ -215,8 +200,6 @@ public class WeblogCategory implements S
     
     /**
      * Get parent category, or null if category is root of hierarchy.
-     *
-     * @hibernate.many-to-one column="parentid" cascade="none" not-null="false"
      */
     public WeblogCategory getParent() {
         return this.parentCategory;
@@ -229,10 +212,6 @@ public class WeblogCategory implements S
     
     /**
      * Get child categories of this category.
-     * 
-     * @hibernate.collection-key column="parentid"
-     * @hibernate.collection-one-to-many class="org.apache.roller.weblogger.pojos.WeblogCategory"
-     * @hibernate.set lazy="true" inverse="true" cascade="delete" order-by="name"
      */
     public Set getWeblogCategories() {
         return this.childCategories;

Modified: roller/trunk/app/src/main/java/org/apache/roller/weblogger/pojos/WeblogEntry.java
URL: http://svn.apache.org/viewvc/roller/trunk/app/src/main/java/org/apache/roller/weblogger/pojos/WeblogEntry.java?rev=1545147&r1=1545146&r2=1545147&view=diff
==============================================================================
--- roller/trunk/app/src/main/java/org/apache/roller/weblogger/pojos/WeblogEntry.java (original)
+++ roller/trunk/app/src/main/java/org/apache/roller/weblogger/pojos/WeblogEntry.java Mon Nov 25 04:09:53 2013
@@ -58,10 +58,7 @@ import org.apache.roller.weblogger.util.
 /**
  * Represents a Weblog Entry.
  *
- * @ejb:bean name="WeblogEntry"
  * @struts.form include-all="true"
- * @hibernate.class lazy="true" table="weblogentry"
- * @hibernate.cache usage="read-write"
  */
 public class WeblogEntry implements Serializable {
     private static Log mLogger =
@@ -204,16 +201,10 @@ public class WeblogEntry implements Seri
     
    //------------------------------------------------------ Simple properties
     
-    /**
-     * @roller.wrapPojoMethod type="simple"
-     * @ejb:persistent-field
-     * @hibernate.id column="id" generator-class="assigned"  
-     */
     public String getId() {
         return this.id;
     }
     
-    /** @ejb:persistent-field */
     public void setId(String id) {
         // Form bean workaround: empty string is never a valid id
         if (id != null && id.trim().length() == 0) {
@@ -222,16 +213,10 @@ public class WeblogEntry implements Seri
         this.id = id;
     }
     
-    /**
-     * @roller.wrapPojoMethod type="pojo"
-     * @ejb:persistent-field
-     * @hibernate.many-to-one column="categoryid" cascade="none" not-null="true"
-     */
     public WeblogCategory getCategory() {
         return this.category;
     }
     
-    /** @ejb:persistent-field */
     public void setCategory(WeblogCategory category) {
         this.category = category;
     }
@@ -239,8 +224,6 @@ public class WeblogEntry implements Seri
     /**
      * Return collection of WeblogCategory objects of this entry.
      * Added for symetry with PlanetEntryData object.
-     * 
-     * @roller.wrapPojoMethod type="pojo-collection" class="org.apache.roller.weblogger.pojos.WeblogCategory"
      */
     public List getCategories() {
         List cats = new ArrayList();
@@ -253,23 +236,14 @@ public class WeblogEntry implements Seri
         // no-op
     }
     
-    /**
-     * @roller.wrapPojoMethod type="pojo"
-     * @ejb:persistent-field
-     * @hibernate.many-to-one column="websiteid" cascade="none" not-null="true"
-     */
     public Weblog getWebsite() {
         return this.website;
     }
     
-    /** @ejb:persistent-field */
     public void setWebsite(Weblog website) {
         this.website = website;
     }
     
-    /**
-     * @roller.wrapPojoMethod type="simple"
-     */
     public User getCreator() {
         try {
             return WebloggerFactory.getWeblogger().getUserManager().getUserByUserName(getCreatorUserName());
@@ -287,25 +261,16 @@ public class WeblogEntry implements Seri
         this.creatorUserName = creatorUserName;
     }   
     
-    /**
-     * @roller.wrapPojoMethod type="simple"
-     * @ejb:persistent-field
-     * @hibernate.property column="title" non-null="true" unique="false"
-     */
     public String getTitle() {
         return this.title;
     }
     
-    /** @ejb:persistent-field */
     public void setTitle(String title) {
         this.title = title;
     }
     
     /**
      * Get summary for weblog entry (maps to RSS description and Atom summary).
-     * @roller.wrapPojoMethod type="simple"
-     * @ejb:persistent-field
-     * @hibernate.property column="summary" non-null="false" unique="false"
      */
     public String getSummary() {
         return summary;
@@ -313,7 +278,6 @@ public class WeblogEntry implements Seri
     
     /**
      * Set summary for weblog entry (maps to RSS description and Atom summary).
-     * @ejb:persistent-field
      */
     public void setSummary(String summary) {
         this.summary = summary;
@@ -321,9 +285,6 @@ public class WeblogEntry implements Seri
     
     /**
      * Get search description for weblog entry.
-     * @roller.wrapPojoMethod type="simple"
-     * @ejb:persistent-field
-     * @hibernate.property column="search_description" non-null="false" unique="false"
      */
     public String getSearchDescription() {
         return searchDescription;
@@ -331,7 +292,6 @@ public class WeblogEntry implements Seri
     
     /**
      * Set search description for weblog entry
-     * @ejb:persistent-field
      */
     public void setSearchDescription(String searchDescription) {
         this.searchDescription = searchDescription;
@@ -339,9 +299,6 @@ public class WeblogEntry implements Seri
 
     /**
      * Get content text for weblog entry (maps to RSS content:encoded and Atom content).
-     * @roller.wrapPojoMethod type="simple"
-     * @ejb:persistent-field
-     * @hibernate.property column="text" non-null="true" unique="false"
      */
     public String getText() {
         return this.text;
@@ -349,7 +306,6 @@ public class WeblogEntry implements Seri
     
     /**
      * Set content text for weblog entry (maps to RSS content:encoded and Atom content).
-     * @ejb:persistent-field
      */
     public void setText(String text) {
         this.text = text;
@@ -357,9 +313,6 @@ public class WeblogEntry implements Seri
     
     /**
      * Get content type (text, html, xhtml or a MIME content type)
-     * @roller.wrapPojoMethod type="simple"
-     * @ejb:persistent-field
-     * @hibernate.property column="content_type" non-null="false" unique="false"
      */
     public String getContentType() {
         return contentType;
@@ -367,7 +320,6 @@ public class WeblogEntry implements Seri
     
     /**
      * Set content type (text, html, xhtml or a MIME content type)
-     * @ejb:persistent-field
      */
     public void setContentType(String contentType) {
         this.contentType = contentType;
@@ -375,9 +327,6 @@ public class WeblogEntry implements Seri
     
     /**
      * Get URL for out-of-line content.
-     * @roller.wrapPojoMethod type="simple"
-     * @ejb:persistent-field
-     * @hibernate.property column="content_src" non-null="false" unique="false"
      */
     public String getContentSrc() {
         return contentSrc;
@@ -385,22 +334,15 @@ public class WeblogEntry implements Seri
     
     /**
      * Set URL for out-of-line content.
-     * @ejb:persistent-field
      */
     public void setContentSrc(String contentSrc) {
         this.contentSrc = contentSrc;
     }
     
-    /**
-     * @roller.wrapPojoMethod type="simple"
-     * @ejb:persistent-field
-     * @hibernate.property column="anchor" non-null="true" unique="false"
-     */
     public String getAnchor() {
         return this.anchor;
     }
     
-    /** @ejb:persistent-field */
     public void setAnchor(String anchor) {
         this.anchor = anchor;
     }
@@ -408,26 +350,17 @@ public class WeblogEntry implements Seri
     //-------------------------------------------------------------------------
     /**
      * Map attributes as set because XDoclet 1.2b4 map support is broken.
-     *
-     * @roller.wrapPojoMethod type="pojo-collection" class="org.apache.roller.weblogger.pojos.WeblogEntryAttribute"
-     * @ejb:persistent-field
-     * @hibernate.set lazy="true" order-by="name" inverse="true" cascade="all"
-     * @hibernate.collection-key column="entryid" type="String"
-     * @hibernate.collection-one-to-many class="org.apache.roller.weblogger.pojos.WeblogEntryAttribute"
      */
     public Set getEntryAttributes() {
         return attSet;
     }
-    /** @ejb:persistent-field */
+
     public void setEntryAttributes(Set atts) {
         this.attSet = atts;
     }
     
-    
     /**
      * Would be named getEntryAttribute, but that would set off XDoclet
-     *
-     * @roller.wrapPojoMethod type="simple"
      */
     public String findEntryAttribute(String name) {
         if (getEntryAttributes() != null) {
@@ -473,16 +406,11 @@ public class WeblogEntry implements Seri
      *
      * <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"
      */
     public Timestamp getPubTime() {
         return this.pubTime;
     }
     
-    /** @ejb:persistent-field */
     public void setPubTime(Timestamp pubTime) {
         this.pubTime = pubTime;
     }
@@ -497,30 +425,19 @@ public class WeblogEntry implements Seri
      *
      * <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"
      */
     public Timestamp getUpdateTime() {
         return this.updateTime;
     }
     
-    /** @ejb:persistent-field */
     public void setUpdateTime(Timestamp updateTime) {
         this.updateTime = updateTime;
     }
     
-    /**
-     * @roller.wrapPojoMethod type="simple"
-     * @ejb:persistent-field
-     * @hibernate.property column="status" non-null="true" unique="false"
-     */
     public String getStatus() {
         return this.status;
     }
     
-    /** @ejb:persistent-field */
     public void setStatus(String status) {
         this.status = status;
     }
@@ -528,17 +445,12 @@ public class WeblogEntry implements Seri
     /**
      * 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"
      */
     public String getLink() {
         return link;
     }
     
     /**
-     * @ejb:persistent-field
      * @param link The link to set.
      */
     public void setLink(String link) {
@@ -547,34 +459,23 @@ public class WeblogEntry implements Seri
     
     /**
      * Comma-delimited list of this entry's Plugins.
-     *
-     * @roller.wrapPojoMethod type="simple"
-     * @ejb:persistent-field
-     * @hibernate.property column="plugins" non-null="false" unique="false"
      */
     public String getPlugins() {
         return plugins;
     }
     
-    /** @ejb:persistent-field */
     public void setPlugins(String string) {
         plugins = string;
     }
-    
-    
+
     /**
      * 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;
@@ -582,17 +483,12 @@ public class WeblogEntry implements Seri
     
     /**
      * 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;
@@ -600,17 +496,12 @@ public class WeblogEntry implements Seri
     
     /**
      * 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;
@@ -619,10 +510,6 @@ public class WeblogEntry implements Seri
     /**
      * 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"
      */
     public Boolean getPinnedToMain() {
         return pinnedToMain;
@@ -630,37 +517,22 @@ public class WeblogEntry implements Seri
     /**
      * True if story should be pinned to the top of the Roller site main blog.
      * @param pinnedToMain The pinned to set.
-     *
-     * @ejb:persistent-field
      */
     public void setPinnedToMain(Boolean pinnedToMain) {
         this.pinnedToMain = pinnedToMain;
     }
-    
-    
+
     /**
      * The locale string that defines the i18n approach for this entry.
-     *
-     * @roller.wrapPojoMethod type="simple"
-     * @ejb:persistent-field
-     * @hibernate.property column="locale" non-null="false" unique="false"
      */
     public String getLocale() {
         return locale;
     }
-    
-    
+
     public void setLocale(String locale) {
         this.locale = locale;
     }
     
-    /**
-     * @ejb:persistent-field 
-     * 
-     * @hibernate.set lazy="true" order-by="name" inverse="true" cascade="all"
-     * @hibernate.collection-key column="entryid"
-     * @hibernate.collection-one-to-many class="org.apache.roller.weblogger.pojos.WeblogEntryTag"
-     */
      public Set<WeblogEntryTag> getTags()
      {
          return tagSet;
@@ -753,9 +625,6 @@ public class WeblogEntry implements Seri
         }
     }
    
-    /**
-     * @roller.wrapPojoMethod type="simple"
-     */
     public String getTagsAsString() {
         StringBuffer sb = new StringBuffer();
         // Sort by name
@@ -786,8 +655,6 @@ public class WeblogEntry implements Seri
      * True if comments are still allowed on this entry considering the
      * allowComments and commentDays fields as well as the website and 
      * site-wide configs.
-     *
-     * @roller.wrapPojoMethod type="simple"
      */
     public boolean getCommentsStillAllowed() {
         if (!WebloggerRuntimeConfig.getBooleanProperty("users.comments.enabled")) {
@@ -833,7 +700,6 @@ public class WeblogEntry implements Seri
      * 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.
      */
@@ -856,7 +722,6 @@ public class WeblogEntry implements Seri
      * 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.
      */
@@ -874,16 +739,11 @@ public class WeblogEntry implements Seri
     
     //------------------------------------------------------------------------
     
-    /**
-     * @roller.wrapPojoMethod type="pojo-collection" class="org.apache.roller.weblogger.pojos.WeblogEntryComment"
-     */
     public List getComments() {
         return getComments(true, true);
     }
     
     /**
-     * @roller.wrapPojoMethod type="pojo-collection" class="org.apache.roller.weblogger.pojos.WeblogEntryComment"
-     *
      * TODO: why is this method exposed to users with ability to get spam/non-approved comments?
      */
     public List getComments(boolean ignoreSpam, boolean approvedOnly) {
@@ -904,9 +764,6 @@ public class WeblogEntry implements Seri
         return list;
     }
     
-    /**
-     * @roller.wrapPojoMethod type="simple"
-     */    
     public int getCommentCount() {
         List comments = getComments(true, true);
         return comments.size();
@@ -917,11 +774,6 @@ public class WeblogEntry implements Seri
         // no-op
     }
     
-    //------------------------------------------------------------------------
-    
-    /**
-     * @roller.wrapPojoMethod type="pojo-collection" class="org.apache.roller.weblogger.pojos.RefererData"
-     */
     public List getReferers() {
         List referers = null;
         try {
@@ -944,7 +796,6 @@ public class WeblogEntry implements Seri
     /**
      * Returns entry permalink, relative to Roller context.
      * @deprecated Use getPermalink() instead.
-     * @roller.wrapPojoMethod type="simple"
      */
     public String getPermaLink() {
         String lAnchor = this.getAnchor();        
@@ -958,7 +809,6 @@ public class WeblogEntry implements Seri
     
     /**
      * Get relative URL to comments page.
-     * @roller.wrapPojoMethod type="simple"
      * @deprecated Use commentLink() instead
      */
     public String getCommentsLink() {
@@ -976,7 +826,6 @@ public class WeblogEntry implements Seri
      * 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() {
@@ -988,8 +837,6 @@ public class WeblogEntry implements Seri
     
     /**
      * Return RSS 09x style description (escaped HTML version of entry text)
-     *
-     * @roller.wrapPojoMethod type="simple"
      */
     public String getRss09xDescription() {
         return getRss09xDescription(-1);
@@ -997,8 +844,6 @@ public class WeblogEntry implements Seri
     
     /**
      * Return RSS 09x style description (escaped HTML version of entry text)
-     *
-     * @roller.wrapPojoMethod type="simple"
      */
     public String getRss09xDescription(int maxLength) {
         String ret = StringEscapeUtils.escapeHtml(getText());
@@ -1078,8 +923,6 @@ public class WeblogEntry implements Seri
     
     /**
      * Convenience method to transform mPlugins to a List
-     *
-     * @roller.wrapPojoMethod type="simple"
      * @return
      */
     public List getPluginsList() {
@@ -1115,7 +958,6 @@ public class WeblogEntry implements Seri
   
     /**
      * Get entry text, transformed by plugins enabled for entry.
-     * @roller.wrapPojoMethod type="simple"
      */
     public String getTransformedText() {
         return render(getText());
@@ -1129,7 +971,6 @@ public class WeblogEntry implements Seri
     
     /**
      * Get entry summary, transformed by plugins enabled for entry.
-     * @roller.wrapPojoMethod type="simple"
      */
     public String getTransformedSummary() {
         return render(getSummary());
@@ -1218,8 +1059,6 @@ public class WeblogEntry implements Seri
      * prefer summary over content and we include a "Read More" link at the
      * end of the summary if it exists.  Otherwise, if the readMoreLink is
      * empty or null then we assume the caller prefers content over summary.
-     *
-     * @roller.wrapPojoMethod type="simple"
      */
     public String displayContent(String readMoreLink) {
         
@@ -1260,17 +1099,11 @@ public class WeblogEntry implements Seri
     
     /**
      * Get the right transformed display content.
-     *
-     * @roller.wrapPojoMethod type="simple"
      */
     public String getDisplayContent() { 
         return displayContent(null);
     }
-    
-    
+
     /** No-op method to please XDoclet */
     public void setDisplayContent(String ignored) {}
-
-
-    
 }

Modified: roller/trunk/app/src/main/java/org/apache/roller/weblogger/pojos/WeblogPermission.java
URL: http://svn.apache.org/viewvc/roller/trunk/app/src/main/java/org/apache/roller/weblogger/pojos/WeblogPermission.java?rev=1545147&r1=1545146&r2=1545147&view=diff
==============================================================================
--- roller/trunk/app/src/main/java/org/apache/roller/weblogger/pojos/WeblogPermission.java (original)
+++ roller/trunk/app/src/main/java/org/apache/roller/weblogger/pojos/WeblogPermission.java Mon Nov 25 04:09:53 2013
@@ -30,10 +30,7 @@ import org.apache.roller.weblogger.busin
 
 /**
  * Permission for one specific weblog
- * @ejb:bean name="WeblogPermission"
  * @struts.form include-all="true"
- * @hibernate.class lazy="true" table="roller_user_permissions"
- * @hibernate.cache usage="read-write"
  *
  * @author Dave Johnson
  */
@@ -152,7 +149,3 @@ public class WeblogPermission extends Ob
                 .toHashCode();
     }
 }
-
-
-
-

Modified: roller/trunk/app/src/main/java/org/apache/roller/weblogger/pojos/WeblogReferrer.java
URL: http://svn.apache.org/viewvc/roller/trunk/app/src/main/java/org/apache/roller/weblogger/pojos/WeblogReferrer.java?rev=1545147&r1=1545146&r2=1545147&view=diff
==============================================================================
--- roller/trunk/app/src/main/java/org/apache/roller/weblogger/pojos/WeblogReferrer.java (original)
+++ roller/trunk/app/src/main/java/org/apache/roller/weblogger/pojos/WeblogReferrer.java Mon Nov 25 04:09:53 2013
@@ -96,9 +96,6 @@ public class WeblogReferrer implements S
     
     /**
      * 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.apache.roller.weblogger.pojos.Weblog getWebsite() {
         return this.website;
@@ -108,10 +105,6 @@ public class WeblogReferrer implements S
         this.website = website;
     }
     
-    /**
-     * @roller.wrapPojoMethod type="pojo"
-     * @hibernate.many-to-one column="entryid" cascade="none"
-     */
     public org.apache.roller.weblogger.pojos.WeblogEntry getWeblogEntry() {
         return weblogEntry;
     }
@@ -125,9 +118,6 @@ public class WeblogReferrer implements S
     
     /**
      * Date string in YYYYMMDD format.
-     *
-     * @roller.wrapPojoMethod type="simple"
-     * @hibernate.property column="datestr" non-null="true" unique="false"
      */
     public String getDateString() {
         return this.dateString;
@@ -139,9 +129,6 @@ public class WeblogReferrer implements S
     
     /**
      * URL of the refering page.
-     *
-     * @roller.wrapPojoMethod type="simple"
-     * @hibernate.property column="refurl" non-null="true" unique="false"
      */
     public String getRefererUrl() {
         return this.refererUrl;
@@ -156,9 +143,6 @@ public class WeblogReferrer implements S
     
     /**
      * Requested URL, the URL linked to by the refering page.
-     *
-     * @roller.wrapPojoMethod type="simple"
-     * @hibernate.property column="refpermalink" non-null="true" unique="false"
      */
     public String getRefererPermalink() {
         return this.refererPermalink;
@@ -170,9 +154,6 @@ public class WeblogReferrer implements S
     
     /**
      * Requested URL, the URL linked to by the refering page.
-     *
-     * @roller.wrapPojoMethod type="simple"
-     * @hibernate.property column="requrl" non-null="true" unique="false"
      */
     public String getRequestUrl() {
         return this.requestUrl;
@@ -184,9 +165,6 @@ public class WeblogReferrer implements S
     
     /**
      * 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 String getTitle() {
         return this.title;
@@ -198,9 +176,6 @@ public class WeblogReferrer implements S
     
     /**
      * 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 String getExcerpt() {
         return this.excerpt;
@@ -212,9 +187,6 @@ public class WeblogReferrer implements S
     
     /**
      * Should this referer be displayed?
-     *
-     * @roller.wrapPojoMethod type="simple"
-     * @hibernate.property column="visible" non-null="true" unique="false"
      */
     public Boolean getVisible() {
         return this.visible;
@@ -226,9 +198,6 @@ public class WeblogReferrer implements S
     
     /**
      * Is this referer a duplicate?
-     *
-     * @roller.wrapPojoMethod type="simple"
-     * @hibernate.property column="duplicate" non-null="true" unique="false"
      */
     public Boolean getDuplicate() {
         return this.duplicate;
@@ -240,9 +209,6 @@ public class WeblogReferrer implements S
     
     /**
      * Hits received today from this referer.
-     *
-     * @roller.wrapPojoMethod type="simple"
-     * @hibernate.property column="dayhits" non-null="true" unique="false"
      */
     public Integer getDayHits() {
         return this.dayHits;
@@ -254,9 +220,6 @@ public class WeblogReferrer implements S
     
     /**
      * Total hits received from this referer.
-     *
-     * @roller.wrapPojoMethod type="simple"
-     * @hibernate.property column="totalhits" non-null="true" unique="false"
      */
     public Integer getTotalHits() {
         return this.totalHits;
@@ -266,11 +229,6 @@ public class WeblogReferrer implements S
         this.totalHits = totalHits;
     }
     
-    //-------------------------------------------------------------------------
-    
-    /**
-     * @roller.wrapPojoMethod type="simple"
-     */
     public String getDisplayUrl(int maxWidth, boolean includeHits) {
         StringBuffer sb = new StringBuffer();
         
@@ -318,11 +276,6 @@ public class WeblogReferrer implements S
         return sb.toString();
     }
     
-    //-------------------------------------------------------------------------
-    
-    /**
-     * @roller.wrapPojoMethod type="simple"
-     */
     public String getUrl() {
         if (getRefererPermalink() != null) {
             return getRefererPermalink();
@@ -331,11 +284,6 @@ public class WeblogReferrer implements S
         }
     }
     
-    //-------------------------------------------------------------------------
-    
-    /**
-     * @roller.wrapPojoMethod type="simple"
-     */
     public String getDisplayUrl() {
         return getDisplayUrl(50, false);
     }

Modified: roller/trunk/app/src/main/java/org/apache/roller/weblogger/pojos/wrapper/WeblogEntryWrapper.java
URL: http://svn.apache.org/viewvc/roller/trunk/app/src/main/java/org/apache/roller/weblogger/pojos/wrapper/WeblogEntryWrapper.java?rev=1545147&r1=1545146&r2=1545147&view=diff
==============================================================================
--- roller/trunk/app/src/main/java/org/apache/roller/weblogger/pojos/wrapper/WeblogEntryWrapper.java (original)
+++ roller/trunk/app/src/main/java/org/apache/roller/weblogger/pojos/wrapper/WeblogEntryWrapper.java Mon Nov 25 04:09:53 2013
@@ -112,8 +112,6 @@ public class WeblogEntryWrapper {
     }
     
     /**
-     * pojo method tagged with @roller.wrapPojoMethod type="simple"
-     *
      * Simply returns the same value that the pojo would have returned.
      */
     public String getText() {

Modified: roller/trunk/pom.xml
URL: http://svn.apache.org/viewvc/roller/trunk/pom.xml?rev=1545147&r1=1545146&r2=1545147&view=diff
==============================================================================
--- roller/trunk/pom.xml (original)
+++ roller/trunk/pom.xml Mon Nov 25 04:09:53 2013
@@ -12,7 +12,7 @@
         <maven>3.0.5</maven>
     </prerequisites>
 
-    <name>Apache Roller</name>
+    <name>Roller project</name>
     <description>
         Roller is an open source blog server built with open source Java
         libraries including Spring, Struts2, Velocity and Commons.



Mime
View raw message