You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@roller.apache.org by ag...@apache.org on 2007/07/05 19:32:14 UTC
svn commit: r553572 [1/2] - in
/roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger:
business/hibernate/ pojos/
Author: agilliland
Date: Thu Jul 5 10:32:12 2007
New Revision: 553572
URL: http://svn.apache.org/viewvc?view=rev&rev=553572
Log:
doing some pojo cleanup by removing old setData() methods and other methods which are no longer used, doing some code reformatting, and removing no longer necessary hibernate and other xdoclet markup.
Modified:
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/business/hibernate/HibernateBookmarkManagerImpl.java
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/pojos/AutoPing.java
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/pojos/PingQueueEntry.java
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/pojos/PingTarget.java
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/pojos/RuntimeConfigProperty.java
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/pojos/TagStat.java
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/pojos/TaskLock.java
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/pojos/UserRole.java
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/pojos/Weblog.java
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/pojos/WeblogBookmark.java
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/pojos/WeblogBookmarkFolder.java
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/pojos/WeblogEntryAttribute.java
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/pojos/WeblogEntryComment.java
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/pojos/WeblogEntryTag.java
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/pojos/WeblogEntryTagAggregate.java
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/pojos/WeblogHitCount.java
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/pojos/WeblogReferrer.java
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/pojos/WeblogTemplate.java
Modified: roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/business/hibernate/HibernateBookmarkManagerImpl.java
URL: http://svn.apache.org/viewvc/roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/business/hibernate/HibernateBookmarkManagerImpl.java?view=diff&rev=553572&r1=553571&r2=553572
==============================================================================
--- roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/business/hibernate/HibernateBookmarkManagerImpl.java (original)
+++ roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/business/hibernate/HibernateBookmarkManagerImpl.java Thu Jul 5 10:32:12 2007
@@ -76,8 +76,6 @@
public WeblogBookmark getBookmark(String id) throws WebloggerException {
WeblogBookmark bd = (WeblogBookmark)
strategy.load(id,WeblogBookmark.class);
- // TODO: huh? why do we do this?
- if (bd != null) bd.setBookmarkManager(this);
return bd;
}
Modified: roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/pojos/AutoPing.java
URL: http://svn.apache.org/viewvc/roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/pojos/AutoPing.java?view=diff&rev=553572&r1=553571&r2=553572
==============================================================================
--- roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/pojos/AutoPing.java (original)
+++ roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/pojos/AutoPing.java Thu Jul 5 10:32:12 2007
@@ -31,17 +31,16 @@
* any category restrictions, the ping target is pinged whenever the corresponding website changes.
*
* @author <a href="mailto:anil@busybuddha.org">Anil Gangolli</a>
- * @ejb:bean name="AutoPing"
- * @hibernate.cache usage="read-write"
- * @hibernate.class lazy="true" table="autoping"
*/
public class AutoPing implements Serializable {
+
private String id = UUIDGenerator.generateUUID();
private PingTarget pingTarget = null;
private Weblog website = null;
public static final long serialVersionUID = -9105985454111986435L;
-
+
+
/**
* Default constructor. Leaves all fields null. Required for bean compliance.
*/
@@ -62,20 +61,9 @@
}
/**
- * Set bean properties based on other bean.
- */
- public void setData(AutoPing other) {
- id = other.getId();
- website = other.getWebsite();
- pingTarget = other.getPingTarget();
- }
-
- /**
* Get the unique id (primary key) of this object.
*
- * @return the unique id of this object. -- struts.validator type="required" msgkey="errors.required"
- * @ejb:persistent-field
- * @hibernate.id column="id" generator-class="assigned"
+ * @return the unique id of this object.
*/
public String getId() {
return id;
@@ -85,7 +73,6 @@
* Set the unique id (primary key) of this object
*
* @param id
- * @ejb:persistent-field
*/
public void setId(String id) {
// Form bean workaround: empty string is never a valid id
@@ -98,8 +85,6 @@
* object.
*
* @return the website.
- * @ejb:persistent-field
- * @hibernate.many-to-one column="websiteid" cascade="none" not-null="false"
*/
public Weblog getWebsite() {
return website;
@@ -110,7 +95,6 @@
* object.
*
* @param website the website.
- * @ejb:persistent-field
*/
public void setWebsite(Weblog website) {
this.website = website;
@@ -120,8 +104,6 @@
* Get the ping target. Get the target to be pinged when the corresponding website changes.
*
* @return the target to be pinged.
- * @ejb:persistent-field
- * @hibernate.many-to-one column="pingtargetid" cascade="none" not-null="false"
*/
public PingTarget getPingTarget() {
return pingTarget;
@@ -131,7 +113,6 @@
* Set the ping target. Set the target to be pinged when the corresponding website changes.
*
* @param pingtarget the target to be pinged.
- * @ejb:persistent-field
*/
public void setPingTarget(PingTarget pingtarget) {
this.pingTarget = pingtarget;
@@ -161,4 +142,5 @@
public int hashCode() {
return new HashCodeBuilder().append(getId()).toHashCode();
}
+
}
Modified: roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/pojos/PingQueueEntry.java
URL: http://svn.apache.org/viewvc/roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/pojos/PingQueueEntry.java?view=diff&rev=553572&r1=553571&r2=553572
==============================================================================
--- roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/pojos/PingQueueEntry.java (original)
+++ roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/pojos/PingQueueEntry.java Thu Jul 5 10:32:12 2007
@@ -24,17 +24,16 @@
import org.apache.commons.lang.builder.HashCodeBuilder;
import org.apache.roller.util.UUIDGenerator;
+
/**
* Ping queue entry. Each instance of this class represents an entry on the ping queue. The entry indicates when it was
* added to the queue, which configuration to apply for the ping, and the number of ping attempts that have been made
* for this entry so far.
*
* @author <a href="mailto:anil@busybuddha.org">Anil Gangolli</a>
- * @ejb:bean name="PingQueueEntry"
- * @hibernate.cache usage="read-write"
- * @hibernate.class lazy="true" table="pingqueueentry"
*/
public class PingQueueEntry implements Serializable {
+
private String id = UUIDGenerator.generateUUID();
private Timestamp entryTime = null;
private PingTarget pingTarget = null;
@@ -43,6 +42,7 @@
public static final long serialVersionUID = -1468021030819538243L;
+
/**
* Default constructor. Leaves all fields at Java-specified default values.
*/
@@ -67,22 +67,9 @@
}
/**
- * Set bean properties based on other bean.
- */
- public void setData(PingQueueEntry other) {
- id = other.getId();
- entryTime = other.getEntryTime();
- pingTarget = other.getPingTarget();
- website = other.getWebsite();
- attempts = other.getAttempts();
- }
-
- /**
* Get the unique id (primary key) of this object.
*
* @return the unique id of this object.
- * @ejb:persistent-field
- * @hibernate.id column="id" generator-class="assigned"
*/
public String getId() {
return id;
@@ -92,11 +79,8 @@
* Set the unique id (primary key) of this object.
*
* @param 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) return;
this.id = id;
}
@@ -104,8 +88,6 @@
* Get the entry time. Get the time this entry was first added to the queue.
*
* @return the time the entry was first added to the queue.
- * @ejb:persistent-field
- * @hibernate.property column="entrytime" non-null="true"
*/
public Timestamp getEntryTime() {
return entryTime;
@@ -115,7 +97,6 @@
* Set the entry time.
*
* @param entryTime the time the entry was first added to the queue.
- * @ejb:persistent-field
*/
public void setEntryTime(Timestamp entryTime) {
this.entryTime = entryTime;
@@ -125,8 +106,6 @@
* Get the ping target. Get the target to ping.
*
* @return the ping target to ping.
- * @ejb:persistent-field
- * @hibernate.many-to-one column="pingtargetid" cascade="none" not-null="true"
*/
public PingTarget getPingTarget() {
return pingTarget;
@@ -136,7 +115,6 @@
* Set the ping target.
*
* @param pingTarget target to ping.
- * @ejb:persistent-field
*/
public void setPingTarget(PingTarget pingTarget) {
this.pingTarget = pingTarget;
@@ -146,8 +124,6 @@
* Get the website originating the ping.
*
* @return the website originating the ping.
- * @ejb:persistent-field
- * @hibernate.many-to-one column="websiteid" cascade="none" not-null="true"
*/
public Weblog getWebsite() {
return website;
@@ -157,7 +133,6 @@
* Set the website originating the ping.
*
* @param website the website originating the ping.
- * @ejb:persistent-field
*/
public void setWebsite(Weblog website) {
this.website = website;
@@ -167,8 +142,6 @@
* Get the number of ping attempts that have been made for this queue entry.
*
* @return the number of ping attempts that have been made for this queue entry.
- * @ejb:persistent-field
- * @hibernate.property column="attempts" non-null="true"
*/
public int getAttempts() {
return attempts;
@@ -178,7 +151,6 @@
* Set the number of failures that have occurred for this queue entry.
*
* @param attempts
- * @ejb:persistent-field
*/
public void setAttempts(int attempts) {
this.attempts = attempts;
@@ -221,4 +193,5 @@
.append(getWebsite())
.toHashCode();
}
+
}
Modified: roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/pojos/PingTarget.java
URL: http://svn.apache.org/viewvc/roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/pojos/PingTarget.java?view=diff&rev=553572&r1=553571&r2=553572
==============================================================================
--- roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/pojos/PingTarget.java (original)
+++ roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/pojos/PingTarget.java Thu Jul 5 10:32:12 2007
@@ -24,16 +24,13 @@
import org.apache.commons.lang.builder.HashCodeBuilder;
import org.apache.roller.util.UUIDGenerator;
+
/**
* Ping target. Each instance represents a possible target of a weblog update ping that we send. Ping targets are
* either common (defined centrally by an administrator and used by any website), or custom (defined by the user of a
* specific website) for update pings issued for that website.
*
* @author <a href="mailto:anil@busybuddha.org">Anil Gangolli</a>
- * @ejb:bean name="PingTarget"
- * @hibernate.cache usage="read-write"
- * @hibernate.class lazy="true" table="pingtarget"
- * @struts.form include-all="true"
*/
public class PingTarget implements Serializable {
@@ -79,29 +76,11 @@
/**
- * Set bean properties based on other bean.
- */
- public void setData(PingTarget other) {
-
- id = other.getId();
- name = other.getName();
- pingUrl = other.getPingUrl();
- website = other.getWebsite();
- conditionCode = other.getConditionCode();
- lastSuccess = other.getLastSuccess();
- autoEnabled = other.isAutoEnabled();
- }
-
-
- /**
* Get the unique id of this ping target.
*
* @return the unique id of this ping target.
- * @struts.validator type="required" msgkey="errors.required"
- * @ejb:persistent-field
- * @hibernate.id column="id" generator-class="assigned"
*/
- public java.lang.String getId() {
+ public String getId() {
return this.id;
}
@@ -110,11 +89,8 @@
* Set the unique id of this ping target
*
* @param id
- * @ejb:persistent-field
*/
- public void setId(java.lang.String id) {
- // Form bean workaround: empty string is never a valid id
- if (id != null && id.trim().length() == 0) return;
+ public void setId(String id) {
this.id = id;
}
@@ -124,10 +100,8 @@
* It is deescriptive and is not necessarily unique.
*
* @return the name of this ping target
- * @ejb:persistent-field
- * @hibernate.property column="name" non-null="true"
*/
- public java.lang.String getName() {
+ public String getName() {
return this.name;
}
@@ -136,9 +110,8 @@
* Set the name of this ping target.
*
* @param name the name of this ping target
- * @ejb:persistent-field
*/
- public void setName(java.lang.String name) {
+ public void setName(String name) {
this.name = name;
}
@@ -147,8 +120,6 @@
* Get the URL to ping.
*
* @return the URL to ping.
- * @ejb:persistent-field
- * @hibernate.property column="pingurl" non-null="true"
*/
public String getPingUrl() {
return pingUrl;
@@ -159,7 +130,6 @@
* Set the URL to ping.
*
* @param pingUrl
- * @ejb:persistent-field
*/
public void setPingUrl(String pingUrl) {
this.pingUrl = pingUrl;
@@ -172,8 +142,6 @@
*
* @return the website for which this ping target is a custom target, or null if this ping target is not a custom
* target.
- * @ejb:persistent-field
- * @hibernate.many-to-one column="websiteid" cascade="none" not-null="false"
*/
public Weblog getWebsite() {
return website;
@@ -185,7 +153,6 @@
*
* @param website the website for which this ping target is a custom target, or null if this ping target is not a
* custom target
- * @ejb:persistent-field
*/
public void setWebsite(Weblog website) {
this.website = website;
@@ -199,8 +166,6 @@
*
* @return one of the condition codes {@link #CONDITION_OK}, {@link #CONDITION_FAILING}, {@link
* #CONDITION_DISABLED}.
- * @ejb:persistent-field
- * @hibernate.property column="conditioncode" not-null="true"
*/
public int getConditionCode() {
return conditionCode;
@@ -211,7 +176,6 @@
* Set the condition code value.
*
* @param conditionCode the condition code value to set
- * @ejb:persistent-field
*/
public void setConditionCode(int conditionCode) {
this.conditionCode = conditionCode;
@@ -222,8 +186,6 @@
* Get the timestamp of the last successful ping (UTC/GMT).
*
* @return the timestamp of the last successful ping; <code>null</code> if the target has not yet been used.
- * @ejb:persistent-field
- * @hibernate.property column="lastsuccess" not-null="false"
*/
public Timestamp getLastSuccess() {
return lastSuccess;
@@ -234,7 +196,6 @@
* Set the timestamp of the last successful ping.
*
* @param lastSuccess the timestamp of the last successful ping.
- * @ejb:persistent-field
*/
public void setLastSuccess(Timestamp lastSuccess) {
this.lastSuccess = lastSuccess;
@@ -245,8 +206,6 @@
* Is this ping target enabled by default for new weblogs?
*
* @return true if ping target is auto enabled. false otherwise.
- * @ejb:persistent-field
- * @hibernate.property column="autoenabled" not-null="true"
*/
public boolean isAutoEnabled() {
return autoEnabled;
@@ -258,7 +217,6 @@
* applies for common ping targets.
*
* @param autoEnabled true if the ping target should be auto enabled.
- * @ejb:persistent-field
*/
public void setAutoEnabled(boolean autoEnabled) {
this.autoEnabled = autoEnabled;
Modified: roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/pojos/RuntimeConfigProperty.java
URL: http://svn.apache.org/viewvc/roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/pojos/RuntimeConfigProperty.java?view=diff&rev=553572&r1=553571&r2=553572
==============================================================================
--- roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/pojos/RuntimeConfigProperty.java (original)
+++ roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/pojos/RuntimeConfigProperty.java Thu Jul 5 10:32:12 2007
@@ -1,56 +1,38 @@
/*
-* Licensed to the Apache Software Foundation (ASF) under one or more
-* contributor license agreements. The ASF licenses this file to You
-* under the Apache License, Version 2.0 (the "License"); you may not
-* use this file except in compliance with the License.
-* You may obtain a copy of the License at
-*
-* http://www.apache.org/licenses/LICENSE-2.0
-*
-* Unless required by applicable law or agreed to in writing, software
-* distributed under the License is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-* See the License for the specific language governing permissions and
-* limitations under the License. For additional information regarding
-* copyright in this work, please see the NOTICE file in the top level
-* directory of this distribution.
-*/
-/*
- * RollerConfigProperty.java
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. The ASF licenses this file to You
+ * under the Apache License, Version 2.0 (the "License"); you may not
+ * use this file except in compliance with the License.
+ * You may obtain a copy of the License at
*
- * Created on April 20, 2005, 2:58 PM
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License. For additional information regarding
+ * copyright in this work, please see the NOTICE file in the top level
+ * directory of this distribution.
*/
package org.apache.roller.weblogger.pojos;
+import java.io.Serializable;
import org.apache.commons.lang.builder.EqualsBuilder;
import org.apache.commons.lang.builder.HashCodeBuilder;
+
/**
* This POJO represents a single property of the roller system.
- *
- * @author Allen Gilliland
- * @ejb:bean name="RuntimeConfigProperty"
- * @hibernate.cache usage="read-write"
- * @hibernate.class lazy="true" table="roller_properties"
*/
-public class RuntimeConfigProperty
- implements java.io.Serializable
-{
+public class RuntimeConfigProperty implements Serializable {
- static final long serialVersionUID = 6913562779484028899L;
+ public static final long serialVersionUID = 6913562779484028899L;
-
- /**
- * Holds value of property name.
- */
private String name;
-
- /**
- * Holds value of property value.
- */
private String value;
-
+
public RuntimeConfigProperty() {}
@@ -61,89 +43,61 @@
}
- public void setData(RuntimeConfigProperty object)
- {
- if (object instanceof RuntimeConfigProperty)
- {
- RuntimeConfigProperty prop = (RuntimeConfigProperty) object;
- this.name = prop.getName();
- this.value = prop.getValue();
- }
- }
-
-
- /*public void setId(String id) {
- setName(id);
- }
-
- public String getId() {
- return getName();
- }*/
-
/**
* Getter for property name.
*
* @return Value of property name.
- * @ejb:persistent-field
- * @hibernate.id column="name" generator-class="assigned"
*/
public String getName() {
-
return this.name;
}
-
+
/**
* Setter for property name.
*
* @param name New value of property name.
- * @ejb:persistent-field
*/
public void setName(String name) {
-
this.name = name;
}
-
+
/**
* Getter for property value.
*
* @return Value of property value.
- * @ejb:persistent-field
- * @hibernate.property column="value" non-null="false" unique="false"
*/
public String getValue() {
-
return this.value;
}
-
+
/**
* Setter for property value.
*
* @param value New value of property value.
- * @ejb:persistent-field
*/
public void setValue(String value) {
-
this.value = value;
}
//------------------------------------------------------- Good citizenship
-
+
public String toString() {
return (this.name + "=" + this.value);
}
-
+
public boolean equals(Object other) {
if (other == this) return true;
if (other instanceof RuntimeConfigProperty != true) return false;
RuntimeConfigProperty o = (RuntimeConfigProperty)other;
return new EqualsBuilder()
- .append(getName(), o.getName())
- .isEquals();
+ .append(getName(), o.getName())
+ .isEquals();
}
- public int hashCode() {
+ public int hashCode() {
return new HashCodeBuilder()
- .append(getName())
- .toHashCode();
+ .append(getName())
+ .toHashCode();
}
+
}
Modified: roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/pojos/TagStat.java
URL: http://svn.apache.org/viewvc/roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/pojos/TagStat.java?view=diff&rev=553572&r1=553571&r2=553572
==============================================================================
--- roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/pojos/TagStat.java (original)
+++ roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/pojos/TagStat.java Thu Jul 5 10:32:12 2007
@@ -28,7 +28,7 @@
private static final long serialVersionUID = 1142064841813545198L;
- private java.lang.String name;
+ private String name;
private int count;
Modified: roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/pojos/TaskLock.java
URL: http://svn.apache.org/viewvc/roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/pojos/TaskLock.java?view=diff&rev=553572&r1=553571&r2=553572
==============================================================================
--- roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/pojos/TaskLock.java (original)
+++ roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/pojos/TaskLock.java Thu Jul 5 10:32:12 2007
@@ -23,12 +23,9 @@
import java.util.Date;
import org.apache.roller.util.UUIDGenerator;
+
/**
* Represents locking information about a specific RollerTask.
- *
- * @ejb:bean name="TaskLock"
- * @hibernate.cache usage="read-write"
- * @hibernate.class lazy="true" table="roller_tasklock"
*/
public class TaskLock implements Serializable {
@@ -81,16 +78,6 @@
return cal.getTime();
}
-
-
- public void setData(TaskLock other) {
- this.id = other.getId();
- this.name = other.getName();
- this.locked = other.isLocked();
- this.timeAquired = other.getTimeAquired();
- this.timeLeased = other.getTimeLeased();
- this.lastRun = other.getLastRun();
- }
//------------------------------------------------------- Good citizenship
@@ -120,24 +107,16 @@
return this.getName().hashCode();
}
- /**
- * @ejb:persistent-field
- * @hibernate.id column="id" generator-class="assigned"
- */
+
public String getId() {
return id;
}
public void setId(String id) {
- // Form bean workaround: empty string is never a valid id
- if (id != null && id.trim().length() == 0) return;
this.id = id;
}
- /**
- * @ejb:persistent-field
- * @hibernate.property column="name" non-null="true" unique="true"
- */
+
public String getName() {
return name;
}
@@ -146,10 +125,7 @@
this.name = name;
}
- /**
- * @ejb:persistent-field
- * @hibernate.property column="timeacquired" non-null="false" unique="false"
- */
+
public Date getTimeAquired() {
return timeAquired;
}
@@ -158,10 +134,7 @@
this.timeAquired = timeAquired;
}
- /**
- * @ejb:persistent-field
- * @hibernate.property column="lastrun" non-null="false" unique="false"
- */
+
public Date getLastRun() {
return lastRun;
}
@@ -170,10 +143,7 @@
this.lastRun = lastRun;
}
- /**
- * @ejb:persistent-field
- * @hibernate.property column="islocked" non-null="false" unique="false"
- */
+
public boolean isLocked() {
// this method requires a little extra logic because we return false
@@ -192,10 +162,7 @@
this.locked = locked;
}
- /**
- * @ejb:persistent-field
- * @hibernate.property column="timeleased" non-null="false" unique="false"
- */
+
public int getTimeLeased() {
return timeLeased;
}
@@ -204,10 +171,7 @@
this.timeLeased = timeLeased;
}
- /**
- * @ejb:persistent-field
- * @hibernate.property column="client" non-null="false" unique="false"
- */
+
public String getClientId() {
return clientId;
}
Modified: roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/pojos/UserRole.java
URL: http://svn.apache.org/viewvc/roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/pojos/UserRole.java?view=diff&rev=553572&r1=553571&r2=553572
==============================================================================
--- roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/pojos/UserRole.java (original)
+++ roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/pojos/UserRole.java Thu Jul 5 10:32:12 2007
@@ -1,126 +1,91 @@
/*
-* Licensed to the Apache Software Foundation (ASF) under one or more
-* contributor license agreements. The ASF licenses this file to You
-* under the Apache License, Version 2.0 (the "License"); you may not
-* use this file except in compliance with the License.
-* You may obtain a copy of the License at
-*
-* http://www.apache.org/licenses/LICENSE-2.0
-*
-* Unless required by applicable law or agreed to in writing, software
-* distributed under the License is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-* See the License for the specific language governing permissions and
-* limitations under the License. For additional information regarding
-* copyright in this work, please see the NOTICE file in the top level
-* directory of this distribution.
-*/
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. The ASF licenses this file to You
+ * under the Apache License, Version 2.0 (the "License"); you may not
+ * use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License. For additional information regarding
+ * copyright in this work, please see the NOTICE file in the top level
+ * directory of this distribution.
+ */
package org.apache.roller.weblogger.pojos;
+import java.io.Serializable;
import org.apache.commons.lang.builder.EqualsBuilder;
import org.apache.commons.lang.builder.HashCodeBuilder;
import org.apache.roller.util.UUIDGenerator;
+
/**
* Role bean.
- * @author David M Johnson
- *
- * @ejb:bean name="UserRole"
- * @struts.form include-all="true"
- * @hibernate.class lazy="true" table="userrole"
- * @hibernate.cache usage="read-write"
*/
-public class UserRole
- implements java.io.Serializable
-{
- static final long serialVersionUID = -4254083071697970972L;
-
- private java.lang.String id = UUIDGenerator.generateUUID();
- private java.lang.String userName;
- private User user;
- private java.lang.String role;
-
- public UserRole()
- {
- }
-
- public UserRole(String id, User user, String role)
- {
- //this.id = id;
- this.userName = user.getUserName();
- this.user = user;
- this.role = role;
- }
-
- public UserRole( UserRole otherData )
- {
- setData(otherData);
- }
-
- /**
- * @ejb:pk-field
- * @ejb:persistent-field
- * @hibernate.id column="id"
- * generator-class="assigned"
- */
- public java.lang.String getId()
- {
- return this.id;
- }
- /** @ejb:persistent-field */
- public void setId( java.lang.String id )
- {
- // Form bean workaround: empty string is never a valid id
- if (id != null && id.trim().length() == 0) return;
- this.id = id;
- }
-
- /**
- * @ejb:persistent-field
- * @hibernate.property column="username" non-null="true" unique="false"
- */
- public java.lang.String getUserName()
- {
- return this.userName;
- }
- /** @ejb:persistent-field */
- public void setUserName( java.lang.String userName )
- {
- this.userName = userName;
- }
-
- /**
- * @hibernate.many-to-one column="userid" cascade="none" not-null="true"
- * @ejb:persistent-field
- */
- public User getUser()
- {
- return this.user;
- }
- /** @ejb:persistent-field */
- public void setUser( User user )
- {
- this.user = user;
- }
-
- /**
- * @ejb:persistent-field
- * @hibernate.property column="rolename" non-null="true" unique="false"
- */
- public java.lang.String getRole()
- {
- return this.role;
- }
- /** @ejb:persistent-field */
- public void setRole( java.lang.String role )
- {
- this.role = role;
- }
-
-
+public class UserRole implements Serializable {
+
+ public static final long serialVersionUID = -4254083071697970972L;
+
+ private String id = UUIDGenerator.generateUUID();
+ private String userName;
+ private User user;
+ private String role;
+
+
+ public UserRole() {
+ }
+
+ public UserRole(String id, User user, String role) {
+ //this.id = id;
+ this.userName = user.getUserName();
+ this.user = user;
+ this.role = role;
+ }
+
+
+ public String getId() {
+ return this.id;
+ }
+
+ public void setId( String id ) {
+ this.id = id;
+ }
+
+
+ public String getUserName() {
+ return this.userName;
+ }
+
+ public void setUserName( String userName ) {
+ this.userName = userName;
+ }
+
+
+ public User getUser() {
+ return this.user;
+ }
+
+ public void setUser( User user ) {
+ this.user = user;
+ }
+
+
+ public String getRole() {
+ return this.role;
+ }
+
+ public void setRole( String role ) {
+ this.role = role;
+ }
+
+
//------------------------------------------------------- Good citizenship
-
+
public String toString() {
StringBuffer buf = new StringBuffer();
buf.append("{");
@@ -130,30 +95,19 @@
buf.append("}");
return buf.toString();
}
-
+
public boolean equals(Object other) {
if (other == this) return true;
if (other instanceof UserRole != true) return false;
UserRole o = (UserRole)other;
return new EqualsBuilder()
- .append(getRole(), o.getRole())
- .append(getUserName(), o.getUserName())
- .isEquals();
+ .append(getRole(), o.getRole())
+ .append(getUserName(), o.getUserName())
+ .isEquals();
}
public int hashCode() {
return new HashCodeBuilder().append(getUserName()).append(getRole()).toHashCode();
}
-
- /**
- * Set bean properties based on other bean.
- */
- public void setData( UserRole otherData )
- {
- this.id = otherData.getId();
- this.userName = otherData.getUserName();
- this.user = otherData.getUser();
- this.role = otherData.getRole();
- }
-
+
}
Modified: roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/pojos/Weblog.java
URL: http://svn.apache.org/viewvc/roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/pojos/Weblog.java?view=diff&rev=553572&r1=553571&r2=553572
==============================================================================
--- roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/pojos/Weblog.java (original)
+++ roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/pojos/Weblog.java Thu Jul 5 10:32:12 2007
@@ -47,19 +47,16 @@
import org.apache.roller.util.UUIDGenerator;
import org.apache.roller.weblogger.util.I18nUtils;
+
/**
* 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.
*
* @author David M Johnson
- *
- * @ejb:bean name="Weblog"
- * @struts.form include-all="true"
- * @hibernate.class lazy="true" table="website"
- * @hibernate.cache usage="read-write"
*/
public class Weblog implements Serializable {
+
public static final long serialVersionUID = 206437645033737127L;
private static Log log = LogFactory.getLog(Weblog.class);
@@ -131,10 +128,6 @@
this.timeZone = timeZone;
}
- public Weblog(Weblog otherData) {
- this.setData(otherData);
- }
-
//------------------------------------------------------- Good citizenship
public String toString() {
@@ -231,8 +224,6 @@
/** @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) return;
this.id = id;
}
Modified: roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/pojos/WeblogBookmark.java
URL: http://svn.apache.org/viewvc/roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/pojos/WeblogBookmark.java?view=diff&rev=553572&r1=553571&r2=553572
==============================================================================
--- roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/pojos/WeblogBookmark.java (original)
+++ roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/pojos/WeblogBookmark.java Thu Jul 5 10:32:12 2007
@@ -28,20 +28,15 @@
/**
* <p>Represents a single URL in a user's favorite web-bookmarks collection.
- * Don't construct one of these yourself, instead use the create method in
+ * Don't construct one of these yourself, instead use the create method in
* the your BookmarkManager implementation.</p>
- *
- * @ejb:bean name="WeblogBookmark"
- * @hibernate.class lazy="true" table="bookmark"
- * @hibernate.cache usage="read-write"
*/
-public class WeblogBookmark
- implements Serializable, Comparable
-{
- static final long serialVersionUID = 2315131256728236003L;
+public class WeblogBookmark implements Serializable, Comparable {
+
+ public static final long serialVersionUID = 2315131256728236003L;
private WeblogBookmarkFolder folder;
-
+
private String id = UUIDGenerator.generateUUID();
private String name;
private String description;
@@ -49,27 +44,23 @@
private Integer weight;
private Integer priority;
private String image;
- private String feedUrl;
+ private String feedUrl;
- private BookmarkManager bookmarkManager = null;
-
//----------------------------------------------------------- Constructors
/** Default constructor, for use in form beans only. */
- public WeblogBookmark()
- {
+ public WeblogBookmark() {
}
public WeblogBookmark(
- WeblogBookmarkFolder parent,
- String name,
- String desc,
- String url,
- String feedUrl,
- Integer weight,
- Integer priority,
- String image)
- {
+ WeblogBookmarkFolder parent,
+ String name,
+ String desc,
+ String url,
+ String feedUrl,
+ Integer weight,
+ Integer priority,
+ String image) {
this.folder = parent;
this.name = name;
this.description = desc;
@@ -77,205 +68,179 @@
this.feedUrl = feedUrl;
this.weight = weight;
this.priority = priority;
- this.image = image;
- }
-
- /** For use by BookmarkManager implementations only. */
- public WeblogBookmark(BookmarkManager bmgr)
- {
- bookmarkManager = bmgr;
+ this.image = image;
}
-
+
//------------------------------------------------------------- Attributes
- /**
+ /**
* @roller.wrapPojoMethod type="simple"
*
- * @ejb:persistent-field
- *
+ * @ejb:persistent-field
+ *
* @hibernate.id column="id"
- * generator-class="assigned"
+ * generator-class="assigned"
*/
- public String getId()
- {
+ 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) return;
+ public void setId(String id) {
this.id = id;
}
-
- /**
+
+ /**
* Name of bookmark.
- *
+ *
* @roller.wrapPojoMethod type="simple"
*
* @struts.validator type="required" msgkey="errors.required"
* @struts.validator-args arg0resource="bookmarkForm.name"
- *
- * @ejb:persistent-field
- *
+ *
+ * @ejb:persistent-field
+ *
* @hibernate.property column="name" non-null="true" unique="false"
*/
- public String getName()
- {
+ public String getName() {
return this.name;
}
-
+
/** @ejb:persistent-field */
- public void setName(String name)
- {
+ public void setName(String name) {
this.name = name;
}
-
- /**
+
+ /**
* Description of bookmark.
*
* @roller.wrapPojoMethod type="simple"
- *
- * @ejb:persistent-field
- *
+ *
+ * @ejb:persistent-field
+ *
* @hibernate.property column="description" non-null="true" unique="false"
*/
- public String getDescription()
- {
+ public String getDescription() {
return this.description;
}
-
+
/** @ejb:persistent-field */
- public void setDescription(String description)
- {
+ public void setDescription(String description) {
this.description = description;
}
-
- /**
+
+ /**
* URL of bookmark.
*
* @roller.wrapPojoMethod type="simple"
- *
- * @ejb:persistent-field
- *
+ *
+ * @ejb:persistent-field
+ *
* @hibernate.property column="url" non-null="true" unique="false"
*/
- public String getUrl()
- {
+ public String getUrl() {
return this.url;
}
-
+
/** @ejb:persistent-field */
- public void setUrl(String url)
- {
+ public void setUrl(String url) {
this.url = url;
}
-
- /**
+
+ /**
* Weight indicates prominence of link
*
* @roller.wrapPojoMethod type="simple"
- *
+ *
* @struts.validator type="required" msgkey="errors.required"
* @struts.validator type="integer" msgkey="errors.integer"
* @struts.validator-args arg0resource="bookmarkForm.weight"
- *
- * @ejb:persistent-field
- *
+ *
+ * @ejb:persistent-field
+ *
* @hibernate.property column="weight" non-null="true" unique="false"
*/
- public java.lang.Integer getWeight()
- {
+ public java.lang.Integer getWeight() {
return this.weight;
}
-
+
/** @ejb:persistent-field */
- public void setWeight(java.lang.Integer weight)
- {
+ public void setWeight(java.lang.Integer weight) {
this.weight = weight;
}
-
- /**
- * Priority determines order of display
+
+ /**
+ * Priority determines order of display
*
* @roller.wrapPojoMethod type="simple"
- *
+ *
* @struts.validator type="required" msgkey="errors.required"
* @struts.validator type="integer" msgkey="errors.integer"
* @struts.validator-args arg0resource="bookmarkForm.priority"
- *
- * @ejb:persistent-field
- *
+ *
+ * @ejb:persistent-field
+ *
* @hibernate.property column="priority" non-null="true" unique="false"
*/
- public java.lang.Integer getPriority()
- {
+ public java.lang.Integer getPriority() {
return this.priority;
}
-
+
/** @ejb:persistent-field */
- public void setPriority(java.lang.Integer priority)
- {
+ public void setPriority(java.lang.Integer priority) {
this.priority = priority;
}
-
- /**
- * @ejb:persistent-field
+
+ /**
+ * @ejb:persistent-field
*
* @roller.wrapPojoMethod type="simple"
- *
+ *
* @hibernate.property column="image" non-null="true" unique="false"
*/
- public String getImage()
- {
+ public String getImage() {
return this.image;
}
-
+
/** @ejb:persistent-field */
- public void setImage(String image)
- {
+ public void setImage(String image) {
this.image = image;
}
-
- /**
- * @ejb:persistent-field
+
+ /**
+ * @ejb:persistent-field
*
* @roller.wrapPojoMethod type="simple"
- *
+ *
* @hibernate.property column="feedurl" non-null="true" unique="false"
*/
- public String getFeedUrl()
- {
+ public String getFeedUrl() {
return this.feedUrl;
}
-
+
/** @ejb:persistent-field */
- public void setFeedUrl(String feedUrl)
- {
+ public void setFeedUrl(String feedUrl) {
this.feedUrl = feedUrl;
}
-
+
//---------------------------------------------------------- Relationships
- /**
+ /**
* @roller.wrapPojoMethod type="pojo"
- * @ejb:persistent-field
+ * @ejb:persistent-field
* @hibernate.many-to-one column="folderid" cascade="none" not-null="true"
*/
- public org.apache.roller.weblogger.pojos.WeblogBookmarkFolder getFolder()
- {
+ public org.apache.roller.weblogger.pojos.WeblogBookmarkFolder getFolder() {
return this.folder;
}
-
+
/** @ejb:persistent-field */
- public void setFolder(org.apache.roller.weblogger.pojos.WeblogBookmarkFolder folder)
- {
+ public void setFolder(org.apache.roller.weblogger.pojos.WeblogBookmarkFolder folder) {
this.folder = folder;
}
-
+
//------------------------------------------------------- Good citizenship
-
+
public String toString() {
StringBuffer buf = new StringBuffer();
buf.append("{");
@@ -284,61 +249,36 @@
buf.append("}");
return buf.toString();
}
-
+
public boolean equals(Object other) {
if (other == this) return true;
if (other instanceof WeblogBookmark != true) return false;
WeblogBookmark o = (WeblogBookmark)other;
return new EqualsBuilder()
- .append(getName(), o.getName())
- .append(getFolder(), o.getFolder())
- .isEquals();
+ .append(getName(), o.getName())
+ .append(getFolder(), o.getFolder())
+ .isEquals();
}
- public int hashCode() {
+ public int hashCode() {
return new HashCodeBuilder()
- .append(getName())
- .append(getFolder())
- .toHashCode();
+ .append(getName())
+ .append(getFolder())
+ .toHashCode();
}
+
/**
- * Set bean properties based on other bean.
- */
- public void setData(WeblogBookmark other)
- {
- this.id = other.getId();
- this.name = other.getName();
- this.description = other.getDescription();
- this.url = other.getUrl();
- this.weight = other.getWeight();
- this.priority = other.getPriority();
- this.folder = other.getFolder();
- this.image = other.getImage();
- this.feedUrl = other.getUrl();
- }
-
- /**
* @see java.lang.Comparable#compareTo(java.lang.Object)
*/
- public int compareTo(Object o)
- {
+ public int compareTo(Object o) {
return bookmarkComparator.compare(this, o);
}
private BookmarkComparator bookmarkComparator = new BookmarkComparator();
-
- /**
- * @param impl
- */
- public void setBookmarkManager(BookmarkManager bmgr)
- {
- bookmarkManager = bmgr;
- }
-
- public Weblog getWebsite()
- {
+
+ public Weblog getWebsite() {
return this.folder.getWebsite();
}
-
+
}
Modified: roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/pojos/WeblogBookmarkFolder.java
URL: http://svn.apache.org/viewvc/roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/pojos/WeblogBookmarkFolder.java?view=diff&rev=553572&r1=553571&r2=553572
==============================================================================
--- roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/pojos/WeblogBookmarkFolder.java (original)
+++ roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/pojos/WeblogBookmarkFolder.java Thu Jul 5 10:32:12 2007
@@ -39,10 +39,6 @@
* set of Folders (there is no one root folder) and each Folder may contain
* Folders or Bookmarks. Don't construct one of these yourself, instead use
* the create method in your BookmarkManager implementation.</p>
- *
- * @ejb:bean name="WeblogBookmarkFolder"
- * @hibernate.class lazy="true" table="folder"
- * @hibernate.cache usage="read-write"
*/
public class WeblogBookmarkFolder implements Serializable, Comparable {
@@ -87,19 +83,6 @@
} else {
this.path = parent.getPath() + "/" + name;
}
- }
-
-
- public void setData(WeblogBookmarkFolder otherData) {
-
- this.id = otherData.getId();
- this.name = otherData.getName();
- this.description = otherData.getDescription();
- this.path = otherData.getPath();
- this.website = otherData.getWebsite();
- this.parentFolder = otherData.getParent();
- this.childFolders = otherData.getFolders();
- this.setBookmarks(otherData.getBookmarks());
}
Modified: roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/pojos/WeblogEntryAttribute.java
URL: http://svn.apache.org/viewvc/roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/pojos/WeblogEntryAttribute.java?view=diff&rev=553572&r1=553571&r2=553572
==============================================================================
--- roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/pojos/WeblogEntryAttribute.java (original)
+++ roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/pojos/WeblogEntryAttribute.java Thu Jul 5 10:32:12 2007
@@ -1,142 +1,81 @@
/*
-* Licensed to the Apache Software Foundation (ASF) under one or more
-* contributor license agreements. The ASF licenses this file to You
-* under the Apache License, Version 2.0 (the "License"); you may not
-* use this file except in compliance with the License.
-* You may obtain a copy of the License at
-*
-* http://www.apache.org/licenses/LICENSE-2.0
-*
-* Unless required by applicable law or agreed to in writing, software
-* distributed under the License is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-* See the License for the specific language governing permissions and
-* limitations under the License. For additional information regarding
-* copyright in this work, please see the NOTICE file in the top level
-* directory of this distribution.
-*/
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. The ASF licenses this file to You
+ * under the Apache License, Version 2.0 (the "License"); you may not
+ * use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License. For additional information regarding
+ * copyright in this work, please see the NOTICE file in the top level
+ * directory of this distribution.
+ */
+
package org.apache.roller.weblogger.pojos;
import org.apache.commons.lang.builder.EqualsBuilder;
import org.apache.commons.lang.builder.HashCodeBuilder;
import org.apache.roller.util.UUIDGenerator;
+
/**
- * @author David M Johnson
- * @ejb:bean name="WeblogEntryAttribute"
- * @hibernate.class lazy="true" table="entryattribute"
- * @hibernate.cache usage="read-write"
+ * Weblog entry attribute.
*/
-public class WeblogEntryAttribute implements java.lang.Comparable
-{
+public class WeblogEntryAttribute implements Comparable {
+
private String id = UUIDGenerator.generateUUID();
private WeblogEntry entry;
private String name;
private String value;
- public WeblogEntryAttribute()
- {
- }
-
- public WeblogEntryAttribute(
-
- String id,WeblogEntry entry,
- String name,
- String value)
- {
- //this.id = id;
- this.entry = entry;
- this.name = name;
- this.value = value;
- }
-
- public WeblogEntryAttribute(WeblogEntryAttribute otherData)
- {
- setData(otherData);
+
+ public WeblogEntryAttribute() {
}
-
- /**
- * @roller.wrapPojoMethod type="simple"
- * @ejb:persistent-field
- * @hibernate.id column="id"
- * generator-class="assigned"
- */
- public java.lang.String getId()
- {
+
+
+ public String getId() {
return this.id;
}
- /** @ejb:persistent-field */
- public void setId(java.lang.String id)
- {
- // Form bean workaround: empty string is never a valid id
- if (id != null && id.trim().length() == 0) return;
-
+
+ public void setId(String id) {
this.id = id;
}
-
- /**
- * Set bean properties based on other bean.
- */
- public void setData(WeblogEntryAttribute otherData)
- {
- this.id = otherData.getId();
- this.entry = otherData.getEntry();
- this.name = otherData.getName();
- this.value = otherData.getValue();
- }
-
- /**
- * @roller.wrapPojoMethod type="pojo"
- * @ejb:persistent-field
- * @hibernate.many-to-one column="entryid" cascade="none" not-null="true"
- */
- public WeblogEntry getEntry()
- {
+
+
+ public WeblogEntry getEntry() {
return entry;
}
- /** @ejb:persistent-field */
- public void setEntry(WeblogEntry entry)
- {
+
+ public void setEntry(WeblogEntry entry) {
this.entry = entry;
}
-
- /**
- * @roller.wrapPojoMethod type="simple"
- * @ejb:persistent-field
- * @hibernate.property column="name" non-null="true" unique="false"
- */
- public String getName()
- {
+
+
+ public String getName() {
return name;
}
- /** @ejb:persistent-field */
- public void setName(String name)
- {
+
+ public void setName(String name) {
this.name = name;
}
- /**
- * @roller.wrapPojoMethod type="simple"
- * @ejb:persistent-field
- * @hibernate.property column="value" non-null="true" unique="false"
- */
- public String getValue()
- {
+
+ public String getValue() {
return value;
}
- /** @ejb:persistent-field */
- public void setValue(String value)
- {
+
+ public void setValue(String value) {
this.value = value;
}
-
- public int compareTo(Object o) {
- WeblogEntryAttribute att = (WeblogEntryAttribute)o;
- return getName().compareTo(att.getName());
- }
+
//------------------------------------------------------- Good citizenship
-
+
public String toString() {
StringBuffer buf = new StringBuffer();
buf.append("{");
@@ -152,15 +91,21 @@
if (other instanceof WeblogEntryAttribute != true) return false;
WeblogEntryAttribute o = (WeblogEntryAttribute)other;
return new EqualsBuilder()
- .append(getName(), o.getName())
- .append(getEntry(), o.getEntry())
- .isEquals();
+ .append(getName(), o.getName())
+ .append(getEntry(), o.getEntry())
+ .isEquals();
}
- public int hashCode() {
+ public int hashCode() {
return new HashCodeBuilder()
- .append(getName())
- .append(getEntry())
- .toHashCode();
+ .append(getName())
+ .append(getEntry())
+ .toHashCode();
+ }
+
+ public int compareTo(Object o) {
+ WeblogEntryAttribute att = (WeblogEntryAttribute)o;
+ return getName().compareTo(att.getName());
}
+
}
Modified: roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/pojos/WeblogEntryComment.java
URL: http://svn.apache.org/viewvc/roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/pojos/WeblogEntryComment.java?view=diff&rev=553572&r1=553571&r2=553572
==============================================================================
--- roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/pojos/WeblogEntryComment.java (original)
+++ roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/pojos/WeblogEntryComment.java Thu Jul 5 10:32:12 2007
@@ -24,26 +24,22 @@
import org.apache.commons.lang.builder.HashCodeBuilder;
import org.apache.roller.util.UUIDGenerator;
+
/**
- * Weblogentry Comment bean.
- *
- * @ejb:bean name="WeblogEntryComment"
- * @struts.form include-all="true"
- *
- * @hibernate.class lazy="true" table="roller_comment"
- * @hibernate.cache usage="read-write"
+ * WeblogEntry comment bean.
*/
public class WeblogEntryComment implements Serializable {
public static final long serialVersionUID = -6668122596726478462L;
+ // status options
public static final String APPROVED = "APPROVED";
public static final String DISAPPROVED = "DISAPPROVED";
public static final String SPAM = "SPAM";
public static final String PENDING = "PENDING";
+ // attributes
private String id = UUIDGenerator.generateUUID();
-
private String name = null;
private String email = null;
private String url = null;
@@ -51,51 +47,28 @@
private Timestamp postTime = null;
private String status = APPROVED;
private Boolean notify = Boolean.FALSE;
-
private String remoteHost = null;
private String referrer = null;
private String userAgent = null;
+ // associations
private WeblogEntry weblogEntry = null;
public WeblogEntryComment() {}
- public WeblogEntryComment(WeblogEntry entry, String name, String email,
- String url, String content, Timestamp postTime,
- String status, Boolean notify) {
- this.name = name;
- this.email = email;
- this.url = url;
- this.content = content;
- this.postTime = postTime;
- this.notify = notify;
-
- this.weblogEntry = entry;
- }
-
- public WeblogEntryComment(WeblogEntryComment otherData) {
- this.setData(otherData);
- }
/**
- * Database ID of comment
- * @roller.wrapPojoMethod type="simple"
- * @ejb:persistent-field
- * @hibernate.id column="id"
- * generator-class="assigned"
+ * Database ID of comment
*/
- public java.lang.String getId() {
+ public String getId() {
return this.id;
}
/**
* Database ID of comment
- * @ejb:persistent-field
*/
- public void setId(java.lang.String id) {
- // Form bean workaround: empty string is never a valid id
- if (id != null && id.trim().length() == 0) return;
+ public void setId(String id) {
this.id = id;
}
@@ -123,7 +96,7 @@
* @ejb:persistent-field
* @hibernate.property column="name" non-null="true" unique="false"
*/
- public java.lang.String getName() {
+ public String getName() {
return this.name;
}
@@ -131,7 +104,7 @@
* Name of person who wrote comment.
* @ejb:persistent-field
*/
- public void setName(java.lang.String name) {
+ public void setName(String name) {
this.name = name;
}
@@ -141,7 +114,7 @@
* @ejb:persistent-field
* @hibernate.property column="email" non-null="true" unique="false"
*/
- public java.lang.String getEmail() {
+ public String getEmail() {
return this.email;
}
@@ -149,7 +122,7 @@
* Email of person who wrote comment.
* @ejb:persistent-field
*/
- public void setEmail(java.lang.String email) {
+ public void setEmail(String email) {
this.email = email;
}
@@ -159,7 +132,7 @@
* @ejb:persistent-field
* @hibernate.property column="url" non-null="true" unique="false"
*/
- public java.lang.String getUrl() {
+ public String getUrl() {
return this.url;
}
@@ -167,7 +140,7 @@
* URL of person who wrote comment.
* @ejb:persistent-field
*/
- public void setUrl(java.lang.String url) {
+ public void setUrl(String url) {
this.url = url;
}
@@ -177,7 +150,7 @@
* @ejb:persistent-field
* @hibernate.property column="content" non-null="true" unique="false"
*/
- public java.lang.String getContent() {
+ public String getContent() {
return this.content;
}
@@ -185,7 +158,7 @@
* Content of comment.
* @ejb:persistent-field
*/
- public void setContent(java.lang.String content) {
+ public void setContent(String content) {
this.content = content;
}
@@ -308,9 +281,6 @@
return new Boolean(SPAM.equals(this.status));
}
- /** No-op to please XDoclet */
- public void setSpam(Boolean b) {}
-
/**
* True if comment has is pending moderator approval.
*
@@ -320,9 +290,6 @@
return new Boolean(PENDING.equals(this.status));
}
- /** No-op to please XDoclet */
- public void setPending(Boolean b) {}
-
/**
* Indicates that comment has been approved for display on weblog.
*
@@ -332,9 +299,6 @@
return new Boolean(APPROVED.equals(this.status));
}
- /** No-op to please XDoclet */
- public void setApproved(Boolean b) {}
-
/**
* Timestamp to be used to formulate comment permlink.
*
@@ -347,9 +311,6 @@
return null;
}
- /** No-op to please XDoclet */
- public void setTimestamp(String timeStamp) {}
-
//------------------------------------------------------- Good citizenship
public String toString() {
@@ -380,24 +341,6 @@
.append(getPostTime())
.append(getWeblogEntry())
.toHashCode();
- }
-
- /**
- * Set bean properties based on other bean.
- */
- public void setData(WeblogEntryComment otherComment) {
-
- this.id = otherComment.getId();
- this.weblogEntry = otherComment.getWeblogEntry();
- this.name = otherComment.getName();
- this.email = otherComment.getEmail();
- this.url = otherComment.getUrl();
- this.content = otherComment.getContent();
- this.postTime = otherComment.getPostTime();
- this.notify = otherComment.getNotify();
- this.setStatus(otherComment.getStatus());
- this.setReferrer(otherComment.getReferrer());
- this.setUserAgent(otherComment.getUserAgent());
}
}
Modified: roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/pojos/WeblogEntryTag.java
URL: http://svn.apache.org/viewvc/roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/pojos/WeblogEntryTag.java?view=diff&rev=553572&r1=553571&r2=553572
==============================================================================
--- roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/pojos/WeblogEntryTag.java (original)
+++ roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/pojos/WeblogEntryTag.java Thu Jul 5 10:32:12 2007
@@ -1,59 +1,54 @@
/*
-* Licensed to the Apache Software Foundation (ASF) under one or more
-* contributor license agreements. The ASF licenses this file to You
-* under the Apache License, Version 2.0 (the "License"); you may not
-* use this file except in compliance with the License.
-* You may obtain a copy of the License at
-*
-* http://www.apache.org/licenses/LICENSE-2.0
-*
-* Unless required by applicable law or agreed to in writing, software
-* distributed under the License is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-* See the License for the specific language governing permissions and
-* limitations under the License. For additional information regarding
-* copyright in this work, please see the NOTICE file in the top level
-* directory of this distribution.
-*/
-/*
- * Generated file - Do not edit!
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. The ASF licenses this file to You
+ * under the Apache License, Version 2.0 (the "License"); you may not
+ * use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License. For additional information regarding
+ * copyright in this work, please see the NOTICE file in the top level
+ * directory of this distribution.
*/
+
package org.apache.roller.weblogger.pojos;
+import java.io.Serializable;
import java.sql.Timestamp;
import org.apache.commons.lang.builder.EqualsBuilder;
import org.apache.commons.lang.builder.HashCodeBuilder;
import org.apache.roller.util.UUIDGenerator;
+
/**
* Tag bean.
- *
+ *
* @author Elias Torres
- * @ejb:bean name="WeblogEntryTag"
- * @hibernate.cache usage="read-write"
- * @hibernate.class lazy="true" table="roller_weblogentrytag"
- * @struts.form include-all="true"
*/
-public class WeblogEntryTag
- implements java.io.Serializable
-{
+public class WeblogEntryTag implements Serializable {
+
private static final long serialVersionUID = -2602052289337573384L;
- private java.lang.String id = UUIDGenerator.generateUUID();
+
+ private String id = UUIDGenerator.generateUUID();
private Weblog website = null;
private WeblogEntry weblogEntry = null;
private User user = null;
- private java.lang.String name = null;
+ private String name = null;
private Timestamp time = null;
-
- public WeblogEntryTag()
- {
+
+
+ public WeblogEntryTag() {
}
-
- public WeblogEntryTag(java.lang.String id,
- Weblog website,WeblogEntry weblogEntry,
- User user, java.lang.String name,
- Timestamp time)
- {
+
+ public WeblogEntryTag(String id,
+ Weblog website,WeblogEntry weblogEntry,
+ User user, String name,
+ Timestamp time) {
//this.id = id;
this.website = website;
this.weblogEntry = weblogEntry;
@@ -61,111 +56,72 @@
this.name = name;
this.time = time;
}
-
- public WeblogEntryTag(WeblogEntryTag otherData)
- {
- setData(otherData);
- }
-
+
//------------------------------------------------------- Simple properties
-
- /**
- * Unique ID and primary key of this Referer.
- *
- * @roller.wrapPojoMethod type="simple"
- * @hibernate.id column="id" generator-class="assigned"
+
+ /**
+ * Unique ID and primary key.
*/
- public java.lang.String getId()
- {
+ public String getId() {
return this.id;
}
-
- public void setId(java.lang.String id)
- {
- // Form bean workaround: empty string is never a valid id
- if (id != null && id.trim().length() == 0) return;
+
+ public void setId(String id) {
this.id = id;
}
-
- /**
+
+
+ /**
* ID of website that this tag refers to.
- *
- * @roller.wrapPojoMethod type="pojo"
- * @hibernate.many-to-one column="websiteid" cascade="none" not-null="true"
*/
- public org.apache.roller.weblogger.pojos.Weblog getWeblog()
- {
+ public Weblog getWeblog() {
return this.website;
}
-
- public void setWeblog(org.apache.roller.weblogger.pojos.Weblog website)
- {
+
+ public void setWeblog(Weblog website) {
this.website = website;
}
-
- /**
- * @roller.wrapPojoMethod type="pojo"
- * @hibernate.many-to-one column="entryid" cascade="none"
- */
- public org.apache.roller.weblogger.pojos.WeblogEntry getWeblogEntry()
- {
+
+
+ public WeblogEntry getWeblogEntry() {
return weblogEntry;
}
-
- /**
- * @param data
- */
- public void setWeblogEntry(org.apache.roller.weblogger.pojos.WeblogEntry data)
- {
+
+ public void setWeblogEntry(WeblogEntry data) {
weblogEntry = data;
}
- /**
- * @roller.wrapPojoMethod type="pojo"
- * @hibernate.many-to-one column="userid" cascade="none"
- */
+
public User getUser() {
return this.user;
}
- /** @ejb:persistent-field */
+
public void setUser( User user ) {
this.user = user;
- }
+ }
/**
- * Tag value
- *
- * @roller.wrapPojoMethod type="simple"
- * @ejb:persistent-field
- * @hibernate.property column="name" non-null="true" unique="false"
+ * Tag value.
*/
public String getName() {
return this.name;
}
- /** @ejb:persistent-field */
+
public void setName( String name ) {
this.name = name;
- }
+ }
+
+
+ public java.sql.Timestamp getTime() {
+ return this.time;
+ }
+
+ public void setTime(java.sql.Timestamp tagTime) {
+ this.time = tagTime;
+ }
- /**
- *
- * @roller.wrapPojoMethod type="simple"
- * @ejb:persistent-field
- * @hibernate.property column="time" non-null="true" unique="false"
- */
- public java.sql.Timestamp getTime()
- {
- return this.time;
- }
-
- /** @ejb:persistent-field */
- public void setTime(java.sql.Timestamp tagTime)
- {
- this.time = tagTime;
- }
-
//------------------------------------------------------- Good citizenship
-
+
public String toString() {
StringBuffer buf = new StringBuffer();
buf.append("{");
@@ -175,36 +131,22 @@
buf.append("}");
return buf.toString();
}
-
+
public boolean equals(Object other) {
if (other == this) return true;
if (other instanceof WeblogEntryTag != true) return false;
WeblogEntryTag o = (WeblogEntryTag)other;
return new EqualsBuilder()
- .append(getName(), o.getName())
- .append(getWeblogEntry(), o.getWeblogEntry())
- .isEquals();
+ .append(getName(), o.getName())
+ .append(getWeblogEntry(), o.getWeblogEntry())
+ .isEquals();
}
- public int hashCode() {
+ public int hashCode() {
return new HashCodeBuilder()
- .append(getName())
- .append(getWeblogEntry())
- .toHashCode();
+ .append(getName())
+ .append(getWeblogEntry())
+ .toHashCode();
}
-
- /**
- * Set bean properties based on other bean.
- */
- public void setData(WeblogEntryTag otherData)
- {
- WeblogEntryTag data = (WeblogEntryTag) otherData;
- this.id = data.getId();
- this.website = data.getWeblog();
- this.weblogEntry = data.getWeblogEntry();
- this.user = data.getUser();
- this.name = data.getName();
- this.time = data.getTime();
- }
-
+
}
Modified: roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/pojos/WeblogEntryTagAggregate.java
URL: http://svn.apache.org/viewvc/roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/pojos/WeblogEntryTagAggregate.java?view=diff&rev=553572&r1=553571&r2=553572
==============================================================================
--- roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/pojos/WeblogEntryTagAggregate.java (original)
+++ roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/pojos/WeblogEntryTagAggregate.java Thu Jul 5 10:32:12 2007
@@ -1,150 +1,110 @@
/*
-* Licensed to the Apache Software Foundation (ASF) under one or more
-* contributor license agreements. The ASF licenses this file to You
-* under the Apache License, Version 2.0 (the "License"); you may not
-* use this file except in compliance with the License.
-* You may obtain a copy of the License at
-*
-* http://www.apache.org/licenses/LICENSE-2.0
-*
-* Unless required by applicable law or agreed to in writing, software
-* distributed under the License is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-* See the License for the specific language governing permissions and
-* limitations under the License. For additional information regarding
-* copyright in this work, please see the NOTICE file in the top level
-* directory of this distribution.
-*/
-/*
- * Generated file - Do not edit!
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. The ASF licenses this file to You
+ * under the Apache License, Version 2.0 (the "License"); you may not
+ * use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License. For additional information regarding
+ * copyright in this work, please see the NOTICE file in the top level
+ * directory of this distribution.
*/
+
package org.apache.roller.weblogger.pojos;
+import java.io.Serializable;
import java.sql.Timestamp;
import org.apache.commons.lang.builder.EqualsBuilder;
import org.apache.commons.lang.builder.HashCodeBuilder;
import org.apache.roller.util.UUIDGenerator;
+
/**
- *
- *
- * @author Elias Torres
- * @ejb:bean name="WeblogEntryTagAggregate"
- * @hibernate.cache usage="read-write"
- * @hibernate.class lazy="true" table="roller_weblogentrytagagg"
- * @struts.form include-all="true"
+ * Tag aggregate data.
*/
-public class WeblogEntryTagAggregate
- implements java.io.Serializable
-{
- private static final long serialVersionUID = -4343500268898106982L;
- private java.lang.String id = UUIDGenerator.generateUUID();
- private java.lang.String name = null;
+public class WeblogEntryTagAggregate implements Serializable {
+
+ public static final long serialVersionUID = -4343500268898106982L;
+
+ private String id = UUIDGenerator.generateUUID();
+ private String name = null;
private Weblog website = null;
private Timestamp lastUsed = null;
private int total = 0;
-
- public WeblogEntryTagAggregate()
- {
+
+
+ public WeblogEntryTagAggregate() {
}
-
- public WeblogEntryTagAggregate(java.lang.String id,
- Weblog website,
- java.lang.String name, int total)
- {
+
+ public WeblogEntryTagAggregate(String id,
+ Weblog website,
+ String name, int total) {
//this.id = id;
this.website = website;
this.name = name;
this.total = total;
}
-
- public WeblogEntryTagAggregate(WeblogEntryTagAggregate otherData)
- {
- setData(otherData);
- }
-
+
//------------------------------------------------------- Simple properties
-
- /**
- * Unique ID and primary key of this Referer.
- *
- * @hibernate.id column="id" generator-class="assigned"
+
+ /**
+ * Unique ID and primary key.
*/
- public java.lang.String getId()
- {
+ public String getId() {
return this.id;
}
-
- public void setId(java.lang.String id)
- {
- // Form bean workaround: empty string is never a valid id
- if (id != null && id.trim().length() == 0) return;
+
+ public void setId(String id) {
this.id = id;
}
- /**
- * @roller.wrapPojoMethod type="pojo"
- * @ejb:persistent-field
- * @hibernate.many-to-one column="websiteid" cascade="none" not-null="false"
- */
+
public Weblog getWeblog() {
return this.website;
}
- /** @ejb:persistent-field */
public void setWeblog(Weblog website) {
this.website = website;
- }
-
+ }
+
+
/**
- * Tag value
- *
- * @roller.wrapPojoMethod type="simple"
- * @ejb:persistent-field
- * @hibernate.property column="name" non-null="true" unique="false"
+ * Tag value.
*/
public String getName() {
return this.name;
}
- /** @ejb:persistent-field */
+
public void setName( String name ) {
this.name = name;
- }
+ }
+
+
+ public int getTotal() {
+ return this.total;
+ }
+
+ public void setTotal(int total) {
+ this.total = total;
+ }
+
+
+ public Timestamp getLastUsed() {
+ return this.lastUsed;
+ }
+
+ public void setLastUsed(Timestamp lastUsed) {
+ this.lastUsed = lastUsed;
+ }
- /**
- *
- * @roller.wrapPojoMethod type="simple"
- * @ejb:persistent-field
- * @hibernate.property column="total" non-null="true" unique="false"
- */
- public int getTotal()
- {
- return this.total;
- }
-
- /**
- *
- * @roller.wrapPojoMethod type="simple"
- * @ejb:persistent-field
- * @hibernate.property column="lastused" non-null="true" unique="false"
- */
- public Timestamp getLastUsed() {
- return this.lastUsed;
- }
-
- /** @ejb:persistent-field */
- public void setLastUsed(Timestamp lastUsed) {
- this.lastUsed = lastUsed;
- }
-
- /** @ejb:persistent-field */
- public void setTotal(int total)
- {
- this.total = total;
- }
-
//------------------------------------------------------- Good citizenship
-
+
public String toString() {
StringBuffer buf = new StringBuffer();
buf.append("{");
@@ -155,34 +115,22 @@
buf.append("}");
return buf.toString();
}
-
+
public boolean equals(Object other) {
if (other == this) return true;
if (other instanceof WeblogEntryTagAggregate != true) return false;
WeblogEntryTagAggregate o = (WeblogEntryTagAggregate)other;
return new EqualsBuilder()
- .append(getName(), o.getName())
- .append(this.getWeblog(), o.getWeblog())
- .isEquals();
+ .append(getName(), o.getName())
+ .append(this.getWeblog(), o.getWeblog())
+ .isEquals();
}
- public int hashCode() {
+ public int hashCode() {
return new HashCodeBuilder()
- .append(getName())
- .append(getWeblog())
- .toHashCode();
- }
-
- /**
- * Set bean properties based on other bean.
- */
- public void setData(WeblogEntryTagAggregate data)
- {
- this.id = data.getId();
- this.website = data.getWeblog();
- this.name = data.getName();
- this.total = data.getTotal();
- this.lastUsed = data.getLastUsed();
+ .append(getName())
+ .append(getWeblog())
+ .toHashCode();
}
-
+
}
Modified: roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/pojos/WeblogHitCount.java
URL: http://svn.apache.org/viewvc/roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/pojos/WeblogHitCount.java?view=diff&rev=553572&r1=553571&r2=553572
==============================================================================
--- roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/pojos/WeblogHitCount.java (original)
+++ roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/pojos/WeblogHitCount.java Thu Jul 5 10:32:12 2007
@@ -22,12 +22,9 @@
import org.apache.commons.lang.builder.HashCodeBuilder;
import org.apache.roller.util.UUIDGenerator;
+
/**
* Represents hit count data for a weblog.
- *
- * @ejb:bean name="WeblogHitCount"
- * @hibernate.class lazy="true" table="roller_hitcounts"
- * @hibernate.cache usage="read-write"
*/
public class WeblogHitCount implements Serializable {
@@ -37,13 +34,6 @@
public WeblogHitCount() {}
-
-
- public void setData(WeblogHitCount other) {
- this.id = other.getId();
- this.weblog = other.getWeblog();
- this.dailyHits = other.getDailyHits();
- }
//------------------------------------------------------- Good citizenship
@@ -56,8 +46,6 @@
buf.append("}");
return buf.toString();
}
-
- //------------------------------------------------------------------------
public boolean equals(Object other) {
@@ -76,24 +64,15 @@
}
- /**
- * @ejb:persistent-field
- * @hibernate.id column="id" generator-class="assigned"
- */
public String getId() {
return id;
}
public void setId(String id) {
- // Form bean workaround: empty string is never a valid id
- if (id != null && id.trim().length() == 0) return;
this.id = id;
}
- /**
- * @ejb:persistent-field
- * @hibernate.many-to-one column="websiteid" cascade="none" non-null="true"
- */
+
public Weblog getWeblog() {
return weblog;
}
@@ -102,10 +81,7 @@
this.weblog = weblog;
}
- /**
- * @ejb:persistent-field
- * @hibernate.property column="dailyhits" non-null="true" unique="false"
- */
+
public int getDailyHits() {
return dailyHits;
}