You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@roller.apache.org by gm...@apache.org on 2013/05/29 00:28:30 UTC
svn commit: r1487153 - in /roller/trunk: ./
planet-business/src/main/java/org/apache/roller/planet/pojos/
weblogger-business/
weblogger-business/src/main/java/org/apache/roller/weblogger/pojos/
weblogger-business/src/main/resources/org/apache/roller/we...
Author: gmazza
Date: Tue May 28 22:28:29 2013
New Revision: 1487153
URL: http://svn.apache.org/r1487153
Log:
Upgraded OpenJPA from 2.0.1 to 2.2.2, introduced test scope commons-pool dependency in weblogger-web (tests would no longer work in the upgrade to OpenJPA 2.2.2 otherwise, although I'm unsure how they managed to work without commons-pool with OpenJPA 2.0.1), switched from field access to getter methods in JPA entity classes to get reduce OpenJPA warnings during build.
Modified:
roller/trunk/build-tomcat-release.sh
roller/trunk/planet-business/src/main/java/org/apache/roller/planet/pojos/RuntimeConfigProperty.java
roller/trunk/planet-business/src/main/java/org/apache/roller/planet/pojos/Subscription.java
roller/trunk/planet-business/src/main/java/org/apache/roller/planet/pojos/SubscriptionEntry.java
roller/trunk/pom.xml
roller/trunk/weblogger-business/pom.xml
roller/trunk/weblogger-business/src/main/java/org/apache/roller/weblogger/pojos/AutoPing.java
roller/trunk/weblogger-business/src/main/java/org/apache/roller/weblogger/pojos/MediaFile.java
roller/trunk/weblogger-business/src/main/java/org/apache/roller/weblogger/pojos/MediaFileTag.java
roller/trunk/weblogger-business/src/main/java/org/apache/roller/weblogger/pojos/PingQueueEntry.java
roller/trunk/weblogger-business/src/main/java/org/apache/roller/weblogger/pojos/PingTarget.java
roller/trunk/weblogger-business/src/main/java/org/apache/roller/weblogger/pojos/RuntimeConfigProperty.java
roller/trunk/weblogger-business/src/main/java/org/apache/roller/weblogger/pojos/StatCount.java
roller/trunk/weblogger-business/src/main/java/org/apache/roller/weblogger/pojos/TaskLock.java
roller/trunk/weblogger-business/src/main/java/org/apache/roller/weblogger/pojos/User.java
roller/trunk/weblogger-business/src/main/java/org/apache/roller/weblogger/pojos/UserAttribute.java
roller/trunk/weblogger-business/src/main/java/org/apache/roller/weblogger/pojos/UserRole.java
roller/trunk/weblogger-business/src/main/java/org/apache/roller/weblogger/pojos/Weblog.java
roller/trunk/weblogger-business/src/main/java/org/apache/roller/weblogger/pojos/WeblogBookmark.java
roller/trunk/weblogger-business/src/main/java/org/apache/roller/weblogger/pojos/WeblogBookmarkFolder.java
roller/trunk/weblogger-business/src/main/java/org/apache/roller/weblogger/pojos/WeblogCategory.java
roller/trunk/weblogger-business/src/main/java/org/apache/roller/weblogger/pojos/WeblogEntry.java
roller/trunk/weblogger-business/src/main/java/org/apache/roller/weblogger/pojos/WeblogEntryAttribute.java
roller/trunk/weblogger-business/src/main/java/org/apache/roller/weblogger/pojos/WeblogEntryComment.java
roller/trunk/weblogger-business/src/main/java/org/apache/roller/weblogger/pojos/WeblogEntryTag.java
roller/trunk/weblogger-business/src/main/java/org/apache/roller/weblogger/pojos/WeblogEntryTagAggregate.java
roller/trunk/weblogger-business/src/main/java/org/apache/roller/weblogger/pojos/WeblogHitCount.java
roller/trunk/weblogger-business/src/main/java/org/apache/roller/weblogger/pojos/WeblogReferrer.java
roller/trunk/weblogger-business/src/main/java/org/apache/roller/weblogger/pojos/WeblogTemplate.java
roller/trunk/weblogger-business/src/main/java/org/apache/roller/weblogger/pojos/WeblogThemeAssoc.java
roller/trunk/weblogger-business/src/main/java/org/apache/roller/weblogger/pojos/WeblogThemeTemplateCode.java
roller/trunk/weblogger-business/src/main/resources/org/apache/roller/weblogger/pojos/TaskLock.orm.xml
roller/trunk/weblogger-web/pom.xml
Modified: roller/trunk/build-tomcat-release.sh
URL: http://svn.apache.org/viewvc/roller/trunk/build-tomcat-release.sh?rev=1487153&r1=1487152&r2=1487153&view=diff
==============================================================================
--- roller/trunk/build-tomcat-release.sh (original)
+++ roller/trunk/build-tomcat-release.sh Tue May 28 22:28:29 2013
@@ -6,7 +6,7 @@ mvn install
cd weblogger-war-assembly
mvn clean
-mvn -Dtomcat=true install
+mvn -Dtomcat=true install
cd ..
cd weblogger-assembly
Modified: roller/trunk/planet-business/src/main/java/org/apache/roller/planet/pojos/RuntimeConfigProperty.java
URL: http://svn.apache.org/viewvc/roller/trunk/planet-business/src/main/java/org/apache/roller/planet/pojos/RuntimeConfigProperty.java?rev=1487153&r1=1487152&r2=1487153&view=diff
==============================================================================
--- roller/trunk/planet-business/src/main/java/org/apache/roller/planet/pojos/RuntimeConfigProperty.java (original)
+++ roller/trunk/planet-business/src/main/java/org/apache/roller/planet/pojos/RuntimeConfigProperty.java Tue May 28 22:28:29 2013
@@ -91,7 +91,7 @@ public class RuntimeConfigProperty imple
//------------------------------------------------------- Good citizenship
public String toString() {
- return (this.name + "=" + this.value);
+ return (getName() + "=" + getValue());
}
public boolean equals(Object other) {
Modified: roller/trunk/planet-business/src/main/java/org/apache/roller/planet/pojos/Subscription.java
URL: http://svn.apache.org/viewvc/roller/trunk/planet-business/src/main/java/org/apache/roller/planet/pojos/Subscription.java?rev=1487153&r1=1487152&r2=1487153&view=diff
==============================================================================
--- roller/trunk/planet-business/src/main/java/org/apache/roller/planet/pojos/Subscription.java (original)
+++ roller/trunk/planet-business/src/main/java/org/apache/roller/planet/pojos/Subscription.java Tue May 28 22:28:29 2013
@@ -77,11 +77,11 @@ public class Subscription implements Ser
StringBuffer buf = new StringBuffer();
buf.append("{");
- buf.append(feedUrl).append(", ");
- buf.append(siteUrl).append(", ");
- buf.append(title).append(", ");
- buf.append(author).append(", ");
- buf.append(lastUpdated);
+ buf.append(getFeedURL()).append(", ");
+ buf.append(getSiteURL()).append(", ");
+ buf.append(getTitle()).append(", ");
+ buf.append(getAuthor()).append(", ");
+ buf.append(getLastUpdated());
buf.append("}");
return buf.toString();
@@ -205,7 +205,7 @@ public class Subscription implements Ser
// for backwards compatability?
public String getName() {
- return title;
+ return getTitle();
}
// for backwards compatability?
Modified: roller/trunk/planet-business/src/main/java/org/apache/roller/planet/pojos/SubscriptionEntry.java
URL: http://svn.apache.org/viewvc/roller/trunk/planet-business/src/main/java/org/apache/roller/planet/pojos/SubscriptionEntry.java?rev=1487153&r1=1487152&r2=1487153&view=diff
==============================================================================
--- roller/trunk/planet-business/src/main/java/org/apache/roller/planet/pojos/SubscriptionEntry.java (original)
+++ roller/trunk/planet-business/src/main/java/org/apache/roller/planet/pojos/SubscriptionEntry.java Tue May 28 22:28:29 2013
@@ -71,14 +71,14 @@ public class SubscriptionEntry implement
if(this == other) return true;
if(!(other instanceof SubscriptionEntry)) return false;
final SubscriptionEntry that = (SubscriptionEntry) other;
- return this.permalink.equals(that.getPermalink());
+ return getPermalink().equals(that.getPermalink());
}
/**
* Generate hash code based on permalink.
*/
public int hashCode() {
- return this.permalink.hashCode();
+ return getPermalink().hashCode();
}
@@ -205,8 +205,8 @@ public class SubscriptionEntry implement
*/
public List getCategories() {
List list = new ArrayList();
- if (categoriesString != null) {
- String[] catArray = Utilities.stringToStringArray(categoriesString,",");
+ if (getCategoriesString() != null) {
+ String[] catArray = Utilities.stringToStringArray(getCategoriesString(),",");
for (int i=0; i<catArray.length; i++) {
Category cat = new Category();
cat.setName(catArray[i]);
@@ -248,10 +248,10 @@ public class SubscriptionEntry implement
*/
public Author getCreator() {
Author user = null;
- if (author != null) {
+ if (getAuthor() != null) {
user = new Author();
- user.setFullName(author);
- user.setUserName(author);
+ user.setFullName(getAuthor());
+ user.setUserName(getAuthor());
}
return user;
}
@@ -270,7 +270,7 @@ public class SubscriptionEntry implement
* @roller.wrapPojoMethod type="pojo"
*/
public Subscription getWebsite() {
- return this.subscription;
+ return getSubscription();
}
public void setWebsite() {
// noop
@@ -280,7 +280,7 @@ public class SubscriptionEntry implement
* Return text as content, to maintain compatibility with PlanetTool templates.
*/
public String getContent() {
- return text;
+ return getText();
}
public void setContent(String ignored) {
// no-op
Modified: roller/trunk/pom.xml
URL: http://svn.apache.org/viewvc/roller/trunk/pom.xml?rev=1487153&r1=1487152&r2=1487153&view=diff
==============================================================================
--- roller/trunk/pom.xml (original)
+++ roller/trunk/pom.xml Tue May 28 22:28:29 2013
@@ -118,7 +118,7 @@
<url>http://oss.sonatype.org/content/groups/public</url>
</repository>
- <!-- EclipseLink repo
+ <!-- EclipseLink repo
<repository>
<id>EclipseLink Repo</id>
<url>http://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/rt/eclipselink/maven.repo</url>
@@ -126,7 +126,7 @@
<enabled>true</enabled>
</snapshots>
</repository> -->
-
+
<!-- JBoss Hibernate JPA repo
<repository>
<id>JBoss Repo</id>
@@ -353,11 +353,17 @@
<dependency>
<groupId>org.apache.openjpa</groupId>
<artifactId>openjpa</artifactId>
- <version>2.0.1</version>
+ <version>2.2.2</version>
<scope>compile</scope>
</dependency>
<dependency>
+ <groupId>commons-pool</groupId>
+ <artifactId>commons-pool</artifactId>
+ <version>1.5.4</version>
+ </dependency>
+
+ <dependency>
<groupId>javax.mail</groupId>
<artifactId>mail</artifactId>
<version>1.4</version>
Modified: roller/trunk/weblogger-business/pom.xml
URL: http://svn.apache.org/viewvc/roller/trunk/weblogger-business/pom.xml?rev=1487153&r1=1487152&r2=1487153&view=diff
==============================================================================
--- roller/trunk/weblogger-business/pom.xml (original)
+++ roller/trunk/weblogger-business/pom.xml Tue May 28 22:28:29 2013
@@ -42,6 +42,7 @@
</dependency>
<!-- OpenJPA deps -->
+
<dependency>
<groupId>org.apache.openjpa</groupId>
<artifactId>openjpa</artifactId>
@@ -75,10 +76,11 @@
<artifactId>geronimo-jpa_2.0_spec</artifactId>
<version>1.1</version>
<scope>provided</scope>
- </dependency
+ </dependency>
-->
-<!-- Hibernate deps (for sometimes testing purposes)
+<!-- Hibernate deps (for sometimes testing purposes) -->
+<!--
<dependency>
<groupId>org.hibernate</groupId>
<artifactId>hibernate-entitymanager</artifactId>
@@ -89,8 +91,8 @@
<artifactId>slf4j-jdk14</artifactId>
<version>1.5.6</version>
<scope>runtime</scope>
- </dependency> -->
-
+ </dependency>
+-->
<dependency>
<groupId>javax.mail</groupId>
<artifactId>mail</artifactId>
Modified: roller/trunk/weblogger-business/src/main/java/org/apache/roller/weblogger/pojos/AutoPing.java
URL: http://svn.apache.org/viewvc/roller/trunk/weblogger-business/src/main/java/org/apache/roller/weblogger/pojos/AutoPing.java?rev=1487153&r1=1487152&r2=1487153&view=diff
==============================================================================
--- roller/trunk/weblogger-business/src/main/java/org/apache/roller/weblogger/pojos/AutoPing.java (original)
+++ roller/trunk/weblogger-business/src/main/java/org/apache/roller/weblogger/pojos/AutoPing.java Tue May 28 22:28:29 2013
@@ -155,7 +155,7 @@ public class AutoPing implements Seriali
public String toString() {
StringBuffer buf = new StringBuffer();
buf.append("{");
- buf.append(this.id);
+ buf.append(getId());
buf.append("}");
return buf.toString();
}
Modified: roller/trunk/weblogger-business/src/main/java/org/apache/roller/weblogger/pojos/MediaFile.java
URL: http://svn.apache.org/viewvc/roller/trunk/weblogger-business/src/main/java/org/apache/roller/weblogger/pojos/MediaFile.java?rev=1487153&r1=1487152&r2=1487153&view=diff
==============================================================================
--- roller/trunk/weblogger-business/src/main/java/org/apache/roller/weblogger/pojos/MediaFile.java (original)
+++ roller/trunk/weblogger-business/src/main/java/org/apache/roller/weblogger/pojos/MediaFile.java Tue May 28 22:28:29 2013
@@ -172,7 +172,7 @@ public class MediaFile implements Serial
}
public long getLastModified() {
- return lastUpdated.getTime();
+ return getLastUpdated().getTime();
}
/**
@@ -321,7 +321,7 @@ public class MediaFile implements Serial
}
public String getPath() {
- return directory.getPath();
+ return getDirectory().getPath();
}
/**
@@ -351,10 +351,10 @@ public class MediaFile implements Serial
*
*/
public boolean isImageFile() {
- if (this.contentType == null) {
+ if (getContentType() == null) {
return false;
}
- return (this.contentType.toLowerCase().startsWith(MediaFileType.IMAGE
+ return (getContentType().toLowerCase().startsWith(MediaFileType.IMAGE
.getContentTypePrefix().toLowerCase()));
}
@@ -363,7 +363,7 @@ public class MediaFile implements Serial
*/
public String getPermalink() {
return WebloggerFactory.getWeblogger().getUrlStrategy()
- .getMediaFileURL(this.weblog, this.getId(), true);
+ .getMediaFileURL(getWeblog(), this.getId(), true);
}
/**
@@ -372,7 +372,7 @@ public class MediaFile implements Serial
*/
public String getThumbnailURL() {
return WebloggerFactory.getWeblogger().getUrlStrategy()
- .getMediaFileThumbnailURL(this.weblog, this.getId(), true);
+ .getMediaFileThumbnailURL(getWeblog(), this.getId(), true);
}
public String getCreatorUserName() {
@@ -521,8 +521,8 @@ public class MediaFile implements Serial
// ------------------------------------------------------- Good citizenship
public String toString() {
- return "MediaFile [name=" + name + ", directory=" + directory
- + ", weblog=" + weblog + "]";
+ return "MediaFile [name=" + getName() + ", directory=" + getDirectory()
+ + ", weblog=" + getWeblog() + "]";
}
public boolean equals(Object other) {
Modified: roller/trunk/weblogger-business/src/main/java/org/apache/roller/weblogger/pojos/MediaFileTag.java
URL: http://svn.apache.org/viewvc/roller/trunk/weblogger-business/src/main/java/org/apache/roller/weblogger/pojos/MediaFileTag.java?rev=1487153&r1=1487152&r2=1487153&view=diff
==============================================================================
--- roller/trunk/weblogger-business/src/main/java/org/apache/roller/weblogger/pojos/MediaFileTag.java (original)
+++ roller/trunk/weblogger-business/src/main/java/org/apache/roller/weblogger/pojos/MediaFileTag.java Tue May 28 22:28:29 2013
@@ -71,8 +71,8 @@ public class MediaFileTag implements Ser
// ------------------------------------------------------- Good citizenship
public String toString() {
- return "MediaFileTag [id=" + id + ", name=" + name + ", mediaFile="
- + mediaFile + "]";
+ return "MediaFileTag [id=" + getId() + ", name=" + getName() + ", mediaFile="
+ + getMediaFile() + "]";
}
public boolean equals(Object other) {
Modified: roller/trunk/weblogger-business/src/main/java/org/apache/roller/weblogger/pojos/PingQueueEntry.java
URL: http://svn.apache.org/viewvc/roller/trunk/weblogger-business/src/main/java/org/apache/roller/weblogger/pojos/PingQueueEntry.java?rev=1487153&r1=1487152&r2=1487153&view=diff
==============================================================================
--- roller/trunk/weblogger-business/src/main/java/org/apache/roller/weblogger/pojos/PingQueueEntry.java (original)
+++ roller/trunk/weblogger-business/src/main/java/org/apache/roller/weblogger/pojos/PingQueueEntry.java Tue May 28 22:28:29 2013
@@ -162,7 +162,9 @@ public class PingQueueEntry implements S
* @return the new value.
*/
public int incrementAttempts() {
- return ++attempts;
+ int newAttempts = getAttempts() + 1;
+ setAttempts(newAttempts);
+ return newAttempts;
}
//------------------------------------------------------- Good citizenship
@@ -170,9 +172,9 @@ public class PingQueueEntry implements S
public String toString() {
StringBuffer buf = new StringBuffer();
buf.append("{");
- buf.append(this.id);
- buf.append(", ").append(this.entryTime);
- buf.append(", ").append(this.attempts);
+ buf.append(getId());
+ buf.append(", ").append(getEntryTime());
+ buf.append(", ").append(getAttempts());
buf.append("}");
return buf.toString();
}
Modified: roller/trunk/weblogger-business/src/main/java/org/apache/roller/weblogger/pojos/PingTarget.java
URL: http://svn.apache.org/viewvc/roller/trunk/weblogger-business/src/main/java/org/apache/roller/weblogger/pojos/PingTarget.java?rev=1487153&r1=1487152&r2=1487153&view=diff
==============================================================================
--- roller/trunk/weblogger-business/src/main/java/org/apache/roller/weblogger/pojos/PingTarget.java (original)
+++ roller/trunk/weblogger-business/src/main/java/org/apache/roller/weblogger/pojos/PingTarget.java Tue May 28 22:28:29 2013
@@ -228,11 +228,11 @@ public class PingTarget implements Seria
public String toString() {
StringBuffer buf = new StringBuffer();
buf.append("{");
- buf.append(this.id);
- buf.append(", ").append(this.name);
- buf.append(", ").append(this.pingUrl);
- buf.append(", ").append(this.lastSuccess);
- buf.append(", ").append(this.autoEnabled);
+ buf.append(getId());
+ buf.append(", ").append(getName());
+ buf.append(", ").append(getPingUrl());
+ buf.append(", ").append(getLastSuccess());
+ buf.append(", ").append(isAutoEnabled());
buf.append("}");
return buf.toString();
}
@@ -248,7 +248,7 @@ public class PingTarget implements Seria
public int hashCode() {
return new HashCodeBuilder()
- .append(id)
+ .append(getId())
.toHashCode();
}
Modified: roller/trunk/weblogger-business/src/main/java/org/apache/roller/weblogger/pojos/RuntimeConfigProperty.java
URL: http://svn.apache.org/viewvc/roller/trunk/weblogger-business/src/main/java/org/apache/roller/weblogger/pojos/RuntimeConfigProperty.java?rev=1487153&r1=1487152&r2=1487153&view=diff
==============================================================================
--- roller/trunk/weblogger-business/src/main/java/org/apache/roller/weblogger/pojos/RuntimeConfigProperty.java (original)
+++ roller/trunk/weblogger-business/src/main/java/org/apache/roller/weblogger/pojos/RuntimeConfigProperty.java Tue May 28 22:28:29 2013
@@ -82,7 +82,7 @@ public class RuntimeConfigProperty imple
//------------------------------------------------------- Good citizenship
public String toString() {
- return (this.name + "=" + this.value);
+ return (getName() + "=" + getValue());
}
public boolean equals(Object other) {
Modified: roller/trunk/weblogger-business/src/main/java/org/apache/roller/weblogger/pojos/StatCount.java
URL: http://svn.apache.org/viewvc/roller/trunk/weblogger-business/src/main/java/org/apache/roller/weblogger/pojos/StatCount.java?rev=1487153&r1=1487152&r2=1487153&view=diff
==============================================================================
--- roller/trunk/weblogger-business/src/main/java/org/apache/roller/weblogger/pojos/StatCount.java (original)
+++ roller/trunk/weblogger-business/src/main/java/org/apache/roller/weblogger/pojos/StatCount.java Tue May 28 22:28:29 2013
@@ -104,8 +104,8 @@ public class StatCount {
public String toString() {
StringBuffer buf = new StringBuffer();
buf.append("{");
- buf.append(this.weblogHandle);
- buf.append(", ").append(this.count);
+ buf.append(getWeblogHandle());
+ buf.append(", ").append(getCount());
buf.append("}");
return buf.toString();
}
Modified: roller/trunk/weblogger-business/src/main/java/org/apache/roller/weblogger/pojos/TaskLock.java
URL: http://svn.apache.org/viewvc/roller/trunk/weblogger-business/src/main/java/org/apache/roller/weblogger/pojos/TaskLock.java?rev=1487153&r1=1487152&r2=1487153&view=diff
==============================================================================
--- roller/trunk/weblogger-business/src/main/java/org/apache/roller/weblogger/pojos/TaskLock.java (original)
+++ roller/trunk/weblogger-business/src/main/java/org/apache/roller/weblogger/pojos/TaskLock.java Tue May 28 22:28:29 2013
@@ -76,7 +76,7 @@ public class TaskLock implements Seriali
// calculate lease expiration time
Calendar cal = Calendar.getInstance();
cal.setTime(leaseAcquisitionTime);
- cal.add(Calendar.MINUTE, timeLeased);
+ cal.add(Calendar.MINUTE, getTimeLeased());
return cal.getTime();
}
@@ -87,10 +87,10 @@ public class TaskLock implements Seriali
public String toString() {
StringBuffer buf = new StringBuffer();
buf.append("{");
- buf.append(this.id);
- buf.append(", ").append(this.name);
- buf.append(", ").append(this.timeAquired);
- buf.append(", ").append(this.timeLeased);
+ buf.append(getId());
+ buf.append(", ").append(getName());
+ buf.append(", ").append(getTimeAquired());
+ buf.append(", ").append(getTimeLeased());
buf.append("}");
return buf.toString();
}
Modified: roller/trunk/weblogger-business/src/main/java/org/apache/roller/weblogger/pojos/User.java
URL: http://svn.apache.org/viewvc/roller/trunk/weblogger-business/src/main/java/org/apache/roller/weblogger/pojos/User.java?rev=1487153&r1=1487152&r2=1487153&view=diff
==============================================================================
--- roller/trunk/weblogger-business/src/main/java/org/apache/roller/weblogger/pojos/User.java (original)
+++ roller/trunk/weblogger-business/src/main/java/org/apache/roller/weblogger/pojos/User.java Tue May 28 22:28:29 2013
@@ -280,12 +280,12 @@ public class User implements Serializabl
public String toString() {
StringBuffer buf = new StringBuffer();
buf.append("{");
- buf.append(this.id);
- buf.append(", ").append(this.userName);
- buf.append(", ").append(this.fullName);
- buf.append(", ").append(this.emailAddress);
- buf.append(", ").append(this.dateCreated);
- buf.append(", ").append(this.enabled);
+ buf.append(getId());
+ buf.append(", ").append(getUserName());
+ buf.append(", ").append(getFullName());
+ buf.append(", ").append(getEmailAddress());
+ buf.append(", ").append(getDateCreated());
+ buf.append(", ").append(getEnabled());
buf.append("}");
return buf.toString();
}
Modified: roller/trunk/weblogger-business/src/main/java/org/apache/roller/weblogger/pojos/UserAttribute.java
URL: http://svn.apache.org/viewvc/roller/trunk/weblogger-business/src/main/java/org/apache/roller/weblogger/pojos/UserAttribute.java?rev=1487153&r1=1487152&r2=1487153&view=diff
==============================================================================
--- roller/trunk/weblogger-business/src/main/java/org/apache/roller/weblogger/pojos/UserAttribute.java (original)
+++ roller/trunk/weblogger-business/src/main/java/org/apache/roller/weblogger/pojos/UserAttribute.java Tue May 28 22:28:29 2013
@@ -99,10 +99,10 @@ public class UserAttribute implements Se
public String toString() {
StringBuffer buf = new StringBuffer();
buf.append("{");
- buf.append(this.id);
- buf.append(", ").append(this.userName);
- buf.append(", ").append(this.attrName);
- buf.append(", ").append(this.attrValue);
+ buf.append(getId());
+ buf.append(", ").append(getUserName());
+ buf.append(", ").append(getName());
+ buf.append(", ").append(getValue());
buf.append("}");
return buf.toString();
}
Modified: roller/trunk/weblogger-business/src/main/java/org/apache/roller/weblogger/pojos/UserRole.java
URL: http://svn.apache.org/viewvc/roller/trunk/weblogger-business/src/main/java/org/apache/roller/weblogger/pojos/UserRole.java?rev=1487153&r1=1487152&r2=1487153&view=diff
==============================================================================
--- roller/trunk/weblogger-business/src/main/java/org/apache/roller/weblogger/pojos/UserRole.java (original)
+++ roller/trunk/weblogger-business/src/main/java/org/apache/roller/weblogger/pojos/UserRole.java Tue May 28 22:28:29 2013
@@ -77,9 +77,9 @@ public class UserRole implements Seriali
public String toString() {
StringBuffer buf = new StringBuffer();
buf.append("{");
- buf.append(this.id);
- buf.append(", ").append(this.userName);
- buf.append(", ").append(this.role);
+ buf.append(getId());
+ buf.append(", ").append(getUserName());
+ buf.append(", ").append(getRole());
buf.append("}");
return buf.toString();
}
Modified: roller/trunk/weblogger-business/src/main/java/org/apache/roller/weblogger/pojos/Weblog.java
URL: http://svn.apache.org/viewvc/roller/trunk/weblogger-business/src/main/java/org/apache/roller/weblogger/pojos/Weblog.java?rev=1487153&r1=1487152&r2=1487153&view=diff
==============================================================================
--- roller/trunk/weblogger-business/src/main/java/org/apache/roller/weblogger/pojos/Weblog.java (original)
+++ roller/trunk/weblogger-business/src/main/java/org/apache/roller/weblogger/pojos/Weblog.java Tue May 28 22:28:29 2013
@@ -133,12 +133,12 @@ public class Weblog implements Serializa
public String toString() {
StringBuffer buf = new StringBuffer();
buf.append("{");
- buf.append(this.id);
- buf.append(", ").append(this.handle);
- buf.append(", ").append(this.name);
- buf.append(", ").append(this.emailAddress);
- buf.append(", ").append(this.locale);
- buf.append(", ").append(this.timeZone);
+ buf.append(getId());
+ buf.append(", ").append(getHandle());
+ buf.append(", ").append(getName());
+ buf.append(", ").append(getEmailAddress());
+ buf.append(", ").append(getLocale());
+ buf.append(", ").append(getTimeZone());
buf.append("}");
return buf.toString();
}
@@ -637,14 +637,14 @@ public class Weblog implements Serializa
* @return TimeZone
*/
public TimeZone getTimeZoneInstance() {
- if (timeZone == null) {
+ if (getTimeZone() == null) {
if (TimeZone.getDefault() != null) {
this.setTimeZone( TimeZone.getDefault().getID() );
} else {
this.setTimeZone("America/New_York");
}
}
- return TimeZone.getTimeZone(timeZone);
+ return TimeZone.getTimeZone(getTimeZone());
}
Modified: roller/trunk/weblogger-business/src/main/java/org/apache/roller/weblogger/pojos/WeblogBookmark.java
URL: http://svn.apache.org/viewvc/roller/trunk/weblogger-business/src/main/java/org/apache/roller/weblogger/pojos/WeblogBookmark.java?rev=1487153&r1=1487152&r2=1487153&view=diff
==============================================================================
--- roller/trunk/weblogger-business/src/main/java/org/apache/roller/weblogger/pojos/WeblogBookmark.java (original)
+++ roller/trunk/weblogger-business/src/main/java/org/apache/roller/weblogger/pojos/WeblogBookmark.java Tue May 28 22:28:29 2013
@@ -244,8 +244,8 @@ public class WeblogBookmark implements S
public String toString() {
StringBuffer buf = new StringBuffer();
buf.append("{");
- buf.append(this.id);
- buf.append(", ").append(this.url);
+ buf.append(getId());
+ buf.append(", ").append(getUrl());
buf.append("}");
return buf.toString();
}
@@ -278,7 +278,7 @@ public class WeblogBookmark implements S
private BookmarkComparator bookmarkComparator = new BookmarkComparator();
public Weblog getWebsite() {
- return this.folder.getWebsite();
+ return getFolder().getWebsite();
}
}
Modified: roller/trunk/weblogger-business/src/main/java/org/apache/roller/weblogger/pojos/WeblogBookmarkFolder.java
URL: http://svn.apache.org/viewvc/roller/trunk/weblogger-business/src/main/java/org/apache/roller/weblogger/pojos/WeblogBookmarkFolder.java?rev=1487153&r1=1487152&r2=1487153&view=diff
==============================================================================
--- roller/trunk/weblogger-business/src/main/java/org/apache/roller/weblogger/pojos/WeblogBookmarkFolder.java (original)
+++ roller/trunk/weblogger-business/src/main/java/org/apache/roller/weblogger/pojos/WeblogBookmarkFolder.java Tue May 28 22:28:29 2013
@@ -91,8 +91,8 @@ public class WeblogBookmarkFolder implem
public String toString() {
StringBuffer buf = new StringBuffer();
buf.append("{");
- buf.append(this.id);
- buf.append(", ").append(this.path);
+ buf.append(getId());
+ buf.append(", ").append(getPath());
buf.append("}");
return buf.toString();
}
@@ -344,7 +344,7 @@ public class WeblogBookmarkFolder implem
return false;
} else {
// if our path starts with our parents path then we are a descendent
- return this.path.startsWith(ancestor.getPath());
+ return getPath().startsWith(ancestor.getPath());
}
}
Modified: roller/trunk/weblogger-business/src/main/java/org/apache/roller/weblogger/pojos/WeblogCategory.java
URL: http://svn.apache.org/viewvc/roller/trunk/weblogger-business/src/main/java/org/apache/roller/weblogger/pojos/WeblogCategory.java?rev=1487153&r1=1487152&r2=1487153&view=diff
==============================================================================
--- roller/trunk/weblogger-business/src/main/java/org/apache/roller/weblogger/pojos/WeblogCategory.java (original)
+++ roller/trunk/weblogger-business/src/main/java/org/apache/roller/weblogger/pojos/WeblogCategory.java Tue May 28 22:28:29 2013
@@ -91,8 +91,8 @@ public class WeblogCategory implements S
public String toString() {
StringBuffer buf = new StringBuffer();
buf.append("{");
- buf.append(this.id);
- buf.append(", ").append(this.path);
+ buf.append(getId());
+ buf.append(", ").append(getPath());
buf.append("}");
return buf.toString();
}
@@ -307,7 +307,7 @@ public class WeblogCategory implements S
return false;
} else {
// if our path starts with our parents path then we are a descendent
- return this.path.startsWith(ancestor.getPath());
+ return getPath().startsWith(ancestor.getPath());
}
}
Modified: roller/trunk/weblogger-business/src/main/java/org/apache/roller/weblogger/pojos/WeblogEntry.java
URL: http://svn.apache.org/viewvc/roller/trunk/weblogger-business/src/main/java/org/apache/roller/weblogger/pojos/WeblogEntry.java?rev=1487153&r1=1487152&r2=1487153&view=diff
==============================================================================
--- roller/trunk/weblogger-business/src/main/java/org/apache/roller/weblogger/pojos/WeblogEntry.java (original)
+++ roller/trunk/weblogger-business/src/main/java/org/apache/roller/weblogger/pojos/WeblogEntry.java Tue May 28 22:28:29 2013
@@ -175,7 +175,7 @@ public class WeblogEntry implements Seri
public String toString() {
StringBuffer buf = new StringBuffer();
buf.append("{");
- buf.append(this.id);
+ buf.append(getId());
buf.append(", ").append(this.getAnchor());
buf.append(", ").append(this.getTitle());
buf.append(", ").append(this.getPubTime());
@@ -781,7 +781,7 @@ public class WeblogEntry implements Seri
if (!WebloggerRuntimeConfig.getBooleanProperty("users.comments.enabled")) {
return false;
}
- if (website.getAllowComments() != null && !website.getAllowComments().booleanValue()) {
+ if (getWebsite().getAllowComments() != null && !getWebsite().getAllowComments().booleanValue()) {
return false;
}
if (getAllowComments() != null && !getAllowComments().booleanValue()) {
@@ -926,7 +926,7 @@ public class WeblogEntry implements Seri
* Returns absolute entry permalink.
*/
public String getPermalink() {
- return WebloggerFactory.getWeblogger().getUrlStrategy().getWeblogEntryURL(getWebsite(), null, anchor, true);
+ return WebloggerFactory.getWeblogger().getUrlStrategy().getWeblogEntryURL(getWebsite(), null, getAnchor(), true);
}
/**
@@ -937,7 +937,7 @@ public class WeblogEntry implements Seri
public String getPermaLink() {
String lAnchor = this.getAnchor();
try {
- lAnchor = URLEncoder.encode(anchor, "UTF-8");
+ lAnchor = URLEncoder.encode(getAnchor(), "UTF-8");
} catch (UnsupportedEncodingException e) {
// go with the "no encoding" version
}
@@ -970,7 +970,7 @@ public class WeblogEntry implements Seri
*/
public String getDisplayTitle() {
if ( getTitle()==null || getTitle().trim().equals("") ) {
- return StringUtils.left(Utilities.removeHTML(text),255);
+ return StringUtils.left(Utilities.removeHTML(getText()),255);
}
return Utilities.removeHTML(getTitle());
}
@@ -990,7 +990,7 @@ public class WeblogEntry implements Seri
* @roller.wrapPojoMethod type="simple"
*/
public String getRss09xDescription(int maxLength) {
- String ret = StringEscapeUtils.escapeHtml(text);
+ String ret = StringEscapeUtils.escapeHtml(getText());
if (maxLength != -1 && ret.length() > maxLength) {
ret = ret.substring(0,maxLength-3)+"...";
}
@@ -1072,15 +1072,15 @@ public class WeblogEntry implements Seri
* @return
*/
public List getPluginsList() {
- if (plugins != null) {
- return Arrays.asList( StringUtils.split(plugins, ",") );
+ if (getPlugins() != null) {
+ return Arrays.asList( StringUtils.split(getPlugins(), ",") );
}
return new ArrayList();
}
/** Convenience method for checking status */
public boolean isDraft() {
- return status.equals(DRAFT);
+ return getStatus().equals(DRAFT);
}
/** no-op: needed only to satisfy XDoclet, use setStatus() instead */
public void setDraft(boolean value) {
@@ -1088,7 +1088,7 @@ public class WeblogEntry implements Seri
/** Convenience method for checking status */
public boolean isPending() {
- return status.equals(PENDING);
+ return getStatus().equals(PENDING);
}
/** no-op: needed only to satisfy XDoclet, use setStatus() instead */
public void setPending(boolean value) {
@@ -1096,7 +1096,7 @@ public class WeblogEntry implements Seri
/** Convenience method for checking status */
public boolean isPublished() {
- return status.equals(PUBLISHED);
+ return getStatus().equals(PUBLISHED);
}
/** no-op: needed only to satisfy XDoclet, use setStatus() instead */
public void setPublished(boolean value) {
@@ -1107,7 +1107,7 @@ public class WeblogEntry implements Seri
* @roller.wrapPojoMethod type="simple"
*/
public String getTransformedText() {
- return render(text);
+ return render(getText());
}
/**
* No-op to please XDoclet.
@@ -1121,7 +1121,7 @@ public class WeblogEntry implements Seri
* @roller.wrapPojoMethod type="simple"
*/
public String getTransformedSummary() {
- return render(summary);
+ return render(getSummary());
}
/**
* No-op to please XDoclet.
@@ -1171,7 +1171,7 @@ public class WeblogEntry implements Seri
private String render(String str) {
String ret = str;
mLogger.debug("Applying page plugins to string");
- Map plugins = this.website.getInitializedPlugins();
+ Map plugins = getWebsite().getInitializedPlugins();
if (str != null && plugins != null) {
List entryPlugins = getPluginsList();
Modified: roller/trunk/weblogger-business/src/main/java/org/apache/roller/weblogger/pojos/WeblogEntryAttribute.java
URL: http://svn.apache.org/viewvc/roller/trunk/weblogger-business/src/main/java/org/apache/roller/weblogger/pojos/WeblogEntryAttribute.java?rev=1487153&r1=1487152&r2=1487153&view=diff
==============================================================================
--- roller/trunk/weblogger-business/src/main/java/org/apache/roller/weblogger/pojos/WeblogEntryAttribute.java (original)
+++ roller/trunk/weblogger-business/src/main/java/org/apache/roller/weblogger/pojos/WeblogEntryAttribute.java Tue May 28 22:28:29 2013
@@ -79,9 +79,9 @@ public class WeblogEntryAttribute implem
public String toString() {
StringBuffer buf = new StringBuffer();
buf.append("{");
- buf.append(this.id);
- buf.append(", ").append(this.name);
- buf.append(", ").append(this.value);
+ buf.append(getId());
+ buf.append(", ").append(getName());
+ buf.append(", ").append(getValue());
buf.append("}");
return buf.toString();
}
Modified: roller/trunk/weblogger-business/src/main/java/org/apache/roller/weblogger/pojos/WeblogEntryComment.java
URL: http://svn.apache.org/viewvc/roller/trunk/weblogger-business/src/main/java/org/apache/roller/weblogger/pojos/WeblogEntryComment.java?rev=1487153&r1=1487152&r2=1487153&view=diff
==============================================================================
--- roller/trunk/weblogger-business/src/main/java/org/apache/roller/weblogger/pojos/WeblogEntryComment.java (original)
+++ roller/trunk/weblogger-business/src/main/java/org/apache/roller/weblogger/pojos/WeblogEntryComment.java Tue May 28 22:28:29 2013
@@ -277,7 +277,7 @@ public class WeblogEntryComment implemen
* Indicates that weblog owner considers this comment to be spam.
*/
public Boolean getSpam() {
- return new Boolean(SPAM.equals(this.status));
+ return new Boolean(SPAM.equals(getStatus()));
}
@@ -285,7 +285,7 @@ public class WeblogEntryComment implemen
* True if comment has is pending moderator approval.
*/
public Boolean getPending() {
- return new Boolean(PENDING.equals(this.status));
+ return new Boolean(PENDING.equals(getStatus()));
}
@@ -293,7 +293,7 @@ public class WeblogEntryComment implemen
* Indicates that comment has been approved for display on weblog.
*/
public Boolean getApproved() {
- return new Boolean(APPROVED.equals(this.status));
+ return new Boolean(APPROVED.equals(getStatus()));
}
@@ -301,8 +301,8 @@ public class WeblogEntryComment implemen
* Timestamp to be used to formulate comment permlink.
*/
public String getTimestamp() {
- if (postTime != null) {
- return Long.toString(postTime.getTime());
+ if (getPostTime() != null) {
+ return Long.toString(getPostTime().getTime());
}
return null;
}
@@ -312,10 +312,10 @@ public class WeblogEntryComment implemen
public String toString() {
StringBuffer buf = new StringBuffer();
buf.append("{");
- buf.append(this.id);
- buf.append(", ").append(this.name);
- buf.append(", ").append(this.email);
- buf.append(", ").append(this.postTime);
+ buf.append(getId());
+ buf.append(", ").append(getName());
+ buf.append(", ").append(getEmail());
+ buf.append(", ").append(getPostTime());
buf.append("}");
return buf.toString();
}
Modified: roller/trunk/weblogger-business/src/main/java/org/apache/roller/weblogger/pojos/WeblogEntryTag.java
URL: http://svn.apache.org/viewvc/roller/trunk/weblogger-business/src/main/java/org/apache/roller/weblogger/pojos/WeblogEntryTag.java?rev=1487153&r1=1487152&r2=1487153&view=diff
==============================================================================
--- roller/trunk/weblogger-business/src/main/java/org/apache/roller/weblogger/pojos/WeblogEntryTag.java (original)
+++ roller/trunk/weblogger-business/src/main/java/org/apache/roller/weblogger/pojos/WeblogEntryTag.java Tue May 28 22:28:29 2013
@@ -140,9 +140,9 @@ public class WeblogEntryTag implements S
public String toString() {
StringBuffer buf = new StringBuffer();
buf.append("{");
- buf.append(this.id);
- buf.append(", ").append(this.name);
- buf.append(", ").append(this.time);
+ buf.append(getId());
+ buf.append(", ").append(getName());
+ buf.append(", ").append(getTime());
buf.append("}");
return buf.toString();
}
Modified: roller/trunk/weblogger-business/src/main/java/org/apache/roller/weblogger/pojos/WeblogEntryTagAggregate.java
URL: http://svn.apache.org/viewvc/roller/trunk/weblogger-business/src/main/java/org/apache/roller/weblogger/pojos/WeblogEntryTagAggregate.java?rev=1487153&r1=1487152&r2=1487153&view=diff
==============================================================================
--- roller/trunk/weblogger-business/src/main/java/org/apache/roller/weblogger/pojos/WeblogEntryTagAggregate.java (original)
+++ roller/trunk/weblogger-business/src/main/java/org/apache/roller/weblogger/pojos/WeblogEntryTagAggregate.java Tue May 28 22:28:29 2013
@@ -108,10 +108,10 @@ public class WeblogEntryTagAggregate imp
public String toString() {
StringBuffer buf = new StringBuffer();
buf.append("{");
- buf.append(this.id);
- buf.append(", ").append(this.name);
- buf.append(", ").append(this.total);
- buf.append(", ").append(this.lastUsed);
+ buf.append(getId());
+ buf.append(", ").append(getName());
+ buf.append(", ").append(getTotal());
+ buf.append(", ").append(getLastUsed());
buf.append("}");
return buf.toString();
}
Modified: roller/trunk/weblogger-business/src/main/java/org/apache/roller/weblogger/pojos/WeblogHitCount.java
URL: http://svn.apache.org/viewvc/roller/trunk/weblogger-business/src/main/java/org/apache/roller/weblogger/pojos/WeblogHitCount.java?rev=1487153&r1=1487152&r2=1487153&view=diff
==============================================================================
--- roller/trunk/weblogger-business/src/main/java/org/apache/roller/weblogger/pojos/WeblogHitCount.java (original)
+++ roller/trunk/weblogger-business/src/main/java/org/apache/roller/weblogger/pojos/WeblogHitCount.java Tue May 28 22:28:29 2013
@@ -41,8 +41,8 @@ public class WeblogHitCount implements S
public String toString() {
StringBuffer buf = new StringBuffer();
buf.append("{");
- buf.append(this.id);
- buf.append(", ").append(this.dailyHits);
+ buf.append(getId());
+ buf.append(", ").append(getDailyHits());
buf.append("}");
return buf.toString();
}
Modified: roller/trunk/weblogger-business/src/main/java/org/apache/roller/weblogger/pojos/WeblogReferrer.java
URL: http://svn.apache.org/viewvc/roller/trunk/weblogger-business/src/main/java/org/apache/roller/weblogger/pojos/WeblogReferrer.java?rev=1487153&r1=1487152&r2=1487153&view=diff
==============================================================================
--- roller/trunk/weblogger-business/src/main/java/org/apache/roller/weblogger/pojos/WeblogReferrer.java (original)
+++ roller/trunk/weblogger-business/src/main/java/org/apache/roller/weblogger/pojos/WeblogReferrer.java Tue May 28 22:28:29 2013
@@ -148,10 +148,10 @@ public class WeblogReferrer implements S
}
public void setRefererUrl(String refererUrl) {
- this.refererUrl = refererUrl;
- if (this.refererUrl != null && this.refererUrl.length() > 255) {
- this.refererUrl = this.refererUrl.substring(0, 255);
+ if (refererUrl != null && refererUrl.length() > 255) {
+ refererUrl = refererUrl.substring(0, 255);
}
+ this.refererUrl = refererUrl;
}
/**
@@ -345,11 +345,11 @@ public class WeblogReferrer implements S
public String toString() {
StringBuffer buf = new StringBuffer();
buf.append("{");
- buf.append(this.id);
- buf.append(", ").append(this.requestUrl);
- buf.append(", ").append(this.refererUrl);
- buf.append(", ").append(this.dayHits);
- buf.append(", ").append(this.totalHits);
+ buf.append(getId());
+ buf.append(", ").append(getRequestUrl());
+ buf.append(", ").append(getRefererUrl());
+ buf.append(", ").append(getDayHits());
+ buf.append(", ").append(getTotalHits());
buf.append("}");
return buf.toString();
}
Modified: roller/trunk/weblogger-business/src/main/java/org/apache/roller/weblogger/pojos/WeblogTemplate.java
URL: http://svn.apache.org/viewvc/roller/trunk/weblogger-business/src/main/java/org/apache/roller/weblogger/pojos/WeblogTemplate.java?rev=1487153&r1=1487152&r2=1487153&view=diff
==============================================================================
--- roller/trunk/weblogger-business/src/main/java/org/apache/roller/weblogger/pojos/WeblogTemplate.java (original)
+++ roller/trunk/weblogger-business/src/main/java/org/apache/roller/weblogger/pojos/WeblogTemplate.java Tue May 28 22:28:29 2013
@@ -75,12 +75,12 @@ public class WeblogTemplate implements T
public ThemeTemplate getDecorator() {
- if(decoratorName != null && !id.equals(decoratorName)) {
+ if(getDecoratorName() != null && !getId().equals(getDecoratorName())) {
try {
- return weblog.getTheme().getTemplateByName(decoratorName);
+ return weblog.getTheme().getTemplateByName(getDecoratorName());
} catch (WebloggerException ex) {
- log.error("Error getting decorator["+decoratorName+"] "+
- "for template "+id);
+ log.error("Error getting decorator["+getDecoratorName()+"] "+
+ "for template "+getId());
}
}
return null;
@@ -221,7 +221,7 @@ public class WeblogTemplate implements T
* eventually, the required flag should probably be stored in the db
* and possibly applicable to any template.
*/
- return (requiredTemplates.contains(this.name) || "Weblog".equals(this.link));
+ return (requiredTemplates.contains(getName()) || "Weblog".equals(getLink()));
}
@@ -234,7 +234,7 @@ public class WeblogTemplate implements T
}
public WeblogThemeTemplateCode getTemplateCode(String type) throws WebloggerException {
- return WebloggerFactory.getWeblogger().getWeblogManager().getTemplateCodeByType(this.id, type);
+ return WebloggerFactory.getWeblogger().getWeblogManager().getTemplateCodeByType(getId(), type);
}
public String getType() {
@@ -251,11 +251,11 @@ public class WeblogTemplate implements T
public String toString() {
StringBuffer buf = new StringBuffer();
buf.append("{");
- buf.append(this.id);
- buf.append(", ").append(this.name);
- buf.append(", ").append(this.link);
- buf.append(", ").append(this.decoratorName);
- buf.append(", ").append(this.templateLanguage);
+ buf.append(getId());
+ buf.append(", ").append(getName());
+ buf.append(", ").append(getLink());
+ buf.append(", ").append(getDecoratorName());
+ buf.append(", ").append(getTemplateLanguage());
buf.append("}");
return buf.toString();
}
@@ -265,7 +265,7 @@ public class WeblogTemplate implements T
if (other instanceof WeblogTemplate != true) return false;
WeblogTemplate o = (WeblogTemplate)other;
return new EqualsBuilder()
- .append(name, o.getName())
+ .append(getName(), o.getName())
.append(getWebsite(), o.getWebsite())
.isEquals();
}
Modified: roller/trunk/weblogger-business/src/main/java/org/apache/roller/weblogger/pojos/WeblogThemeAssoc.java
URL: http://svn.apache.org/viewvc/roller/trunk/weblogger-business/src/main/java/org/apache/roller/weblogger/pojos/WeblogThemeAssoc.java?rev=1487153&r1=1487152&r2=1487153&view=diff
==============================================================================
--- roller/trunk/weblogger-business/src/main/java/org/apache/roller/weblogger/pojos/WeblogThemeAssoc.java (original)
+++ roller/trunk/weblogger-business/src/main/java/org/apache/roller/weblogger/pojos/WeblogThemeAssoc.java Tue May 28 22:28:29 2013
@@ -112,7 +112,7 @@ public class WeblogThemeAssoc implements
public String toString() {
StringBuffer buf = new StringBuffer();
buf.append("{");
- buf.append(this.id);
+ buf.append(getId());
buf.append("}");
return buf.toString();
}
Modified: roller/trunk/weblogger-business/src/main/java/org/apache/roller/weblogger/pojos/WeblogThemeTemplateCode.java
URL: http://svn.apache.org/viewvc/roller/trunk/weblogger-business/src/main/java/org/apache/roller/weblogger/pojos/WeblogThemeTemplateCode.java?rev=1487153&r1=1487152&r2=1487153&view=diff
==============================================================================
--- roller/trunk/weblogger-business/src/main/java/org/apache/roller/weblogger/pojos/WeblogThemeTemplateCode.java (original)
+++ roller/trunk/weblogger-business/src/main/java/org/apache/roller/weblogger/pojos/WeblogThemeTemplateCode.java Tue May 28 22:28:29 2013
@@ -111,10 +111,10 @@ public class WeblogThemeTemplateCode imp
public String toString() {
StringBuffer buf = new StringBuffer();
buf.append("{");
- buf.append(this.id);
- buf.append(", ").append(this.templateId);
- buf.append(", [ ").append(this.template);
- buf.append("] , ").append(this.type);
+ buf.append(getId());
+ buf.append(", ").append(getTemplateId());
+ buf.append(", [ ").append(getTemplate());
+ buf.append("] , ").append(getType());
buf.append("}");
return buf.toString();
}
@@ -125,8 +125,8 @@ public class WeblogThemeTemplateCode imp
if (other instanceof WeblogThemeTemplateCode != true)
return false;
WeblogThemeTemplateCode o = (WeblogThemeTemplateCode) other;
- return new EqualsBuilder().append(templateId, o.getTemplateId())
- .append(template, o.getTemplate()).isEquals();
+ return new EqualsBuilder().append(getTemplateId(), o.getTemplateId())
+ .append(getTemplate(), o.getTemplate()).isEquals();
}
public int hashCode() {
Modified: roller/trunk/weblogger-business/src/main/resources/org/apache/roller/weblogger/pojos/TaskLock.orm.xml
URL: http://svn.apache.org/viewvc/roller/trunk/weblogger-business/src/main/resources/org/apache/roller/weblogger/pojos/TaskLock.orm.xml?rev=1487153&r1=1487152&r2=1487153&view=diff
==============================================================================
--- roller/trunk/weblogger-business/src/main/resources/org/apache/roller/weblogger/pojos/TaskLock.orm.xml (original)
+++ roller/trunk/weblogger-business/src/main/resources/org/apache/roller/weblogger/pojos/TaskLock.orm.xml Tue May 28 22:28:29 2013
@@ -50,7 +50,7 @@
</basic>
<transient name="leaseExpiration"/>
-
+
</attributes>
</entity>
</entity-mappings>
Modified: roller/trunk/weblogger-web/pom.xml
URL: http://svn.apache.org/viewvc/roller/trunk/weblogger-web/pom.xml?rev=1487153&r1=1487152&r2=1487153&view=diff
==============================================================================
--- roller/trunk/weblogger-web/pom.xml (original)
+++ roller/trunk/weblogger-web/pom.xml Tue May 28 22:28:29 2013
@@ -75,6 +75,12 @@
</exclusions>
</dependency>
+ <dependency>
+ <groupId>commons-pool</groupId>
+ <artifactId>commons-pool</artifactId>
+ <scope>test</scope>
+ </dependency>
+
<!-- EclipseLink deps (for sometimes testing purposes)
<dependency>
<groupId>org.eclipse.persistence</groupId>