roller-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From snoopd...@apache.org
Subject svn commit: r1546817 [2/4] - in /roller/branches/rome2: ./ app/src/main/java/org/apache/roller/planet/business/jpa/ app/src/main/java/org/apache/roller/planet/pojos/ app/src/main/java/org/apache/roller/util/ app/src/main/java/org/apache/roller/weblogge...
Date Sun, 01 Dec 2013 14:42:55 GMT
Modified: roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/pojos/MediaFileDirectory.java
URL: http://svn.apache.org/viewvc/roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/pojos/MediaFileDirectory.java?rev=1546817&r1=1546816&r2=1546817&view=diff
==============================================================================
--- roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/pojos/MediaFileDirectory.java (original)
+++ roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/pojos/MediaFileDirectory.java Sun Dec  1 14:42:52 2013
@@ -260,7 +260,7 @@ public class MediaFileDirectory {
         if (other == this) {
             return true;
         }
-        if (other instanceof MediaFileDirectory != true) {
+        if (!(other instanceof MediaFileDirectory)) {
             return false;
         }
         MediaFileDirectory o = (MediaFileDirectory) other;

Propchange: roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/pojos/MediaFileDirectory.java
------------------------------------------------------------------------------
  Merged /roller/trunk/app/src/main/java/org/apache/roller/weblogger/pojos/MediaFileDirectory.java:r1529476-1546815

Propchange: roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/pojos/MediaFileDirectoryComparator.java
------------------------------------------------------------------------------
  Merged /roller/trunk/app/src/main/java/org/apache/roller/weblogger/pojos/MediaFileDirectoryComparator.java:r1529476-1546815

Propchange: roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/pojos/MediaFileFilter.java
------------------------------------------------------------------------------
  Merged /roller/trunk/app/src/main/java/org/apache/roller/weblogger/pojos/MediaFileFilter.java:r1529476-1546815

Propchange: roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/pojos/MediaFileTag.java
------------------------------------------------------------------------------
  Merged /roller/trunk/app/src/main/java/org/apache/roller/weblogger/pojos/MediaFileTag.java:r1529476-1546815

Propchange: roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/pojos/MediaFileType.java
------------------------------------------------------------------------------
  Merged /roller/trunk/app/src/main/java/org/apache/roller/weblogger/pojos/MediaFileType.java:r1529476-1546815

Propchange: roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/pojos/OAuthAccessorRecord.java
------------------------------------------------------------------------------
  Merged /roller/trunk/app/src/main/java/org/apache/roller/weblogger/pojos/OAuthAccessorRecord.java:r1529476-1546815

Propchange: roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/pojos/OAuthConsumerRecord.java
------------------------------------------------------------------------------
  Merged /roller/trunk/app/src/main/java/org/apache/roller/weblogger/pojos/OAuthConsumerRecord.java:r1529476-1546815

Propchange: roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/pojos/ObjectPermission.java
------------------------------------------------------------------------------
  Merged /roller/trunk/app/src/main/java/org/apache/roller/weblogger/pojos/ObjectPermission.java:r1529476-1546815

Propchange: roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/pojos/PingQueueEntry.java
------------------------------------------------------------------------------
  Merged /roller/trunk/app/src/main/java/org/apache/roller/weblogger/pojos/PingQueueEntry.java:r1529476-1546815

Propchange: roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/pojos/PingTarget.java
------------------------------------------------------------------------------
  Merged /roller/trunk/app/src/main/java/org/apache/roller/weblogger/pojos/PingTarget.java:r1529476-1546815

Propchange: roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/pojos/Resource.java
------------------------------------------------------------------------------
  Merged /roller/trunk/app/src/main/java/org/apache/roller/weblogger/pojos/Resource.java:r1529476-1546815

Propchange: roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/pojos/RollerPermission.java
------------------------------------------------------------------------------
  Merged /roller/trunk/app/src/main/java/org/apache/roller/weblogger/pojos/RollerPermission.java:r1529476-1546815

Propchange: roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/pojos/RuntimeConfigProperty.java
------------------------------------------------------------------------------
  Merged /roller/trunk/app/src/main/java/org/apache/roller/weblogger/pojos/RuntimeConfigProperty.java:r1529476-1546815

Propchange: roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/pojos/StatCount.java
------------------------------------------------------------------------------
  Merged /roller/trunk/app/src/main/java/org/apache/roller/weblogger/pojos/StatCount.java:r1529476-1546815

Propchange: roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/pojos/StatCountCountComparator.java
------------------------------------------------------------------------------
  Merged /roller/trunk/app/src/main/java/org/apache/roller/weblogger/pojos/StatCountCountComparator.java:r1529476-1546815

Propchange: roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/pojos/StaticTemplate.java
------------------------------------------------------------------------------
  Merged /roller/trunk/app/src/main/java/org/apache/roller/weblogger/pojos/StaticTemplate.java:r1529476-1546815

Propchange: roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/pojos/StaticThemeTemplate.java
------------------------------------------------------------------------------
  Merged /roller/trunk/app/src/main/java/org/apache/roller/weblogger/pojos/StaticThemeTemplate.java:r1529476-1546815

Propchange: roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/pojos/TagStatComparator.java
------------------------------------------------------------------------------
  Merged /roller/trunk/app/src/main/java/org/apache/roller/weblogger/pojos/TagStatComparator.java:r1529476-1546815

Propchange: roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/pojos/TagStatCountComparator.java
------------------------------------------------------------------------------
  Merged /roller/trunk/app/src/main/java/org/apache/roller/weblogger/pojos/TagStatCountComparator.java:r1529476-1546815

Modified: roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/pojos/TaskLock.java
URL: http://svn.apache.org/viewvc/roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/pojos/TaskLock.java?rev=1546817&r1=1546816&r2=1546817&view=diff
==============================================================================
--- roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/pojos/TaskLock.java (original)
+++ roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/pojos/TaskLock.java Sun Dec  1 14:42:52 2013
@@ -85,7 +85,7 @@ public class TaskLock implements Seriali
 
     @Override
     public String toString() {
-        StringBuffer buf = new StringBuffer();
+        StringBuilder buf = new StringBuilder();
         buf.append("{");
         buf.append(getId());
         buf.append(", ").append(getName());

Propchange: roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/pojos/TaskLock.java
------------------------------------------------------------------------------
  Merged /roller/trunk/app/src/main/java/org/apache/roller/weblogger/pojos/TaskLock.java:r1529476-1546815

Propchange: roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/pojos/Template.java
------------------------------------------------------------------------------
  Merged /roller/trunk/app/src/main/java/org/apache/roller/weblogger/pojos/Template.java:r1529476-1546815

Propchange: roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/pojos/Theme.java
------------------------------------------------------------------------------
  Merged /roller/trunk/app/src/main/java/org/apache/roller/weblogger/pojos/Theme.java:r1529476-1546815

Propchange: roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/pojos/ThemeResource.java
------------------------------------------------------------------------------
  Merged /roller/trunk/app/src/main/java/org/apache/roller/weblogger/pojos/ThemeResource.java:r1529476-1546815

Propchange: roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/pojos/ThemeTemplate.java
------------------------------------------------------------------------------
  Merged /roller/trunk/app/src/main/java/org/apache/roller/weblogger/pojos/ThemeTemplate.java:r1529476-1546815

Propchange: roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/pojos/UserAttribute.java
------------------------------------------------------------------------------
  Merged /roller/trunk/app/src/main/java/org/apache/roller/weblogger/pojos/UserAttribute.java:r1529476-1546815

Propchange: roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/pojos/UserRole.java
------------------------------------------------------------------------------
  Merged /roller/trunk/app/src/main/java/org/apache/roller/weblogger/pojos/UserRole.java:r1529476-1546815

Modified: roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/pojos/Weblog.java
URL: http://svn.apache.org/viewvc/roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/pojos/Weblog.java?rev=1546817&r1=1546816&r2=1546817&view=diff
==============================================================================
--- roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/pojos/Weblog.java (original)
+++ roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/pojos/Weblog.java Sun Dec  1 14:42:52 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;
@@ -771,7 +616,7 @@ public class Weblog implements Serializa
      * Returns true if comment moderation is required by website or config.
      */ 
     public boolean getCommentModerationRequired() { 
-        return (getModerateComments().booleanValue()
+        return (getModerateComments()
          || WebloggerRuntimeConfig.getBooleanProperty("users.moderation.required"));
     }
     
@@ -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;

Propchange: roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/pojos/Weblog.java
------------------------------------------------------------------------------
  Merged /roller/trunk/app/src/main/java/org/apache/roller/weblogger/pojos/Weblog.java:r1529476-1546815

Modified: roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/pojos/WeblogBookmarkFolder.java
URL: http://svn.apache.org/viewvc/roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/pojos/WeblogBookmarkFolder.java?rev=1546817&r1=1546816&r2=1546817&view=diff
==============================================================================
--- roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/pojos/WeblogBookmarkFolder.java (original)
+++ roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/pojos/WeblogBookmarkFolder.java Sun Dec  1 14:42:52 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) {
         

Propchange: roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/pojos/WeblogBookmarkFolder.java
------------------------------------------------------------------------------
  Merged /roller/trunk/app/src/main/java/org/apache/roller/weblogger/pojos/WeblogBookmarkFolder.java:r1529476-1546815

Propchange: roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/pojos/WeblogCategoryPathComparator.java
------------------------------------------------------------------------------
  Merged /roller/trunk/app/src/main/java/org/apache/roller/weblogger/pojos/WeblogCategoryPathComparator.java:r1529476-1546815

Modified: roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/pojos/WeblogEntry.java
URL: http://svn.apache.org/viewvc/roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/pojos/WeblogEntry.java?rev=1546817&r1=1546816&r2=1546817&view=diff
==============================================================================
--- roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/pojos/WeblogEntry.java (original)
+++ roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/pojos/WeblogEntry.java Sun Dec  1 14:42:52 2013
@@ -50,6 +50,7 @@ import org.apache.roller.weblogger.busin
 import org.apache.roller.weblogger.business.WeblogEntryManager;
 import org.apache.roller.weblogger.business.WebloggerFactory;
 import org.apache.roller.weblogger.business.plugins.entry.WeblogEntryPlugin;
+import org.apache.roller.weblogger.config.WebloggerConfig;
 import org.apache.roller.weblogger.config.WebloggerRuntimeConfig;
 import org.apache.roller.weblogger.util.HTMLSanitizer;
 import org.apache.roller.weblogger.util.I18nMessages;
@@ -58,10 +59,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 =
@@ -73,7 +71,10 @@ public class WeblogEntry implements Seri
     public static final String PUBLISHED = "PUBLISHED";
     public static final String PENDING   = "PENDING";
     public static final String SCHEDULED = "SCHEDULED";
-    
+
+    private static final char TITLE_SEPARATOR =
+        WebloggerConfig.getBooleanProperty("weblogentry.title.useUnderscoreSeparator") ? '_' : '-';
+
     // Simple properies
     private String    id            = UUIDGenerator.generateUUID();
     private String    title         = null;
@@ -87,7 +88,7 @@ public class WeblogEntry implements Seri
     private Timestamp updateTime    = null;
     private String    plugins       = null;
     private Boolean   allowComments = Boolean.TRUE;
-    private Integer   commentDays   = new Integer(7);
+    private Integer   commentDays   = 7;
     private Boolean   rightToLeft   = Boolean.FALSE;
     private Boolean   pinnedToMain  = Boolean.FALSE;
     private String    status        = DRAFT;
@@ -204,16 +205,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 +217,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 +228,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 +240,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 +265,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 +282,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 +289,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 +296,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 +303,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 +310,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 +317,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 +324,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 +331,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 +338,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 +354,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 +410,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 +429,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 +449,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 +463,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 +487,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 +500,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 +514,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 +521,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,11 +629,8 @@ public class WeblogEntry implements Seri
         }
     }
    
-    /**
-     * @roller.wrapPojoMethod type="simple"
-     */
     public String getTagsAsString() {
-        StringBuffer sb = new StringBuffer();
+        StringBuilder sb = new StringBuilder();
         // Sort by name
         Set<WeblogEntryTag> tmp = new TreeSet<WeblogEntryTag>(new WeblogEntryTagComparator());
         tmp.addAll(getTags());
@@ -786,21 +659,19 @@ 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")) {
             return false;
         }
-        if (getWebsite().getAllowComments() != null && !getWebsite().getAllowComments().booleanValue()) {
+        if (getWebsite().getAllowComments() != null && !getWebsite().getAllowComments()) {
             return false;
         }
-        if (getAllowComments() != null && !getAllowComments().booleanValue()) {
+        if (getAllowComments() != null && !getAllowComments()) {
             return false;
         }
         boolean ret = false;
-        if (getCommentDays() == null || getCommentDays().intValue() == 0) {
+        if (getCommentDays() == null || getCommentDays() == 0) {
             ret = true;
         } else {
             // we want to use pubtime for calculating when comments expire, but
@@ -813,7 +684,7 @@ public class WeblogEntry implements Seri
             Calendar expireCal = Calendar.getInstance(
                     getWebsite().getLocaleInstance());
             expireCal.setTime(inPubTime);
-            expireCal.add(Calendar.DATE, getCommentDays().intValue());
+            expireCal.add(Calendar.DATE, getCommentDays());
             Date expireDay = expireCal.getTime();
             Date today = new Date();
             if (today.before(expireDay)) {
@@ -833,7 +704,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 +726,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 +743,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 +768,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 +778,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 +800,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 +813,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 +830,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 +841,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 +848,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());
@@ -1035,7 +884,7 @@ public class WeblogEntry implements Seri
             while (toker.hasMoreTokens() && count < 5) {
                 String s = toker.nextToken();
                 s = s.toLowerCase();
-                tmp = (tmp == null) ? s : tmp + "_" + s;
+                tmp = (tmp == null) ? s : tmp + TITLE_SEPARATOR + s;
                 count++;
             }
             base = tmp;
@@ -1078,8 +927,6 @@ public class WeblogEntry implements Seri
     
     /**
      * Convenience method to transform mPlugins to a List
-     *
-     * @roller.wrapPojoMethod type="simple"
      * @return
      */
     public List getPluginsList() {
@@ -1115,7 +962,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 +975,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 +1063,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 +1103,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) {}
-
-
-    
 }

Propchange: roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/pojos/WeblogEntry.java
------------------------------------------------------------------------------
  Merged /roller/trunk/app/src/main/java/org/apache/roller/weblogger/pojos/WeblogEntry.java:r1529476-1546815

Propchange: roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/pojos/WeblogEntryAttribute.java
------------------------------------------------------------------------------
  Merged /roller/trunk/app/src/main/java/org/apache/roller/weblogger/pojos/WeblogEntryAttribute.java:r1529476-1546815

Propchange: roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/pojos/WeblogEntryComment.java
------------------------------------------------------------------------------
  Merged /roller/trunk/app/src/main/java/org/apache/roller/weblogger/pojos/WeblogEntryComment.java:r1529476-1546815

Propchange: roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/pojos/WeblogEntryTag.java
------------------------------------------------------------------------------
  Merged /roller/trunk/app/src/main/java/org/apache/roller/weblogger/pojos/WeblogEntryTag.java:r1529476-1546815

Propchange: roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/pojos/WeblogEntryTagAggregate.java
------------------------------------------------------------------------------
  Merged /roller/trunk/app/src/main/java/org/apache/roller/weblogger/pojos/WeblogEntryTagAggregate.java:r1529476-1546815

Propchange: roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/pojos/WeblogEntryWrapperComparator.java
------------------------------------------------------------------------------
  Merged /roller/trunk/app/src/main/java/org/apache/roller/weblogger/pojos/WeblogEntryWrapperComparator.java:r1529476-1546815

Propchange: roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/pojos/WeblogHitCount.java
------------------------------------------------------------------------------
  Merged /roller/trunk/app/src/main/java/org/apache/roller/weblogger/pojos/WeblogHitCount.java:r1529476-1546815

Propchange: roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/pojos/WeblogTemplate.java
------------------------------------------------------------------------------
  Merged /roller/trunk/app/src/main/java/org/apache/roller/weblogger/pojos/WeblogTemplate.java:r1529476-1546815

Propchange: roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/pojos/WeblogTheme.java
------------------------------------------------------------------------------
  Merged /roller/trunk/app/src/main/java/org/apache/roller/weblogger/pojos/WeblogTheme.java:r1529476-1546815

Modified: roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/pojos/wrapper/WeblogEntryWrapper.java
URL: http://svn.apache.org/viewvc/roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/pojos/wrapper/WeblogEntryWrapper.java?rev=1546817&r1=1546816&r2=1546817&view=diff
==============================================================================
--- roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/pojos/wrapper/WeblogEntryWrapper.java (original)
+++ roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/pojos/wrapper/WeblogEntryWrapper.java Sun Dec  1 14:42:52 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() {

Propchange: roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/ui/
------------------------------------------------------------------------------
  Merged /roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui:r1529476-1546815

Modified: roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/ui/core/filters/CustomOpenIDAuthenticationProcessingFilter.java
URL: http://svn.apache.org/viewvc/roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/ui/core/filters/CustomOpenIDAuthenticationProcessingFilter.java?rev=1546817&r1=1546816&r2=1546817&view=diff
==============================================================================
--- roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/ui/core/filters/CustomOpenIDAuthenticationProcessingFilter.java (original)
+++ roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/ui/core/filters/CustomOpenIDAuthenticationProcessingFilter.java Sun Dec  1 14:42:52 2013
@@ -97,7 +97,7 @@ public class CustomOpenIDAuthenticationP
                 URL url = new URL(returnToUrl);
                 int port = url.getPort();
 
-                StringBuffer realmBuffer = new StringBuffer(returnToUrl.length())
+                StringBuilder realmBuffer = new StringBuilder(returnToUrl.length())
                         .append(url.getProtocol())
                         .append("://")
                         .append(url.getHost());

Modified: roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/ui/core/security/CustomUserRegistry.java
URL: http://svn.apache.org/viewvc/roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/ui/core/security/CustomUserRegistry.java?rev=1546817&r1=1546816&r2=1546817&view=diff
==============================================================================
--- roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/ui/core/security/CustomUserRegistry.java (original)
+++ roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/ui/core/security/CustomUserRegistry.java Sun Dec  1 14:42:52 2013
@@ -40,7 +40,7 @@ import org.apache.roller.weblogger.pojos
  */
 public class CustomUserRegistry {
     
-    private static final Log log = LogFactory.getLog(CustomUserRegistry.class);
+    private static final Log LOG = LogFactory.getLog(CustomUserRegistry.class);
 
     private static final String DEFAULT_SNAME_LDAP_ATTRIBUTE = "screenname";
     private static final String DEFAULT_UID_LDAP_ATTRIBUTE = "uid";
@@ -60,7 +60,7 @@ public class CustomUserRegistry {
 
         boolean usingSSO = WebloggerConfig.getBooleanProperty("users.sso.enabled");
         if(!usingSSO) {
-            log.info("SSO is not enabled. Skipping CustomUserRegistry functionality.");
+            LOG.info("SSO is not enabled. Skipping CustomUserRegistry functionality.");
             return null;
         }
         
@@ -100,7 +100,7 @@ public class CustomUserRegistry {
             if (userName == null && fullName == null && screenName == null &&
                     email == null && locale == null && timezone == null) {
 
-                log.warn("No Authentication found in SecurityContextHolder and HttpServletRequest.");
+                LOG.warn("No Authentication found in SecurityContextHolder and HttpServletRequest.");
                 return null;
             } else {
                 enabled = true;
@@ -110,12 +110,12 @@ public class CustomUserRegistry {
             Object oPrincipal = authentication.getPrincipal();
         
             if(oPrincipal == null) {
-                log.warn("Principal is null. Skipping auto-registration.");
+                LOG.warn("Principal is null. Skipping auto-registration.");
                 return null;
             }
         
             if (!(oPrincipal instanceof UserDetails)) {
-                log.warn("Unsupported Principal type in Authentication. Skipping auto-registration.");
+                LOG.warn("Unsupported Principal type in Authentication. Skipping auto-registration.");
                 return null;
             }
         

Modified: roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/ui/core/tags/calendar/BigWeblogCalendarModel.java
URL: http://svn.apache.org/viewvc/roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/ui/core/tags/calendar/BigWeblogCalendarModel.java?rev=1546817&r1=1546816&r2=1546817&view=diff
==============================================================================
--- roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/ui/core/tags/calendar/BigWeblogCalendarModel.java (original)
+++ roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/ui/core/tags/calendar/BigWeblogCalendarModel.java Sun Dec  1 14:42:52 2013
@@ -39,10 +39,10 @@ public class BigWeblogCalendarModel exte
     
     private static Log mLogger = LogFactory.getLog(BigWeblogCalendarModel.class);
     
-    protected static final SimpleDateFormat mStarDateFormat =
+    protected static final SimpleDateFormat STAR_DATE_FORMAT =
             DateUtil.get8charDateFormat();
     
-    protected static final SimpleDateFormat mSingleDayFormat =
+    protected static final SimpleDateFormat SINGLE_DAY_FORMAT =
             new SimpleDateFormat("dd");
     
     
@@ -73,14 +73,14 @@ public class BigWeblogCalendarModel exte
     public String getContent(Date day) {
         String content = null;
         try {
-            StringBuffer sb = new StringBuffer();
+            StringBuilder sb = new StringBuilder();
             
             // get the 8 char YYYYMMDD datestring for day, returns null
             // if no weblog entry on that day
             String dateString = null;
             List entries = (List)monthMap.get(day);
             if ( entries != null ) {
-                dateString = mStarDateFormat.format(
+                dateString = STAR_DATE_FORMAT.format(
                         ((WeblogEntry)entries.get(0)).getPubTime());
                 
                 // append 8 char date string on end of selfurl
@@ -90,7 +90,7 @@ public class BigWeblogCalendarModel exte
                 sb.append("<a href=\"");
                 sb.append( dayUrl );
                 sb.append("\">");
-                sb.append( mSingleDayFormat.format( day ) );
+                sb.append(SINGLE_DAY_FORMAT.format(day));
                 sb.append("</a></div>");
                 
                 for ( int i=0; i<entries.size(); i++ ) {
@@ -113,7 +113,7 @@ public class BigWeblogCalendarModel exte
                 
             } else {
                 sb.append("<div class=\"hCalendarDayTitleBig\">");
-                sb.append( mSingleDayFormat.format( day ) );
+                sb.append(SINGLE_DAY_FORMAT.format(day));
                 sb.append("</div>");
                 sb.append("<div class=\"bCalendarDayContentBig\"/>");
             }
@@ -139,9 +139,11 @@ public class BigWeblogCalendarModel exte
         List entries = (List)monthMap.get( day );
         if ( entries != null && day != null ) {
             WeblogEntry entry = (WeblogEntry)entries.get(0);
-            dateString = mStarDateFormat.format(entry.getPubTime());
+            dateString = STAR_DATE_FORMAT.format(entry.getPubTime());
+        }
+        if (dateString == null && !alwaysURL) {
+            return null;
         }
-        if (dateString == null && !alwaysURL) return null;
         else if (dateString == null && !nextPrevMonthURL) {
             dateString = DateUtil.format8chars(day);
         } else if (dateString == null && nextPrevMonthURL) {

Modified: roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/ui/core/tags/calendar/WeblogCalendarModel.java
URL: http://svn.apache.org/viewvc/roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/ui/core/tags/calendar/WeblogCalendarModel.java?rev=1546817&r1=1546816&r2=1546817&view=diff
==============================================================================
--- roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/ui/core/tags/calendar/WeblogCalendarModel.java (original)
+++ roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/ui/core/tags/calendar/WeblogCalendarModel.java Sun Dec  1 14:42:52 2013
@@ -273,7 +273,9 @@ public class WeblogCalendarModel impleme
         String url = null;
         // get the 8 char YYYYMMDD datestring for day
         String dateString = (String)monthMap.get(day);
-        if (dateString == null && !alwaysURL) return null;
+        if (dateString == null && !alwaysURL) {
+            return null;
+        }
         else if (dateString == null && !monthURL) {
             dateString = DateUtil.format8chars(day);
         	dateString = format8chars(day,getCalendar());

Modified: roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/ui/rendering/plugins/comments/AkismetCommentValidator.java
URL: http://svn.apache.org/viewvc/roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/ui/rendering/plugins/comments/AkismetCommentValidator.java?rev=1546817&r1=1546816&r2=1546817&view=diff
==============================================================================
--- roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/ui/rendering/plugins/comments/AkismetCommentValidator.java (original)
+++ roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/ui/rendering/plugins/comments/AkismetCommentValidator.java Sun Dec  1 14:42:52 2013
@@ -53,7 +53,7 @@ public class AkismetCommentValidator imp
     }
 
     public int validate(WeblogEntryComment comment, RollerMessages messages) {
-        StringBuffer sb = new StringBuffer();
+        StringBuilder sb = new StringBuilder();
         sb.append("blog=").append(
             WebloggerFactory.getWeblogger().getUrlStrategy().getWeblogURL(comment.getWeblogEntry().getWebsite(), null, true)).append("&");
         sb.append("user_ip="        ).append(comment.getRemoteHost()).append("&");
@@ -86,7 +86,9 @@ public class AkismetCommentValidator imp
                 messages.addError("comment.validator.akismetMessage");
                 return 0;
             }
-            else return 100;
+            else {
+                return 100;
+            }
         } catch (Exception e) {
             log.error("ERROR checking comment against Akismet", e);
         }

Modified: roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/ui/rendering/plugins/comments/LdapCommentAuthenticator.java
URL: http://svn.apache.org/viewvc/roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/ui/rendering/plugins/comments/LdapCommentAuthenticator.java?rev=1546817&r1=1546816&r2=1546817&view=diff
==============================================================================
--- roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/ui/rendering/plugins/comments/LdapCommentAuthenticator.java (original)
+++ roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/ui/rendering/plugins/comments/LdapCommentAuthenticator.java Sun Dec  1 14:42:52 2013
@@ -75,7 +75,7 @@ public class LdapCommentAuthenticator im
 			ldapPass = ldapPassTemp != null ? ldapPassTemp : "";
 		}
 
-		StringBuffer sb = new StringBuffer();
+		StringBuilder sb = new StringBuilder();
 
 		sb.append("<p>");
 		sb.append(bundle.getString("comments.ldapAuthenticatorUserName"));

Modified: roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/ui/rendering/plugins/comments/MathCommentAuthenticator.java
URL: http://svn.apache.org/viewvc/roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/ui/rendering/plugins/comments/MathCommentAuthenticator.java?rev=1546817&r1=1546816&r2=1546817&view=diff
==============================================================================
--- roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/ui/rendering/plugins/comments/MathCommentAuthenticator.java (original)
+++ roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/ui/rendering/plugins/comments/MathCommentAuthenticator.java Sun Dec  1 14:42:52 2013
@@ -46,9 +46,9 @@ public class MathCommentAuthenticator im
             int value1 = (int)(Math.random()*10.0);
             int value2 = (int)(Math.random()*100.0);
             int sum = value1 + value2;
-            session.setAttribute("mathValue1", new Integer(value1));
-            session.setAttribute("mathValue2", new Integer(value2));
-            session.setAttribute("mathAnswer", new Integer(sum));
+            session.setAttribute("mathValue1", value1);
+            session.setAttribute("mathValue2", value2);
+            session.setAttribute("mathAnswer", sum);
         } else {
             // preserve user's answer
             answer = request.getParameter("answer");
@@ -59,7 +59,7 @@ public class MathCommentAuthenticator im
         Integer value1o = (Integer)request.getSession().getAttribute("mathValue1");
         Integer value2o = (Integer)request.getSession().getAttribute("mathValue2");
         
-        StringBuffer sb = new StringBuffer();
+        StringBuilder sb = new StringBuilder();
         
         sb.append("<p>");
         sb.append(bundle.getString("comments.mathAuthenticatorQuestion"));
@@ -88,7 +88,7 @@ public class MathCommentAuthenticator im
                 int answer = Integer.parseInt(answerString);
                 Integer sum = (Integer) session.getAttribute("mathAnswer");
                 
-                if (sum != null && answer == sum.intValue()) {
+                if (sum != null && answer == sum) {
                     authentic = true;
                     session.removeAttribute("mathAnswer");
                     session.removeAttribute("mathValue1");

Modified: roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/ui/rendering/servlets/MediaResourceServlet.java
URL: http://svn.apache.org/viewvc/roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/ui/rendering/servlets/MediaResourceServlet.java?rev=1546817&r1=1546816&r2=1546817&view=diff
==============================================================================
--- roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/ui/rendering/servlets/MediaResourceServlet.java (original)
+++ roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/ui/rendering/servlets/MediaResourceServlet.java Sun Dec  1 14:42:52 2013
@@ -38,23 +38,22 @@ import org.apache.roller.weblogger.pojos
 import org.apache.roller.weblogger.ui.rendering.util.ModDateHeaderUtil;
 import org.apache.roller.weblogger.ui.rendering.util.WeblogMediaResourceRequest;
 
-
 /**
  * Serves media files uploaded by users.
- *
- * Since we keep resources in a location outside of the webapp
- * context we need a way to serve them up.  This servlet assumes that
- * resources are stored on a filesystem in the "uploads.dir" directory.
+ * 
+ * Since we keep resources in a location outside of the webapp context we need a
+ * way to serve them up. This servlet assumes that resources are stored on a
+ * filesystem in the "uploads.dir" directory.
  */
 public class MediaResourceServlet extends HttpServlet {
 
     private static Log log = LogFactory.getLog(MediaResourceServlet.class);
-    
+
     public void init(ServletConfig config) throws ServletException {
 
         super.init(config);
         log.info("Initializing ResourceServlet");
-        
+
     }
 
     /**
@@ -62,8 +61,9 @@ public class MediaResourceServlet extend
      */
     public void doGet(HttpServletRequest request, HttpServletResponse response)
             throws ServletException, IOException {
-        
-        MediaFileManager mfMgr = WebloggerFactory.getWeblogger().getMediaFileManager();
+
+        MediaFileManager mfMgr = WebloggerFactory.getWeblogger()
+                .getMediaFileManager();
 
         Weblog weblog = null;
         String ctx = request.getContextPath();
@@ -76,26 +76,27 @@ public class MediaResourceServlet extend
             resourceRequest = new WeblogMediaResourceRequest(request);
 
             weblog = resourceRequest.getWeblog();
-            if(weblog == null) {
-                throw new WebloggerException("unable to lookup weblog: "+
-                        resourceRequest.getWeblogHandle());
+            if (weblog == null) {
+                throw new WebloggerException("unable to lookup weblog: "
+                        + resourceRequest.getWeblogHandle());
             }
 
-        } catch(Exception e) {
+        } catch (Exception e) {
             // invalid resource request or weblog doesn't exist
             log.debug("error creating weblog resource request", e);
             response.sendError(HttpServletResponse.SC_NOT_FOUND);
             return;
         }
-    
+
         long resourceLastMod = 0;
         InputStream resourceStream = null;
         MediaFile mediaFile = null;
-        
+
         try {
-            mediaFile = mfMgr.getMediaFile(resourceRequest.getResourceId(), true);
+            mediaFile = mfMgr.getMediaFile(resourceRequest.getResourceId(),
+                    true);
             resourceLastMod = mediaFile.getLastModified();
-            
+
         } catch (Exception ex) {
             // still not found? then we don't have it, 404.
             log.debug("Unable to get resource", ex);
@@ -104,13 +105,14 @@ public class MediaResourceServlet extend
         }
 
         // Respond with 304 Not Modified if it is not modified.
-        if (ModDateHeaderUtil.respondIfNotModified(request, response, resourceLastMod)) {
+        if (ModDateHeaderUtil.respondIfNotModified(request, response,
+                resourceLastMod, resourceRequest.getDeviceType())) {
             return;
         } else {
             // set last-modified date
-            ModDateHeaderUtil.setLastModifiedHeader(response, resourceLastMod);
+            ModDateHeaderUtil.setLastModifiedHeader(response, resourceLastMod,
+                    resourceRequest.getDeviceType());
         }
-        
 
         // set the content type based on whatever is in our web.xml mime defs
         if (resourceRequest.isThumbnail()) {
@@ -119,7 +121,9 @@ public class MediaResourceServlet extend
                 resourceStream = mediaFile.getThumbnailInputStream();
             } catch (Exception e) {
                 if (log.isDebugEnabled()) {
-                    log.debug("ERROR loading thumbnail for " + mediaFile.getId(), e);
+                    log.debug(
+                            "ERROR loading thumbnail for " + mediaFile.getId(),
+                            e);
                 } else {
                     log.warn("ERROR loading thumbnail for " + mediaFile.getId());
                 }
@@ -137,16 +141,16 @@ public class MediaResourceServlet extend
             byte[] buf = new byte[8192];
             int length = 0;
             out = response.getOutputStream();
-            while((length = resourceStream.read(buf)) > 0) {
+            while ((length = resourceStream.read(buf)) > 0) {
                 out.write(buf, 0, length);
             }
-            
+
             // close output stream
             out.close();
-            
+
         } catch (Exception ex) {
-            log.error("ERROR",ex);
-            if(!response.isCommitted()) {
+            log.error("ERROR", ex);
+            if (!response.isCommitted()) {
                 response.reset();
                 response.sendError(HttpServletResponse.SC_INTERNAL_SERVER_ERROR);
             }



Mime
View raw message