roller/src/org/roller/pojos PageData.java,1.1,1.2 RoleData.java,1.1,1.2 UserData.java,1.1,1.2

Update of /cvsroot/roller/roller/src/org/roller/pojos
In directory sc8-pr-cvs1:/tmp/cvs-serv12635/src/org/roller/pojos

Modified Files:
        PageData.java RoleData.java UserData.java 
Log Message:
Changes for 
http://opensource.atlassian.com/projects/roller/secure/ViewIssue.jspa?key=ROL-187
"reserved keywords".

Note: you will need to update your roller.xml/roller.conf (or web.xml) to 
change the authentication parameters: password -> passphrase, role (table) -> 
userrole, and role (column) -> rolename.  I have made these changes to the CVS 
files (could someone test the roller.xml changes for Tomcat please).

Index: PageData.java
===================================================================
RCS file: /cvsroot/roller/roller/src/org/roller/pojos/PageData.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** PageData.java       25 May 2003 12:51:13 -0000      1.1
--- PageData.java       13 Jun 2003 15:56:24 -0000      1.2
***************
*** 7,13 ****
   * @ejb:bean name="PageData"
   * @struts.form include-all="true"
!  * @castor.class name="page" table="page" id="id"
   *  key-generator="UUID" auto-complete="true"
!  * @hibernate.class table="page"
   */
  public class PageData
--- 7,13 ----
   * @ejb:bean name="PageData"
   * @struts.form include-all="true"
!  * @castor.class name="webpage" table="webpage" id="id"
   *  key-generator="UUID" auto-complete="true"
!  * @hibernate.class table="webpage"
   */
  public class PageData

Index: RoleData.java
===================================================================
RCS file: /cvsroot/roller/roller/src/org/roller/pojos/RoleData.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** RoleData.java       25 May 2003 12:51:13 -0000      1.1
--- RoleData.java       13 Jun 2003 15:56:24 -0000      1.2
***************
*** 11,18 ****
   * @ejb:bean name="RoleData"
   * @struts.form include-all="true"
!  * @castor.class name="role" table="role"
   *  id="id" key-generator="UUID" auto-complete="true"
   *  cache-type="unlimited"
!  * @hibernate.class table="role"
   */
  public class RoleData
--- 11,18 ----
   * @ejb:bean name="RoleData"
   * @struts.form include-all="true"
!  * @castor.class name="userrole" table="userrole"
   *  id="id" key-generator="UUID" auto-complete="true"
   *  cache-type="unlimited"
!  * @hibernate.class table="userrole"
   */
  public class RoleData
***************
*** 101,107 ****
     /** 
      * @castor.field set-method="setRole"
!     * @castor.field-sql name="role" dirty="check" sql-dirty="check"
      * @ejb:persistent-field 
!     * @hibernate.property column="role" non-null="true" unique="false"
      */
     public java.lang.String getRole()
--- 101,107 ----
     /** 
      * @castor.field set-method="setRole"
!     * @castor.field-sql name="rolename" dirty="check" sql-dirty="check"
      * @ejb:persistent-field 
!     * @hibernate.property column="rolename" non-null="true" unique="false"
      */
     public java.lang.String getRole()

Index: UserData.java
===================================================================
RCS file: /cvsroot/roller/roller/src/org/roller/pojos/UserData.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** UserData.java       25 May 2003 12:51:13 -0000      1.1
--- UserData.java       13 Jun 2003 15:56:24 -0000      1.2
***************
*** 85,91 ****
     /** Password of the user.
       * @castor.field set-method="setPassword"
!      * @castor.field-sql name="password" dirty="check" sql-dirty="check" 
       * @ejb:persistent-field 
!      * @hibernate.property column="password" non-null="true" unique="true"
       */
     public java.lang.String getPassword()
--- 85,91 ----
     /** Password of the user.
       * @castor.field set-method="setPassword"
!      * @castor.field-sql name="passphrase" dirty="check" sql-dirty="check" 
       * @ejb:persistent-field 
!      * @hibernate.property column="passphrase" non-null="true" unique="true"
       */
     public java.lang.String getPassword()




-------------------------------------------------------
This SF.NET email is sponsored by: eBay
Great deals on office technology -- on eBay now! Click here:
http://adfarm.mediaplex.com/ad/ck/711-11697-6916-5